592 files changed, 33586 insertions, 47269 deletions

diff --git a/data/classificator.txt b/data/classificator.txt
index 63bd0fd469..b36e28609d 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -21,41 +21,30 @@ world  +
         bank  -
         bar  -
         bench  -
-        bicycle_parking  -
         bicycle_rental  -
-        brothel  -
         bureau_de_change  -
         bus_station  -
         cafe  -
         car_rental  -
         car_sharing  -
-        casino  -
         cinema  -
         college  -
-        community_centre  -
-        courthouse  -
-        dentist  -
         doctors  -
         drinking_water  -
         embassy  -
-        emergency_phone  -
         fast_food  -
         ferry_terminal  -
-        fire_hydrant  -
         fire_station  -
         fountain  -
         fuel  -
-        gambling  -
         grave_yard  +
             christian  -
             {}
         hospital  -
         hunting_stand  -
         kindergarten  -
-        laundry  -
         library  -
         marketplace  -
-        money_transfer  -
         nightclub  -
         parking  +
             fee  -
@@ -77,7 +66,6 @@ world  +
         police  -
         post_box  -
         post_office  -
-        prison  -
         pub  -
         recycling  -
         restaurant  +
@@ -87,8 +75,6 @@ world  +
             {}
         school  -
         shelter  -
-        shower  -
-        social_facility  -
         speed_trap  -
         taxi  -
         telephone  -
@@ -96,7 +82,6 @@ world  +
         toilets  -
         townhall  -
         university  -
-        waste_basket  -
         {}
     area:highway  +
         cycleway  -
@@ -118,7 +103,6 @@ world  +
     barrier  +
         block  -
         bollard  -
-        border_control  -
         city_wall  -
         cycle_barrier  -
         fence  -
@@ -163,24 +147,10 @@ world  +
             underground  -
             {}
         {}
-    craft  +
-        carpenter  -
-        shoemaker  -
-        tailor  -
-        {}
     earthquake:damage  +
         spontaneous_camp  -
         {}
-    emergency  +
-        fire_hydrant  -
-        phone  -
-        {}
     entrance  -
-    harbour  -
-    healthcare  +
-        dentist  -
-        hospital  -
-        {}
     highway  +
         bridleway  +
             bridge  -
@@ -289,7 +259,6 @@ world  +
             bridge  -
             tunnel  -
             {}
-        street_lamp  -
         tertiary  +
             bridge  -
             tunnel  -
@@ -388,7 +357,6 @@ world  +
         vineyard  -
         {}
     leisure  +
-        beach_resort  -
         common  -
         dog_park  +
             tennis  -
@@ -427,24 +395,14 @@ world  +
     man_made  +
         breakwater  -
         cairn  -
-        communication_tower  -
         cutline  -
         lighthouse  -
-        mast  -
         pier  -
         pipeline  +
             overground  -
             {}
-        storage_tank  -
         survey_point  -
         wastewater_plant  -
-        water_tower  -
-        water_well  +
-            drinking_water  -
-            manual  -
-            powered  -
-            {}
-        watermill  -
         windmill  -
         {}
     mapswithme  +
@@ -503,7 +461,6 @@ world  +
         estate_agent  -
         government  -
         lawyer  -
-        ngo  -
         telecommunication  -
         {}
     oneway  -
@@ -551,9 +508,7 @@ world  +
     power  +
         generator  +
             hydro  -
-            nuclear  -
             photovoltaic  -
-            solar  -
             wind  -
             {}
         line  +
@@ -570,7 +525,6 @@ world  +
             bridge  -
             tunnel  -
             {}
-        construction  -
         crossing  -
         disused  -
         funicular  +
@@ -643,24 +597,11 @@ world  +
             orange  -
             purple  -
             red  -
+            tunnel  -
             violet  -
             yellow  -
             {}
-        subway_entrance  +
-            blue  -
-            brown  -
-            darkgreen  -
-            gray  -
-            green  -
-            grey  -
-            lightblue  -
-            lightgreen  -
-            orange  -
-            purple  -
-            red  -
-            violet  -
-            yellow  -
-            {}
+        subway_entrance  -
         tram  +
             bridge  -
             tunnel  -
@@ -671,18 +612,9 @@ world  +
             tunnel  -
             {}
         {}
-    religion  +
-        christian  -
-        hindu  -
-        jewish  -
-        muslim  -
-        {}
     route  +
         ferry  -
         {}
-    seamark:type  +
-        harbour  -
-        {}
     shop  +
         alcohol  -
         bakery  -
@@ -691,23 +623,18 @@ world  +
         books  -
         butcher  -
         car  -
-        car_parts  -
         car_repair  -
         chemist  -
         clothes  -
         computer  -
         confectionery  -
         convenience  -
-        copyshop  -
         department_store  -
         doityourself  -
-        dry_cleaning  -
         electronics  -
         florist  -
-        funeral_directors  -
         furniture  -
         garden_centre  -
-        general  -
         gift  -
         greengrocer  -
         hairdresser  -
@@ -716,13 +643,7 @@ world  +
         kiosk  -
         mall  -
         mobile_phone  -
-        motorcycle  -
-        music  -
-        musical_instrument  -
         optician  -
-        outdoor  -
-        photo  -
-        photo_studio  -
         shoes  -
         supermarket  -
         toys  -
@@ -757,7 +678,6 @@ world  +
         attraction  -
         camp_site  -
         caravan_site  -
-        gallery  -
         guest_house  -
         hostel  -
         hotel  -
@@ -796,8 +716,4 @@ world  +
             {}
         weir  -
         {}
-    wood  +
-        coniferous  -
-        deciduous  -
-        {}
     {}
diff --git a/data/drules_proto-bw.bin b/data/drules_proto-bw.bin
index bd4b04c33d..34e684caa5 100644
--- a/data/drules_proto-bw.bin
+++ b/data/drules_proto-bw.bin
diff --git a/data/drules_proto-bw.txt b/data/drules_proto-bw.txt
index 19f4affffd..a5d5f733f0 100644
--- a/data/drules_proto-bw.txt
+++ b/data/drules_proto-bw.txt
@@ -5,7 +5,7 @@ cont {
     lines {
       width: 0.8
       color: 2236962
-      priority: 1589
+      priority: 1588
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15,7 +15,7 @@ cont {
     lines {
       width: 1.6
       color: 2236962
-      priority: 1768
+      priority: 1767
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -58,7 +58,7 @@ cont {
     lines {
       width: 0.8
       color: 2236962
-      priority: 1595
+      priority: 1594
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68,7 +68,7 @@ cont {
     lines {
       width: 1.6
       color: 2236962
-      priority: 1774
+      priority: 1773
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -111,7 +111,7 @@ cont {
     lines {
       width: 0.8
       color: 2236962
-      priority: 1592
+      priority: 1591
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -121,7 +121,7 @@ cont {
     lines {
       width: 1.6
       color: 2236962
-      priority: 1771
+      priority: 1770
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -164,7 +164,7 @@ cont {
     lines {
       width: 0.8
       color: 2236962
-      priority: 1598
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -174,7 +174,7 @@ cont {
     lines {
       width: 1.6
       color: 2236962
-      priority: 1777
+      priority: 1776
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -213,91 +213,47 @@ cont {
 cont {
   name: "aerialway-station"
   element {
-    scale: 13
-    circle {
-      radius: 2.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 14
-    circle {
-      radius: 2.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 15
-    circle {
-      radius: 3.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
     scale: 16
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
       }
-      priority: 15000
-    }
-    circle {
-      radius: 4.0
-      color: 16777215
-      priority: 14000
+      priority: 16000
     }
   }
   element {
     scale: 17
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
       }
-      priority: 15000
-    }
-    circle {
-      radius: 3.2
-      color: 16777215
-      priority: 14000
+      priority: 16000
     }
   }
   element {
     scale: 18
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
       }
-      priority: 15000
-    }
-    circle {
-      radius: 3.2
-      color: 16777215
-      priority: 14000
+      priority: 16000
     }
   }
   element {
     scale: 19
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
       }
-      priority: 15000
-    }
-    circle {
-      radius: 3.2
-      color: 16777215
-      priority: 14000
+      priority: 16000
     }
   }
 }
@@ -317,7 +273,7 @@ cont {
       priority: -16002
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -329,6 +285,11 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 13
@@ -337,7 +298,7 @@ cont {
       priority: -16003
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -349,6 +310,11 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 14
@@ -357,7 +323,7 @@ cont {
       priority: -16004
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -369,6 +335,11 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 15
@@ -377,7 +348,7 @@ cont {
       priority: -16005
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -389,6 +360,11 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 16
@@ -397,7 +373,7 @@ cont {
       priority: -16006
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -409,6 +385,11 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
@@ -417,7 +398,7 @@ cont {
       priority: -16007
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -429,6 +410,11 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
@@ -437,7 +423,7 @@ cont {
       priority: -16008
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -449,6 +435,11 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
@@ -457,7 +448,7 @@ cont {
       priority: -16009
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -469,6 +460,11 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
@@ -476,7 +472,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/airport-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -488,11 +484,16 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/airport-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -504,11 +505,16 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/airport-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -520,11 +526,16 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/airport-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -536,11 +547,16 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/airport-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -552,11 +568,16 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/airport-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -568,11 +589,16 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/airport-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -584,11 +610,16 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/airport-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -600,6 +631,11 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
@@ -672,35 +708,35 @@ cont {
   name: "aeroway-gate"
   element {
     scale: 17
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
       }
-      priority: 15000
+      priority: 16000
     }
   }
   element {
     scale: 18
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
       }
-      priority: 15000
+      priority: 16000
     }
   }
   element {
     scale: 19
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
       }
-      priority: 15000
+      priority: 16000
     }
   }
 }
@@ -709,37 +745,62 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/heliport-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "helipad"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/heliport-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "helipad"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/heliport-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "helipad"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/heliport-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "helipad"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/heliport-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "helipad"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
@@ -749,14 +810,14 @@ cont {
     lines {
       width: 4.0
       color: 2236962
-      priority: 252
+      priority: 250
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14540219
-      priority: 1252
+      priority: 1250
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -766,14 +827,14 @@ cont {
     lines {
       width: 4.5
       color: 2236962
-      priority: 266
+      priority: 264
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.5
       color: 14540219
-      priority: 1266
+      priority: 1264
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -783,14 +844,14 @@ cont {
     lines {
       width: 14.0
       color: 2236962
-      priority: 346
+      priority: 344
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 10.0
       color: 14540219
-      priority: 1346
+      priority: 1344
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -888,14 +949,14 @@ cont {
     lines {
       width: 2.5
       color: 2236962
-      priority: 255
+      priority: 252
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 0.5
       color: 14540219
-      priority: 1255
+      priority: 1252
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -905,14 +966,14 @@ cont {
     lines {
       width: 3.0
       color: 2236962
-      priority: 269
+      priority: 267
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 14540219
-      priority: 1269
+      priority: 1267
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -922,14 +983,14 @@ cont {
     lines {
       width: 6.0
       color: 2236962
-      priority: 348
+      priority: 347
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 14540219
-      priority: 1348
+      priority: 1347
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -939,14 +1000,14 @@ cont {
     lines {
       width: 12.0
       color: 2236962
-      priority: 422
+      priority: 420
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 14540219
-      priority: 1422
+      priority: 1420
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -956,14 +1017,14 @@ cont {
     lines {
       width: 12.0
       color: 2236962
-      priority: 422
+      priority: 420
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 14540219
-      priority: 1422
+      priority: 1420
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -973,14 +1034,14 @@ cont {
     lines {
       width: 12.0
       color: 2236962
-      priority: 422
+      priority: 420
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 14540219
-      priority: 1422
+      priority: 1420
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -990,14 +1051,14 @@ cont {
     lines {
       width: 12.0
       color: 2236962
-      priority: 422
+      priority: 420
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 14540219
-      priority: 1422
+      priority: 1420
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -1007,14 +1068,14 @@ cont {
     lines {
       width: 12.0
       color: 2236962
-      priority: 422
+      priority: 420
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 14540219
-      priority: 1422
+      priority: 1420
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -1121,16 +1182,9 @@ cont {
 cont {
   name: "amenity-atm"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/atm-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/nori/atm-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "atm"
       priority: 16008
     }
     caption {
@@ -1142,11 +1196,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/atm-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "atm"
       priority: 16008
     }
     caption {
@@ -1158,11 +1217,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/atm-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "atm"
       priority: 16008
     }
     caption {
@@ -1174,6 +1238,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -1181,15 +1250,20 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bank-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
+      name: "bank"
+      priority: 16017
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14017
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bank-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "bank"
+      priority: 16017
     }
     caption {
       primary {
@@ -1198,14 +1272,19 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15008
+      priority: 15017
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14017
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bank-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "bank"
+      priority: 16017
     }
     caption {
       primary {
@@ -1214,14 +1293,19 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15008
+      priority: 15017
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14017
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bank-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "bank"
+      priority: 16017
     }
     caption {
       primary {
@@ -1230,7 +1314,12 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15008
+      priority: 15017
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14017
     }
   }
 }
@@ -1239,65 +1328,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bar-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bar"
       priority: 16000
     }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/bar-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/bar-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/bar-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
-}
-cont {
-  name: "amenity-bench"
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/bench-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bar"
       priority: 16008
     }
     caption {
@@ -1309,11 +1352,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/bench-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bar"
       priority: 16008
     }
     caption {
@@ -1325,11 +1373,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/bench-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bar"
       priority: 16008
     }
     caption {
@@ -1341,21 +1394,26 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
-  name: "amenity-bicycle_parking"
+  name: "amenity-bench"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "bench"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "bench"
       priority: 16008
     }
     caption {
@@ -1371,7 +1429,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "bench"
       priority: 16008
     }
     caption {
@@ -1387,7 +1445,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "bench"
       priority: 16008
     }
     caption {
@@ -1406,14 +1464,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bicycle_rental"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bicycle_rental"
       priority: 16008
     }
     caption {
@@ -1425,11 +1488,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bicycle_rental"
       priority: 16008
     }
     caption {
@@ -1441,11 +1509,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bicycle_rental"
       priority: 16008
     }
     caption {
@@ -1457,44 +1530,10 @@ cont {
       }
       priority: 15008
     }
-  }
-}
-cont {
-  name: "amenity-brothel"
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
     }
   }
 }
@@ -1503,14 +1542,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/bureau_de_change-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bureau_de_change"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/bureau_de_change-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bureau_de_change"
       priority: 16008
     }
     caption {
@@ -1522,11 +1566,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/bureau_de_change-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bureau_de_change"
       priority: 16008
     }
     caption {
@@ -1538,11 +1587,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/bureau_de_change-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bureau_de_change"
       priority: 16008
     }
     caption {
@@ -1554,6 +1608,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -1561,14 +1620,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bus-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "bus"
       priority: 16032
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14032
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bus-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "bus"
       priority: 16032
     }
     caption {
@@ -1580,11 +1644,16 @@ cont {
       }
       priority: 15032
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14032
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bus-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "bus"
       priority: 16032
     }
     caption {
@@ -1596,11 +1665,16 @@ cont {
       }
       priority: 15032
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14032
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bus-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "bus"
       priority: 16032
     }
     caption {
@@ -1612,6 +1686,11 @@ cont {
       }
       priority: 15032
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14032
+    }
   }
 }
 cont {
@@ -1619,14 +1698,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/cafe-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
+      name: "cafe"
+      priority: 16008
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/cafe-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "cafe"
       priority: 16008
     }
     caption {
@@ -1638,11 +1722,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/cafe-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "cafe"
       priority: 16008
     }
     caption {
@@ -1654,11 +1743,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/cafe-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "cafe"
       priority: 16008
     }
     caption {
@@ -1670,6 +1764,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -1677,14 +1776,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/car_rental-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "car_rental"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/car_rental-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "car_rental"
       priority: 16008
     }
     caption {
@@ -1696,11 +1800,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/car_rental-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "car_rental"
       priority: 16008
     }
     caption {
@@ -1712,11 +1821,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/car_rental-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "car_rental"
       priority: 16008
     }
     caption {
@@ -1728,60 +1842,31 @@ cont {
       }
       priority: 15008
     }
-  }
-}
-cont {
-  name: "amenity-car_sharing"
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
     }
   }
 }
 cont {
-  name: "amenity-casino"
+  name: "amenity-car_sharing"
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/gambling-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "car_sharing"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/gambling-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "car_sharing"
       priority: 16008
     }
     caption {
@@ -1793,11 +1878,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/gambling-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "car_sharing"
       priority: 16008
     }
     caption {
@@ -1809,11 +1899,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/gambling-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "car_sharing"
       priority: 16008
     }
     caption {
@@ -1825,6 +1920,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -1832,14 +1932,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/cinema-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "cinema"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/cinema-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "cinema"
       priority: 16008
     }
     caption {
@@ -1851,11 +1956,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/cinema-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "cinema"
       priority: 16008
     }
     caption {
@@ -1867,11 +1977,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/cinema-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "cinema"
       priority: 16008
     }
     caption {
@@ -1883,6 +1998,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -1900,10 +2020,6 @@ cont {
       color: 6710886
       priority: -16028
     }
-    symbol {
-      name: "symbols/maki/college-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 17
@@ -1912,7 +2028,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/college-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "university"
       priority: 16008
     }
     caption {
@@ -1924,6 +2040,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
@@ -1932,7 +2053,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/college-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "university"
       priority: 16008
     }
     caption {
@@ -1944,6 +2065,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
@@ -1952,49 +2078,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/college-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "amenity-community_centre"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/community_centre-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/community_centre-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/community_centre-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "university"
       priority: 16008
     }
     caption {
@@ -2006,127 +2090,31 @@ cont {
       }
       priority: 15008
     }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/community_centre-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
     }
   }
 }
 cont {
-  name: "amenity-courthouse"
+  name: "amenity-doctors"
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/courthouse-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "pharmacy"
       priority: 16000
     }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/courthouse-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/courthouse-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/courthouse-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "amenity-dentist"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/dentist-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/dentist-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/dentist-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/dentist-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "pharmacy"
       priority: 16008
     }
     caption {
@@ -2138,37 +2126,16 @@ cont {
       }
       priority: 15008
     }
-  }
-}
-cont {
-  name: "amenity-doctors"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/hospital-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/hospital-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/hospital-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "pharmacy"
       priority: 16008
     }
     caption {
@@ -2180,11 +2147,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/hospital-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "pharmacy"
       priority: 16008
     }
     caption {
@@ -2196,21 +2168,19 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
   name: "amenity-drinking_water"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/drinking_water-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/nori/drinking_water-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "drinking_water"
       priority: 16008
     }
     caption {
@@ -2222,11 +2192,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/drinking_water-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "drinking_water"
       priority: 16008
     }
     caption {
@@ -2238,11 +2213,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/drinking_water-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "drinking_water"
       priority: 16008
     }
     caption {
@@ -2254,6 +2234,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -2261,72 +2246,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/embassy-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "embassy"
       priority: 16000
     }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/embassy-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/embassy-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/embassy-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "amenity-emergency_phone"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "embassy"
       priority: 16008
     }
     caption {
@@ -2338,11 +2270,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "embassy"
       priority: 16008
     }
     caption {
@@ -2354,11 +2291,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "embassy"
       priority: 16008
     }
     caption {
@@ -2370,6 +2312,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -2377,14 +2324,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/fast-food-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "fastfood"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/fast-food-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "fastfood"
       priority: 16008
     }
     caption {
@@ -2396,11 +2348,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/fast-food-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "fastfood"
       priority: 16008
     }
     caption {
@@ -2412,11 +2369,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/fast-food-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "fastfood"
       priority: 16008
     }
     caption {
@@ -2428,6 +2390,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -2435,72 +2402,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/ferry-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "slipway"
       priority: 16000
     }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/ferry-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/ferry-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/ferry-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "amenity-fire_hydrant"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/fire_hydrant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/fire_hydrant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "slipway"
       priority: 16008
     }
     caption {
@@ -2512,11 +2426,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/fire_hydrant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "slipway"
       priority: 16008
     }
     caption {
@@ -2528,11 +2447,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/fire_hydrant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "slipway"
       priority: 16008
     }
     caption {
@@ -2544,6 +2468,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -2551,14 +2480,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/fire-station-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "firebrigade"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/fire-station-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "firebrigade"
       priority: 16008
     }
     caption {
@@ -2570,11 +2504,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/fire-station-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "firebrigade"
       priority: 16008
     }
     caption {
@@ -2586,11 +2525,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/fire-station-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "firebrigade"
       priority: 16008
     }
     caption {
@@ -2602,6 +2546,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -2610,7 +2559,16 @@ cont {
     scale: 16
     area {
       color: 0
-      priority: 1103
+      priority: 1098
+    }
+    symbol {
+      name: "fountain"
+      priority: 16097
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14097
     }
   }
   element {
@@ -2619,6 +2577,10 @@ cont {
       color: 0
       priority: 1009
     }
+    symbol {
+      name: "fountain"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -2628,6 +2590,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
@@ -2635,6 +2602,10 @@ cont {
       color: 0
       priority: 1009
     }
+    symbol {
+      name: "fountain"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -2644,6 +2615,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
@@ -2651,6 +2627,10 @@ cont {
       color: 0
       priority: 1009
     }
+    symbol {
+      name: "fountain"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -2660,6 +2640,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -2667,79 +2652,31 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/fuel-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "petrolstation"
       priority: 16000
     }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/fuel-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/fuel-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/fuel-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/fuel-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
-}
-cont {
-  name: "amenity-gambling"
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/gambling-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "petrolstation"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/gambling-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "petrolstation"
       priority: 16008
     }
     caption {
@@ -2751,11 +2688,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/gambling-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "petrolstation"
       priority: 16008
     }
     caption {
@@ -2767,11 +2709,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/gambling-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "petrolstation"
       priority: 16008
     }
     caption {
@@ -2783,6 +2730,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -2814,10 +2766,6 @@ cont {
       color: 6710886
       priority: 1001
     }
-    symbol {
-      name: "symbols/nori/grave_yard-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 17
@@ -2825,10 +2773,6 @@ cont {
       color: 6710886
       priority: 1009
     }
-    symbol {
-      name: "symbols/nori/grave_yard-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -2845,10 +2789,6 @@ cont {
       color: 6710886
       priority: 1009
     }
-    symbol {
-      name: "symbols/nori/grave_yard-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -2865,10 +2805,6 @@ cont {
       color: 6710886
       priority: 1009
     }
-    symbol {
-      name: "symbols/nori/grave_yard-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -2909,10 +2845,6 @@ cont {
       color: 6710886
       priority: 1001
     }
-    symbol {
-      name: "symbols/nori/grave_yard-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 17
@@ -2920,10 +2852,6 @@ cont {
       color: 6710886
       priority: 1009
     }
-    symbol {
-      name: "symbols/nori/grave_yard-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -2940,10 +2868,6 @@ cont {
       color: 6710886
       priority: 1009
     }
-    symbol {
-      name: "symbols/nori/grave_yard-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -2960,10 +2884,6 @@ cont {
       color: 6710886
       priority: 1009
     }
-    symbol {
-      name: "symbols/nori/grave_yard-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -2978,16 +2898,9 @@ cont {
 cont {
   name: "amenity-hospital"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/hospital-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/maki/hospital-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hospital"
       priority: 16008
     }
     caption {
@@ -2999,11 +2912,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/hospital-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hospital"
       priority: 16008
     }
     caption {
@@ -3015,11 +2933,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/hospital-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hospital"
       priority: 16008
     }
     caption {
@@ -3031,12 +2954,33 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
   name: "amenity-hunting_stand"
   element {
+    scale: 16
+    symbol {
+      name: "hunting_closed_high"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
     scale: 17
+    symbol {
+      name: "hunting_closed_high"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -3046,9 +2990,18 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
+    symbol {
+      name: "hunting_closed_high"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -3058,9 +3011,18 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
+    symbol {
+      name: "hunting_closed_high"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -3070,6 +3032,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -3087,10 +3054,6 @@ cont {
       color: 6710886
       priority: -16030
     }
-    symbol {
-      name: "symbols/nori/kindergarten-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 17
@@ -3099,7 +3062,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/nori/kindergarten-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "kindergarten2"
       priority: 16008
     }
     caption {
@@ -3111,6 +3074,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
@@ -3119,7 +3087,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/nori/kindergarten-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "kindergarten2"
       priority: 16008
     }
     caption {
@@ -3131,6 +3099,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
@@ -3139,7 +3112,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/nori/kindergarten-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "kindergarten2"
       priority: 16008
     }
     caption {
@@ -3151,63 +3124,10 @@ cont {
       }
       priority: 15008
     }
-  }
-}
-cont {
-  name: "amenity-laundry"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/dry_cleaning-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/dry_cleaning-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/dry_cleaning-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/dry_cleaning-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
     }
   }
 }
@@ -3216,14 +3136,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/library-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "library"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/library-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "library"
       priority: 16008
     }
     caption {
@@ -3235,11 +3160,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/library-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "library"
       priority: 16008
     }
     caption {
@@ -3251,11 +3181,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/library-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "library"
       priority: 16008
     }
     caption {
@@ -3267,6 +3202,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -3274,72 +3214,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16000
     }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "amenity-money_transfer"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/money_transfer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/money_transfer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -3351,11 +3238,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/money_transfer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -3367,11 +3259,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/money_transfer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -3383,6 +3280,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -3390,14 +3292,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bar-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bar"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bar-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bar"
       priority: 16008
     }
     caption {
@@ -3409,11 +3316,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bar-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bar"
       priority: 16008
     }
     caption {
@@ -3425,11 +3337,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bar-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bar"
       priority: 16008
     }
     caption {
@@ -3441,23 +3358,17 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
   name: "amenity-parking"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3470,10 +3381,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3486,10 +3393,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3504,18 +3407,7 @@ cont {
 cont {
   name: "amenity-parking-fee"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3528,10 +3420,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3544,10 +3432,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3562,18 +3446,7 @@ cont {
 cont {
   name: "amenity-parking-multi-storey"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
-    symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3586,10 +3459,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3602,10 +3471,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3620,18 +3485,7 @@ cont {
 cont {
   name: "amenity-parking-multi-storey-fee"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
-    symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3644,10 +3498,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3660,10 +3510,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3717,18 +3563,7 @@ cont {
 cont {
   name: "amenity-parking-park_and_ride"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3741,10 +3576,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3757,10 +3588,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3775,18 +3602,7 @@ cont {
 cont {
   name: "amenity-parking-permissive"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3799,10 +3615,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3815,10 +3627,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3833,18 +3641,7 @@ cont {
 cont {
   name: "amenity-parking-permissive-fee"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3857,10 +3654,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3873,10 +3666,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3891,18 +3680,7 @@ cont {
 cont {
   name: "amenity-parking-private"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3915,10 +3693,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3931,10 +3705,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3949,18 +3719,7 @@ cont {
 cont {
   name: "amenity-parking-underground"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
-    symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3973,10 +3732,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3989,10 +3744,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -4007,18 +3758,7 @@ cont {
 cont {
   name: "amenity-parking-underground-fee"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
-    symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -4031,10 +3771,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -4047,10 +3783,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -4067,14 +3799,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/pharmacy-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "pharmacy"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/pharmacy-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "pharmacy"
       priority: 16008
     }
     caption {
@@ -4086,11 +3823,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/pharmacy-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "pharmacy"
       priority: 16008
     }
     caption {
@@ -4102,11 +3844,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/pharmacy-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "pharmacy"
       priority: 16008
     }
     caption {
@@ -4118,6 +3865,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -4125,14 +3877,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/place-of-worship-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "religion"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/place-of-worship-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "religion"
       priority: 16008
     }
     caption {
@@ -4144,11 +3901,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/place-of-worship-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "religion"
       priority: 16008
     }
     caption {
@@ -4160,11 +3922,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/place-of-worship-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "religion"
       priority: 16008
     }
     caption {
@@ -4176,21 +3943,19 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
   name: "amenity-police"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/police-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/maki/police-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "police"
       priority: 16008
     }
     caption {
@@ -4202,11 +3967,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/police-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "police"
       priority: 16008
     }
     caption {
@@ -4218,11 +3988,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/police-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "police"
       priority: 16008
     }
     caption {
@@ -4234,21 +4009,19 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
   name: "amenity-post_box"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/post-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/maki/post-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "postbox"
       priority: 16008
     }
     caption {
@@ -4260,11 +4033,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/post-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "postbox"
       priority: 16008
     }
     caption {
@@ -4276,11 +4054,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/post-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "postbox"
       priority: 16008
     }
     caption {
@@ -4292,6 +4075,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -4299,72 +4087,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/post-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "postoffice"
       priority: 16000
     }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/post-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/post-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/post-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "amenity-prison"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/prison-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/prison-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "postoffice"
       priority: 16008
     }
     caption {
@@ -4376,11 +4111,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/prison-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "postoffice"
       priority: 16008
     }
     caption {
@@ -4392,11 +4132,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/prison-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "postoffice"
       priority: 16008
     }
     caption {
@@ -4408,6 +4153,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -4415,14 +4165,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/pub-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "pub"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/pub-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "pub"
       priority: 16008
     }
     caption {
@@ -4434,11 +4189,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/pub-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "pub"
       priority: 16008
     }
     caption {
@@ -4450,11 +4210,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/pub-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "pub"
       priority: 16008
     }
     caption {
@@ -4466,21 +4231,19 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
   name: "amenity-recycling"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/recycling-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/nori/recycling-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "recycling"
       priority: 16008
     }
     caption {
@@ -4492,11 +4255,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/recycling-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "recycling"
       priority: 16008
     }
     caption {
@@ -4508,11 +4276,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/recycling-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "recycling"
       priority: 16008
     }
     caption {
@@ -4524,6 +4297,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -4531,14 +4309,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "restaurant"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "restaurant"
       priority: 16008
     }
     caption {
@@ -4550,11 +4333,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "restaurant"
       priority: 16008
     }
     caption {
@@ -4566,11 +4354,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "restaurant"
       priority: 16008
     }
     caption {
@@ -4582,6 +4375,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -4589,14 +4387,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hotel_and_restaurant"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hotel_and_restaurant"
       priority: 16008
     }
     caption {
@@ -4608,11 +4411,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hotel_and_restaurant"
       priority: 16008
     }
     caption {
@@ -4624,11 +4432,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hotel_and_restaurant"
       priority: 16008
     }
     caption {
@@ -4640,6 +4453,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -4647,14 +4465,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "restaurant"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "restaurant"
       priority: 16008
     }
     caption {
@@ -4666,11 +4489,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "restaurant"
       priority: 16008
     }
     caption {
@@ -4682,11 +4510,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "restaurant"
       priority: 16008
     }
     caption {
@@ -4698,6 +4531,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -4705,14 +4543,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "restaurant"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "restaurant"
       priority: 16008
     }
     caption {
@@ -4724,11 +4567,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "restaurant"
       priority: 16008
     }
     caption {
@@ -4740,11 +4588,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "restaurant"
       priority: 16008
     }
     caption {
@@ -4756,6 +4609,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -4773,10 +4631,6 @@ cont {
       color: 6710886
       priority: -16032
     }
-    symbol {
-      name: "symbols/maki/school-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 17
@@ -4785,7 +4639,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/school-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "school"
       priority: 16008
     }
     caption {
@@ -4797,6 +4651,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
@@ -4805,7 +4664,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/school-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "school"
       priority: 16008
     }
     caption {
@@ -4817,6 +4676,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
@@ -4825,7 +4689,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/school-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "school"
       priority: 16008
     }
     caption {
@@ -4837,60 +4701,55 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
   name: "amenity-shelter"
   element {
-    scale: 17
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    scale: 14
+    symbol {
+      name: "shelter"
+      priority: 16000
     }
-  }
-  element {
-    scale: 18
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
-    scale: 19
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    scale: 15
+    symbol {
+      name: "shelter"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
-}
-cont {
-  name: "amenity-shower"
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/shower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "shelter"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/shower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "shelter"
       priority: 16008
     }
     caption {
@@ -4902,11 +4761,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/shower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "shelter"
       priority: 16008
     }
     caption {
@@ -4918,11 +4782,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/shower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "shelter"
       priority: 16008
     }
     caption {
@@ -4934,21 +4803,31 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
-  name: "amenity-social_facility"
+  name: "amenity-speed_trap"
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/social_facility-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "speed_trap"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/social_facility-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "speed_trap"
       priority: 16008
     }
     caption {
@@ -4960,11 +4839,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/social_facility-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "speed_trap"
       priority: 16008
     }
     caption {
@@ -4976,11 +4860,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/social_facility-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "speed_trap"
       priority: 16008
     }
     caption {
@@ -4992,44 +4881,10 @@ cont {
       }
       priority: 15008
     }
-  }
-}
-cont {
-  name: "amenity-speed_trap"
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
     }
   }
 }
@@ -5038,14 +4893,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/taxi-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "taxi"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/taxi-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "taxi"
       priority: 16008
     }
     caption {
@@ -5057,11 +4917,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/taxi-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "taxi"
       priority: 16008
     }
     caption {
@@ -5073,11 +4938,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/taxi-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "taxi"
       priority: 16008
     }
     caption {
@@ -5089,6 +4959,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -5096,14 +4971,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/telephone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "telephone"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/telephone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "telephone"
       priority: 16008
     }
     caption {
@@ -5115,11 +4995,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/telephone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "telephone"
       priority: 16008
     }
     caption {
@@ -5131,11 +5016,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/telephone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "telephone"
       priority: 16008
     }
     caption {
@@ -5147,6 +5037,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -5154,14 +5049,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/theatre-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "theatre"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/theatre-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "theatre"
       priority: 16008
     }
     caption {
@@ -5173,11 +5073,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/theatre-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "theatre"
       priority: 16008
     }
     caption {
@@ -5189,11 +5094,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/theatre-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "theatre"
       priority: 16008
     }
     caption {
@@ -5205,21 +5115,19 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
   name: "amenity-toilets"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/toilets-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/maki/toilets-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "toilets"
       priority: 16008
     }
     caption {
@@ -5231,11 +5139,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/toilets-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "toilets"
       priority: 16008
     }
     caption {
@@ -5247,11 +5160,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/toilets-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "toilets"
       priority: 16008
     }
     caption {
@@ -5263,6 +5181,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -5330,10 +5253,6 @@ cont {
       color: 6710886
       priority: -16034
     }
-    symbol {
-      name: "symbols/maki/college-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 17
@@ -5342,7 +5261,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/college-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "university"
       priority: 16008
     }
     caption {
@@ -5354,6 +5273,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
@@ -5362,7 +5286,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/college-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "university"
       priority: 16008
     }
     caption {
@@ -5374,6 +5298,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
@@ -5382,7 +5311,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/college-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "university"
       priority: 16008
     }
     caption {
@@ -5394,63 +5323,10 @@ cont {
       }
       priority: 15008
     }
-  }
-}
-cont {
-  name: "amenity-waste_basket"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/waste_basket-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/waste_basket-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/waste_basket-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/waste_basket-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
     }
   }
 }
@@ -5460,140 +5336,140 @@ cont {
     scale: 0
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 1
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 2
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 3
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 4
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 5
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 6
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 7
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 8
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 9
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 10
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 11
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 12
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 13
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 14
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 15
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 16
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 17
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 18
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 19
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
 }
@@ -5603,140 +5479,140 @@ cont {
     scale: 0
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 1
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 2
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 3
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 4
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 5
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 6
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 7
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 8
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 9
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 10
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 11
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 12
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 13
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 14
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 15
     area {
       color: 14540253
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 16
     area {
       color: 14540253
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 17
     area {
       color: 14540253
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 18
     area {
       color: 14540253
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 19
     area {
       color: 14540253
-      priority: 1391
+      priority: 1389
     }
   }
 }
@@ -5746,140 +5622,140 @@ cont {
     scale: 0
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 1
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 2
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 3
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 4
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 5
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 6
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 7
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 8
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 9
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 10
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 11
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 12
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 13
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 14
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 15
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 16
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 17
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 18
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 19
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
 }
@@ -5889,140 +5765,140 @@ cont {
     scale: 0
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 1
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 2
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 3
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 4
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 5
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 6
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 7
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 8
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 9
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 10
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 11
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 12
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 13
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 14
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 15
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 16
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 17
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 18
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 19
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
 }
@@ -6032,140 +5908,140 @@ cont {
     scale: 0
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 1
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 2
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 3
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 4
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 5
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 6
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 7
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 8
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 9
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 10
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 11
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 12
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 13
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 14
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 15
     area {
       color: 14540253
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 16
     area {
       color: 14540253
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 17
     area {
       color: 14540253
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 18
     area {
       color: 14540253
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 19
     area {
       color: 14540253
-      priority: 1391
+      priority: 1389
     }
   }
 }
@@ -6175,140 +6051,140 @@ cont {
     scale: 0
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 1
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 2
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 3
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 4
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 5
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 6
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 7
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 8
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 9
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 10
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 11
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 12
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 13
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 14
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 15
     area {
       color: 14540253
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 16
     area {
       color: 14540253
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 17
     area {
       color: 14540253
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 18
     area {
       color: 14540253
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 19
     area {
       color: 14540253
-      priority: 1391
+      priority: 1389
     }
   }
 }
@@ -6318,140 +6194,140 @@ cont {
     scale: 0
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 1
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 2
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 3
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 4
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 5
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 6
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 7
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 8
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 9
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 10
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 11
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 12
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 13
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 14
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 15
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 16
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 17
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 18
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 19
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
 }
@@ -6461,140 +6337,140 @@ cont {
     scale: 0
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 1
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 2
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 3
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 4
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 5
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 6
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 7
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 8
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 9
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 10
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 11
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 12
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 13
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 14
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 15
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 16
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 17
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 18
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 19
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
 }
@@ -6604,140 +6480,140 @@ cont {
     scale: 0
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 1
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 2
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 3
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 4
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 5
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 6
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 7
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 8
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 9
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 10
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 11
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 12
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 13
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 14
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 15
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 16
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 17
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 18
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 19
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
 }
@@ -6747,140 +6623,140 @@ cont {
     scale: 0
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 1
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 2
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 3
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 4
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 5
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 6
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 7
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 8
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 9
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 10
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 11
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 12
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 13
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 14
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 15
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 16
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 17
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 18
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 19
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
 }
@@ -6890,140 +6766,140 @@ cont {
     scale: 0
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 1
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 2
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 3
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 4
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 5
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 6
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 7
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 8
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 9
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 10
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 11
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 12
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 13
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 14
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 15
     area {
       color: 14540253
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 16
     area {
       color: 14540253
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 17
     area {
       color: 14540253
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 18
     area {
       color: 14540253
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 19
     area {
       color: 14540253
-      priority: 1391
+      priority: 1389
     }
   }
 }
@@ -7033,140 +6909,140 @@ cont {
     scale: 0
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 1
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 2
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 3
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 4
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 5
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 6
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 7
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 8
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 9
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 10
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 11
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 12
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 13
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 14
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 15
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 16
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 17
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 18
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 19
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
 }
@@ -7176,140 +7052,140 @@ cont {
     scale: 0
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 1
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 2
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 3
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 4
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 5
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 6
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 7
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 8
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 9
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 10
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 11
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 12
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 13
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 14
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 15
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 16
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 17
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 18
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 19
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
 }
@@ -7319,140 +7195,140 @@ cont {
     scale: 0
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 1
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 2
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 3
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 4
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 5
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 6
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 7
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 8
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 9
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 10
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 11
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 12
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 13
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 14
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 15
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 16
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 17
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 18
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 19
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
 }
@@ -7462,140 +7338,140 @@ cont {
     scale: 0
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 1
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 2
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 3
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 4
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 5
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 6
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 7
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 8
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 9
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 10
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 11
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 12
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 13
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 14
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 15
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 16
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 17
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 18
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
   element {
     scale: 19
     area {
       color: 16777215
-      priority: 1391
+      priority: 1389
     }
   }
 }
@@ -7603,49 +7479,33 @@ cont {
   name: "barrier-block"
   element {
     scale: 16
-    symbol {
-      name: "symbols/maki/roadblock-12.svg:#000000:#FFFFFF:::"
-      priority: 16000
-    }
     circle {
       radius: 1.2
-      color: 16777215
+      color: 7829367
       priority: 14000
     }
   }
   element {
     scale: 17
-    symbol {
-      name: "symbols/maki/roadblock-12.svg:#000000:#FFFFFF:::"
-      priority: 16000
-    }
     circle {
       radius: 1.6
-      color: 16777215
+      color: 7829367
       priority: 14000
     }
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/roadblock-12.svg:#000000:#FFFFFF:::"
-      priority: 16000
-    }
     circle {
       radius: 1.6
-      color: 16777215
+      color: 7829367
       priority: 14000
     }
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/roadblock-12.svg:#000000:#FFFFFF:::"
-      priority: 16000
-    }
     circle {
       radius: 1.6
-      color: 16777215
+      color: 7829367
       priority: 14000
     }
   }
@@ -7654,85 +7514,38 @@ cont {
   name: "barrier-bollard"
   element {
     scale: 16
-    symbol {
-      name: "symbols/neta/bollard-18.svg:#000000:#FFFFFF:::"
-      priority: 16000
-    }
     circle {
       radius: 1.2
-      color: 16777215
+      color: 7829367
       priority: 14000
     }
   }
   element {
     scale: 17
-    symbol {
-      name: "symbols/neta/bollard-18.svg:#000000:#FFFFFF:::"
-      priority: 16000
-    }
     circle {
       radius: 1.6
-      color: 16777215
+      color: 7829367
       priority: 14000
     }
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/neta/bollard-18.svg:#000000:#FFFFFF:::"
-      priority: 16000
-    }
     circle {
       radius: 1.6
-      color: 16777215
+      color: 7829367
       priority: 14000
     }
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/neta/bollard-18.svg:#000000:#FFFFFF:::"
-      priority: 16000
-    }
     circle {
       radius: 1.6
-      color: 16777215
+      color: 7829367
       priority: 14000
     }
   }
 }
 cont {
-  name: "barrier-border_control"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/border_control-18.svg:#000000:#FFFFFF:::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/border_control-18.svg:#000000:#FFFFFF:::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/border_control-18.svg:#000000:#FFFFFF:::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/border_control-18.svg:#000000:#FFFFFF:::"
-      priority: 16000
-    }
-  }
-}
-cont {
   name: "barrier-city_wall"
   element {
     scale: 16
@@ -7837,30 +7650,23 @@ cont {
 cont {
   name: "barrier-gate"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/entrance-18.svg:#000000:#FFFFFF:::"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/neta/entrance-18.svg:#000000:#FFFFFF:::"
+      name: "gate"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/entrance-18.svg:#000000:#FFFFFF:::"
+      name: "gate"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/entrance-18.svg:#000000:#FFFFFF:::"
+      name: "gate"
       priority: 16000
     }
   }
@@ -7876,7 +7682,7 @@ cont {
         dd: 1.0
         dd: 2.0
       }
-      priority: 1824
+      priority: 1823
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7929,28 +7735,28 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/lift_gate-18.svg:#000000:#FFFFFF:::"
+      name: "barrier"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/lift_gate-18.svg:#000000:#FFFFFF:::"
+      name: "barrier"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/lift_gate-18.svg:#000000:#FFFFFF:::"
+      name: "barrier"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/lift_gate-18.svg:#000000:#FFFFFF:::"
+      name: "barrier"
       priority: 16000
     }
   }
@@ -8020,7 +7826,7 @@ cont {
     scale: 16
     circle {
       radius: 1.2
-      color: 16777215
+      color: 7829367
       priority: 14000
     }
   }
@@ -8028,7 +7834,7 @@ cont {
     scale: 17
     circle {
       radius: 1.6
-      color: 16777215
+      color: 7829367
       priority: 14000
     }
   }
@@ -8036,7 +7842,7 @@ cont {
     scale: 18
     circle {
       radius: 1.6
-      color: 16777215
+      color: 7829367
       priority: 14000
     }
   }
@@ -8044,7 +7850,7 @@ cont {
     scale: 19
     circle {
       radius: 1.6
-      color: 16777215
+      color: 7829367
       priority: 14000
     }
   }
@@ -8055,7 +7861,7 @@ cont {
     scale: 16
     circle {
       radius: 1.2
-      color: 16777215
+      color: 7829367
       priority: 14000
     }
   }
@@ -8063,7 +7869,7 @@ cont {
     scale: 17
     circle {
       radius: 1.6
-      color: 16777215
+      color: 7829367
       priority: 14000
     }
   }
@@ -8071,7 +7877,7 @@ cont {
     scale: 18
     circle {
       radius: 1.6
-      color: 16777215
+      color: 7829367
       priority: 14000
     }
   }
@@ -8079,7 +7885,7 @@ cont {
     scale: 19
     circle {
       radius: 1.6
-      color: 16777215
+      color: 7829367
       priority: 14000
     }
   }
@@ -8134,7 +7940,7 @@ cont {
     lines {
       width: 0.8
       color: 16733508
-      priority: 16696
+      priority: 16695
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8144,7 +7950,7 @@ cont {
     lines {
       width: 0.8
       color: 16733508
-      priority: 16863
+      priority: 16862
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8342,14 +8148,14 @@ cont {
     lines {
       width: 6.0
       color: 15658717
-      priority: 16405
+      priority: 16403
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
       color: 16733508
-      priority: 16408
+      priority: 16406
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8359,14 +8165,14 @@ cont {
     lines {
       width: 6.0
       color: 15658717
-      priority: 1434
+      priority: 1432
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
       color: 16733508
-      priority: 1436
+      priority: 1435
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8376,14 +8182,14 @@ cont {
     lines {
       width: 6.0
       color: 15658717
-      priority: 1478
+      priority: 1476
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
       color: 16733508
-      priority: 1480
+      priority: 1479
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8393,14 +8199,14 @@ cont {
     lines {
       width: 6.0
       color: 15658717
-      priority: 16719
+      priority: 16718
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
       color: 16733508
-      priority: 1721
+      priority: 1720
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8481,7 +8287,7 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 16141
+      priority: 16136
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8491,7 +8297,7 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 16141
+      priority: 16136
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8501,14 +8307,14 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 16141
+      priority: 16136
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16138
+      priority: 16133
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8518,14 +8324,14 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 16141
+      priority: 16136
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16138
+      priority: 16133
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8535,14 +8341,14 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 16141
+      priority: 16136
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16138
+      priority: 16133
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8552,14 +8358,14 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 16141
+      priority: 16136
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16138
+      priority: 16133
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8569,14 +8375,14 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 16141
+      priority: 16136
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16138
+      priority: 16133
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8586,14 +8392,14 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 16141
+      priority: 16136
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16138
+      priority: 16133
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8603,14 +8409,14 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 16141
+      priority: 16136
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16138
+      priority: 16133
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8620,14 +8426,14 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 16141
+      priority: 16136
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16138
+      priority: 16133
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8637,14 +8443,14 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 16141
+      priority: 16136
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16138
+      priority: 16133
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8654,14 +8460,14 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 16141
+      priority: 16136
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16138
+      priority: 16133
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8671,14 +8477,14 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 16141
+      priority: 16136
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16138
+      priority: 16133
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8688,14 +8494,14 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 16141
+      priority: 16136
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16138
+      priority: 16133
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8705,14 +8511,14 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 16141
+      priority: 16136
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16138
+      priority: 16133
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8722,14 +8528,14 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 16141
+      priority: 16136
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16138
+      priority: 16133
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8742,7 +8548,7 @@ cont {
     lines {
       width: 0.2
       color: 11184810
-      priority: 16135
+      priority: 16130
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8752,14 +8558,14 @@ cont {
     lines {
       width: 0.2
       color: 11184810
-      priority: 16135
+      priority: 16130
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16132
+      priority: 16127
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8769,14 +8575,14 @@ cont {
     lines {
       width: 0.2
       color: 11184810
-      priority: 16135
+      priority: 16130
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16132
+      priority: 16127
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8786,14 +8592,14 @@ cont {
     lines {
       width: 0.7
       color: 10066329
-      priority: 16135
+      priority: 16130
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16132
+      priority: 16127
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8803,14 +8609,14 @@ cont {
     lines {
       width: 0.7
       color: 10066329
-      priority: 16135
+      priority: 16130
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16132
+      priority: 16127
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8820,7 +8626,7 @@ cont {
     lines {
       width: 1.0
       color: 10066329
-      priority: 16027
+      priority: 16030
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8837,14 +8643,14 @@ cont {
     lines {
       width: 1.5
       color: 10066329
-      priority: 16396
+      priority: 16395
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658717
-      priority: 16393
+      priority: 16392
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8857,14 +8663,14 @@ cont {
     lines {
       width: 0.2
       color: 11184810
-      priority: 16135
+      priority: 16130
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16132
+      priority: 16127
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8874,14 +8680,14 @@ cont {
     lines {
       width: 0.2
       color: 11184810
-      priority: 16135
+      priority: 16130
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16132
+      priority: 16127
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8891,14 +8697,14 @@ cont {
     lines {
       width: 0.2
       color: 11184810
-      priority: 16135
+      priority: 16130
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16132
+      priority: 16127
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8959,14 +8765,14 @@ cont {
     lines {
       width: 1.5
       color: 10066329
-      priority: 16396
+      priority: 16395
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16733508
-      priority: 16174
+      priority: 16171
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8976,7 +8782,7 @@ cont {
     lines {
       width: 2.0
       color: 16733508
-      priority: 1173
+      priority: 1170
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8986,7 +8792,7 @@ cont {
     lines {
       width: 2.0
       color: 16733508
-      priority: 16417
+      priority: 16415
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8996,7 +8802,7 @@ cont {
     lines {
       width: 2.0
       color: 16733508
-      priority: 1442
+      priority: 1441
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9006,7 +8812,7 @@ cont {
     lines {
       width: 2.0
       color: 16733508
-      priority: 1489
+      priority: 1488
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9069,7 +8875,7 @@ cont {
     lines {
       width: 1.0
       color: 16733508
-      priority: 1475
+      priority: 1473
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9079,7 +8885,7 @@ cont {
     lines {
       width: 1.0
       color: 16733508
-      priority: 1709
+      priority: 1708
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9132,7 +8938,7 @@ cont {
     lines {
       width: 1.0
       color: 16733508
-      priority: 1472
+      priority: 1470
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9142,7 +8948,7 @@ cont {
     lines {
       width: 1.0
       color: 16733508
-      priority: 16707
+      priority: 16706
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9195,7 +9001,7 @@ cont {
     lines {
       width: 1.0
       color: 16733508
-      priority: 16704
+      priority: 16703
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9215,7 +9021,7 @@ cont {
     lines {
       width: 0.8
       color: 16733508
-      priority: 16957
+      priority: 16956
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9225,7 +9031,7 @@ cont {
     lines {
       width: 0.8
       color: 16733508
-      priority: 16957
+      priority: 16956
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9235,7 +9041,7 @@ cont {
     lines {
       width: 0.8
       color: 16733508
-      priority: 16957
+      priority: 16956
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9258,7 +9064,7 @@ cont {
     lines {
       width: 1.0
       color: 16733508
-      priority: 16869
+      priority: 16868
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9268,7 +9074,7 @@ cont {
     lines {
       width: 1.0
       color: 16733508
-      priority: 16954
+      priority: 16953
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9278,7 +9084,7 @@ cont {
     lines {
       width: 1.0
       color: 16733508
-      priority: 16954
+      priority: 16953
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9288,7 +9094,7 @@ cont {
     lines {
       width: 1.0
       color: 16733508
-      priority: 16954
+      priority: 16953
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9311,7 +9117,7 @@ cont {
     lines {
       width: 1.0
       color: 16733508
-      priority: 16866
+      priority: 16865
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9354,7 +9160,7 @@ cont {
     lines {
       width: 0.8
       color: 16733508
-      priority: 16737
+      priority: 16736
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9407,14 +9213,14 @@ cont {
     lines {
       width: 6.0
       color: 16776960
-      priority: 16423
+      priority: 16421
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
       color: 16733508
-      priority: 16429
+      priority: 16427
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9424,14 +9230,14 @@ cont {
     lines {
       width: 6.0
       color: 16776960
-      priority: 16446
+      priority: 16445
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
       color: 16733508
-      priority: 1451
+      priority: 1450
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9441,14 +9247,14 @@ cont {
     lines {
       width: 6.0
       color: 16776960
-      priority: 1492
+      priority: 1491
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
       color: 16733508
-      priority: 1498
+      priority: 1497
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9458,14 +9264,14 @@ cont {
     lines {
       width: 6.0
       color: 16776960
-      priority: 16754
+      priority: 16753
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
       color: 16733508
-      priority: 16760
+      priority: 16759
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9482,7 +9288,7 @@ cont {
     lines {
       width: 2.0
       color: 16733508
-      priority: 16910
+      priority: 16909
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9546,7 +9352,7 @@ cont {
     lines {
       width: 1.0
       color: 16733508
-      priority: 1483
+      priority: 1482
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9556,7 +9362,7 @@ cont {
     lines {
       width: 1.0
       color: 16733508
-      priority: 1739
+      priority: 1738
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9609,7 +9415,7 @@ cont {
     lines {
       width: 1.0
       color: 16733508
-      priority: 16734
+      priority: 16733
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9662,14 +9468,14 @@ cont {
     lines {
       width: 6.0
       color: 16776960
-      priority: 16420
+      priority: 16418
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
       color: 16733508
-      priority: 16426
+      priority: 16424
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9679,7 +9485,7 @@ cont {
     lines {
       width: 2.0
       color: 16733508
-      priority: 1448
+      priority: 1447
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9689,7 +9495,7 @@ cont {
     lines {
       width: 2.0
       color: 16733508
-      priority: 1495
+      priority: 1494
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9706,7 +9512,7 @@ cont {
     lines {
       width: 2.0
       color: 16733508
-      priority: 16757
+      priority: 16756
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9716,14 +9522,14 @@ cont {
     lines {
       width: 6.0
       color: 16776960
-      priority: 16904
+      priority: 16903
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.0
       color: 16733508
-      priority: 16907
+      priority: 16906
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9787,7 +9593,7 @@ cont {
     lines {
       width: 1.0
       color: 16733508
-      priority: 16414
+      priority: 16412
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9797,7 +9603,7 @@ cont {
     lines {
       width: 1.0
       color: 16733508
-      priority: 1439
+      priority: 1438
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9807,7 +9613,7 @@ cont {
     lines {
       width: 1.0
       color: 16733508
-      priority: 1486
+      priority: 1485
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9931,14 +9737,14 @@ cont {
     lines {
       width: 5.0
       color: 16776960
-      priority: 1170
+      priority: 1167
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.0
       color: 16733508
-      priority: 1173
+      priority: 1170
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9948,7 +9754,7 @@ cont {
     lines {
       width: 2.0
       color: 16733508
-      priority: 1173
+      priority: 1170
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9958,7 +9764,7 @@ cont {
     lines {
       width: 2.0
       color: 16733508
-      priority: 16417
+      priority: 16415
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9968,7 +9774,7 @@ cont {
     lines {
       width: 2.0
       color: 16733508
-      priority: 1442
+      priority: 1441
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9978,7 +9784,7 @@ cont {
     lines {
       width: 2.0
       color: 16733508
-      priority: 1489
+      priority: 1488
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10041,7 +9847,7 @@ cont {
     lines {
       width: 0.8
       color: 16733508
-      priority: 16731
+      priority: 16730
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10094,7 +9900,7 @@ cont {
     lines {
       width: 1.0
       color: 4521796
-      priority: 16176
+      priority: 16174
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10104,7 +9910,7 @@ cont {
     lines {
       width: 2.0
       color: 4521796
-      priority: 16176
+      priority: 16174
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10114,7 +9920,7 @@ cont {
     lines {
       width: 2.0
       color: 4521796
-      priority: 16432
+      priority: 16430
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10124,7 +9930,7 @@ cont {
     lines {
       width: 2.0
       color: 4521796
-      priority: 16763
+      priority: 16762
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10134,7 +9940,7 @@ cont {
     lines {
       width: 2.0
       color: 4521796
-      priority: 16913
+      priority: 16912
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10301,7 +10107,7 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1806
+      priority: 1805
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10381,7 +10187,7 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1806
+      priority: 1805
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10475,226 +10281,77 @@ cont {
   }
 }
 cont {
-  name: "craft"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/craft-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/craft-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/craft-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/craft-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "craft-carpenter"
+  name: "earthquake:damage-spontaneous_camp"
   element {
-    scale: 16
+    scale: 14
     symbol {
-      name: "symbols/nori/carpenter-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "earthquakecamp"
       priority: 16000
     }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/carpenter-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
-    scale: 18
+    scale: 15
     symbol {
-      name: "symbols/nori/carpenter-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "earthquakecamp"
       priority: 16000
     }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/carpenter-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
-}
-cont {
-  name: "craft-shoemaker"
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/shoemaker-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/shoemaker-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/shoemaker-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "earthquakecamp"
       priority: 16000
     }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/shoemaker-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "craft-tailor"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/tailor-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/tailor-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/tailor-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "earthquakecamp"
       priority: 16000
     }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/tailor-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "earthquake:damage-spontaneous_camp"
-  element {
-    scale: 15
-    symbol {
-      name: "symbols/maki/campsite-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/campsite-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/campsite-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/campsite-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "emergency-fire_hydrant"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/fire_hydrant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "earthquakecamp"
       priority: 16000
     }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/fire_hydrant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/fire_hydrant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/fire_hydrant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "emergency-phone"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "earthquakecamp"
       priority: 16000
     }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
 }
@@ -10702,288 +10359,44 @@ cont {
   name: "entrance"
   element {
     scale: 17
-    caption {
+    path_text {
       primary {
         height: 9
         color: 0
         stroke_color: 16777215
         offset_x: 6
       }
-      priority: 15023
-    }
-    circle {
-      radius: 2.0
-      color: 16777215
-      priority: 14023
+      priority: 16026
     }
   }
   element {
     scale: 18
-    caption {
+    path_text {
       primary {
         height: 9
         color: 0
         stroke_color: 16777215
         offset_x: 6
       }
-      priority: 15023
-    }
-    circle {
-      radius: 2.0
-      color: 16777215
-      priority: 14023
+      priority: 16026
     }
   }
   element {
     scale: 19
-    caption {
+    path_text {
       primary {
         height: 9
         color: 0
         stroke_color: 16777215
         offset_x: 6
       }
-      secondary {
-        height: 9
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15023
-    }
-    circle {
-      radius: 2.0
-      color: 16777215
-      priority: 14023
-    }
-  }
-}
-cont {
-  name: "harbour"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/harbor-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/harbor-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/harbor-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/harbor-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "healthcare-dentist"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/dentist-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/dentist-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/dentist-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/dentist-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "healthcare-hospital"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/hospital-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/hospital-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/hospital-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/hospital-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
+      priority: 16026
     }
   }
 }
 cont {
   name: "highway-bridleway"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 13
     lines {
       width: 6.9
@@ -10995,7 +10408,7 @@ cont {
     lines {
       width: 2.5
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11019,7 +10432,7 @@ cont {
     lines {
       width: 3.2
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11043,7 +10456,7 @@ cont {
     lines {
       width: 4.8
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11067,7 +10480,7 @@ cont {
     lines {
       width: 8.0
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11099,7 +10512,7 @@ cont {
     lines {
       width: 8.4
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11131,7 +10544,7 @@ cont {
     lines {
       width: 8.4
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11163,7 +10576,7 @@ cont {
     lines {
       width: 8.4
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11187,136 +10600,6 @@ cont {
 cont {
   name: "highway-bridleway-bridge"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 13
     lines {
       width: 6.9
@@ -11328,7 +10611,7 @@ cont {
     lines {
       width: 2.5
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11352,7 +10635,7 @@ cont {
     lines {
       width: 3.2
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11376,7 +10659,7 @@ cont {
     lines {
       width: 4.8
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11414,7 +10697,7 @@ cont {
     lines {
       width: 8.0
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11460,7 +10743,7 @@ cont {
     lines {
       width: 8.4
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11506,7 +10789,7 @@ cont {
     lines {
       width: 8.4
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11552,7 +10835,7 @@ cont {
     lines {
       width: 8.4
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11590,136 +10873,6 @@ cont {
 cont {
   name: "highway-bridleway-permissive"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 13
     lines {
       width: 6.9
@@ -11731,7 +10884,7 @@ cont {
     lines {
       width: 2.5
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11755,7 +10908,7 @@ cont {
     lines {
       width: 3.2
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11779,7 +10932,7 @@ cont {
     lines {
       width: 4.8
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11803,7 +10956,7 @@ cont {
     lines {
       width: 8.0
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11835,7 +10988,7 @@ cont {
     lines {
       width: 8.4
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11867,7 +11020,7 @@ cont {
     lines {
       width: 8.4
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11899,7 +11052,7 @@ cont {
     lines {
       width: 8.4
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11923,136 +11076,6 @@ cont {
 cont {
   name: "highway-bridleway-private"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 13
     lines {
       width: 6.9
@@ -12064,7 +11087,7 @@ cont {
     lines {
       width: 2.5
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12088,7 +11111,7 @@ cont {
     lines {
       width: 3.2
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12112,7 +11135,7 @@ cont {
     lines {
       width: 4.8
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12136,7 +11159,7 @@ cont {
     lines {
       width: 8.0
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12168,7 +11191,7 @@ cont {
     lines {
       width: 8.4
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12200,7 +11223,7 @@ cont {
     lines {
       width: 8.4
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12232,7 +11255,7 @@ cont {
     lines {
       width: 8.4
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12256,136 +11279,6 @@ cont {
 cont {
   name: "highway-bridleway-tunnel"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 13
     lines {
       width: 6.9
@@ -12397,7 +11290,7 @@ cont {
     lines {
       width: 2.5
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12421,7 +11314,7 @@ cont {
     lines {
       width: 3.2
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12445,7 +11338,7 @@ cont {
     lines {
       width: 4.8
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12487,7 +11380,7 @@ cont {
     lines {
       width: 8.0
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12537,7 +11430,7 @@ cont {
     lines {
       width: 8.4
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12587,7 +11480,7 @@ cont {
     lines {
       width: 8.4
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12637,7 +11530,7 @@ cont {
     lines {
       width: 8.4
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12681,7 +11574,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bus-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "bus-mini"
       priority: 16032
     }
     caption {
@@ -12693,11 +11586,16 @@ cont {
       }
       priority: 15032
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14032
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bus-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "bus"
       priority: 16032
     }
     caption {
@@ -12709,11 +11607,16 @@ cont {
       }
       priority: 15032
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14032
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bus-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "bus"
       priority: 16032
     }
     caption {
@@ -12725,11 +11628,16 @@ cont {
       }
       priority: 15032
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14032
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bus-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "bus"
       priority: 16032
     }
     caption {
@@ -12741,6 +11649,11 @@ cont {
       }
       priority: 15032
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14032
+    }
   }
 }
 cont {
@@ -13805,7 +12718,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13841,7 +12754,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13877,7 +12790,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13958,7 +12871,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13994,7 +12907,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14030,7 +12943,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14245,7 +13158,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14278,7 +13191,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14311,7 +13224,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14404,6 +13317,13 @@ cont {
   element {
     scale: 17
     lines {
+      width: 10.0
+      color: 7829367
+      priority: -14986
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 5.0
       color: 14540253
       priority: 1035
@@ -14411,27 +13331,20 @@ cont {
       cap: ROUNDCAP
     }
     lines {
+      width: 8.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 4.0
       color: 14540253
       dashdot {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 10.0
-      color: 7829367
-      priority: -14986
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 8.0
-      color: 7829367
-      priority: 14
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14454,6 +13367,13 @@ cont {
   element {
     scale: 18
     lines {
+      width: 14.0
+      color: 7829367
+      priority: -14986
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 9.0
       color: 14540253
       priority: 1035
@@ -14461,27 +13381,20 @@ cont {
       cap: ROUNDCAP
     }
     lines {
+      width: 12.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 8.0
       color: 14540253
       dashdot {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 14.0
-      color: 7829367
-      priority: -14986
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 12.0
-      color: 7829367
-      priority: 14
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14504,6 +13417,13 @@ cont {
   element {
     scale: 19
     lines {
+      width: 22.0
+      color: 7829367
+      priority: -14986
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 17.0
       color: 14540253
       priority: 1035
@@ -14511,27 +13431,20 @@ cont {
       cap: ROUNDCAP
     }
     lines {
+      width: 20.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 16.0
       color: 14540253
       dashdot {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1756
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 22.0
-      color: 7829367
-      priority: -14986
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 20.0
-      color: 7829367
-      priority: 14
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14623,7 +13536,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14659,7 +13572,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14695,7 +13608,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14780,7 +13693,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14816,7 +13729,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14852,7 +13765,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14937,7 +13850,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14973,7 +13886,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15009,7 +13922,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15090,7 +14003,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15126,7 +14039,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15162,7 +14075,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15247,7 +14160,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15283,7 +14196,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15319,7 +14232,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15400,7 +14313,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15436,7 +14349,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15472,7 +14385,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15553,7 +14466,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15589,7 +14502,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15625,7 +14538,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15706,7 +14619,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15742,7 +14655,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15778,7 +14691,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15875,6 +14788,13 @@ cont {
   element {
     scale: 17
     lines {
+      width: 8.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 5.0
       color: 14540253
       priority: 1035
@@ -15888,7 +14808,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15910,13 +14830,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    lines {
-      width: 8.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 12
@@ -15929,6 +14842,13 @@ cont {
   element {
     scale: 18
     lines {
+      width: 12.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 9.0
       color: 14540253
       priority: 1035
@@ -15942,7 +14862,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15964,13 +14884,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    lines {
-      width: 12.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 12
@@ -15983,6 +14896,13 @@ cont {
   element {
     scale: 19
     lines {
+      width: 20.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 17.0
       color: 14540253
       priority: 1035
@@ -15996,7 +14916,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16018,13 +14938,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    lines {
-      width: 20.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 12
@@ -16038,136 +14951,6 @@ cont {
 cont {
   name: "highway-ford"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 13
     lines {
       width: 8.75
@@ -16179,7 +14962,7 @@ cont {
     lines {
       width: 4.35
       color: 2236962
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16203,7 +14986,7 @@ cont {
     lines {
       width: 5.1
       color: 1118481
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16227,7 +15010,7 @@ cont {
     lines {
       width: 8.6
       color: 7829367
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16251,7 +15034,7 @@ cont {
     lines {
       width: 10.6
       color: 7829367
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16275,7 +15058,7 @@ cont {
     lines {
       width: 11.6
       color: 7829367
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16299,7 +15082,7 @@ cont {
     lines {
       width: 11.6
       color: 7829367
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16323,7 +15106,7 @@ cont {
     lines {
       width: 11.6
       color: 7829367
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16339,136 +15122,6 @@ cont {
 cont {
   name: "highway-living_street"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 13
     lines {
       width: 7.0
@@ -16480,7 +15133,7 @@ cont {
     lines {
       width: 2.6
       color: 13421738
-      priority: -15000
+      priority: 35
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16504,7 +15157,7 @@ cont {
     lines {
       width: 4.6
       color: 13421738
-      priority: -15000
+      priority: 35
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16528,7 +15181,7 @@ cont {
     lines {
       width: 5.6
       color: 13421738
-      priority: -15000
+      priority: 35
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16560,7 +15213,7 @@ cont {
     lines {
       width: 7.6
       color: 13421738
-      priority: -15000
+      priority: 35
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16592,7 +15245,7 @@ cont {
     lines {
       width: 9.6
       color: 13421738
-      priority: -15000
+      priority: 35
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16624,7 +15277,7 @@ cont {
     lines {
       width: 24.6
       color: 13421738
-      priority: -15000
+      priority: 35
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16656,7 +15309,7 @@ cont {
     lines {
       width: 42.6
       color: 13421738
-      priority: -15000
+      priority: 35
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16680,136 +15333,6 @@ cont {
 cont {
   name: "highway-living_street-bridge"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 13
     lines {
       width: 7.0
@@ -16821,7 +15344,7 @@ cont {
     lines {
       width: 2.6
       color: 13421738
-      priority: -15000
+      priority: 35
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16845,7 +15368,7 @@ cont {
     lines {
       width: 4.6
       color: 13421738
-      priority: -15000
+      priority: 35
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16869,7 +15392,7 @@ cont {
     lines {
       width: 5.6
       color: 13421738
-      priority: -15000
+      priority: 35
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16915,7 +15438,7 @@ cont {
     lines {
       width: 7.6
       color: 13421738
-      priority: -15000
+      priority: 35
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16961,7 +15484,7 @@ cont {
     lines {
       width: 9.6
       color: 13421738
-      priority: -15000
+      priority: 35
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17007,7 +15530,7 @@ cont {
     lines {
       width: 24.6
       color: 13421738
-      priority: -15000
+      priority: 35
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17053,7 +15576,7 @@ cont {
     lines {
       width: 42.6
       color: 13421738
-      priority: -15000
+      priority: 35
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17091,136 +15614,6 @@ cont {
 cont {
   name: "highway-living_street-tunnel"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 13
     lines {
       width: 7.0
@@ -17232,7 +15625,7 @@ cont {
     lines {
       width: 2.6
       color: 13421738
-      priority: -15000
+      priority: 35
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17256,7 +15649,7 @@ cont {
     lines {
       width: 4.6
       color: 13421738
-      priority: -15000
+      priority: 35
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17280,7 +15673,7 @@ cont {
     lines {
       width: 5.6
       color: 13421738
-      priority: -15000
+      priority: 35
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17330,7 +15723,7 @@ cont {
     lines {
       width: 7.6
       color: 13421738
-      priority: -15000
+      priority: 35
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17380,7 +15773,7 @@ cont {
     lines {
       width: 9.6
       color: 13421738
-      priority: -15000
+      priority: 35
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17430,7 +15823,7 @@ cont {
     lines {
       width: 24.6
       color: 13421738
-      priority: -15000
+      priority: 35
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17480,7 +15873,7 @@ cont {
     lines {
       width: 42.6
       color: 13421738
-      priority: -15000
+      priority: 35
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17522,81 +15915,11 @@ cont {
 cont {
   name: "highway-motorway"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 7
     lines {
       width: 2.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17605,7 +15928,7 @@ cont {
       color: 16777215
       priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -17613,7 +15936,7 @@ cont {
     lines {
       width: 3.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17622,7 +15945,7 @@ cont {
       color: 16777215
       priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -17637,7 +15960,7 @@ cont {
     lines {
       width: 4.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17646,7 +15969,7 @@ cont {
       color: 16777215
       priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -17661,7 +15984,7 @@ cont {
     lines {
       width: 5.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17670,7 +15993,7 @@ cont {
       color: 16777215
       priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -17693,7 +16016,7 @@ cont {
     lines {
       width: 5.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17725,7 +16048,7 @@ cont {
     lines {
       width: 7.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17757,7 +16080,7 @@ cont {
     lines {
       width: 9.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17789,7 +16112,7 @@ cont {
     lines {
       width: 13.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17821,7 +16144,7 @@ cont {
     lines {
       width: 17.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17853,7 +16176,7 @@ cont {
     lines {
       width: 17.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17885,7 +16208,7 @@ cont {
     lines {
       width: 18.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17917,7 +16240,7 @@ cont {
     lines {
       width: 24.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17949,7 +16272,7 @@ cont {
     lines {
       width: 42.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17973,81 +16296,11 @@ cont {
 cont {
   name: "highway-motorway-bridge"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 7
     lines {
       width: 2.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18056,7 +16309,7 @@ cont {
       color: 16777215
       priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -18064,7 +16317,7 @@ cont {
     lines {
       width: 3.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18073,7 +16326,7 @@ cont {
       color: 16777215
       priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -18088,7 +16341,7 @@ cont {
     lines {
       width: 4.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18097,7 +16350,7 @@ cont {
       color: 16777215
       priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -18112,7 +16365,7 @@ cont {
     lines {
       width: 5.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18121,7 +16374,7 @@ cont {
       color: 16777215
       priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -18144,7 +16397,7 @@ cont {
     lines {
       width: 5.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18176,7 +16429,7 @@ cont {
     lines {
       width: 7.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18208,7 +16461,7 @@ cont {
     lines {
       width: 9.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18240,7 +16493,7 @@ cont {
     lines {
       width: 13.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18272,7 +16525,7 @@ cont {
     lines {
       width: 17.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18318,7 +16571,7 @@ cont {
     lines {
       width: 17.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18364,7 +16617,7 @@ cont {
     lines {
       width: 18.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18410,7 +16663,7 @@ cont {
     lines {
       width: 24.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18456,7 +16709,7 @@ cont {
     lines {
       width: 42.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18494,81 +16747,11 @@ cont {
 cont {
   name: "highway-motorway-tunnel"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 7
     lines {
       width: 2.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18577,7 +16760,7 @@ cont {
       color: 16777215
       priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -18585,7 +16768,7 @@ cont {
     lines {
       width: 3.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18594,7 +16777,7 @@ cont {
       color: 16777215
       priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -18609,7 +16792,7 @@ cont {
     lines {
       width: 4.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18618,7 +16801,7 @@ cont {
       color: 16777215
       priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -18633,7 +16816,7 @@ cont {
     lines {
       width: 5.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18642,7 +16825,7 @@ cont {
       color: 16777215
       priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -18665,7 +16848,7 @@ cont {
     lines {
       width: 5.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18697,7 +16880,7 @@ cont {
     lines {
       width: 7.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18729,7 +16912,7 @@ cont {
     lines {
       width: 9.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18761,7 +16944,7 @@ cont {
     lines {
       width: 13.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18793,7 +16976,7 @@ cont {
     lines {
       width: 17.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18843,7 +17026,7 @@ cont {
     lines {
       width: 17.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18893,7 +17076,7 @@ cont {
     lines {
       width: 18.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18943,7 +17126,7 @@ cont {
     lines {
       width: 24.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18993,7 +17176,7 @@ cont {
     lines {
       width: 42.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19115,126 +17298,6 @@ cont {
 cont {
   name: "highway-motorway_link"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 12
     lines {
       width: 7.0
@@ -19246,7 +17309,7 @@ cont {
     lines {
       width: 2.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19270,7 +17333,7 @@ cont {
     lines {
       width: 3.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19294,7 +17357,7 @@ cont {
     lines {
       width: 5.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19326,7 +17389,7 @@ cont {
     lines {
       width: 9.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19358,7 +17421,7 @@ cont {
     lines {
       width: 13.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19390,7 +17453,7 @@ cont {
     lines {
       width: 13.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19422,7 +17485,7 @@ cont {
     lines {
       width: 24.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19454,7 +17517,7 @@ cont {
     lines {
       width: 42.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19478,126 +17541,6 @@ cont {
 cont {
   name: "highway-motorway_link-bridge"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 12
     lines {
       width: 7.0
@@ -19609,7 +17552,7 @@ cont {
     lines {
       width: 2.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19633,7 +17576,7 @@ cont {
     lines {
       width: 3.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19657,7 +17600,7 @@ cont {
     lines {
       width: 5.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19689,7 +17632,7 @@ cont {
     lines {
       width: 9.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19735,7 +17678,7 @@ cont {
     lines {
       width: 13.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19781,7 +17724,7 @@ cont {
     lines {
       width: 13.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19827,7 +17770,7 @@ cont {
     lines {
       width: 24.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19873,7 +17816,7 @@ cont {
     lines {
       width: 42.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19911,126 +17854,6 @@ cont {
 cont {
   name: "highway-motorway_link-tunnel"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 0
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 12
     lines {
       width: 7.0
@@ -20042,7 +17865,7 @@ cont {
     lines {
       width: 2.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20066,7 +17889,7 @@ cont {
     lines {
       width: 3.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20090,7 +17913,7 @@ cont {
     lines {
       width: 5.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20122,7 +17945,7 @@ cont {
     lines {
       width: 9.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20172,7 +17995,7 @@ cont {
     lines {
       width: 13.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20222,7 +18045,7 @@ cont {
     lines {
       width: 13.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20272,7 +18095,7 @@ cont {
     lines {
       width: 24.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20322,7 +18145,7 @@ cont {
     lines {
       width: 42.6
       color: 0
-      priority: -15000
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23555,91 +21378,11 @@ cont {
 cont {
   name: "highway-primary"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 8
     lines {
       width: 2.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23648,7 +21391,7 @@ cont {
       color: 16777215
       priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -23663,7 +21406,7 @@ cont {
     lines {
       width: 2.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23672,7 +21415,7 @@ cont {
       color: 16777215
       priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -23687,7 +21430,7 @@ cont {
     lines {
       width: 2.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23696,7 +21439,7 @@ cont {
       color: 16777215
       priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -23719,7 +21462,7 @@ cont {
     lines {
       width: 3.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23728,7 +21471,7 @@ cont {
       color: 16777215
       priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -23751,7 +21494,7 @@ cont {
     lines {
       width: 4.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23783,7 +21526,7 @@ cont {
     lines {
       width: 6.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23815,7 +21558,7 @@ cont {
     lines {
       width: 8.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23847,7 +21590,7 @@ cont {
     lines {
       width: 15.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23879,7 +21622,7 @@ cont {
     lines {
       width: 15.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23911,7 +21654,7 @@ cont {
     lines {
       width: 17.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23943,7 +21686,7 @@ cont {
     lines {
       width: 24.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23975,7 +21718,7 @@ cont {
     lines {
       width: 42.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23999,91 +21742,11 @@ cont {
 cont {
   name: "highway-primary-bridge"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 8
     lines {
       width: 2.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24092,7 +21755,7 @@ cont {
       color: 16777215
       priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -24107,7 +21770,7 @@ cont {
     lines {
       width: 2.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24116,7 +21779,7 @@ cont {
       color: 16777215
       priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -24131,7 +21794,7 @@ cont {
     lines {
       width: 2.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24140,7 +21803,7 @@ cont {
       color: 16777215
       priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -24163,7 +21826,7 @@ cont {
     lines {
       width: 3.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24172,7 +21835,7 @@ cont {
       color: 16777215
       priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -24195,7 +21858,7 @@ cont {
     lines {
       width: 4.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24227,7 +21890,7 @@ cont {
     lines {
       width: 6.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24259,7 +21922,7 @@ cont {
     lines {
       width: 8.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24291,7 +21954,7 @@ cont {
     lines {
       width: 15.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24337,7 +22000,7 @@ cont {
     lines {
       width: 15.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24383,7 +22046,7 @@ cont {
     lines {
       width: 17.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24429,7 +22092,7 @@ cont {
     lines {
       width: 24.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24475,7 +22138,7 @@ cont {
     lines {
       width: 42.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24513,91 +22176,11 @@ cont {
 cont {
   name: "highway-primary-tunnel"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 8
     lines {
       width: 2.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24606,7 +22189,7 @@ cont {
       color: 16777215
       priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -24621,7 +22204,7 @@ cont {
     lines {
       width: 2.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24630,7 +22213,7 @@ cont {
       color: 16777215
       priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -24645,7 +22228,7 @@ cont {
     lines {
       width: 2.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24654,7 +22237,7 @@ cont {
       color: 16777215
       priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -24677,7 +22260,7 @@ cont {
     lines {
       width: 3.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24686,7 +22269,7 @@ cont {
       color: 16777215
       priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -24709,7 +22292,7 @@ cont {
     lines {
       width: 4.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24741,7 +22324,7 @@ cont {
     lines {
       width: 6.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24773,7 +22356,7 @@ cont {
     lines {
       width: 8.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24805,7 +22388,7 @@ cont {
     lines {
       width: 15.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24855,7 +22438,7 @@ cont {
     lines {
       width: 15.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24905,7 +22488,7 @@ cont {
     lines {
       width: 17.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24955,7 +22538,7 @@ cont {
     lines {
       width: 24.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25005,7 +22588,7 @@ cont {
     lines {
       width: 42.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25047,106 +22630,6 @@ cont {
 cont {
   name: "highway-primary_link"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 10
     lines {
       width: 7.0
@@ -25158,7 +22641,7 @@ cont {
     lines {
       width: 2.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25182,7 +22665,7 @@ cont {
     lines {
       width: 2.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25206,7 +22689,7 @@ cont {
     lines {
       width: 4.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25230,7 +22713,7 @@ cont {
     lines {
       width: 4.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25254,7 +22737,7 @@ cont {
     lines {
       width: 6.1
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25286,7 +22769,7 @@ cont {
     lines {
       width: 10.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25318,7 +22801,7 @@ cont {
     lines {
       width: 13.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25350,7 +22833,7 @@ cont {
     lines {
       width: 13.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25382,7 +22865,7 @@ cont {
     lines {
       width: 24.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25414,7 +22897,7 @@ cont {
     lines {
       width: 42.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25438,106 +22921,6 @@ cont {
 cont {
   name: "highway-primary_link-bridge"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 10
     lines {
       width: 7.0
@@ -25549,7 +22932,7 @@ cont {
     lines {
       width: 2.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25573,7 +22956,7 @@ cont {
     lines {
       width: 2.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25597,7 +22980,7 @@ cont {
     lines {
       width: 4.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25621,7 +23004,7 @@ cont {
     lines {
       width: 4.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25645,7 +23028,7 @@ cont {
     lines {
       width: 6.1
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25677,7 +23060,7 @@ cont {
     lines {
       width: 10.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25723,7 +23106,7 @@ cont {
     lines {
       width: 13.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25769,7 +23152,7 @@ cont {
     lines {
       width: 13.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25815,7 +23198,7 @@ cont {
     lines {
       width: 24.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25861,7 +23244,7 @@ cont {
     lines {
       width: 42.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25899,106 +23282,6 @@ cont {
 cont {
   name: "highway-primary_link-tunnel"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 10
     lines {
       width: 7.0
@@ -26010,7 +23293,7 @@ cont {
     lines {
       width: 2.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26034,7 +23317,7 @@ cont {
     lines {
       width: 2.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26058,7 +23341,7 @@ cont {
     lines {
       width: 4.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26082,7 +23365,7 @@ cont {
     lines {
       width: 4.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26106,7 +23389,7 @@ cont {
     lines {
       width: 6.1
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26138,7 +23421,7 @@ cont {
     lines {
       width: 10.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26188,7 +23471,7 @@ cont {
     lines {
       width: 13.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26238,7 +23521,7 @@ cont {
     lines {
       width: 13.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26288,7 +23571,7 @@ cont {
     lines {
       width: 24.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26338,7 +23621,7 @@ cont {
     lines {
       width: 42.6
       color: 2236962
-      priority: -15000
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26380,176 +23663,6 @@ cont {
 cont {
   name: "highway-proposed"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 17
     lines {
       width: 16.0
@@ -26565,7 +23678,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26597,7 +23710,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26629,7 +23742,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26649,126 +23762,6 @@ cont {
 cont {
   name: "highway-raceway"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 12
     lines {
       width: 6.38
@@ -26780,7 +23773,7 @@ cont {
     lines {
       width: 1.98
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26804,7 +23797,7 @@ cont {
     lines {
       width: 2.35
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26828,7 +23821,7 @@ cont {
     lines {
       width: 4.6
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26852,21 +23845,21 @@ cont {
     lines {
       width: 5.0
       color: 12294468
-      priority: -15000
+      priority: 179
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.4
       color: 16777215
-      priority: 1181
+      priority: 1179
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 6.0
       color: 15658717
-      priority: 1351
+      priority: 1350
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -26877,7 +23870,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1184
+      priority: 1182
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26894,14 +23887,14 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: -15000
+      priority: 576
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 1577
+      priority: 1576
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -26912,14 +23905,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1454
+      priority: 1452
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 15658717
-      priority: 1580
+      priority: 1579
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -26936,14 +23929,14 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: -15000
+      priority: 455
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 1457
+      priority: 1455
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -26954,14 +23947,14 @@ cont {
         dd: 1.6
         dd: 1.6
       }
-      priority: 1460
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 15658717
-      priority: 1621
+      priority: 1620
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -26978,14 +23971,14 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: -15000
+      priority: 455
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 1457
+      priority: 1455
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -26996,14 +23989,14 @@ cont {
         dd: 1.6
         dd: 1.6
       }
-      priority: 1460
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 15658717
-      priority: 1621
+      priority: 1620
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -27020,14 +24013,14 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: -15000
+      priority: 455
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 1457
+      priority: 1455
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -27038,14 +24031,14 @@ cont {
         dd: 1.6
         dd: 1.6
       }
-      priority: 1460
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 15658717
-      priority: 1621
+      priority: 1620
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -27054,136 +24047,6 @@ cont {
 cont {
   name: "highway-residential"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 13
     lines {
       width: 7.0
@@ -27195,14 +24058,14 @@ cont {
     lines {
       width: 2.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -27219,14 +24082,14 @@ cont {
     lines {
       width: 4.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -27236,7 +24099,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -27251,14 +24114,14 @@ cont {
     lines {
       width: 5.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -27268,7 +24131,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -27283,14 +24146,14 @@ cont {
     lines {
       width: 7.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -27300,7 +24163,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -27315,14 +24178,14 @@ cont {
     lines {
       width: 9.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -27332,7 +24195,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -27347,14 +24210,14 @@ cont {
     lines {
       width: 24.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -27364,7 +24227,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -27379,14 +24242,14 @@ cont {
     lines {
       width: 42.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -27396,7 +24259,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
 }
@@ -27406,63 +24269,63 @@ cont {
     scale: 0
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 1
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 2
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 3
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 4
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 5
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 6
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 7
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 8
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -27476,7 +24339,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -27490,7 +24353,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -27504,7 +24367,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -27518,7 +24381,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -27532,7 +24395,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -27546,7 +24409,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
     path_text {
       primary {
@@ -27554,7 +24417,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -27568,7 +24431,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
     path_text {
       primary {
@@ -27576,7 +24439,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -27590,7 +24453,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
     path_text {
       primary {
@@ -27598,7 +24461,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -27612,7 +24475,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
     path_text {
       primary {
@@ -27620,7 +24483,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -27634,7 +24497,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
     path_text {
       primary {
@@ -27642,7 +24505,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -27656,7 +24519,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
     path_text {
       primary {
@@ -27664,143 +24527,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-residential-bridge"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 13
     lines {
       width: 7.0
@@ -27812,14 +24545,14 @@ cont {
     lines {
       width: 2.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -27836,14 +24569,14 @@ cont {
     lines {
       width: 4.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -27853,7 +24586,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -27868,14 +24601,14 @@ cont {
     lines {
       width: 5.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -27899,7 +24632,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -27914,14 +24647,14 @@ cont {
     lines {
       width: 7.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -27945,7 +24678,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -27960,14 +24693,14 @@ cont {
     lines {
       width: 9.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -27991,7 +24724,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -28006,14 +24739,14 @@ cont {
     lines {
       width: 24.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28037,7 +24770,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -28052,14 +24785,14 @@ cont {
     lines {
       width: 42.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28083,143 +24816,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-residential-private"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 13
     lines {
       width: 7.0
@@ -28231,14 +24834,14 @@ cont {
     lines {
       width: 2.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28255,14 +24858,14 @@ cont {
     lines {
       width: 4.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28272,7 +24875,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -28287,14 +24890,14 @@ cont {
     lines {
       width: 5.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28304,7 +24907,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -28319,14 +24922,14 @@ cont {
     lines {
       width: 7.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28336,7 +24939,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -28351,14 +24954,14 @@ cont {
     lines {
       width: 9.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28368,7 +24971,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -28383,14 +24986,14 @@ cont {
     lines {
       width: 24.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28400,7 +25003,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -28415,14 +25018,14 @@ cont {
     lines {
       width: 42.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28432,143 +25035,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-residential-tunnel"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 13
     lines {
       width: 7.0
@@ -28580,14 +25053,14 @@ cont {
     lines {
       width: 2.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28604,14 +25077,14 @@ cont {
     lines {
       width: 4.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28621,7 +25094,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -28636,14 +25109,14 @@ cont {
     lines {
       width: 5.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28671,7 +25144,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -28686,14 +25159,14 @@ cont {
     lines {
       width: 7.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28721,7 +25194,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -28736,14 +25209,14 @@ cont {
     lines {
       width: 9.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28771,7 +25244,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -28786,14 +25259,14 @@ cont {
     lines {
       width: 24.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28821,7 +25294,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -28836,14 +25309,14 @@ cont {
     lines {
       width: 42.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28871,153 +25344,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-road"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 14
     lines {
       width: 9.5
@@ -29029,7 +25362,7 @@ cont {
     lines {
       width: 5.1
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29061,7 +25394,7 @@ cont {
     lines {
       width: 8.6
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29093,7 +25426,7 @@ cont {
     lines {
       width: 10.6
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29125,7 +25458,7 @@ cont {
     lines {
       width: 11.6
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29157,7 +25490,7 @@ cont {
     lines {
       width: 11.6
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29189,7 +25522,7 @@ cont {
     lines {
       width: 11.6
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29213,146 +25546,6 @@ cont {
 cont {
   name: "highway-road-bridge"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 14
     lines {
       width: 9.5
@@ -29364,7 +25557,7 @@ cont {
     lines {
       width: 5.1
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29396,7 +25589,7 @@ cont {
     lines {
       width: 8.6
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29442,7 +25635,7 @@ cont {
     lines {
       width: 10.6
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29488,7 +25681,7 @@ cont {
     lines {
       width: 11.6
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29534,7 +25727,7 @@ cont {
     lines {
       width: 11.6
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29580,7 +25773,7 @@ cont {
     lines {
       width: 11.6
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29618,146 +25811,6 @@ cont {
 cont {
   name: "highway-road-tunnel"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 14
     lines {
       width: 9.5
@@ -29769,7 +25822,7 @@ cont {
     lines {
       width: 5.1
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29801,7 +25854,7 @@ cont {
     lines {
       width: 8.6
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29851,7 +25904,7 @@ cont {
     lines {
       width: 10.6
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29901,7 +25954,7 @@ cont {
     lines {
       width: 11.6
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29951,7 +26004,7 @@ cont {
     lines {
       width: 11.6
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -30001,7 +26054,7 @@ cont {
     lines {
       width: 11.6
       color: 12294468
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -30043,96 +26096,6 @@ cont {
 cont {
   name: "highway-secondary"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 9
     lines {
       width: 7.0
@@ -30144,14 +26107,14 @@ cont {
     lines {
       width: 2.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30168,14 +26131,14 @@ cont {
     lines {
       width: 2.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30192,14 +26155,14 @@ cont {
     lines {
       width: 3.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30216,14 +26179,14 @@ cont {
     lines {
       width: 4.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30240,14 +26203,14 @@ cont {
     lines {
       width: 5.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30257,7 +26220,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -30272,14 +26235,14 @@ cont {
     lines {
       width: 6.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30289,7 +26252,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -30304,14 +26267,14 @@ cont {
     lines {
       width: 8.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30321,7 +26284,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -30336,14 +26299,14 @@ cont {
     lines {
       width: 12.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30353,7 +26316,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -30368,14 +26331,14 @@ cont {
     lines {
       width: 15.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30385,7 +26348,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -30400,14 +26363,14 @@ cont {
     lines {
       width: 24.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30417,7 +26380,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -30432,14 +26395,14 @@ cont {
     lines {
       width: 42.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30449,103 +26412,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
 }
 cont {
   name: "highway-secondary-bridge"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 9
     lines {
       width: 7.0
@@ -30557,14 +26430,14 @@ cont {
     lines {
       width: 2.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30581,14 +26454,14 @@ cont {
     lines {
       width: 2.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30605,14 +26478,14 @@ cont {
     lines {
       width: 3.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30629,14 +26502,14 @@ cont {
     lines {
       width: 4.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30653,14 +26526,14 @@ cont {
     lines {
       width: 5.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30670,7 +26543,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -30685,14 +26558,14 @@ cont {
     lines {
       width: 6.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30702,7 +26575,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -30717,14 +26590,14 @@ cont {
     lines {
       width: 8.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30748,7 +26621,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -30763,14 +26636,14 @@ cont {
     lines {
       width: 12.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30794,7 +26667,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -30809,14 +26682,14 @@ cont {
     lines {
       width: 15.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30840,7 +26713,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -30855,14 +26728,14 @@ cont {
     lines {
       width: 24.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30886,7 +26759,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -30901,14 +26774,14 @@ cont {
     lines {
       width: 42.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30932,103 +26805,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
 }
 cont {
   name: "highway-secondary-tunnel"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 9
     lines {
       width: 7.0
@@ -31040,14 +26823,14 @@ cont {
     lines {
       width: 2.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31064,14 +26847,14 @@ cont {
     lines {
       width: 2.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31088,14 +26871,14 @@ cont {
     lines {
       width: 3.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31112,14 +26895,14 @@ cont {
     lines {
       width: 4.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31136,14 +26919,14 @@ cont {
     lines {
       width: 5.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31153,7 +26936,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -31168,14 +26951,14 @@ cont {
     lines {
       width: 6.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31185,7 +26968,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -31200,14 +26983,14 @@ cont {
     lines {
       width: 8.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31235,7 +27018,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -31250,14 +27033,14 @@ cont {
     lines {
       width: 12.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31285,7 +27068,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -31300,14 +27083,14 @@ cont {
     lines {
       width: 15.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31335,7 +27118,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -31350,14 +27133,14 @@ cont {
     lines {
       width: 24.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31385,7 +27168,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -31400,14 +27183,14 @@ cont {
     lines {
       width: 42.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31435,113 +27218,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
 }
 cont {
   name: "highway-secondary_link"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 10
     lines {
       width: 7.0
@@ -31553,14 +27236,14 @@ cont {
     lines {
       width: 2.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31577,14 +27260,14 @@ cont {
     lines {
       width: 2.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31601,14 +27284,14 @@ cont {
     lines {
       width: 2.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31625,14 +27308,14 @@ cont {
     lines {
       width: 3.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31649,14 +27332,14 @@ cont {
     lines {
       width: 6.1
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.5
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31666,7 +27349,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -31681,14 +27364,14 @@ cont {
     lines {
       width: 10.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31698,7 +27381,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -31713,14 +27396,14 @@ cont {
     lines {
       width: 13.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31730,7 +27413,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -31745,14 +27428,14 @@ cont {
     lines {
       width: 13.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31762,7 +27445,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -31777,14 +27460,14 @@ cont {
     lines {
       width: 24.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31794,7 +27477,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -31809,14 +27492,14 @@ cont {
     lines {
       width: 42.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31826,113 +27509,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
 }
 cont {
   name: "highway-secondary_link-bridge"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 10
     lines {
       width: 7.0
@@ -31944,14 +27527,14 @@ cont {
     lines {
       width: 2.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31968,14 +27551,14 @@ cont {
     lines {
       width: 2.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31992,14 +27575,14 @@ cont {
     lines {
       width: 2.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32016,14 +27599,14 @@ cont {
     lines {
       width: 3.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32040,14 +27623,14 @@ cont {
     lines {
       width: 6.1
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.5
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32057,7 +27640,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -32072,14 +27655,14 @@ cont {
     lines {
       width: 10.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32103,7 +27686,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -32118,14 +27701,14 @@ cont {
     lines {
       width: 13.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32149,7 +27732,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -32164,14 +27747,14 @@ cont {
     lines {
       width: 13.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32195,7 +27778,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -32210,14 +27793,14 @@ cont {
     lines {
       width: 24.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32241,7 +27824,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -32256,14 +27839,14 @@ cont {
     lines {
       width: 42.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32287,113 +27870,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
 }
 cont {
   name: "highway-secondary_link-tunnel"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 3355443
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 10
     lines {
       width: 7.0
@@ -32405,14 +27888,14 @@ cont {
     lines {
       width: 2.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32429,14 +27912,14 @@ cont {
     lines {
       width: 2.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32453,14 +27936,14 @@ cont {
     lines {
       width: 2.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32477,14 +27960,14 @@ cont {
     lines {
       width: 3.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32501,14 +27984,14 @@ cont {
     lines {
       width: 6.1
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.5
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32518,7 +28001,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -32533,14 +28016,14 @@ cont {
     lines {
       width: 10.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32568,7 +28051,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -32583,14 +28066,14 @@ cont {
     lines {
       width: 13.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32618,7 +28101,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -32633,14 +28116,14 @@ cont {
     lines {
       width: 13.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32668,7 +28151,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -32683,14 +28166,14 @@ cont {
     lines {
       width: 24.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32718,7 +28201,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
   element {
@@ -32733,14 +28216,14 @@ cont {
     lines {
       width: 42.6
       color: 3355443
-      priority: -15000
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 16777215
-      priority: 1049
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32768,163 +28251,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16049
+      priority: 16050
     }
   }
 }
 cont {
   name: "highway-service"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 15
     lines {
       width: 9.0
@@ -32936,14 +28269,14 @@ cont {
     lines {
       width: 4.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32960,14 +28293,14 @@ cont {
     lines {
       width: 6.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32977,7 +28310,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -32992,14 +28325,14 @@ cont {
     lines {
       width: 8.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33009,7 +28342,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -33024,14 +28357,14 @@ cont {
     lines {
       width: 10.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33041,7 +28374,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -33056,14 +28389,14 @@ cont {
     lines {
       width: 18.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33073,7 +28406,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
 }
@@ -33083,63 +28416,63 @@ cont {
     scale: 0
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 1
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 2
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 3
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 4
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 5
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 6
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 7
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 8
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -33153,7 +28486,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -33167,7 +28500,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -33181,7 +28514,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -33195,7 +28528,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -33209,7 +28542,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -33223,7 +28556,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -33237,7 +28570,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -33251,7 +28584,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
     path_text {
       primary {
@@ -33259,7 +28592,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -33273,7 +28606,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
     path_text {
       primary {
@@ -33281,7 +28614,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -33295,7 +28628,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
     path_text {
       primary {
@@ -33303,7 +28636,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -33317,7 +28650,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
     path_text {
       primary {
@@ -33325,163 +28658,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-service-bridge"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 15
     lines {
       width: 9.0
@@ -33493,14 +28676,14 @@ cont {
     lines {
       width: 4.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33531,14 +28714,14 @@ cont {
     lines {
       width: 6.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33562,7 +28745,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -33577,14 +28760,14 @@ cont {
     lines {
       width: 8.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33608,7 +28791,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -33623,14 +28806,14 @@ cont {
     lines {
       width: 10.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33654,7 +28837,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -33669,14 +28852,14 @@ cont {
     lines {
       width: 18.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33700,163 +28883,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-service-driveway"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 15
     lines {
       width: 9.0
@@ -33868,14 +28901,14 @@ cont {
     lines {
       width: 4.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33892,14 +28925,14 @@ cont {
     lines {
       width: 6.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33909,7 +28942,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -33924,14 +28957,14 @@ cont {
     lines {
       width: 8.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33941,7 +28974,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -33956,14 +28989,14 @@ cont {
     lines {
       width: 10.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33973,7 +29006,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -33988,14 +29021,14 @@ cont {
     lines {
       width: 18.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34005,7 +29038,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
 }
@@ -34015,63 +29048,63 @@ cont {
     scale: 0
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 1
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 2
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 3
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 4
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 5
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 6
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 7
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 8
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -34085,7 +29118,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -34099,7 +29132,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -34113,7 +29146,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -34127,7 +29160,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -34141,7 +29174,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -34155,7 +29188,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -34169,7 +29202,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -34183,7 +29216,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
     path_text {
       primary {
@@ -34191,7 +29224,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -34205,7 +29238,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
     path_text {
       primary {
@@ -34213,7 +29246,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -34227,7 +29260,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
     path_text {
       primary {
@@ -34235,7 +29268,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -34249,7 +29282,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
     path_text {
       primary {
@@ -34257,163 +29290,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-service-driveway-bridge"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 15
     lines {
       width: 9.0
@@ -34425,14 +29308,14 @@ cont {
     lines {
       width: 4.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34463,14 +29346,14 @@ cont {
     lines {
       width: 6.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34494,7 +29377,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -34509,14 +29392,14 @@ cont {
     lines {
       width: 8.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34540,7 +29423,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -34555,14 +29438,14 @@ cont {
     lines {
       width: 10.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34586,7 +29469,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -34601,14 +29484,14 @@ cont {
     lines {
       width: 18.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34632,163 +29515,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-service-driveway-tunnel"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 15
     lines {
       width: 9.0
@@ -34800,14 +29533,14 @@ cont {
     lines {
       width: 4.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34842,14 +29575,14 @@ cont {
     lines {
       width: 6.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34877,7 +29610,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -34892,14 +29625,14 @@ cont {
     lines {
       width: 8.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34927,7 +29660,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -34942,14 +29675,14 @@ cont {
     lines {
       width: 10.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34977,7 +29710,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -34992,14 +29725,14 @@ cont {
     lines {
       width: 18.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -35027,163 +29760,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-service-parking_aisle"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 15
     lines {
       width: 9.0
@@ -35195,14 +29778,14 @@ cont {
     lines {
       width: 4.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -35219,14 +29802,14 @@ cont {
     lines {
       width: 6.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -35236,7 +29819,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -35251,14 +29834,14 @@ cont {
     lines {
       width: 8.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -35268,7 +29851,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -35283,14 +29866,14 @@ cont {
     lines {
       width: 10.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -35300,7 +29883,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -35315,14 +29898,14 @@ cont {
     lines {
       width: 18.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -35332,163 +29915,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-service-tunnel"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 6710886
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 15
     lines {
       width: 9.0
@@ -35500,14 +29933,14 @@ cont {
     lines {
       width: 4.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -35542,14 +29975,14 @@ cont {
     lines {
       width: 6.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -35577,7 +30010,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -35592,14 +30025,14 @@ cont {
     lines {
       width: 8.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -35627,7 +30060,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -35642,14 +30075,14 @@ cont {
     lines {
       width: 10.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -35677,7 +30110,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -35692,14 +30125,14 @@ cont {
     lines {
       width: 18.6
       color: 6710886
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -35727,7 +30160,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
 }
@@ -35785,7 +30218,7 @@ cont {
         dd: 2.4
         dd: 1.0
       }
-      priority: 1322
+      priority: 1320
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -35821,7 +30254,7 @@ cont {
         dd: 3.0
         dd: 1.0
       }
-      priority: 1322
+      priority: 1320
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -35857,7 +30290,7 @@ cont {
         dd: 4.0
         dd: 1.0
       }
-      priority: 1322
+      priority: 1320
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -35919,34 +30352,34 @@ cont {
   element {
     scale: 17
     lines {
-      width: 6.0
-      color: 16777215
-      priority: 1041
+      width: 10.0
+      color: 7829367
+      priority: -14986
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.0
-      color: 14535850
-      dashdot {
-        dd: 2.4
-        dd: 1.0
-      }
-      priority: 1322
+      width: 6.0
+      color: 16777215
+      priority: 1041
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 10.0
+      width: 8.0
       color: 7829367
-      priority: -14986
+      priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
-      color: 7829367
-      priority: 14
+      width: 4.0
+      color: 14535850
+      dashdot {
+        dd: 2.4
+        dd: 1.0
+      }
+      priority: 1320
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -35969,34 +30402,34 @@ cont {
   element {
     scale: 18
     lines {
-      width: 10.0
-      color: 16777215
-      priority: 1041
+      width: 14.0
+      color: 7829367
+      priority: -14986
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
-      color: 14535850
-      dashdot {
-        dd: 3.0
-        dd: 1.0
-      }
-      priority: 1322
+      width: 10.0
+      color: 16777215
+      priority: 1041
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 14.0
+      width: 12.0
       color: 7829367
-      priority: -14986
+      priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 12.0
-      color: 7829367
-      priority: 14
+      width: 8.0
+      color: 14535850
+      dashdot {
+        dd: 3.0
+        dd: 1.0
+      }
+      priority: 1320
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -36019,34 +30452,34 @@ cont {
   element {
     scale: 19
     lines {
-      width: 18.0
-      color: 16777215
-      priority: 1041
+      width: 22.0
+      color: 7829367
+      priority: -14986
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 16.0
-      color: 14535850
-      dashdot {
-        dd: 4.0
-        dd: 1.0
-      }
-      priority: 1322
+      width: 18.0
+      color: 16777215
+      priority: 1041
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 22.0
+      width: 20.0
       color: 7829367
-      priority: -14986
+      priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 20.0
-      color: 7829367
-      priority: 14
+      width: 16.0
+      color: 14535850
+      dashdot {
+        dd: 4.0
+        dd: 1.0
+      }
+      priority: 1320
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -36119,6 +30552,13 @@ cont {
   element {
     scale: 17
     lines {
+      width: 10.0
+      color: 7829367
+      priority: -14986
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 6.0
       color: 16777215
       priority: 1041
@@ -36126,13 +30566,20 @@ cont {
       cap: BUTTCAP
     }
     lines {
+      width: 8.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 4.0
       color: 14535850
       dashdot {
         dd: 2.4
         dd: 1.0
       }
-      priority: 1322
+      priority: 1320
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -36147,20 +30594,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    lines {
-      width: 10.0
-      color: 7829367
-      priority: -14986
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 8.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 12
@@ -36173,6 +30606,13 @@ cont {
   element {
     scale: 18
     lines {
+      width: 14.0
+      color: 7829367
+      priority: -14986
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 10.0
       color: 16777215
       priority: 1041
@@ -36180,13 +30620,20 @@ cont {
       cap: BUTTCAP
     }
     lines {
+      width: 12.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 8.0
       color: 14535850
       dashdot {
         dd: 3.0
         dd: 1.0
       }
-      priority: 1322
+      priority: 1320
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -36201,20 +30648,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    lines {
-      width: 14.0
-      color: 7829367
-      priority: -14986
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 12.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 12
@@ -36227,6 +30660,13 @@ cont {
   element {
     scale: 19
     lines {
+      width: 22.0
+      color: 7829367
+      priority: -14986
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 18.0
       color: 16777215
       priority: 1041
@@ -36234,13 +30674,20 @@ cont {
       cap: BUTTCAP
     }
     lines {
+      width: 20.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 16.0
       color: 14535850
       dashdot {
         dd: 4.0
         dd: 1.0
       }
-      priority: 1322
+      priority: 1320
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -36255,20 +30702,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    lines {
-      width: 22.0
-      color: 7829367
-      priority: -14986
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 20.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 12
@@ -36280,347 +30713,8 @@ cont {
   }
 }
 cont {
-  name: "highway-street_lamp"
-  element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    symbol {
-      name: "symbols/nori/street_lamp-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    symbol {
-      name: "symbols/nori/street_lamp-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    symbol {
-      name: "symbols/nori/street_lamp-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    symbol {
-      name: "symbols/nori/street_lamp-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
   name: "highway-tertiary"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 12
     lines {
       width: 7.0
@@ -36632,14 +30726,14 @@ cont {
     lines {
       width: 2.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -36656,14 +30750,14 @@ cont {
     lines {
       width: 3.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -36680,14 +30774,14 @@ cont {
     lines {
       width: 4.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -36697,7 +30791,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -36712,14 +30806,14 @@ cont {
     lines {
       width: 5.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -36729,7 +30823,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -36744,14 +30838,14 @@ cont {
     lines {
       width: 7.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -36761,7 +30855,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -36776,14 +30870,14 @@ cont {
     lines {
       width: 13.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -36793,7 +30887,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -36808,14 +30902,14 @@ cont {
     lines {
       width: 24.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -36825,7 +30919,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -36840,14 +30934,14 @@ cont {
     lines {
       width: 42.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -36857,133 +30951,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
 }
 cont {
   name: "highway-tertiary-bridge"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 12
     lines {
       width: 7.0
@@ -36995,14 +30969,14 @@ cont {
     lines {
       width: 2.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -37019,14 +30993,14 @@ cont {
     lines {
       width: 3.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -37043,14 +31017,14 @@ cont {
     lines {
       width: 4.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -37060,7 +31034,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -37075,14 +31049,14 @@ cont {
     lines {
       width: 5.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -37106,7 +31080,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -37121,14 +31095,14 @@ cont {
     lines {
       width: 7.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -37152,7 +31126,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -37167,14 +31141,14 @@ cont {
     lines {
       width: 13.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -37198,7 +31172,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -37213,14 +31187,14 @@ cont {
     lines {
       width: 24.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -37244,7 +31218,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -37259,14 +31233,14 @@ cont {
     lines {
       width: 42.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -37290,133 +31264,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
 }
 cont {
   name: "highway-tertiary-tunnel"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 12
     lines {
       width: 7.0
@@ -37428,14 +31282,14 @@ cont {
     lines {
       width: 2.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -37452,14 +31306,14 @@ cont {
     lines {
       width: 3.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -37476,14 +31330,14 @@ cont {
     lines {
       width: 4.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -37493,7 +31347,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -37508,14 +31362,14 @@ cont {
     lines {
       width: 5.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -37543,7 +31397,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -37558,14 +31412,14 @@ cont {
     lines {
       width: 7.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -37593,7 +31447,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -37608,14 +31462,14 @@ cont {
     lines {
       width: 13.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -37643,7 +31497,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -37658,14 +31512,14 @@ cont {
     lines {
       width: 24.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -37693,7 +31547,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -37708,14 +31562,14 @@ cont {
     lines {
       width: 42.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -37743,133 +31597,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
 }
 cont {
   name: "highway-tertiary_link"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 12
     lines {
       width: 7.0
@@ -37881,14 +31615,14 @@ cont {
     lines {
       width: 2.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -37905,14 +31639,14 @@ cont {
     lines {
       width: 4.35
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.75
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -37929,14 +31663,14 @@ cont {
     lines {
       width: 6.1
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.5
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -37953,14 +31687,14 @@ cont {
     lines {
       width: 10.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -37970,7 +31704,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -37985,14 +31719,14 @@ cont {
     lines {
       width: 13.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -38002,7 +31736,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -38017,14 +31751,14 @@ cont {
     lines {
       width: 13.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -38034,7 +31768,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -38049,14 +31783,14 @@ cont {
     lines {
       width: 24.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -38066,7 +31800,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -38081,14 +31815,14 @@ cont {
     lines {
       width: 42.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -38098,133 +31832,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
 }
 cont {
   name: "highway-tertiary_link-bridge"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 12
     lines {
       width: 7.0
@@ -38236,14 +31850,14 @@ cont {
     lines {
       width: 2.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -38260,14 +31874,14 @@ cont {
     lines {
       width: 4.35
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.75
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -38284,14 +31898,14 @@ cont {
     lines {
       width: 6.1
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.5
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -38308,14 +31922,14 @@ cont {
     lines {
       width: 10.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -38339,7 +31953,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -38354,14 +31968,14 @@ cont {
     lines {
       width: 13.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -38385,7 +31999,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -38400,14 +32014,14 @@ cont {
     lines {
       width: 13.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -38431,7 +32045,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -38446,14 +32060,14 @@ cont {
     lines {
       width: 24.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -38477,7 +32091,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -38492,14 +32106,14 @@ cont {
     lines {
       width: 42.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -38523,133 +32137,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
 }
 cont {
   name: "highway-tertiary_link-tunnel"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 4473924
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 12
     lines {
       width: 7.0
@@ -38661,14 +32155,14 @@ cont {
     lines {
       width: 2.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -38685,14 +32179,14 @@ cont {
     lines {
       width: 4.35
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.75
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -38709,14 +32203,14 @@ cont {
     lines {
       width: 6.1
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.5
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -38733,14 +32227,14 @@ cont {
     lines {
       width: 10.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -38768,7 +32262,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -38783,14 +32277,14 @@ cont {
     lines {
       width: 13.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -38818,7 +32312,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -38833,14 +32327,14 @@ cont {
     lines {
       width: 13.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -38868,7 +32362,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -38883,14 +32377,14 @@ cont {
     lines {
       width: 24.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -38918,7 +32412,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
   element {
@@ -38933,14 +32427,14 @@ cont {
     lines {
       width: 42.6
       color: 4473924
-      priority: -15000
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 16777215
-      priority: 1046
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -38968,7 +32462,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16046
+      priority: 16047
     }
   }
 }
@@ -38988,7 +32482,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -39005,7 +32499,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -39394,7 +32888,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -39411,7 +32905,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -39618,7 +33112,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -39635,7 +33129,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -39772,7 +33266,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -39789,7 +33283,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -39926,7 +33420,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -39943,7 +33437,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -40080,7 +33574,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -40097,7 +33591,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -40234,7 +33728,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -40251,7 +33745,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -40388,7 +33882,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -40405,7 +33899,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -40542,7 +34036,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -40559,7 +34053,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -40696,7 +34190,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -40713,7 +34207,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -40850,7 +34344,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -40867,7 +34361,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -41004,7 +34498,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -41021,7 +34515,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -41158,7 +34652,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -41175,7 +34669,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -41312,7 +34806,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -41329,7 +34823,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -41466,7 +34960,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -41483,7 +34977,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -41620,7 +35114,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -41637,7 +35131,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -41774,7 +35268,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -41791,7 +35285,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -41928,7 +35422,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -41945,7 +35439,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -42082,7 +35576,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -42099,7 +35593,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -42236,7 +35730,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -42253,7 +35747,7 @@ cont {
       color: 16777215
       priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -42467,81 +35961,11 @@ cont {
 cont {
   name: "highway-trunk"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 7
     lines {
       width: 2.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -42550,7 +35974,7 @@ cont {
       color: 16777215
       priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -42558,7 +35982,7 @@ cont {
     lines {
       width: 3.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -42567,7 +35991,7 @@ cont {
       color: 16777215
       priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -42582,7 +36006,7 @@ cont {
     lines {
       width: 3.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -42591,7 +36015,7 @@ cont {
       color: 16777215
       priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -42606,7 +36030,7 @@ cont {
     lines {
       width: 3.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -42615,7 +36039,7 @@ cont {
       color: 16777215
       priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -42638,7 +36062,7 @@ cont {
     lines {
       width: 4.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -42647,7 +36071,7 @@ cont {
       color: 16777215
       priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -42670,7 +36094,7 @@ cont {
     lines {
       width: 4.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -42702,7 +36126,7 @@ cont {
     lines {
       width: 6.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -42734,7 +36158,7 @@ cont {
     lines {
       width: 8.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -42766,7 +36190,7 @@ cont {
     lines {
       width: 9.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -42798,7 +36222,7 @@ cont {
     lines {
       width: 15.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -42830,7 +36254,7 @@ cont {
     lines {
       width: 17.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -42862,7 +36286,7 @@ cont {
     lines {
       width: 24.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -42894,7 +36318,7 @@ cont {
     lines {
       width: 42.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -42918,81 +36342,11 @@ cont {
 cont {
   name: "highway-trunk-bridge"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 7
     lines {
       width: 2.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43001,7 +36355,7 @@ cont {
       color: 16777215
       priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -43009,7 +36363,7 @@ cont {
     lines {
       width: 3.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43018,7 +36372,7 @@ cont {
       color: 16777215
       priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -43033,7 +36387,7 @@ cont {
     lines {
       width: 3.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43042,7 +36396,7 @@ cont {
       color: 16777215
       priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -43057,7 +36411,7 @@ cont {
     lines {
       width: 3.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43066,7 +36420,7 @@ cont {
       color: 16777215
       priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -43089,7 +36443,7 @@ cont {
     lines {
       width: 4.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43098,7 +36452,7 @@ cont {
       color: 16777215
       priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -43121,7 +36475,7 @@ cont {
     lines {
       width: 4.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43153,7 +36507,7 @@ cont {
     lines {
       width: 6.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43185,7 +36539,7 @@ cont {
     lines {
       width: 8.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43217,7 +36571,7 @@ cont {
     lines {
       width: 9.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43263,7 +36617,7 @@ cont {
     lines {
       width: 15.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43309,7 +36663,7 @@ cont {
     lines {
       width: 17.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43355,7 +36709,7 @@ cont {
     lines {
       width: 24.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43401,7 +36755,7 @@ cont {
     lines {
       width: 42.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43439,81 +36793,11 @@ cont {
 cont {
   name: "highway-trunk-tunnel"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 7
     lines {
       width: 2.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43522,7 +36806,7 @@ cont {
       color: 16777215
       priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -43530,7 +36814,7 @@ cont {
     lines {
       width: 3.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43539,7 +36823,7 @@ cont {
       color: 16777215
       priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -43554,7 +36838,7 @@ cont {
     lines {
       width: 3.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43563,7 +36847,7 @@ cont {
       color: 16777215
       priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -43578,7 +36862,7 @@ cont {
     lines {
       width: 3.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43587,7 +36871,7 @@ cont {
       color: 16777215
       priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -43610,7 +36894,7 @@ cont {
     lines {
       width: 4.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43619,7 +36903,7 @@ cont {
       color: 16777215
       priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -43642,7 +36926,7 @@ cont {
     lines {
       width: 4.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43674,7 +36958,7 @@ cont {
     lines {
       width: 6.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43706,7 +36990,7 @@ cont {
     lines {
       width: 8.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43738,7 +37022,7 @@ cont {
     lines {
       width: 9.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43788,7 +37072,7 @@ cont {
     lines {
       width: 15.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43838,7 +37122,7 @@ cont {
     lines {
       width: 17.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43888,7 +37172,7 @@ cont {
     lines {
       width: 24.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43938,7 +37222,7 @@ cont {
     lines {
       width: 42.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -43980,106 +37264,6 @@ cont {
 cont {
   name: "highway-trunk_link"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 10
     lines {
       width: 7.0
@@ -44091,7 +37275,7 @@ cont {
     lines {
       width: 2.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44115,7 +37299,7 @@ cont {
     lines {
       width: 2.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44139,7 +37323,7 @@ cont {
     lines {
       width: 2.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44163,7 +37347,7 @@ cont {
     lines {
       width: 3.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44187,7 +37371,7 @@ cont {
     lines {
       width: 5.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44211,7 +37395,7 @@ cont {
     lines {
       width: 9.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44235,7 +37419,7 @@ cont {
     lines {
       width: 15.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44267,7 +37451,7 @@ cont {
     lines {
       width: 17.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44299,7 +37483,7 @@ cont {
     lines {
       width: 24.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44331,7 +37515,7 @@ cont {
     lines {
       width: 42.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44355,106 +37539,6 @@ cont {
 cont {
   name: "highway-trunk_link-bridge"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 10
     lines {
       width: 7.0
@@ -44466,7 +37550,7 @@ cont {
     lines {
       width: 2.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44490,7 +37574,7 @@ cont {
     lines {
       width: 2.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44514,7 +37598,7 @@ cont {
     lines {
       width: 2.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44538,7 +37622,7 @@ cont {
     lines {
       width: 3.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44562,7 +37646,7 @@ cont {
     lines {
       width: 5.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44586,7 +37670,7 @@ cont {
     lines {
       width: 9.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44624,7 +37708,7 @@ cont {
     lines {
       width: 15.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44670,7 +37754,7 @@ cont {
     lines {
       width: 17.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44716,7 +37800,7 @@ cont {
     lines {
       width: 24.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44762,7 +37846,7 @@ cont {
     lines {
       width: 42.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44800,106 +37884,6 @@ cont {
 cont {
   name: "highway-trunk_link-tunnel"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 10
     lines {
       width: 7.0
@@ -44911,7 +37895,7 @@ cont {
     lines {
       width: 2.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44935,7 +37919,7 @@ cont {
     lines {
       width: 2.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44959,7 +37943,7 @@ cont {
     lines {
       width: 2.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -44983,7 +37967,7 @@ cont {
     lines {
       width: 3.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -45007,7 +37991,7 @@ cont {
     lines {
       width: 5.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -45031,7 +38015,7 @@ cont {
     lines {
       width: 9.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -45073,7 +38057,7 @@ cont {
     lines {
       width: 15.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -45123,7 +38107,7 @@ cont {
     lines {
       width: 17.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -45173,7 +38157,7 @@ cont {
     lines {
       width: 24.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -45223,7 +38207,7 @@ cont {
     lines {
       width: 42.6
       color: 1118481
-      priority: -15000
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -45265,136 +38249,6 @@ cont {
 cont {
   name: "highway-unclassified"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 13
     lines {
       width: 7.0
@@ -45406,16 +38260,16 @@ cont {
     lines {
       width: 2.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -45430,14 +38284,14 @@ cont {
     lines {
       width: 4.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -45447,7 +38301,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -45462,14 +38316,14 @@ cont {
     lines {
       width: 5.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -45479,7 +38333,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -45494,14 +38348,14 @@ cont {
     lines {
       width: 7.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -45511,7 +38365,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -45526,14 +38380,14 @@ cont {
     lines {
       width: 9.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -45543,7 +38397,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -45558,14 +38412,14 @@ cont {
     lines {
       width: 24.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -45575,7 +38429,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -45590,14 +38444,14 @@ cont {
     lines {
       width: 42.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -45607,7 +38461,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
 }
@@ -45617,63 +38471,63 @@ cont {
     scale: 0
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 1
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 2
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 3
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 4
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 5
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 6
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 7
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
     scale: 8
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -45687,7 +38541,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -45701,7 +38555,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -45715,7 +38569,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -45729,7 +38583,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -45743,7 +38597,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
   }
   element {
@@ -45757,7 +38611,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
     path_text {
       primary {
@@ -45765,7 +38619,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -45779,7 +38633,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
     path_text {
       primary {
@@ -45787,7 +38641,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -45801,7 +38655,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
     path_text {
       primary {
@@ -45809,7 +38663,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -45823,7 +38677,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
     path_text {
       primary {
@@ -45831,7 +38685,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -45845,7 +38699,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
     path_text {
       primary {
@@ -45853,7 +38707,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -45867,7 +38721,7 @@ cont {
     }
     area {
       color: 16777215
-      priority: 1044
+      priority: 1045
     }
     path_text {
       primary {
@@ -45875,143 +38729,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-unclassified-bridge"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 13
     lines {
       width: 7.0
@@ -46023,16 +38747,16 @@ cont {
     lines {
       width: 2.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -46047,14 +38771,14 @@ cont {
     lines {
       width: 4.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -46064,7 +38788,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -46079,14 +38803,14 @@ cont {
     lines {
       width: 5.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -46110,7 +38834,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -46125,14 +38849,14 @@ cont {
     lines {
       width: 7.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -46156,7 +38880,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -46171,14 +38895,14 @@ cont {
     lines {
       width: 9.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -46202,7 +38926,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -46217,14 +38941,14 @@ cont {
     lines {
       width: 24.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -46248,7 +38972,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -46263,14 +38987,14 @@ cont {
     lines {
       width: 42.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -46294,143 +39018,13 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-unclassified-tunnel"
   element {
-    scale: 0
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 1
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 2
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 3
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 4
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 5
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.6
-      color: 5592405
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
     scale: 13
     lines {
       width: 7.0
@@ -46442,16 +39036,16 @@ cont {
     lines {
       width: 2.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -46466,14 +39060,14 @@ cont {
     lines {
       width: 4.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -46483,7 +39077,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -46498,14 +39092,14 @@ cont {
     lines {
       width: 5.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -46533,7 +39127,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -46548,14 +39142,14 @@ cont {
     lines {
       width: 7.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -46583,7 +39177,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -46598,14 +39192,14 @@ cont {
     lines {
       width: 9.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -46633,7 +39227,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -46648,14 +39242,14 @@ cont {
     lines {
       width: 24.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -46683,7 +39277,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
   element {
@@ -46698,14 +39292,14 @@ cont {
     lines {
       width: 42.6
       color: 5592405
-      priority: -15000
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 16777215
-      priority: 1043
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -46733,14 +39327,30 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16043
+      priority: 16044
     }
   }
 }
 cont {
   name: "historic-archaeological_site"
   element {
+    scale: 16
+    symbol {
+      name: "museum"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
     scale: 17
+    symbol {
+      name: "museum"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -46750,9 +39360,18 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
+    symbol {
+      name: "museum"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -46762,9 +39381,18 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
+    symbol {
+      name: "museum"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -46774,12 +39402,33 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
   name: "historic-battlefield"
   element {
+    scale: 16
+    symbol {
+      name: "cannon"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
     scale: 17
+    symbol {
+      name: "cannon"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -46789,9 +39438,18 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
+    symbol {
+      name: "cannon"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -46801,9 +39459,18 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
+    symbol {
+      name: "cannon"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -46813,12 +39480,33 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
   name: "historic-castle"
   element {
+    scale: 16
+    symbol {
+      name: "castle"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
     scale: 17
+    symbol {
+      name: "castle"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -46828,9 +39516,18 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
+    symbol {
+      name: "castle"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -46840,9 +39537,18 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
+    symbol {
+      name: "castle"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -46852,6 +39558,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -46859,14 +39570,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/monument-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "memorial"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/monument-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "memorial"
       priority: 16008
     }
     caption {
@@ -46878,11 +39594,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/monument-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "memorial"
       priority: 16008
     }
     caption {
@@ -46894,11 +39615,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/monument-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "memorial"
       priority: 16008
     }
     caption {
@@ -46910,6 +39636,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -46917,14 +39648,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/monument-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "memorial"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/monument-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "memorial"
       priority: 16008
     }
     caption {
@@ -46936,11 +39672,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/monument-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "memorial"
       priority: 16008
     }
     caption {
@@ -46952,11 +39693,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/monument-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "memorial"
       priority: 16008
     }
     caption {
@@ -46968,6 +39714,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -46975,14 +39726,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/museum-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "museum"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/museum-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "museum"
       priority: 16008
     }
     caption {
@@ -46994,11 +39750,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/museum-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "museum"
       priority: 16008
     }
     caption {
@@ -47010,11 +39771,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/museum-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "museum"
       priority: 16008
     }
     caption {
@@ -47026,12 +39792,33 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
   name: "historic-ruins"
   element {
+    scale: 16
+    symbol {
+      name: "ruins"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
     scale: 17
+    symbol {
+      name: "ruins"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -47041,9 +39828,18 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
+    symbol {
+      name: "ruins"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -47053,9 +39849,18 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
+    symbol {
+      name: "ruins"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -47065,6 +39870,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -47253,28 +40063,28 @@ cont {
     scale: 12
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 13
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 14
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 15
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -47282,14 +40092,14 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 16
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -47297,14 +40107,14 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 17
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -47312,14 +40122,14 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 18
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -47327,14 +40137,14 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 19
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -47342,7 +40152,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
 }
@@ -47489,10 +40299,6 @@ cont {
       color: 6710886
       priority: -16055
     }
-    symbol {
-      name: "symbols/maki/cemetery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
     caption {
       primary {
         height: 16
@@ -47508,10 +40314,6 @@ cont {
       color: 6710886
       priority: -16056
     }
-    symbol {
-      name: "symbols/maki/cemetery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
     caption {
       primary {
         height: 16
@@ -47527,10 +40329,6 @@ cont {
       color: 6710886
       priority: -16057
     }
-    symbol {
-      name: "symbols/maki/cemetery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
     caption {
       primary {
         height: 16
@@ -47546,10 +40344,6 @@ cont {
       color: 6710886
       priority: -16058
     }
-    symbol {
-      name: "symbols/maki/cemetery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
     caption {
       primary {
         height: 16
@@ -47604,10 +40398,6 @@ cont {
       color: 6710886
       priority: -16063
     }
-    symbol {
-      name: "symbols/maki/religious-christian-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
     caption {
       primary {
         height: 16
@@ -47623,10 +40413,6 @@ cont {
       color: 6710886
       priority: -16064
     }
-    symbol {
-      name: "symbols/maki/religious-christian-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
     caption {
       primary {
         height: 16
@@ -47642,10 +40428,6 @@ cont {
       color: 6710886
       priority: -16065
     }
-    symbol {
-      name: "symbols/maki/religious-christian-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
     caption {
       primary {
         height: 16
@@ -47661,10 +40443,6 @@ cont {
       color: 6710886
       priority: -16066
     }
-    symbol {
-      name: "symbols/maki/religious-christian-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
     caption {
       primary {
         height: 16
@@ -48414,10 +41192,6 @@ cont {
       color: 5592405
       priority: -16133
     }
-    symbol {
-      name: "symbols/maki/park-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
     caption {
       primary {
         height: 16
@@ -48433,10 +41207,6 @@ cont {
       color: 5592405
       priority: -16134
     }
-    symbol {
-      name: "symbols/maki/park-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
     caption {
       primary {
         height: 16
@@ -48452,10 +41222,6 @@ cont {
       color: 5592405
       priority: -16135
     }
-    symbol {
-      name: "symbols/maki/park-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
     caption {
       primary {
         height: 16
@@ -48471,10 +41237,6 @@ cont {
       color: 5592405
       priority: -16136
     }
-    symbol {
-      name: "symbols/maki/park-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
     caption {
       primary {
         height: 16
@@ -48543,16 +41305,11 @@ cont {
       color: 5592405
       priority: -16143
     }
-    symbol {
-      name: "symbols/maki/park2-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
     caption {
       primary {
         height: 16
         color: 0
         stroke_color: 16777215
-        offset_y: 10
       }
       priority: 15000
     }
@@ -48563,16 +41320,11 @@ cont {
       color: 5592405
       priority: -16144
     }
-    symbol {
-      name: "symbols/maki/park2-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
     caption {
       primary {
         height: 16
         color: 0
         stroke_color: 16777215
-        offset_y: 10
       }
       priority: 15000
     }
@@ -48583,16 +41335,11 @@ cont {
       color: 5592405
       priority: -16145
     }
-    symbol {
-      name: "symbols/maki/park2-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
     caption {
       primary {
         height: 16
         color: 0
         stroke_color: 16777215
-        offset_y: 10
       }
       priority: 15000
     }
@@ -48603,16 +41350,11 @@ cont {
       color: 5592405
       priority: -16146
     }
-    symbol {
-      name: "symbols/maki/park2-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
     caption {
       primary {
         height: 16
         color: 0
         stroke_color: 16777215
-        offset_y: 10
       }
       priority: 15000
     }
@@ -49815,28 +42557,28 @@ cont {
     scale: 12
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 13
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 14
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 15
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -49844,14 +42586,14 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 16
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -49859,14 +42601,14 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 17
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -49874,14 +42616,14 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 18
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -49889,14 +42631,14 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 19
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -49904,7 +42646,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
 }
@@ -50435,37 +43177,6 @@ cont {
   }
 }
 cont {
-  name: "leisure-beach_resort"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/beach_resort-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/beach_resort-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/beach_resort-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/beach_resort-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
   name: "leisure-dog_park-tennis"
   element {
     scale: 13
@@ -50494,10 +43205,6 @@ cont {
       color: 14531481
       priority: -16281
     }
-    symbol {
-      name: "symbols/maki/tennis-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 17
@@ -50505,10 +43212,6 @@ cont {
       color: 14531481
       priority: -16282
     }
-    symbol {
-      name: "symbols/maki/tennis-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 18
@@ -50516,10 +43219,6 @@ cont {
       color: 14531481
       priority: -16283
     }
-    symbol {
-      name: "symbols/maki/tennis-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 19
@@ -50527,10 +43226,6 @@ cont {
       color: 14531481
       priority: -16284
     }
-    symbol {
-      name: "symbols/maki/tennis-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
 }
 cont {
@@ -50572,32 +43267,103 @@ cont {
 cont {
   name: "leisure-golf_course"
   element {
+    scale: 17
+    symbol {
+      name: "golfCourse"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "golfCourse"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "golfCourse"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+}
+cont {
+  name: "leisure-nature_reserve"
+  element {
+    scale: 15
+    symbol {
+      name: "bird"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
     scale: 16
     symbol {
-      name: "symbols/maki/golf-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bird"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/golf-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bird"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/golf-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bird"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/golf-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bird"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
@@ -50921,37 +43687,6 @@ cont {
   }
 }
 cont {
-  name: "leisure-pitch"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/pitch-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/pitch-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/pitch-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/pitch-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
   name: "leisure-pitch-tennis"
   element {
     scale: 13
@@ -50980,10 +43715,6 @@ cont {
       color: 14531481
       priority: -16288
     }
-    symbol {
-      name: "symbols/maki/tennis-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 17
@@ -50991,10 +43722,6 @@ cont {
       color: 14531481
       priority: -16289
     }
-    symbol {
-      name: "symbols/maki/tennis-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 18
@@ -51002,10 +43729,6 @@ cont {
       color: 14531481
       priority: -16290
     }
-    symbol {
-      name: "symbols/maki/tennis-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 19
@@ -51013,41 +43736,45 @@ cont {
       color: 14531481
       priority: -16291
     }
-    symbol {
-      name: "symbols/maki/tennis-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
 }
 cont {
   name: "leisure-playground"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/playground-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/nori/playground-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "playground"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/playground-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "playground"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/playground-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "playground"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
@@ -51079,10 +43806,6 @@ cont {
       color: 14531481
       priority: -16295
     }
-    symbol {
-      name: "symbols/nori/playground-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 17
@@ -51091,9 +43814,14 @@ cont {
       priority: -16296
     }
     symbol {
-      name: "symbols/nori/playground-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "playground"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
@@ -51102,9 +43830,14 @@ cont {
       priority: -16297
     }
     symbol {
-      name: "symbols/nori/playground-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "playground"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
@@ -51113,9 +43846,14 @@ cont {
       priority: -16298
     }
     symbol {
-      name: "symbols/nori/playground-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "playground"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
@@ -51147,10 +43885,6 @@ cont {
       color: 14531481
       priority: -16302
     }
-    symbol {
-      name: "symbols/maki/tennis-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 17
@@ -51158,10 +43892,6 @@ cont {
       color: 14531481
       priority: -16303
     }
-    symbol {
-      name: "symbols/maki/tennis-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 18
@@ -51169,10 +43899,6 @@ cont {
       color: 14531481
       priority: -16304
     }
-    symbol {
-      name: "symbols/maki/tennis-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 19
@@ -51180,41 +43906,45 @@ cont {
       color: 14531481
       priority: -16305
     }
-    symbol {
-      name: "symbols/maki/tennis-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
 }
 cont {
   name: "leisure-slipway"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/ferry-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/maki/ferry-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "slipway"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/ferry-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "slipway"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/ferry-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "slipway"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
@@ -51389,49 +44119,49 @@ cont {
     scale: 13
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 14
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 15
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 16
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 17
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 18
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 19
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
 }
@@ -51607,7 +44337,7 @@ cont {
     lines {
       width: 4.0
       color: 7829367
-      priority: 1780
+      priority: 1779
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51644,174 +44374,41 @@ cont {
   }
 }
 cont {
-  name: "man_made-cairn"
+  name: "man_made-lighthouse"
   element {
     scale: 17
-    circle {
-      radius: 3.2
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 18
-    circle {
-      radius: 3.2
-      color: 16777215
-      priority: 14000
+    symbol {
+      name: "lighthouse"
+      priority: 16000
     }
-  }
-  element {
-    scale: 19
     circle {
-      radius: 3.2
+      radius: 13.0
       color: 16777215
       priority: 14000
     }
   }
-}
-cont {
-  name: "man_made-communication_tower"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/communication-tower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/communication-tower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/communication-tower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "lighthouse"
       priority: 16000
     }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/communication-tower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "man_made-cutline"
-  element {
-    scale: 12
-    lines {
-      width: 2.0
-      color: 15658734
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 4.0
-      color: 15658734
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 4.0
-      color: 15658734
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 6.0
-      color: 15658734
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 6.0
-      color: 15658734
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 6.0
-      color: 15658734
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 6.0
-      color: 15658734
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 19
-    lines {
-      width: 6.0
-      color: 15658734
-      priority: -15000
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-}
-cont {
-  name: "man_made-mast"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/communication-tower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/communication-tower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
     symbol {
-      name: "symbols/nori/communication-tower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "lighthouse"
       priority: 16000
     }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/communication-tower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
 }
@@ -51822,20 +44419,20 @@ cont {
     lines {
       width: 0.1
       color: 14540253
-      priority: 1463
+      priority: 1461
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.6
       color: 15658734
-      priority: 1466
+      priority: 1464
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 16772846
-      priority: 1464
+      priority: 1462
     }
   }
   element {
@@ -51843,20 +44440,20 @@ cont {
     lines {
       width: 1.6
       color: 14540253
-      priority: 1615
+      priority: 1614
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.2
       color: 15658734
-      priority: 1618
+      priority: 1617
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 16772846
-      priority: 1616
+      priority: 1615
     }
   }
   element {
@@ -51899,7 +44496,7 @@ cont {
     lines {
       width: 2.4
       color: 15658734
-      priority: 1853
+      priority: 1852
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51927,7 +44524,7 @@ cont {
     lines {
       width: 2.4
       color: 15658734
-      priority: 1853
+      priority: 1852
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51955,7 +44552,7 @@ cont {
     lines {
       width: 2.4
       color: 15658734
-      priority: 1853
+      priority: 1852
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51979,7 +44576,7 @@ cont {
     lines {
       width: 1.6
       color: 2164260863
-      priority: 1809
+      priority: 1808
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51994,7 +44591,7 @@ cont {
         dd: 1.2
         dd: 4.4
       }
-      priority: 1815
+      priority: 1814
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -52086,7 +44683,7 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1809
+      priority: 1808
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -52101,7 +44698,7 @@ cont {
         dd: 1.2
         dd: 4.4
       }
-      priority: 1815
+      priority: 1814
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -52183,37 +44780,6 @@ cont {
   }
 }
 cont {
-  name: "man_made-storage_tank"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/storage_tank-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/storage_tank-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/storage_tank-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/storage_tank-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
   name: "man_made-wastewater_plant"
   element {
     scale: 12
@@ -52273,188 +44839,41 @@ cont {
   }
 }
 cont {
-  name: "man_made-water_tower"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/water_tower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "man_made-windmill"
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/water_tower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/water_tower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "windmill"
       priority: 16000
     }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/water_tower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "man_made-water_well"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/bucket-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/bucket-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/bucket-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/bucket-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "man_made-water_well-drinking_water"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/drinking_water_well-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/drinking_water_well-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/drinking_water_well-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/drinking_water_well-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "man_made-water_well-manual"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/pump-manual-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/pump-manual-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/pump-manual-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "windmill"
       priority: 16000
     }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/pump-manual-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "man_made-water_well-powered"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/pump-powered-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/pump-powered-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/pump-powered-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/pump-powered-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "windmill"
       priority: 16000
     }
-  }
-}
-cont {
-  name: "man_made-watermill"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/watermill-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/watermill-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/watermill-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/watermill-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
 }
@@ -52839,12 +45258,51 @@ cont {
   }
 }
 cont {
+  name: "military-bunker"
+  element {
+    scale: 17
+    symbol {
+      name: "cannon"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "cannon"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "cannon"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+}
+cont {
   name: "natural-bay"
   element {
     scale: 14
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -52852,14 +45310,14 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 15
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -52867,14 +45325,14 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 16
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -52882,14 +45340,14 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 17
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -52897,14 +45355,14 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 18
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -52912,14 +45370,14 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 19
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -52927,7 +45385,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
 }
@@ -52979,23 +45437,9 @@ cont {
 cont {
   name: "natural-cave_entrance"
   element {
-    scale: 12
-    symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 13
-    symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 14
     symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "cave_entrance"
       priority: 16000
     }
     caption {
@@ -53007,11 +45451,16 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "cave_entrance"
       priority: 16000
     }
     caption {
@@ -53023,11 +45472,16 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "cave_entrance"
       priority: 16000
     }
     caption {
@@ -53039,11 +45493,16 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "cave_entrance"
       priority: 16000
     }
     caption {
@@ -53055,11 +45514,16 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "cave_entrance"
       priority: 16000
     }
     caption {
@@ -53071,11 +45535,16 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "cave_entrance"
       priority: 16000
     }
     caption {
@@ -53087,6 +45556,11 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
@@ -53095,140 +45569,140 @@ cont {
     scale: 0
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 1
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 2
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 3
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 4
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 5
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 6
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 7
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 8
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 9
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 10
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 11
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 12
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 13
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 14
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 15
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 16
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 17
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 18
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 19
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
 }
@@ -53239,7 +45713,7 @@ cont {
     lines {
       width: 0.75
       color: 11197934
-      priority: 1017
+      priority: 1020
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53249,7 +45723,7 @@ cont {
     lines {
       width: 0.8
       color: 11197934
-      priority: 1020
+      priority: 1023
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53259,7 +45733,7 @@ cont {
     lines {
       width: 1.6
       color: 11197934
-      priority: 1020
+      priority: 1023
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53269,7 +45743,7 @@ cont {
     lines {
       width: 3.2
       color: 11197934
-      priority: 1020
+      priority: 1023
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53279,7 +45753,7 @@ cont {
     lines {
       width: 6.4
       color: 11197934
-      priority: 1020
+      priority: 1023
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53289,7 +45763,7 @@ cont {
     lines {
       width: 6.4
       color: 11197934
-      priority: 1020
+      priority: 1023
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53299,7 +45773,7 @@ cont {
     lines {
       width: 6.4
       color: 11197934
-      priority: 1020
+      priority: 1023
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53544,51 +46018,35 @@ cont {
     scale: 10
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 11
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 12
     area {
       color: 0
-      priority: -15898
-    }
-    caption {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 16777215
-      }
-      priority: 15102
+      priority: -15903
     }
   }
   element {
     scale: 13
     area {
       color: 0
-      priority: -15898
-    }
-    caption {
-      primary {
-        height: 12
-        color: 0
-        stroke_color: 16777215
-      }
-      priority: 15102
+      priority: -15903
     }
   }
   element {
     scale: 14
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -53596,14 +46054,14 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 15
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -53611,14 +46069,14 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 16
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -53626,14 +46084,14 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 17
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -53641,14 +46099,14 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 18
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -53656,14 +46114,14 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 19
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -53671,7 +46129,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
 }
@@ -53897,14 +46355,14 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000:#FFFFFF:::"
+      name: "peak-mini"
       priority: 16000
     }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000:#FFFFFF:::"
+      name: "peak-mini"
       priority: 16000
     }
     caption {
@@ -53920,7 +46378,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000:#FFFFFF:::"
+      name: "peak"
       priority: 16000
     }
     caption {
@@ -53936,7 +46394,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000:#FFFFFF:::"
+      name: "peak"
       priority: 16000
     }
     caption {
@@ -53952,7 +46410,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000:#FFFFFF:::"
+      name: "peak"
       priority: 16000
     }
     caption {
@@ -53968,7 +46426,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000:#FFFFFF:::"
+      name: "peak"
       priority: 16000
     }
     caption {
@@ -53984,7 +46442,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000:#FFFFFF:::"
+      name: "peak"
       priority: 16000
     }
     caption {
@@ -54000,7 +46458,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000:#FFFFFF:::"
+      name: "peak"
       priority: 16000
     }
     caption {
@@ -54020,21 +46478,21 @@ cont {
     scale: 10
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 11
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 12
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -54042,14 +46500,14 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 13
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -54057,14 +46515,14 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 14
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -54072,42 +46530,42 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 15
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 16
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 17
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 18
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 19
     area {
       color: 0
-      priority: -15898
+      priority: -15903
     }
   }
 }
@@ -54466,28 +46924,32 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/park2-18.svg:#000000:#FFFFFF:::"
+      name: "tree"
+      apply_for_type: 1
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/park2-18.svg:#000000:#FFFFFF:::"
+      name: "tree"
+      apply_for_type: 1
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/park2-18.svg:#000000:#FFFFFF:::"
+      name: "tree"
+      apply_for_type: 1
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/park2-18.svg:#000000:#FFFFFF:::"
+      name: "tree"
+      apply_for_type: 1
       priority: 16000
     }
   }
@@ -54555,21 +47017,31 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "vulcan"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "vulcan"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "vulcan"
       priority: 16000
     }
     caption {
@@ -54581,11 +47053,16 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "vulcan"
       priority: 16000
     }
     caption {
@@ -54597,11 +47074,16 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "vulcan"
       priority: 16000
     }
     caption {
@@ -54613,11 +47095,16 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "vulcan"
       priority: 16000
     }
     caption {
@@ -54629,11 +47116,16 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "vulcan"
       priority: 16000
     }
     caption {
@@ -54645,11 +47137,16 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "vulcan"
       priority: 16000
     }
     caption {
@@ -54661,6 +47158,11 @@ cont {
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
@@ -54739,28 +47241,28 @@ cont {
     scale: 10
     area {
       color: 1118481
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 11
     area {
       color: 1118481
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 12
     area {
       color: 1118481
-      priority: -15898
+      priority: -15903
     }
   }
   element {
     scale: 13
     area {
       color: 1118481
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -54768,14 +47270,14 @@ cont {
         color: 16777215
         stroke_color: 0
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 14
     area {
       color: 1118481
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -54783,14 +47285,14 @@ cont {
         color: 16777215
         stroke_color: 0
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 15
     area {
       color: 1118481
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -54798,14 +47300,14 @@ cont {
         color: 16777215
         stroke_color: 0
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 16
     area {
       color: 1118481
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -54813,14 +47315,14 @@ cont {
         color: 16777215
         stroke_color: 0
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 17
     area {
       color: 1118481
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -54828,14 +47330,14 @@ cont {
         color: 16777215
         stroke_color: 0
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 18
     area {
       color: 1118481
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -54843,14 +47345,14 @@ cont {
         color: 16777215
         stroke_color: 0
       }
-      priority: 15102
+      priority: 15097
     }
   }
   element {
     scale: 19
     area {
       color: 1118481
-      priority: -15898
+      priority: -15903
     }
     caption {
       primary {
@@ -54858,7 +47360,7 @@ cont {
         color: 16777215
         stroke_color: 0
       }
-      priority: 15102
+      priority: 15097
     }
   }
 }
@@ -55089,10 +47591,6 @@ cont {
       color: 5592405
       priority: -16434
     }
-    symbol {
-      name: "symbols/maki/park-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 17
@@ -55100,10 +47598,6 @@ cont {
       color: 5592405
       priority: -16435
     }
-    symbol {
-      name: "symbols/maki/park-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 18
@@ -55111,10 +47605,6 @@ cont {
       color: 5592405
       priority: -16436
     }
-    symbol {
-      name: "symbols/maki/park-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 19
@@ -55122,10 +47612,6 @@ cont {
       color: 5592405
       priority: -16437
     }
-    symbol {
-      name: "symbols/maki/park-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
 }
 cont {
@@ -55178,10 +47664,6 @@ cont {
       color: 5592405
       priority: -16444
     }
-    symbol {
-      name: "symbols/maki/park2-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 17
@@ -55189,10 +47671,6 @@ cont {
       color: 5592405
       priority: -16445
     }
-    symbol {
-      name: "symbols/maki/park2-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 18
@@ -55200,10 +47678,6 @@ cont {
       color: 5592405
       priority: -16446
     }
-    symbol {
-      name: "symbols/maki/park2-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
   element {
     scale: 19
@@ -55211,10 +47685,6 @@ cont {
       color: 5592405
       priority: -16447
     }
-    symbol {
-      name: "symbols/maki/park2-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
 }
 cont {
@@ -55410,18 +47880,7 @@ cont {
 cont {
   name: "office-government"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/government-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
-    symbol {
-      name: "symbols/nori/government-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -55434,10 +47893,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/nori/government-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -55450,10 +47905,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/nori/government-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -55505,64 +47956,6 @@ cont {
   }
 }
 cont {
-  name: "office-ngo"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/ngo-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/ngo-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/ngo-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/ngo-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
   name: "office-telecommunication"
   element {
     scale: 17
@@ -55610,7 +48003,7 @@ cont {
       color: 0
       priority: 1997
       pathsym {
-        name: "symbols/arrow.svg:::::"
+        name: "arrow"
         step: 218.0
         offset: 200.0
       }
@@ -55623,7 +48016,7 @@ cont {
       color: 0
       priority: 1997
       pathsym {
-        name: "symbols/arrow.svg:::::"
+        name: "arrow"
         step: 218.0
         offset: 200.0
       }
@@ -55636,7 +48029,7 @@ cont {
       color: 0
       priority: 1997
       pathsym {
-        name: "symbols/arrow.svg:::::"
+        name: "arrow"
         step: 218.0
         offset: 200.0
       }
@@ -55649,7 +48042,7 @@ cont {
       color: 0
       priority: 1997
       pathsym {
-        name: "symbols/arrow.svg:::::"
+        name: "arrow"
         step: 218.0
         offset: 200.0
       }
@@ -55678,13 +48071,13 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
       }
-      priority: 15000
+      priority: 16000
     }
   }
   element {
@@ -55703,7 +48096,7 @@ cont {
         dd: 1.0
         dd: 40.0
       }
-      priority: 1583
+      priority: 1582
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -55724,7 +48117,7 @@ cont {
         dd: 1.0
         dd: 40.0
       }
-      priority: 1583
+      priority: 1582
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -55745,7 +48138,7 @@ cont {
         dd: 1.0
         dd: 40.0
       }
-      priority: 1583
+      priority: 1582
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -55766,7 +48159,7 @@ cont {
         dd: 1.0
         dd: 40.0
       }
-      priority: 1583
+      priority: 1582
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -55787,7 +48180,7 @@ cont {
         dd: 1.0
         dd: 40.0
       }
-      priority: 1583
+      priority: 1582
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -55868,13 +48261,13 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
       }
-      priority: 15000
+      priority: 16000
     }
   }
   element {
@@ -55994,7 +48387,7 @@ cont {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1586
+      priority: 1585
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -56078,13 +48471,13 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
       }
-      priority: 15000
+      priority: 16000
     }
   }
   element {
@@ -56842,7 +49235,7 @@ cont {
     lines {
       width: 10.0
       color: 16772829
-      priority: 1765
+      priority: 1764
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57227,11 +49620,6 @@ cont {
         color: 0
         stroke_color: 7829367
       }
-      secondary {
-        height: 14
-        color: 11184793
-        stroke_color: 16777215
-      }
       priority: 15000
     }
   }
@@ -57400,10 +49788,6 @@ cont {
   }
   element {
     scale: 14
-    area {
-      color: 14540236
-      priority: -16458
-    }
     caption {
       primary {
         height: 12
@@ -57415,10 +49799,6 @@ cont {
   }
   element {
     scale: 15
-    area {
-      color: 14540236
-      priority: -16459
-    }
     caption {
       primary {
         height: 12
@@ -57430,10 +49810,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 14540236
-      priority: -16460
-    }
     caption {
       primary {
         height: 16
@@ -57445,10 +49821,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 14540236
-      priority: -16461
-    }
     caption {
       primary {
         height: 16
@@ -57460,10 +49832,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 14540236
-      priority: -16462
-    }
     caption {
       primary {
         height: 16
@@ -57475,10 +49843,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 14540236
-      priority: -16463
-    }
     caption {
       primary {
         height: 16
@@ -58490,18 +50854,7 @@ cont {
 cont {
   name: "place-village"
   element {
-    scale: 11
-    area {
-      color: 14540236
-      priority: -16464
-    }
-  }
-  element {
     scale: 12
-    area {
-      color: 14540236
-      priority: -16465
-    }
     caption {
       primary {
         height: 12
@@ -58513,10 +50866,6 @@ cont {
   }
   element {
     scale: 13
-    area {
-      color: 14540236
-      priority: -16466
-    }
     caption {
       primary {
         height: 12
@@ -58528,10 +50877,6 @@ cont {
   }
   element {
     scale: 14
-    area {
-      color: 14540236
-      priority: -16467
-    }
     caption {
       primary {
         height: 12
@@ -58543,10 +50888,6 @@ cont {
   }
   element {
     scale: 15
-    area {
-      color: 14540236
-      priority: -16468
-    }
     caption {
       primary {
         height: 16
@@ -58558,10 +50899,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 14540236
-      priority: -16469
-    }
     caption {
       primary {
         height: 16
@@ -58573,10 +50910,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 14540236
-      priority: -16470
-    }
     caption {
       primary {
         height: 18
@@ -58588,10 +50921,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 14540236
-      priority: -16471
-    }
     caption {
       primary {
         height: 18
@@ -58603,10 +50932,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 14540236
-      priority: -16472
-    }
     caption {
       primary {
         height: 18
@@ -58626,7 +50951,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -58637,7 +50962,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -58648,7 +50973,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -58659,7 +50984,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -58670,7 +50995,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -58681,7 +51006,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -58695,7 +51020,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_hydro"
       priority: 16000
     }
   }
@@ -58706,7 +51031,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_hydro"
       priority: 16000
     }
   }
@@ -58717,7 +51042,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_hydro"
       priority: 16000
     }
   }
@@ -58728,7 +51053,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_hydro"
       priority: 16000
     }
   }
@@ -58739,7 +51064,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_hydro"
       priority: 16000
     }
   }
@@ -58750,76 +51075,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "power-generator-nuclear"
-  element {
-    scale: 14
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator_nuclear-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 15
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator_nuclear-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator_nuclear-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator_nuclear-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator_nuclear-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator_nuclear-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_hydro"
       priority: 16000
     }
   }
@@ -58833,76 +51089,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 15
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "power-generator-solar"
-  element {
-    scale: 14
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator_solar-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -58913,7 +51100,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_solar-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -58924,7 +51111,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_solar-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -58935,7 +51122,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_solar-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -58946,7 +51133,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_solar-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -58957,7 +51144,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_solar-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -58971,7 +51158,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_wind-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_wind"
       priority: 16000
     }
   }
@@ -58982,7 +51169,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_wind-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_wind"
       priority: 16000
     }
   }
@@ -58993,7 +51180,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_wind-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_wind"
       priority: 16000
     }
   }
@@ -59004,7 +51191,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_wind-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_wind"
       priority: 16000
     }
   }
@@ -59015,7 +51202,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_wind-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_wind"
       priority: 16000
     }
   }
@@ -59026,7 +51213,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_wind-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "power_wind"
       priority: 16000
     }
   }
@@ -59255,7 +51442,7 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1803
+      priority: 1802
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59280,7 +51467,7 @@ cont {
     lines {
       width: 1.6
       color: 2164260863
-      priority: 1856
+      priority: 1855
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59291,7 +51478,7 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1859
+      priority: 1858
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59316,7 +51503,7 @@ cont {
     lines {
       width: 1.6
       color: 2164260863
-      priority: 1856
+      priority: 1855
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59327,7 +51514,7 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1859
+      priority: 1858
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59352,7 +51539,7 @@ cont {
     lines {
       width: 1.6
       color: 2164260863
-      priority: 1856
+      priority: 1855
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59363,7 +51550,7 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1859
+      priority: 1858
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59389,28 +51576,28 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/cross-12.svg:#000000:#FFFFFF:::"
+      name: "power-pole"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/cross-12.svg:#000000:#FFFFFF:::"
+      name: "power-pole"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/cross-12.svg:#000000:#FFFFFF:::"
+      name: "power-pole"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/cross-12.svg:#000000:#FFFFFF:::"
+      name: "power-pole"
       priority: 16000
     }
   }
@@ -59510,28 +51697,28 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/power_tower-12.svg:#000000:#FFFFFF:::"
+      name: "power-tower"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/power_tower-12.svg:#000000:#FFFFFF:::"
+      name: "power-tower"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/power_tower-12.svg:#000000:#FFFFFF:::"
+      name: "power-tower"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/power_tower-12.svg:#000000:#FFFFFF:::"
+      name: "power-tower"
       priority: 16000
     }
   }
@@ -59543,7 +51730,7 @@ cont {
     lines {
       width: 0.25
       color: 3015424955
-      priority: 1222
+      priority: 1220
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59553,7 +51740,7 @@ cont {
     lines {
       width: 0.55
       color: 3015424955
-      priority: 1243
+      priority: 1241
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59563,7 +51750,7 @@ cont {
     lines {
       width: 1.6
       color: 2579217339
-      priority: 1193
+      priority: 1191
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59574,14 +51761,14 @@ cont {
         dd: 4.5
         dd: 4.5
       }
-      priority: 1322
+      priority: 1320
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 2583691263
-      priority: 1281
+      priority: 1279
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59591,7 +51778,7 @@ cont {
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1287
+      priority: 1285
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59602,14 +51789,14 @@ cont {
         dd: 9.0
         dd: 9.0
       }
-      priority: 1392
+      priority: 1391
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1360
+      priority: 1358
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59619,14 +51806,14 @@ cont {
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1510
+      priority: 1508
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.4
       color: 2583691263
-      priority: 1609
+      priority: 1608
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59636,7 +51823,7 @@ cont {
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1545
+      priority: 1544
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59647,14 +51834,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1718
+      priority: 1717
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1674
+      priority: 1673
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59664,7 +51851,7 @@ cont {
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1545
+      priority: 1544
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59675,14 +51862,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1718
+      priority: 1717
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1674
+      priority: 1673
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59692,7 +51879,7 @@ cont {
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1545
+      priority: 1544
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59703,14 +51890,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1718
+      priority: 1717
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1674
+      priority: 1673
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59723,7 +51910,7 @@ cont {
     lines {
       width: 0.25
       color: 3015424955
-      priority: 1222
+      priority: 1220
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59733,7 +51920,7 @@ cont {
     lines {
       width: 0.55
       color: 3015424955
-      priority: 1243
+      priority: 1241
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59743,7 +51930,7 @@ cont {
     lines {
       width: 1.6
       color: 2579217339
-      priority: 1193
+      priority: 1191
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59754,14 +51941,14 @@ cont {
         dd: 4.5
         dd: 4.5
       }
-      priority: 1322
+      priority: 1320
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 2583691263
-      priority: 1281
+      priority: 1279
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59771,36 +51958,36 @@ cont {
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1287
+      priority: 1285
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 2579217339
       dashdot {
         dd: 9.0
         dd: 9.0
       }
-      priority: 1392
+      priority: 1391
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1360
+      priority: 1358
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 8.0
       color: 7829367
       priority: 11
@@ -59813,7 +52000,7 @@ cont {
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1510
+      priority: 1508
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59827,7 +52014,7 @@ cont {
     lines {
       width: 2.4
       color: 2583691263
-      priority: 1609
+      priority: 1608
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59844,36 +52031,36 @@ cont {
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1545
+      priority: 1544
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 2579217339
       dashdot {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1718
+      priority: 1717
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1674
+      priority: 1673
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 8.0
       color: 7829367
       priority: 11
@@ -59886,36 +52073,36 @@ cont {
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1545
+      priority: 1544
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 2579217339
       dashdot {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1718
+      priority: 1717
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1674
+      priority: 1673
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 8.0
       color: 7829367
       priority: 11
@@ -59928,36 +52115,36 @@ cont {
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1545
+      priority: 1544
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 2579217339
       dashdot {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1718
+      priority: 1717
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1674
+      priority: 1673
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 8.0
       color: 7829367
       priority: 11
@@ -59973,7 +52160,7 @@ cont {
     lines {
       width: 0.25
       color: 3015424955
-      priority: 1222
+      priority: 1220
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59983,7 +52170,7 @@ cont {
     lines {
       width: 0.55
       color: 3015424955
-      priority: 1243
+      priority: 1241
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -59993,7 +52180,7 @@ cont {
     lines {
       width: 1.6
       color: 2579217339
-      priority: 1193
+      priority: 1191
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60004,14 +52191,14 @@ cont {
         dd: 4.5
         dd: 4.5
       }
-      priority: 1322
+      priority: 1320
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 2583691263
-      priority: 1281
+      priority: 1279
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60019,9 +52206,16 @@ cont {
   element {
     scale: 15
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 3.2
       color: 2579217339
-      priority: 1287
+      priority: 1285
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60032,14 +52226,14 @@ cont {
         dd: 9.0
         dd: 9.0
       }
-      priority: 1392
+      priority: 1391
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1360
+      priority: 1358
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60054,20 +52248,13 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
   }
   element {
     scale: 16
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1510
+      priority: 1508
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60081,7 +52268,7 @@ cont {
     lines {
       width: 2.4
       color: 2583691263
-      priority: 1609
+      priority: 1608
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60100,9 +52287,16 @@ cont {
   element {
     scale: 17
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 3.2
       color: 2579217339
-      priority: 1545
+      priority: 1544
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60113,14 +52307,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1718
+      priority: 1717
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1674
+      priority: 1673
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60135,6 +52329,9 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
       width: 6.0
       color: 7829367
@@ -60142,13 +52339,10 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1545
+      priority: 1544
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60159,14 +52353,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1718
+      priority: 1717
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1674
+      priority: 1673
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60181,6 +52375,9 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
       width: 6.0
       color: 7829367
@@ -60188,13 +52385,10 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1545
+      priority: 1544
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60205,14 +52399,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1718
+      priority: 1717
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1674
+      priority: 1673
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60227,247 +52421,56 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
   }
 }
 cont {
-  name: "railway-construction"
-  element {
-    scale: 12
-    lines {
-      width: 0.75
-      color: 4473924
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1217
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.35
-      color: 4473924
-      dashdot {
-        dd: 1.5
-        dd: 1.5
-      }
-      priority: 1234
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 2.4
-      color: 6710886
-      dashdot {
-        dd: 1.5
-        dd: 1.5
-      }
-      priority: 1187
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.7
-      color: 6710886
-      dashdot {
-        dd: 1.5
-        dd: 1.5
-        dd: 1.5
-        dd: 4.5
-      }
-      priority: 1313
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.7
-      color: 16777215
-      priority: 1272
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 3.2
-      color: 6710886
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 1275
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 6710886
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-        dd: 3.0
-        dd: 9.0
-      }
-      priority: 1387
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 16777215
-      priority: 1354
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
+  name: "railway-crossing"
   element {
     scale: 16
-    lines {
-      width: 3.2
-      color: 6710886
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-      }
-      priority: 1501
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.4
-      color: 6710886
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-        dd: 4.0
-        dd: 12.0
-      }
-      priority: 1636
-      join: ROUNDJOIN
-      cap: BUTTCAP
+    symbol {
+      name: "railway-crossing-small"
+      priority: 16000
     }
-    lines {
-      width: 2.4
+    circle {
+      radius: 13.0
       color: 16777215
-      priority: 1601
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+      priority: 14000
     }
   }
   element {
     scale: 17
-    lines {
-      width: 3.2
-      color: 6710886
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-      }
-      priority: 1539
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 6710886
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-        dd: 4.0
-        dd: 12.0
-      }
-      priority: 1703
-      join: ROUNDJOIN
-      cap: BUTTCAP
+    symbol {
+      name: "railway-crossing-small"
+      priority: 16000
     }
-    lines {
-      width: 2.0
+    circle {
+      radius: 13.0
       color: 16777215
-      priority: 1665
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+      priority: 14000
     }
   }
   element {
     scale: 18
-    lines {
-      width: 3.2
-      color: 6710886
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-      }
-      priority: 1539
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 6710886
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-        dd: 4.0
-        dd: 12.0
-      }
-      priority: 1703
-      join: ROUNDJOIN
-      cap: BUTTCAP
+    symbol {
+      name: "railway-crossing-small"
+      priority: 16000
     }
-    lines {
-      width: 2.0
+    circle {
+      radius: 13.0
       color: 16777215
-      priority: 1665
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+      priority: 14000
     }
   }
   element {
     scale: 19
-    lines {
-      width: 3.2
-      color: 6710886
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-      }
-      priority: 1539
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 6710886
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-        dd: 4.0
-        dd: 12.0
-      }
-      priority: 1703
-      join: ROUNDJOIN
-      cap: BUTTCAP
+    symbol {
+      name: "railway-crossing-small"
+      priority: 16000
     }
-    lines {
-      width: 2.0
+    circle {
+      radius: 13.0
       color: 16777215
-      priority: 1665
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+      priority: 14000
     }
   }
 }
@@ -60478,7 +52481,7 @@ cont {
     lines {
       width: 0.5
       color: 2156431496
-      priority: 1219
+      priority: 1217
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60488,7 +52491,7 @@ cont {
     lines {
       width: 0.85
       color: 2156431496
-      priority: 1240
+      priority: 1238
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60498,7 +52501,7 @@ cont {
     lines {
       width: 1.6
       color: 1300793480
-      priority: 1190
+      priority: 1188
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60509,14 +52512,14 @@ cont {
         dd: 4.5
         dd: 4.5
       }
-      priority: 1319
+      priority: 1317
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 1308622847
-      priority: 1278
+      priority: 1276
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60526,7 +52529,7 @@ cont {
     lines {
       width: 3.2
       color: 1300793480
-      priority: 1284
+      priority: 1282
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60537,14 +52540,14 @@ cont {
         dd: 9.0
         dd: 9.0
       }
-      priority: 1390
+      priority: 1388
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 1308622847
-      priority: 1357
+      priority: 1355
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60554,14 +52557,14 @@ cont {
     lines {
       width: 3.2
       color: 1300793480
-      priority: 1504
+      priority: 1502
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.4
       color: 1308622847
-      priority: 1604
+      priority: 1602
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60571,7 +52574,7 @@ cont {
     lines {
       width: 3.2
       color: 1300793480
-      priority: 1542
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60582,14 +52585,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1712
+      priority: 1711
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 1308622847
-      priority: 1668
+      priority: 1667
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60599,7 +52602,7 @@ cont {
     lines {
       width: 3.2
       color: 1300793480
-      priority: 1542
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60610,14 +52613,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1712
+      priority: 1711
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 1308622847
-      priority: 1668
+      priority: 1667
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60627,7 +52630,7 @@ cont {
     lines {
       width: 3.2
       color: 1300793480
-      priority: 1542
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60638,14 +52641,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1712
+      priority: 1711
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 1308622847
-      priority: 1668
+      priority: 1667
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60658,7 +52661,7 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 1237
+      priority: 1235
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60668,7 +52671,7 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 1258
+      priority: 1255
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60678,14 +52681,14 @@ cont {
     lines {
       width: 2.4
       color: 5570560
-      priority: 1205
+      priority: 1202
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.4
       color: 5570560
-      priority: 1334
+      priority: 1332
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60696,7 +52699,7 @@ cont {
         dd: 3.6
         dd: 5.4
       }
-      priority: 1302
+      priority: 1300
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60706,14 +52709,14 @@ cont {
     lines {
       width: 3.2
       color: 4456448
-      priority: 1304
+      priority: 1302
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.5
       color: 4456448
-      priority: 1407
+      priority: 1405
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60724,7 +52727,7 @@ cont {
         dd: 7.2
         dd: 10.8
       }
-      priority: 1375
+      priority: 1373
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60734,14 +52737,14 @@ cont {
     lines {
       width: 3.2
       color: 4456448
-      priority: 1519
+      priority: 1517
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.6
       color: 4456448
-      priority: 1653
+      priority: 1652
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60752,7 +52755,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1624
+      priority: 1623
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60762,7 +52765,7 @@ cont {
     lines {
       width: 3.2
       color: 4456448
-      priority: 1563
+      priority: 1561
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60780,7 +52783,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1692
+      priority: 1691
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60790,7 +52793,7 @@ cont {
     lines {
       width: 3.2
       color: 4456448
-      priority: 1563
+      priority: 1561
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60808,7 +52811,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1692
+      priority: 1691
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60818,7 +52821,7 @@ cont {
     lines {
       width: 3.2
       color: 4456448
-      priority: 1563
+      priority: 1561
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60836,7 +52839,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1692
+      priority: 1691
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60849,7 +52852,7 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 1237
+      priority: 1235
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60859,7 +52862,7 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 1258
+      priority: 1255
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60869,14 +52872,14 @@ cont {
     lines {
       width: 2.4
       color: 5570560
-      priority: 1205
+      priority: 1202
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.4
       color: 5570560
-      priority: 1334
+      priority: 1332
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60887,7 +52890,7 @@ cont {
         dd: 3.6
         dd: 5.4
       }
-      priority: 1302
+      priority: 1300
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60897,14 +52900,21 @@ cont {
     lines {
       width: 3.2
       color: 4456448
-      priority: 1304
+      priority: 1302
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 4.5
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 0.5
       color: 4456448
-      priority: 1407
+      priority: 1405
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60915,14 +52925,7 @@ cont {
         dd: 7.2
         dd: 10.8
       }
-      priority: 1375
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 4.5
-      color: 7829367
-      priority: 14
+      priority: 1373
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60939,14 +52942,21 @@ cont {
     lines {
       width: 3.2
       color: 4456448
-      priority: 1519
+      priority: 1517
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 4.6
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 0.6
       color: 4456448
-      priority: 1653
+      priority: 1652
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60957,14 +52967,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1624
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 4.6
-      color: 7829367
-      priority: 14
+      priority: 1623
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60981,11 +52984,18 @@ cont {
     lines {
       width: 3.2
       color: 4456448
-      priority: 1563
+      priority: 1561
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 4.64
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 0.64
       color: 4456448
       priority: 1744
@@ -60999,14 +53009,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1692
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 4.64
-      color: 7829367
-      priority: 14
+      priority: 1691
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -61023,11 +53026,18 @@ cont {
     lines {
       width: 3.2
       color: 4456448
-      priority: 1563
+      priority: 1561
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 4.64
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 0.64
       color: 4456448
       priority: 1744
@@ -61041,14 +53051,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1692
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 4.64
-      color: 7829367
-      priority: 14
+      priority: 1691
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -61065,11 +53068,18 @@ cont {
     lines {
       width: 3.2
       color: 4456448
-      priority: 1563
+      priority: 1561
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 4.64
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 0.64
       color: 4456448
       priority: 1744
@@ -61083,14 +53093,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1692
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 4.64
-      color: 7829367
-      priority: 14
+      priority: 1691
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -61110,7 +53113,7 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 1237
+      priority: 1235
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61120,7 +53123,7 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 1258
+      priority: 1255
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61130,14 +53133,14 @@ cont {
     lines {
       width: 2.4
       color: 5570560
-      priority: 1205
+      priority: 1202
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.4
       color: 5570560
-      priority: 1334
+      priority: 1332
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61148,7 +53151,7 @@ cont {
         dd: 3.6
         dd: 5.4
       }
-      priority: 1302
+      priority: 1300
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -61156,16 +53159,23 @@ cont {
   element {
     scale: 15
     lines {
+      width: 4.5
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 3.2
       color: 4456448
-      priority: 1304
+      priority: 1302
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.5
       color: 4456448
-      priority: 1407
+      priority: 1405
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61176,7 +53186,7 @@ cont {
         dd: 7.2
         dd: 10.8
       }
-      priority: 1375
+      priority: 1373
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -61191,27 +53201,27 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 16
     lines {
-      width: 4.5
+      width: 4.6
       color: 7829367
       priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 16
     lines {
       width: 3.2
       color: 4456448
-      priority: 1519
+      priority: 1517
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.6
       color: 4456448
-      priority: 1653
+      priority: 1652
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61222,7 +53232,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1624
+      priority: 1623
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -61237,20 +53247,20 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
     lines {
-      width: 4.6
+      width: 4.64
       color: 7829367
       priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 17
     lines {
       width: 3.2
       color: 4456448
-      priority: 1563
+      priority: 1561
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61268,7 +53278,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1692
+      priority: 1691
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -61283,6 +53293,9 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
       width: 4.64
       color: 7829367
@@ -61290,13 +53303,10 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
       width: 3.2
       color: 4456448
-      priority: 1563
+      priority: 1561
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61314,7 +53324,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1692
+      priority: 1691
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -61329,6 +53339,9 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
       width: 4.64
       color: 7829367
@@ -61336,13 +53349,10 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
       width: 3.2
       color: 4456448
-      priority: 1563
+      priority: 1561
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61360,7 +53370,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1692
+      priority: 1691
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -61375,13 +53385,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    lines {
-      width: 4.64
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
   }
 }
 cont {
@@ -61389,52 +53392,72 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/rail-above-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16000
+      name: "railway-station-mini"
+      priority: 16164
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14164
     }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/rail-above-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16000
+      name: "railway-station-mini"
+      priority: 16164
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14164
     }
     path_text {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 16000
+      priority: 16164
     }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16000
+      name: "railway-station-mini"
+      priority: 16164
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14164
     }
     path_text {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 16000
+      priority: 16164
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "railway-station"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
     path_text {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
@@ -61444,13 +53467,18 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "railway-station"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
     path_text {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
@@ -61460,13 +53488,18 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "railway-station"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
     path_text {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
@@ -61475,13 +53508,64 @@ cont {
   }
 }
 cont {
+  name: "railway-level_crossing"
+  element {
+    scale: 16
+    symbol {
+      name: "railway-crossing"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "railway-crossing"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "railway-crossing"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "railway-crossing"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+}
+cont {
   name: "railway-light_rail"
   element {
     scale: 12
     lines {
       width: 1.0
       color: 10083737
-      priority: 1689
+      priority: 1688
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61501,7 +53585,7 @@ cont {
     lines {
       width: 2.4
       color: 21760
-      priority: 1689
+      priority: 1688
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61519,7 +53603,7 @@ cont {
     lines {
       width: 1.7
       color: 12316398
-      priority: 1712
+      priority: 1711
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61529,7 +53613,7 @@ cont {
     lines {
       width: 3.2
       color: 17408
-      priority: 1689
+      priority: 1688
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61547,7 +53631,7 @@ cont {
     lines {
       width: 2.0
       color: 12316398
-      priority: 1712
+      priority: 1711
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61557,7 +53641,7 @@ cont {
     lines {
       width: 3.2
       color: 17408
-      priority: 1689
+      priority: 1688
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61575,7 +53659,7 @@ cont {
     lines {
       width: 2.0
       color: 12316398
-      priority: 1712
+      priority: 1711
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61585,7 +53669,7 @@ cont {
     lines {
       width: 3.2
       color: 17408
-      priority: 1560
+      priority: 1558
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61596,14 +53680,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1733
+      priority: 1732
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1686
+      priority: 1685
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61613,7 +53697,7 @@ cont {
     lines {
       width: 3.2
       color: 17408
-      priority: 1560
+      priority: 1558
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61624,14 +53708,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1733
+      priority: 1732
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1686
+      priority: 1685
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61641,7 +53725,7 @@ cont {
     lines {
       width: 3.2
       color: 17408
-      priority: 1560
+      priority: 1558
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61652,14 +53736,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1733
+      priority: 1732
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1686
+      priority: 1685
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61672,7 +53756,7 @@ cont {
     lines {
       width: 1.0
       color: 10083737
-      priority: 1689
+      priority: 1688
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61692,7 +53776,7 @@ cont {
     lines {
       width: 2.4
       color: 21760
-      priority: 1689
+      priority: 1688
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61710,7 +53794,7 @@ cont {
     lines {
       width: 1.7
       color: 12316398
-      priority: 1712
+      priority: 1711
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61720,11 +53804,18 @@ cont {
     lines {
       width: 3.2
       color: 17408
-      priority: 1689
+      priority: 1688
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 17408
       dashdot {
@@ -61738,18 +53829,11 @@ cont {
     lines {
       width: 2.0
       color: 12316398
-      priority: 1712
+      priority: 1711
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 8.0
       color: 7829367
       priority: 11
@@ -61762,11 +53846,18 @@ cont {
     lines {
       width: 3.2
       color: 17408
-      priority: 1689
+      priority: 1688
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 17408
       dashdot {
@@ -61780,18 +53871,11 @@ cont {
     lines {
       width: 2.0
       color: 12316398
-      priority: 1712
+      priority: 1711
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 8.0
       color: 7829367
       priority: 11
@@ -61804,36 +53888,36 @@ cont {
     lines {
       width: 3.2
       color: 17408
-      priority: 1560
+      priority: 1558
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 17408
       dashdot {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1733
+      priority: 1732
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1686
+      priority: 1685
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 8.0
       color: 7829367
       priority: 11
@@ -61846,36 +53930,36 @@ cont {
     lines {
       width: 3.2
       color: 17408
-      priority: 1560
+      priority: 1558
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 17408
       dashdot {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1733
+      priority: 1732
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1686
+      priority: 1685
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 8.0
       color: 7829367
       priority: 11
@@ -61888,36 +53972,36 @@ cont {
     lines {
       width: 3.2
       color: 17408
-      priority: 1560
+      priority: 1558
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 17408
       dashdot {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1733
+      priority: 1732
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1686
+      priority: 1685
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 8.0
       color: 7829367
       priority: 11
@@ -61933,7 +54017,7 @@ cont {
     lines {
       width: 1.0
       color: 10083737
-      priority: 1689
+      priority: 1688
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61953,7 +54037,7 @@ cont {
     lines {
       width: 2.4
       color: 21760
-      priority: 1689
+      priority: 1688
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61971,7 +54055,7 @@ cont {
     lines {
       width: 1.7
       color: 12316398
-      priority: 1712
+      priority: 1711
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61979,9 +54063,16 @@ cont {
   element {
     scale: 15
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 3.2
       color: 17408
-      priority: 1689
+      priority: 1688
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -61999,7 +54090,7 @@ cont {
     lines {
       width: 2.0
       color: 12316398
-      priority: 1712
+      priority: 1711
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62014,6 +54105,9 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 16
     lines {
       width: 6.0
       color: 7829367
@@ -62021,13 +54115,10 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 16
     lines {
       width: 3.2
       color: 17408
-      priority: 1689
+      priority: 1688
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62045,7 +54136,7 @@ cont {
     lines {
       width: 2.0
       color: 12316398
-      priority: 1712
+      priority: 1711
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62060,6 +54151,9 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
     lines {
       width: 6.0
       color: 7829367
@@ -62067,13 +54161,10 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 17
     lines {
       width: 3.2
       color: 17408
-      priority: 1560
+      priority: 1558
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62084,14 +54175,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1733
+      priority: 1732
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1686
+      priority: 1685
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62106,6 +54197,9 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
       width: 6.0
       color: 7829367
@@ -62113,13 +54207,10 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
       width: 3.2
       color: 17408
-      priority: 1560
+      priority: 1558
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62130,14 +54221,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1733
+      priority: 1732
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1686
+      priority: 1685
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62152,6 +54243,9 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
       width: 6.0
       color: 7829367
@@ -62159,13 +54253,10 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
       width: 3.2
       color: 17408
-      priority: 1560
+      priority: 1558
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62176,14 +54267,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1733
+      priority: 1732
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1686
+      priority: 1685
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62198,13 +54289,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
   }
 }
 cont {
@@ -62214,7 +54298,7 @@ cont {
     lines {
       width: 1.0
       color: 14518408
-      priority: 1240
+      priority: 1238
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62232,27 +54316,27 @@ cont {
   element {
     scale: 14
     lines {
+      width: 2.0
+      color: 5570645
+      priority: 1529
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+    lines {
       width: 1.7
       color: 5570645
       dashdot {
         dd: 3.6
         dd: 5.4
       }
-      priority: 1536
+      priority: 1535
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.0
-      color: 5570645
-      priority: 1530
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.7
       color: 14518408
-      priority: 1533
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62262,7 +54346,7 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1533
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62273,14 +54357,14 @@ cont {
         dd: 7.2
         dd: 10.8
       }
-      priority: 1548
+      priority: 1547
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1539
+      priority: 1538
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62290,7 +54374,7 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1533
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62301,14 +54385,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1548
+      priority: 1547
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1539
+      priority: 1538
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62318,7 +54402,7 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1533
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62329,14 +54413,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1548
+      priority: 1547
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1539
+      priority: 1538
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62346,7 +54430,7 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1533
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62357,14 +54441,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1548
+      priority: 1547
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1539
+      priority: 1538
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62374,7 +54458,7 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1533
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62385,14 +54469,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1548
+      priority: 1547
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1539
+      priority: 1538
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62405,7 +54489,7 @@ cont {
     lines {
       width: 1.0
       color: 14518408
-      priority: 1240
+      priority: 1238
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62423,27 +54507,27 @@ cont {
   element {
     scale: 14
     lines {
+      width: 2.0
+      color: 5570645
+      priority: 1529
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+    lines {
       width: 1.7
       color: 5570645
       dashdot {
         dd: 3.6
         dd: 5.4
       }
-      priority: 1536
+      priority: 1535
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.0
-      color: 5570645
-      priority: 1530
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.7
       color: 14518408
-      priority: 1533
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62453,36 +54537,36 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1533
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 4456516
       dashdot {
         dd: 7.2
         dd: 10.8
       }
-      priority: 1548
+      priority: 1547
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1539
+      priority: 1538
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 8.0
       color: 7829367
       priority: 11
@@ -62495,36 +54579,36 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1533
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 4456516
       dashdot {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1548
+      priority: 1547
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1539
+      priority: 1538
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 8.0
       color: 7829367
       priority: 11
@@ -62537,36 +54621,36 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1533
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 4456516
       dashdot {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1548
+      priority: 1547
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1539
+      priority: 1538
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 8.0
       color: 7829367
       priority: 11
@@ -62579,36 +54663,36 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1533
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 4456516
       dashdot {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1548
+      priority: 1547
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1539
+      priority: 1538
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 8.0
       color: 7829367
       priority: 11
@@ -62621,36 +54705,36 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1533
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 4456516
       dashdot {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1548
+      priority: 1547
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1539
+      priority: 1538
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 8.0
       color: 7829367
       priority: 11
@@ -62666,7 +54750,7 @@ cont {
     lines {
       width: 1.0
       color: 14518408
-      priority: 1240
+      priority: 1238
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62684,27 +54768,27 @@ cont {
   element {
     scale: 14
     lines {
+      width: 2.0
+      color: 5570645
+      priority: 1529
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+    lines {
       width: 1.7
       color: 5570645
       dashdot {
         dd: 3.6
         dd: 5.4
       }
-      priority: 1536
+      priority: 1535
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.0
-      color: 5570645
-      priority: 1530
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.7
       color: 14518408
-      priority: 1533
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62712,9 +54796,16 @@ cont {
   element {
     scale: 15
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 3.2
       color: 4456516
-      priority: 1533
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62725,14 +54816,14 @@ cont {
         dd: 7.2
         dd: 10.8
       }
-      priority: 1548
+      priority: 1547
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1539
+      priority: 1538
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62747,6 +54838,9 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 16
     lines {
       width: 6.0
       color: 7829367
@@ -62754,13 +54848,10 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 16
     lines {
       width: 3.2
       color: 4456516
-      priority: 1533
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62771,14 +54862,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1548
+      priority: 1547
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1539
+      priority: 1538
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62793,6 +54884,9 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
     lines {
       width: 6.0
       color: 7829367
@@ -62800,13 +54894,10 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 17
     lines {
       width: 3.2
       color: 4456516
-      priority: 1533
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62817,14 +54908,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1548
+      priority: 1547
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1539
+      priority: 1538
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62839,6 +54930,9 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
       width: 6.0
       color: 7829367
@@ -62846,13 +54940,10 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
       width: 3.2
       color: 4456516
-      priority: 1533
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62863,14 +54954,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1548
+      priority: 1547
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1539
+      priority: 1538
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62885,6 +54976,9 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
       width: 6.0
       color: 7829367
@@ -62892,13 +54986,10 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
       width: 3.2
       color: 4456516
-      priority: 1533
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62909,14 +55000,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1548
+      priority: 1547
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1539
+      priority: 1538
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62931,13 +55022,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
   }
 }
 cont {
@@ -62947,7 +55031,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1228
+      priority: 1226
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62957,7 +55041,7 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 1252
+      priority: 1250
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62967,7 +55051,7 @@ cont {
     lines {
       width: 2.4
       color: 6710886
-      priority: 1199
+      priority: 1197
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62978,14 +55062,14 @@ cont {
         dd: 5.5
         dd: 5.5
       }
-      priority: 1328
+      priority: 1326
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.7
       color: 15658734
-      priority: 1290
+      priority: 1288
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62995,7 +55079,7 @@ cont {
     lines {
       width: 3.2
       color: 3355443
-      priority: 1296
+      priority: 1294
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63006,14 +55090,14 @@ cont {
         dd: 11.0
         dd: 11.0
       }
-      priority: 1398
+      priority: 1397
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1366
+      priority: 1364
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63023,7 +55107,7 @@ cont {
     lines {
       width: 3.2
       color: 3355443
-      priority: 1516
+      priority: 1514
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63034,14 +55118,14 @@ cont {
         dd: 14.0
         dd: 14.0
       }
-      priority: 1648
+      priority: 1647
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1618
+      priority: 1617
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63051,7 +55135,7 @@ cont {
     lines {
       width: 3.2
       color: 3355443
-      priority: 1554
+      priority: 1552
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63062,14 +55146,14 @@ cont {
         dd: 14.4
         dd: 14.4
       }
-      priority: 1727
+      priority: 1726
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1680
+      priority: 1679
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63079,7 +55163,7 @@ cont {
     lines {
       width: 3.2
       color: 3355443
-      priority: 1554
+      priority: 1552
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63090,14 +55174,14 @@ cont {
         dd: 14.4
         dd: 14.4
       }
-      priority: 1727
+      priority: 1726
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1680
+      priority: 1679
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63107,7 +55191,7 @@ cont {
     lines {
       width: 3.2
       color: 3355443
-      priority: 1554
+      priority: 1552
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63118,14 +55202,14 @@ cont {
         dd: 14.4
         dd: 14.4
       }
-      priority: 1727
+      priority: 1726
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1680
+      priority: 1679
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63138,7 +55222,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1228
+      priority: 1226
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63148,7 +55232,7 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 1252
+      priority: 1250
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63158,7 +55242,7 @@ cont {
     lines {
       width: 2.4
       color: 6710886
-      priority: 1199
+      priority: 1197
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63169,14 +55253,14 @@ cont {
         dd: 5.5
         dd: 5.5
       }
-      priority: 1328
+      priority: 1326
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.7
       color: 15658734
-      priority: 1290
+      priority: 1288
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63186,37 +55270,37 @@ cont {
     lines {
       width: 3.2
       color: 3355443
-      priority: 1296
+      priority: 1294
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 3355443
       dashdot {
         dd: 11.0
         dd: 11.0
       }
-      priority: 1398
+      priority: 1397
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1366
+      priority: 1364
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 7.2
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 9.2
+      width: 8.0
       color: 7829367
       priority: 11
       join: ROUNDJOIN
@@ -63228,37 +55312,37 @@ cont {
     lines {
       width: 3.2
       color: 3355443
-      priority: 1516
+      priority: 1514
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 3355443
       dashdot {
         dd: 14.0
         dd: 14.0
       }
-      priority: 1648
+      priority: 1647
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1618
+      priority: 1617
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 7.2
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 9.2
+      width: 8.0
       color: 7829367
       priority: 11
       join: ROUNDJOIN
@@ -63270,36 +55354,36 @@ cont {
     lines {
       width: 3.2
       color: 3355443
-      priority: 1554
+      priority: 1552
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 3355443
       dashdot {
         dd: 14.4
         dd: 14.4
       }
-      priority: 1727
+      priority: 1726
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1680
+      priority: 1679
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 8.0
       color: 7829367
       priority: 11
@@ -63312,36 +55396,36 @@ cont {
     lines {
       width: 3.2
       color: 3355443
-      priority: 1554
+      priority: 1552
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 3355443
       dashdot {
         dd: 14.4
         dd: 14.4
       }
-      priority: 1727
+      priority: 1726
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1680
+      priority: 1679
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 8.0
       color: 7829367
       priority: 11
@@ -63354,36 +55438,36 @@ cont {
     lines {
       width: 3.2
       color: 3355443
-      priority: 1554
+      priority: 1552
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 3355443
       dashdot {
         dd: 14.4
         dd: 14.4
       }
-      priority: 1727
+      priority: 1726
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1680
+      priority: 1679
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 8.0
       color: 7829367
       priority: 11
@@ -63399,7 +55483,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1228
+      priority: 1226
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63409,7 +55493,7 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 1252
+      priority: 1250
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63419,7 +55503,7 @@ cont {
     lines {
       width: 2.4
       color: 6710886
-      priority: 1199
+      priority: 1197
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63430,14 +55514,14 @@ cont {
         dd: 5.5
         dd: 5.5
       }
-      priority: 1328
+      priority: 1326
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.7
       color: 15658734
-      priority: 1290
+      priority: 1288
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63445,9 +55529,16 @@ cont {
   element {
     scale: 15
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 3.2
       color: 3355443
-      priority: 1296
+      priority: 1294
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63458,19 +55549,19 @@ cont {
         dd: 11.0
         dd: 11.0
       }
-      priority: 1398
+      priority: 1397
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1366
+      priority: 1364
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 9.2
+      width: 8.0
       color: 7829367
       dashdot {
         dd: 5.0
@@ -63480,20 +55571,20 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 16
     lines {
-      width: 7.2
+      width: 6.0
       color: 7829367
       priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 16
     lines {
       width: 3.2
       color: 3355443
-      priority: 1516
+      priority: 1514
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63504,19 +55595,19 @@ cont {
         dd: 14.0
         dd: 14.0
       }
-      priority: 1648
+      priority: 1647
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1618
+      priority: 1617
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 9.2
+      width: 8.0
       color: 7829367
       dashdot {
         dd: 5.0
@@ -63526,20 +55617,20 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
     lines {
-      width: 7.2
+      width: 6.0
       color: 7829367
       priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 17
     lines {
       width: 3.2
       color: 3355443
-      priority: 1554
+      priority: 1552
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63550,14 +55641,14 @@ cont {
         dd: 14.4
         dd: 14.4
       }
-      priority: 1727
+      priority: 1726
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1680
+      priority: 1679
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63572,6 +55663,9 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
       width: 6.0
       color: 7829367
@@ -63579,13 +55673,10 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
       width: 3.2
       color: 3355443
-      priority: 1554
+      priority: 1552
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63596,14 +55687,14 @@ cont {
         dd: 14.4
         dd: 14.4
       }
-      priority: 1727
+      priority: 1726
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1680
+      priority: 1679
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63618,6 +55709,9 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
       width: 6.0
       color: 7829367
@@ -63625,13 +55719,10 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
       width: 3.2
       color: 3355443
-      priority: 1554
+      priority: 1552
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63642,14 +55733,14 @@ cont {
         dd: 14.4
         dd: 14.4
       }
-      priority: 1727
+      priority: 1726
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1680
+      priority: 1679
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63664,13 +55755,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
   }
 }
 cont {
@@ -63680,13 +55764,13 @@ cont {
     lines {
       width: 4.0
       color: 12303291
-      priority: 1574
+      priority: 1573
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 12303291
-      priority: 1575
+      priority: 1574
     }
   }
   element {
@@ -63739,7 +55823,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1231
+      priority: 1229
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63749,7 +55833,7 @@ cont {
     lines {
       width: 1.35
       color: 12303291
-      priority: 1255
+      priority: 1252
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63759,7 +55843,7 @@ cont {
     lines {
       width: 2.4
       color: 10066329
-      priority: 1202
+      priority: 1200
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63770,7 +55854,7 @@ cont {
         dd: 4.5
         dd: 4.5
       }
-      priority: 1331
+      priority: 1329
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -63787,7 +55871,7 @@ cont {
     lines {
       width: 3.2
       color: 10066329
-      priority: 1299
+      priority: 1297
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63798,14 +55882,14 @@ cont {
         dd: 9.0
         dd: 9.0
       }
-      priority: 1401
+      priority: 1400
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1369
+      priority: 1367
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63826,7 +55910,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1651
+      priority: 1650
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -63836,7 +55920,7 @@ cont {
     lines {
       width: 3.2
       color: 10066329
-      priority: 1557
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63847,14 +55931,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1730
+      priority: 1729
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1683
+      priority: 1682
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63864,7 +55948,7 @@ cont {
     lines {
       width: 3.2
       color: 10066329
-      priority: 1557
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63875,14 +55959,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1730
+      priority: 1729
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1683
+      priority: 1682
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63892,7 +55976,7 @@ cont {
     lines {
       width: 3.2
       color: 10066329
-      priority: 1557
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63903,14 +55987,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1730
+      priority: 1729
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1683
+      priority: 1682
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63923,7 +56007,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1231
+      priority: 1229
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63933,7 +56017,7 @@ cont {
     lines {
       width: 1.35
       color: 12303291
-      priority: 1255
+      priority: 1252
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63943,7 +56027,7 @@ cont {
     lines {
       width: 2.4
       color: 10066329
-      priority: 1202
+      priority: 1200
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63954,7 +56038,7 @@ cont {
         dd: 4.5
         dd: 4.5
       }
-      priority: 1331
+      priority: 1329
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -63971,36 +56055,36 @@ cont {
     lines {
       width: 3.2
       color: 10066329
-      priority: 1299
+      priority: 1297
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 3355443
       dashdot {
         dd: 9.0
         dd: 9.0
       }
-      priority: 1401
+      priority: 1400
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1369
+      priority: 1367
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 8.0
       color: 7829367
       priority: 11
@@ -64018,7 +56102,7 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 7.2
+      width: 6.0
       color: 7829367
       priority: 14
       join: ROUNDJOIN
@@ -64031,12 +56115,12 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1651
+      priority: 1650
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.2
+      width: 8.0
       color: 7829367
       priority: 11
       join: ROUNDJOIN
@@ -64048,36 +56132,36 @@ cont {
     lines {
       width: 3.2
       color: 10066329
-      priority: 1557
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 3355443
       dashdot {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1730
+      priority: 1729
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1683
+      priority: 1682
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 8.0
       color: 7829367
       priority: 11
@@ -64090,36 +56174,36 @@ cont {
     lines {
       width: 3.2
       color: 10066329
-      priority: 1557
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 3355443
       dashdot {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1730
+      priority: 1729
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1683
+      priority: 1682
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 8.0
       color: 7829367
       priority: 11
@@ -64132,36 +56216,36 @@ cont {
     lines {
       width: 3.2
       color: 10066329
-      priority: 1557
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.0
       color: 3355443
       dashdot {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1730
+      priority: 1729
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1683
+      priority: 1682
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 8.0
       color: 7829367
       priority: 11
@@ -64177,7 +56261,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1231
+      priority: 1229
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64187,7 +56271,7 @@ cont {
     lines {
       width: 1.35
       color: 12303291
-      priority: 1255
+      priority: 1252
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64197,7 +56281,7 @@ cont {
     lines {
       width: 2.4
       color: 10066329
-      priority: 1202
+      priority: 1200
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64208,7 +56292,7 @@ cont {
         dd: 4.5
         dd: 4.5
       }
-      priority: 1331
+      priority: 1329
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -64223,9 +56307,16 @@ cont {
   element {
     scale: 15
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 3.2
       color: 10066329
-      priority: 1299
+      priority: 1297
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64236,14 +56327,14 @@ cont {
         dd: 9.0
         dd: 9.0
       }
-      priority: 1401
+      priority: 1400
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1369
+      priority: 1367
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64258,18 +56349,11 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
   }
   element {
     scale: 16
     lines {
-      width: 7.2
+      width: 6.0
       color: 7829367
       priority: 14
       join: ROUNDJOIN
@@ -64289,12 +56373,12 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1651
+      priority: 1650
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.2
+      width: 8.0
       color: 7829367
       dashdot {
         dd: 5.0
@@ -64308,9 +56392,16 @@ cont {
   element {
     scale: 17
     lines {
+      width: 6.0
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 3.2
       color: 10066329
-      priority: 1557
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64321,14 +56412,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1730
+      priority: 1729
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1683
+      priority: 1682
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64343,6 +56434,9 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
       width: 6.0
       color: 7829367
@@ -64350,13 +56444,10 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
       width: 3.2
       color: 10066329
-      priority: 1557
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64367,14 +56458,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1730
+      priority: 1729
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1683
+      priority: 1682
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64389,6 +56480,9 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
       width: 6.0
       color: 7829367
@@ -64396,13 +56490,10 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
       width: 3.2
       color: 10066329
-      priority: 1557
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64413,14 +56504,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1730
+      priority: 1729
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1683
+      priority: 1682
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64435,13 +56526,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    lines {
-      width: 6.0
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
   }
 }
 cont {
@@ -64451,7 +56535,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1164
+      priority: 1158
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64462,7 +56546,7 @@ cont {
         dd: 4.0
         dd: 5.0
       }
-      priority: 1536
+      priority: 1535
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -64472,7 +56556,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1164
+      priority: 1158
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64483,7 +56567,7 @@ cont {
         dd: 4.0
         dd: 5.0
       }
-      priority: 1536
+      priority: 1535
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -64492,25 +56576,32 @@ cont {
     scale: 12
     lines {
       width: 1.0
+      color: 13421772
+      priority: 1223
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+    lines {
+      width: 1.0
       color: 5570645
       dashdot {
         dd: 4.0
         dd: 5.0
       }
-      priority: 1536
+      priority: 1535
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 13
     lines {
-      width: 1.0
-      color: 13421772
-      priority: 1225
+      width: 1.85
+      color: 12303291
+      priority: 1247
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-  }
-  element {
-    scale: 13
     lines {
       width: 1.0
       color: 5570645
@@ -64518,31 +56609,24 @@ cont {
         dd: 4.0
         dd: 5.0
       }
-      priority: 1536
+      priority: 1535
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    lines {
-      width: 1.85
-      color: 12303291
-      priority: 1249
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
   }
   element {
     scale: 14
     lines {
       width: 3.0
       color: 8947848
-      priority: 1196
+      priority: 1194
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.8
       color: 15658734
-      priority: 1287
+      priority: 1285
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64553,7 +56637,7 @@ cont {
         dd: 4.5
         dd: 4.5
       }
-      priority: 1325
+      priority: 1323
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -64563,7 +56647,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16196
+      priority: 16194
     }
   }
   element {
@@ -64571,14 +56655,14 @@ cont {
     lines {
       width: 4.0
       color: 6710886
-      priority: 1293
+      priority: 1291
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.4
       color: 15658734
-      priority: 1363
+      priority: 1361
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64589,7 +56673,7 @@ cont {
         dd: 9.0
         dd: 9.0
       }
-      priority: 1366
+      priority: 1364
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -64599,7 +56683,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16293
+      priority: 16291
     }
   }
   element {
@@ -64607,14 +56691,14 @@ cont {
     lines {
       width: 2.4
       color: 15658734
-      priority: 1615
+      priority: 1614
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 4.0
       color: 6710886
-      priority: 1513
+      priority: 1511
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64625,7 +56709,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1645
+      priority: 1644
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -64635,7 +56719,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16615
+      priority: 16614
     }
   }
   element {
@@ -64643,14 +56727,14 @@ cont {
     lines {
       width: 4.4
       color: 6710886
-      priority: 1551
+      priority: 1550
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 15658734
-      priority: 1677
+      priority: 1676
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64661,7 +56745,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1724
+      priority: 1723
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -64671,7 +56755,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16551
+      priority: 16550
     }
   }
   element {
@@ -64679,14 +56763,14 @@ cont {
     lines {
       width: 4.4
       color: 6710886
-      priority: 1551
+      priority: 1550
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 15658734
-      priority: 1677
+      priority: 1676
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64697,7 +56781,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1724
+      priority: 1723
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -64707,7 +56791,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16551
+      priority: 16550
     }
   }
   element {
@@ -64715,14 +56799,14 @@ cont {
     lines {
       width: 4.4
       color: 6710886
-      priority: 1551
+      priority: 1550
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 15658734
-      priority: 1677
+      priority: 1676
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64733,7 +56817,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1724
+      priority: 1723
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -64743,7 +56827,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16551
+      priority: 16550
     }
   }
 }
@@ -64754,7 +56838,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1164
+      priority: 1158
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64765,7 +56849,7 @@ cont {
         dd: 4.0
         dd: 5.0
       }
-      priority: 1536
+      priority: 1535
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -64775,7 +56859,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1164
+      priority: 1158
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64786,7 +56870,7 @@ cont {
         dd: 4.0
         dd: 5.0
       }
-      priority: 1536
+      priority: 1535
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -64795,25 +56879,32 @@ cont {
     scale: 12
     lines {
       width: 1.0
+      color: 13421772
+      priority: 1223
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+    lines {
+      width: 1.0
       color: 5570645
       dashdot {
         dd: 4.0
         dd: 5.0
       }
-      priority: 1536
+      priority: 1535
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 13
     lines {
-      width: 1.0
-      color: 13421772
-      priority: 1225
+      width: 1.85
+      color: 12303291
+      priority: 1247
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-  }
-  element {
-    scale: 13
     lines {
       width: 1.0
       color: 5570645
@@ -64821,31 +56912,24 @@ cont {
         dd: 4.0
         dd: 5.0
       }
-      priority: 1536
+      priority: 1535
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    lines {
-      width: 1.85
-      color: 12303291
-      priority: 1249
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
   }
   element {
     scale: 14
     lines {
       width: 3.0
       color: 8947848
-      priority: 1196
+      priority: 1194
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.8
       color: 15658734
-      priority: 1287
+      priority: 1285
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64856,7 +56940,7 @@ cont {
         dd: 4.5
         dd: 4.5
       }
-      priority: 1325
+      priority: 1323
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -64866,22 +56950,29 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16196
+      priority: 16194
     }
   }
   element {
     scale: 15
     lines {
+      width: 6.4
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 4.0
       color: 6710886
-      priority: 1293
+      priority: 1291
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.4
       color: 15658734
-      priority: 1363
+      priority: 1361
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64892,14 +56983,7 @@ cont {
         dd: 9.0
         dd: 9.0
       }
-      priority: 1366
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 6.4
-      color: 7829367
-      priority: 14
+      priority: 1364
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -64916,7 +57000,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16293
+      priority: 16291
     }
   }
   element {
@@ -64924,14 +57008,21 @@ cont {
     lines {
       width: 2.4
       color: 15658734
-      priority: 1615
+      priority: 1614
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 6.4
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 4.0
       color: 6710886
-      priority: 1513
+      priority: 1511
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64942,14 +57033,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1645
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 6.4
-      color: 7829367
-      priority: 14
+      priority: 1644
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -64966,22 +57050,29 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16615
+      priority: 16614
     }
   }
   element {
     scale: 17
     lines {
+      width: 7.2
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 4.4
       color: 6710886
-      priority: 1551
+      priority: 1550
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 15658734
-      priority: 1677
+      priority: 1676
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -64992,14 +57083,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1724
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 7.2
-      color: 7829367
-      priority: 14
+      priority: 1723
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -65016,22 +57100,29 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16551
+      priority: 16550
     }
   }
   element {
     scale: 18
     lines {
+      width: 7.2
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 4.4
       color: 6710886
-      priority: 1551
+      priority: 1550
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 15658734
-      priority: 1677
+      priority: 1676
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65042,14 +57133,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1724
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 7.2
-      color: 7829367
-      priority: 14
+      priority: 1723
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -65066,22 +57150,29 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16551
+      priority: 16550
     }
   }
   element {
     scale: 19
     lines {
+      width: 7.2
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 4.4
       color: 6710886
-      priority: 1551
+      priority: 1550
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 15658734
-      priority: 1677
+      priority: 1676
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65092,14 +57183,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1724
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 7.2
-      color: 7829367
-      priority: 14
+      priority: 1723
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -65116,7 +57200,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16551
+      priority: 16550
     }
   }
 }
@@ -65127,7 +57211,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1164
+      priority: 1158
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65138,7 +57222,7 @@ cont {
         dd: 4.0
         dd: 5.0
       }
-      priority: 1536
+      priority: 1535
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -65148,7 +57232,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1164
+      priority: 1158
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65159,7 +57243,7 @@ cont {
         dd: 4.0
         dd: 5.0
       }
-      priority: 1536
+      priority: 1535
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -65168,25 +57252,32 @@ cont {
     scale: 12
     lines {
       width: 1.0
+      color: 13421772
+      priority: 1223
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+    lines {
+      width: 1.0
       color: 5570645
       dashdot {
         dd: 4.0
         dd: 5.0
       }
-      priority: 1536
+      priority: 1535
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 13
     lines {
-      width: 1.0
-      color: 13421772
-      priority: 1225
+      width: 1.85
+      color: 12303291
+      priority: 1247
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-  }
-  element {
-    scale: 13
     lines {
       width: 1.0
       color: 5570645
@@ -65194,31 +57285,24 @@ cont {
         dd: 4.0
         dd: 5.0
       }
-      priority: 1536
+      priority: 1535
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    lines {
-      width: 1.85
-      color: 12303291
-      priority: 1249
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
   }
   element {
     scale: 14
     lines {
       width: 3.0
       color: 8947848
-      priority: 1196
+      priority: 1194
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.8
       color: 15658734
-      priority: 1287
+      priority: 1285
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65229,7 +57313,7 @@ cont {
         dd: 4.5
         dd: 4.5
       }
-      priority: 1325
+      priority: 1323
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -65239,7 +57323,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16196
+      priority: 16194
     }
   }
   element {
@@ -65247,25 +57331,21 @@ cont {
     lines {
       width: 4.0
       color: 6710886
-      priority: 1293
+      priority: 1291
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.4
       color: 15658734
-      priority: 1363
+      priority: 1361
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 8.4
+      width: 6.4
       color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 11
+      priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -65276,14 +57356,18 @@ cont {
         dd: 9.0
         dd: 9.0
       }
-      priority: 1366
+      priority: 1364
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.4
+      width: 8.4
       color: 7829367
-      priority: 14
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 11
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -65293,51 +57377,51 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16293
+      priority: 16291
     }
   }
   element {
     scale: 16
     lines {
+      width: 6.4
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.4
       color: 15658734
-      priority: 1615
+      priority: 1614
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 4.0
       color: 6710886
-      priority: 1513
+      priority: 1511
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 8.4
-      color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 11
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 2.4
       color: 6710886
       dashdot {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1645
+      priority: 1644
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.4
+      width: 8.4
       color: 7829367
-      priority: 14
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 11
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -65347,7 +57431,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16615
+      priority: 16614
     }
   }
   element {
@@ -65355,25 +57439,21 @@ cont {
     lines {
       width: 4.4
       color: 6710886
-      priority: 1551
+      priority: 1550
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 15658734
-      priority: 1677
+      priority: 1676
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 9.2
+      width: 7.2
       color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 11
+      priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -65384,14 +57464,18 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1724
+      priority: 1723
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.2
+      width: 9.2
       color: 7829367
-      priority: 14
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 11
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -65401,7 +57485,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16551
+      priority: 16550
     }
   }
   element {
@@ -65409,25 +57493,21 @@ cont {
     lines {
       width: 4.4
       color: 6710886
-      priority: 1551
+      priority: 1550
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 15658734
-      priority: 1677
+      priority: 1676
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 9.2
+      width: 7.2
       color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 11
+      priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -65438,14 +57518,18 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1724
+      priority: 1723
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.2
+      width: 9.2
       color: 7829367
-      priority: 14
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 11
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -65455,7 +57539,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16551
+      priority: 16550
     }
   }
   element {
@@ -65463,25 +57547,21 @@ cont {
     lines {
       width: 4.4
       color: 6710886
-      priority: 1551
+      priority: 1550
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 15658734
-      priority: 1677
+      priority: 1676
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 9.2
+      width: 7.2
       color: 7829367
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 11
+      priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -65492,14 +57572,18 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1724
+      priority: 1723
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.2
+      width: 9.2
       color: 7829367
-      priority: 14
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 11
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -65509,7 +57593,7 @@ cont {
         color: 0
         stroke_color: 16777215
       }
-      priority: 16551
+      priority: 16550
     }
   }
 }
@@ -65524,7 +57608,7 @@ cont {
         dd: 2.4
         dd: 2.4
       }
-      priority: 1507
+      priority: 1505
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -65539,14 +57623,14 @@ cont {
         dd: 2.4
         dd: 12.0
       }
-      priority: 1642
+      priority: 1641
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 3019898879
-      priority: 1607
+      priority: 1605
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65564,14 +57648,14 @@ cont {
         dd: 2.4
         dd: 12.0
       }
-      priority: 1715
+      priority: 1714
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 3019898879
-      priority: 1671
+      priority: 1670
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65589,14 +57673,14 @@ cont {
         dd: 2.4
         dd: 12.0
       }
-      priority: 1715
+      priority: 1714
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 3019898879
-      priority: 1671
+      priority: 1670
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65614,14 +57698,14 @@ cont {
         dd: 2.4
         dd: 12.0
       }
-      priority: 1715
+      priority: 1714
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 3019898879
-      priority: 1671
+      priority: 1670
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65634,7 +57718,7 @@ cont {
     lines {
       width: 1.0
       color: 12303291
-      priority: 1263
+      priority: 1261
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65644,7 +57728,7 @@ cont {
     lines {
       width: 1.6
       color: 10066329
-      priority: 1214
+      priority: 1211
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65655,14 +57739,14 @@ cont {
         dd: 3.0
         dd: 6.0
       }
-      priority: 1343
+      priority: 1341
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658734
-      priority: 1310
+      priority: 1308
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65672,7 +57756,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1316
+      priority: 1314
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65683,14 +57767,14 @@ cont {
         dd: 6.0
         dd: 12.0
       }
-      priority: 1416
+      priority: 1414
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.4
       color: 15658734
-      priority: 1384
+      priority: 1382
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65700,7 +57784,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1527
+      priority: 1526
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65711,14 +57795,14 @@ cont {
         dd: 8.0
         dd: 16.0
       }
-      priority: 1662
+      priority: 1661
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.2
       color: 15658734
-      priority: 1633
+      priority: 1632
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65728,7 +57812,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1571
+      priority: 1570
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65739,7 +57823,7 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -65756,7 +57840,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1571
+      priority: 1570
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65767,7 +57851,7 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -65784,7 +57868,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1571
+      priority: 1570
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65795,7 +57879,7 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -65815,7 +57899,7 @@ cont {
     lines {
       width: 1.0
       color: 12303291
-      priority: 1263
+      priority: 1261
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65825,7 +57909,7 @@ cont {
     lines {
       width: 1.6
       color: 10066329
-      priority: 1214
+      priority: 1211
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65836,14 +57920,14 @@ cont {
         dd: 3.0
         dd: 6.0
       }
-      priority: 1343
+      priority: 1341
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658734
-      priority: 1310
+      priority: 1308
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -65853,37 +57937,37 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1316
+      priority: 1314
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 5.4
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 1.4
       color: 3355443
       dashdot {
         dd: 6.0
         dd: 12.0
       }
-      priority: 1416
+      priority: 1414
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.4
       color: 15658734
-      priority: 1384
+      priority: 1382
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 6.4
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 8.4
+      width: 7.4
       color: 7829367
       priority: 11
       join: ROUNDJOIN
@@ -65895,36 +57979,36 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1527
+      priority: 1526
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 5.2
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 1.2
       color: 3355443
       dashdot {
         dd: 8.0
         dd: 16.0
       }
-      priority: 1662
+      priority: 1661
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.2
       color: 15658734
-      priority: 1633
+      priority: 1632
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 5.2
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 7.2
       color: 7829367
       priority: 11
@@ -65937,18 +58021,25 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1571
+      priority: 1570
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 5.36
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 1.36
       color: 3355443
       dashdot {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -65960,14 +58051,7 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 6.4
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 8.4
+      width: 7.36
       color: 7829367
       priority: 11
       join: ROUNDJOIN
@@ -65979,18 +58063,25 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1571
+      priority: 1570
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 5.36
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 1.36
       color: 3355443
       dashdot {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -66002,14 +58093,7 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 6.4
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 8.4
+      width: 7.36
       color: 7829367
       priority: 11
       join: ROUNDJOIN
@@ -66021,18 +58105,25 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1571
+      priority: 1570
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 5.36
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 1.36
       color: 3355443
       dashdot {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -66044,14 +58135,7 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 6.4
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 8.4
+      width: 7.36
       color: 7829367
       priority: 11
       join: ROUNDJOIN
@@ -66066,7 +58150,7 @@ cont {
     lines {
       width: 1.0
       color: 12303291
-      priority: 1263
+      priority: 1261
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66076,7 +58160,7 @@ cont {
     lines {
       width: 1.6
       color: 10066329
-      priority: 1214
+      priority: 1211
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66087,14 +58171,14 @@ cont {
         dd: 3.0
         dd: 6.0
       }
-      priority: 1343
+      priority: 1341
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658734
-      priority: 1310
+      priority: 1308
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66102,9 +58186,16 @@ cont {
   element {
     scale: 15
     lines {
+      width: 5.4
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.4
       color: 3355443
-      priority: 1316
+      priority: 1314
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66115,19 +58206,19 @@ cont {
         dd: 6.0
         dd: 12.0
       }
-      priority: 1416
+      priority: 1414
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.4
       color: 15658734
-      priority: 1384
+      priority: 1382
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 8.4
+      width: 7.4
       color: 7829367
       dashdot {
         dd: 5.0
@@ -66137,20 +58228,20 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 16
     lines {
-      width: 6.4
+      width: 5.2
       color: 7829367
       priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 16
     lines {
       width: 2.4
       color: 3355443
-      priority: 1527
+      priority: 1526
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66161,14 +58252,14 @@ cont {
         dd: 8.0
         dd: 16.0
       }
-      priority: 1662
+      priority: 1661
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.2
       color: 15658734
-      priority: 1633
+      priority: 1632
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66183,20 +58274,20 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
     lines {
-      width: 5.2
+      width: 5.36
       color: 7829367
       priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 17
     lines {
       width: 2.4
       color: 3355443
-      priority: 1571
+      priority: 1570
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66207,7 +58298,7 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -66219,7 +58310,7 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 8.4
+      width: 7.36
       color: 7829367
       dashdot {
         dd: 5.0
@@ -66229,20 +58320,20 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
-      width: 6.4
+      width: 5.36
       color: 7829367
       priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
       width: 2.4
       color: 3355443
-      priority: 1571
+      priority: 1570
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66253,7 +58344,7 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -66265,7 +58356,7 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 8.4
+      width: 7.36
       color: 7829367
       dashdot {
         dd: 5.0
@@ -66275,20 +58366,20 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
-      width: 6.4
+      width: 5.36
       color: 7829367
       priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
       width: 2.4
       color: 3355443
-      priority: 1571
+      priority: 1570
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66299,7 +58390,7 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1756
+      priority: 1755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -66311,7 +58402,7 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 8.4
+      width: 7.36
       color: 7829367
       dashdot {
         dd: 5.0
@@ -66321,13 +58412,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    lines {
-      width: 6.4
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
   }
 }
 cont {
@@ -66337,7 +58421,7 @@ cont {
     lines {
       width: 1.6
       color: 12303291
-      priority: 1208
+      priority: 1205
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66348,14 +58432,14 @@ cont {
         dd: 3.0
         dd: 6.0
       }
-      priority: 1337
+      priority: 1335
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 10066329
-      priority: 1304
+      priority: 1302
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66365,7 +58449,7 @@ cont {
     lines {
       width: 2.4
       color: 6710886
-      priority: 1310
+      priority: 1308
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66376,14 +58460,14 @@ cont {
         dd: 6.0
         dd: 12.0
       }
-      priority: 1410
+      priority: 1408
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.4
       color: 15658734
-      priority: 1378
+      priority: 1376
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66393,7 +58477,7 @@ cont {
     lines {
       width: 2.4
       color: 6710886
-      priority: 1521
+      priority: 1520
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66404,14 +58488,14 @@ cont {
         dd: 8.0
         dd: 16.0
       }
-      priority: 1656
+      priority: 1655
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.2
       color: 15658734
-      priority: 1627
+      priority: 1626
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66421,7 +58505,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1565
+      priority: 1564
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66439,7 +58523,7 @@ cont {
     lines {
       width: 1.36
       color: 15658734
-      priority: 1695
+      priority: 1694
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66449,7 +58533,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1565
+      priority: 1564
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66467,7 +58551,7 @@ cont {
     lines {
       width: 1.36
       color: 15658734
-      priority: 1695
+      priority: 1694
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66477,7 +58561,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1565
+      priority: 1564
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66495,7 +58579,7 @@ cont {
     lines {
       width: 1.36
       color: 15658734
-      priority: 1695
+      priority: 1694
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66508,7 +58592,7 @@ cont {
     lines {
       width: 1.6
       color: 12303291
-      priority: 1208
+      priority: 1205
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66519,14 +58603,14 @@ cont {
         dd: 3.0
         dd: 6.0
       }
-      priority: 1337
+      priority: 1335
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 10066329
-      priority: 1304
+      priority: 1302
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66536,36 +58620,36 @@ cont {
     lines {
       width: 2.4
       color: 6710886
-      priority: 1310
+      priority: 1308
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 5.4
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 1.4
       color: 6710886
       dashdot {
         dd: 6.0
         dd: 12.0
       }
-      priority: 1410
+      priority: 1408
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.4
       color: 15658734
-      priority: 1378
+      priority: 1376
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 5.4
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 7.4
       color: 7829367
       priority: 11
@@ -66578,36 +58662,36 @@ cont {
     lines {
       width: 2.4
       color: 6710886
-      priority: 1521
+      priority: 1520
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 5.2
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 1.2
       color: 3355443
       dashdot {
         dd: 8.0
         dd: 16.0
       }
-      priority: 1656
+      priority: 1655
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.2
       color: 15658734
-      priority: 1627
+      priority: 1626
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 5.2
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 7.2
       color: 7829367
       priority: 11
@@ -66620,11 +58704,18 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1565
+      priority: 1564
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 5.36
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 1.36
       color: 3355443
       dashdot {
@@ -66638,18 +58729,11 @@ cont {
     lines {
       width: 1.36
       color: 15658734
-      priority: 1695
+      priority: 1694
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 5.36
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 7.36
       color: 7829367
       priority: 11
@@ -66662,11 +58746,18 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1565
+      priority: 1564
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 5.36
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 1.36
       color: 3355443
       dashdot {
@@ -66680,18 +58771,11 @@ cont {
     lines {
       width: 1.36
       color: 15658734
-      priority: 1695
+      priority: 1694
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 5.36
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 7.36
       color: 7829367
       priority: 11
@@ -66704,11 +58788,18 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1565
+      priority: 1564
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 5.36
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 1.36
       color: 3355443
       dashdot {
@@ -66722,18 +58813,11 @@ cont {
     lines {
       width: 1.36
       color: 15658734
-      priority: 1695
+      priority: 1694
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 5.36
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 7.36
       color: 7829367
       priority: 11
@@ -66749,7 +58833,7 @@ cont {
     lines {
       width: 1.6
       color: 12303291
-      priority: 1208
+      priority: 1205
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66760,14 +58844,14 @@ cont {
         dd: 3.0
         dd: 6.0
       }
-      priority: 1337
+      priority: 1335
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 10066329
-      priority: 1304
+      priority: 1302
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66775,9 +58859,16 @@ cont {
   element {
     scale: 15
     lines {
+      width: 5.4
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.4
       color: 6710886
-      priority: 1310
+      priority: 1308
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66788,14 +58879,14 @@ cont {
         dd: 6.0
         dd: 12.0
       }
-      priority: 1410
+      priority: 1408
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.4
       color: 15658734
-      priority: 1378
+      priority: 1376
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66810,20 +58901,20 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 16
     lines {
-      width: 5.4
+      width: 5.2
       color: 7829367
       priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 16
     lines {
       width: 2.4
       color: 6710886
-      priority: 1521
+      priority: 1520
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66834,14 +58925,14 @@ cont {
         dd: 8.0
         dd: 16.0
       }
-      priority: 1656
+      priority: 1655
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.2
       color: 15658734
-      priority: 1627
+      priority: 1626
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66856,20 +58947,20 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
     lines {
-      width: 5.2
+      width: 5.36
       color: 7829367
       priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 17
     lines {
       width: 2.4
       color: 3355443
-      priority: 1565
+      priority: 1564
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66887,7 +58978,7 @@ cont {
     lines {
       width: 1.36
       color: 15658734
-      priority: 1695
+      priority: 1694
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66902,6 +58993,9 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
       width: 5.36
       color: 7829367
@@ -66909,13 +59003,10 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
       width: 2.4
       color: 3355443
-      priority: 1565
+      priority: 1564
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66933,7 +59024,7 @@ cont {
     lines {
       width: 1.36
       color: 15658734
-      priority: 1695
+      priority: 1694
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66948,6 +59039,9 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
       width: 5.36
       color: 7829367
@@ -66955,13 +59049,10 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
       width: 2.4
       color: 3355443
-      priority: 1565
+      priority: 1564
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66979,7 +59070,7 @@ cont {
     lines {
       width: 1.36
       color: 15658734
-      priority: 1695
+      priority: 1694
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -66994,13 +59085,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    lines {
-      width: 5.36
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
   }
 }
 cont {
@@ -67008,15 +59092,20 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/rail-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16000
+      name: "railway-station-mini"
+      priority: 16164
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14164
     }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/rail-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16178
+      name: "railway-station-mini"
+      priority: 16164
     }
     caption {
       primary {
@@ -67025,14 +59114,19 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15178
+      priority: 15164
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14164
     }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16178
+      name: "railway-station"
+      priority: 16176
     }
     caption {
       primary {
@@ -67041,14 +59135,19 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15178
+      priority: 15176
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14176
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16178
+      name: "railway-station"
+      priority: 16176
     }
     caption {
       primary {
@@ -67057,14 +59156,19 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15178
+      priority: 15176
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14176
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16178
+      name: "railway-station"
+      priority: 16176
     }
     caption {
       primary {
@@ -67073,14 +59177,19 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15178
+      priority: 15176
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14176
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
-      priority: 16178
+      name: "railway-station"
+      priority: 16176
     }
     caption {
       primary {
@@ -67089,7 +59198,12 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15178
+      priority: 15176
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14176
     }
   }
 }
@@ -67098,130 +59212,170 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 10
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 9.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 10.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 11.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
 }
 cont {
@@ -67229,130 +59383,170 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 10
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 9.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 10.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 11.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
 }
 cont {
@@ -67360,130 +59554,170 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 10
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 9.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 10.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 11.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
 }
 cont {
@@ -67491,130 +59725,170 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 10
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 9.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 10.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 11.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
 }
 cont {
@@ -67622,130 +59896,170 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 10
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 9.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 10.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 11.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
 }
 cont {
@@ -67753,130 +60067,170 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 10
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 9.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 10.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 11.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
 }
 cont {
@@ -67884,130 +60238,170 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 10
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 9.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 10.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 11.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
 }
 cont {
@@ -68015,130 +60409,170 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 10
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 9.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 10.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 11.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
 }
 cont {
@@ -68146,130 +60580,170 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 10
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 9.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 10.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 11.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
 }
 cont {
@@ -68277,130 +60751,170 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 10
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 9.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 10.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 11.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
 }
 cont {
@@ -68408,130 +60922,170 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 10
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 9.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 10.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 11.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
 }
 cont {
@@ -68539,130 +61093,170 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 10
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 9.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 10.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 11.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
 }
 cont {
@@ -68670,130 +61264,170 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 10
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 9.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 10.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 11.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
 }
 cont {
@@ -68801,2960 +61435,200 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 10
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 9.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 10.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 11.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 19000
     }
-  }
-}
-cont {
-  name: "railway-subway"
-  element {
-    scale: 12
-    lines {
-      width: 3.0
-      color: 3003121732
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 3.0
-      color: 3003121732
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 3.0
-      color: 3003121732
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 3.0
-      color: 3003121732
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 3003121732
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 3003121732
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 3003121732
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 3003121732
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-}
-cont {
-  name: "railway-subway-blue"
-  element {
-    scale: 12
-    lines {
-      width: 3.0
-      color: 3003130504
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 3.0
-      color: 3003130504
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 3.0
-      color: 3003130504
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 3.0
-      color: 3003130504
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 3003130504
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 3003130504
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 3003130504
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 3003130504
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-}
-cont {
-  name: "railway-subway-bridge"
-  element {
-    scale: 12
-    lines {
-      width: 3.0
-      color: 3003121732
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 3.0
-      color: 3003121732
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 3.0
-      color: 3003121732
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 3.0
-      color: 3003121732
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 3003121732
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 3003121732
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 3003121732
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 3003121732
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-}
-cont {
-  name: "railway-subway-brown"
-  element {
-    scale: 12
-    lines {
-      width: 3.0
-      color: 3015407360
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 3.0
-      color: 3015407360
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 3.0
-      color: 3015407360
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 3.0
-      color: 3015407360
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 3015407360
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 3015407360
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 3015407360
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 3015407360
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-}
-cont {
-  name: "railway-subway-darkgreen"
-  element {
-    scale: 12
-    lines {
-      width: 3.0
-      color: 3003147776
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 3.0
-      color: 3003147776
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 3.0
-      color: 3003147776
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 3.0
-      color: 3003147776
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 3003147776
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 3003147776
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 3003147776
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 3003147776
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-}
-cont {
-  name: "railway-subway-gray"
-  element {
-    scale: 12
-    lines {
-      width: 3.0
-      color: 3012069512
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 3.0
-      color: 3012069512
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 3.0
-      color: 3012069512
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 3.0
-      color: 3012069512
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 3012069512
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 3012069512
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 3012069512
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 3012069512
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-}
-cont {
-  name: "railway-subway-green"
-  element {
-    scale: 12
-    lines {
-      width: 3.0
-      color: 3003147776
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 3.0
-      color: 3003147776
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 3.0
-      color: 3003147776
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 3.0
-      color: 3003147776
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 3003147776
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 3003147776
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 3003147776
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 3003147776
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-}
-cont {
-  name: "railway-subway-grey"
-  element {
-    scale: 12
-    lines {
-      width: 3.0
-      color: 3012069512
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 3.0
-      color: 3012069512
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 3.0
-      color: 3012069512
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 3.0
-      color: 3012069512
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 3012069512
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 3012069512
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 3012069512
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 3012069512
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-}
-cont {
-  name: "railway-subway-lightblue"
-  element {
-    scale: 12
-    lines {
-      width: 3.0
-      color: 3014319598
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 3.0
-      color: 3014319598
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 3.0
-      color: 3014319598
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 3.0
-      color: 3014319598
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 3014319598
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 3014319598
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 3014319598
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 3014319598
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-}
-cont {
-  name: "railway-subway-lightgreen"
-  element {
-    scale: 12
-    lines {
-      width: 3.0
-      color: 3013209753
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 3.0
-      color: 3013209753
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 3.0
-      color: 3013209753
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 3.0
-      color: 3013209753
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 3013209753
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 3013209753
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 3013209753
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 3013209753
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-}
-cont {
-  name: "railway-subway-orange"
-  element {
-    scale: 12
-    lines {
-      width: 3.0
-      color: 3019863808
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 3.0
-      color: 3019863808
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 3.0
-      color: 3019863808
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 3.0
-      color: 3019863808
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 3019863808
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 3019863808
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 3019863808
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 3019863808
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-}
-cont {
-  name: "railway-subway-purple"
-  element {
-    scale: 12
-    lines {
-      width: 3.0
-      color: 3012056473
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 3.0
-      color: 3012056473
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 3.0
-      color: 3012056473
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 3.0
-      color: 3012056473
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 3012056473
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 3012056473
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 3012056473
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 3012056473
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-}
-cont {
-  name: "railway-subway-red"
-  element {
-    scale: 12
-    lines {
-      width: 3.0
-      color: 3017605120
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 3.0
-      color: 3017605120
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 3.0
-      color: 3017605120
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 3.0
-      color: 3017605120
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 3017605120
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 3017605120
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 3017605120
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 3017605120
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-}
-cont {
-  name: "railway-subway-violet"
-  element {
-    scale: 12
-    lines {
-      width: 3.0
-      color: 3018754286
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 3.0
-      color: 3018754286
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 3.0
-      color: 3018754286
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 3.0
-      color: 3018754286
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 3018754286
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 3018754286
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 3018754286
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 3018754286
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-}
-cont {
-  name: "railway-subway-yellow"
-  element {
-    scale: 12
-    lines {
-      width: 3.0
-      color: 3019885568
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 3.0
-      color: 3019885568
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 3.0
-      color: 3019885568
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 3.0
-      color: 3019885568
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 3019885568
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 3019885568
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 3019885568
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 3019885568
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 16030
-      join: ROUNDJOIN
-      cap: BUTTCAP
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 19000
     }
   }
 }
 cont {
   name: "railway-subway_entrance"
   element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-blue"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-brown"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-darkgreen"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-gray"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-green"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-grey"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-lightblue"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-lightgreen"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-orange"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-purple"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-red"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-violet"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-yellow"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
+      name: "subway"
+      priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
+      name: "subway"
+      priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
+      name: "subway"
+      priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:"
-      priority: 16178
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15178
+      name: "subway"
+      priority: 16000
     }
   }
 }
@@ -71763,27 +61637,9 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.7
-      color: 5570645
-      dashdot {
-        dd: 3.6
-        dd: 5.4
-      }
-      priority: 1536
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 5570645
-      priority: 1530
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 1.7
-      color: 15645678
-      priority: 1533
+      width: 1.0
+      color: 0
+      priority: 16001
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -71791,27 +61647,9 @@ cont {
   element {
     scale: 15
     lines {
-      width: 3.2
-      color: 4456516
-      priority: 1533
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.0
-      color: 4456516
-      dashdot {
-        dd: 7.2
-        dd: 10.8
-      }
-      priority: 1548
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 15645678
-      priority: 1539
+      width: 1.0
+      color: 0
+      priority: 16001
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -71819,27 +61657,9 @@ cont {
   element {
     scale: 16
     lines {
-      width: 3.2
-      color: 4456516
-      priority: 1533
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.0
-      color: 4456516
-      dashdot {
-        dd: 9.6
-        dd: 14.4
-      }
-      priority: 1548
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 15645678
-      priority: 1539
+      width: 1.0
+      color: 0
+      priority: 16001
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -71847,27 +61667,9 @@ cont {
   element {
     scale: 17
     lines {
-      width: 3.2
-      color: 4456516
-      priority: 1533
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.0
-      color: 4456516
-      dashdot {
-        dd: 9.6
-        dd: 14.4
-      }
-      priority: 1548
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 15645678
-      priority: 1539
+      width: 1.0
+      color: 0
+      priority: 16001
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -71875,27 +61677,9 @@ cont {
   element {
     scale: 18
     lines {
-      width: 3.2
-      color: 4456516
-      priority: 1533
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.0
-      color: 4456516
-      dashdot {
-        dd: 9.6
-        dd: 14.4
-      }
-      priority: 1548
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 15645678
-      priority: 1539
+      width: 1.0
+      color: 0
+      priority: 16001
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -71903,27 +61687,9 @@ cont {
   element {
     scale: 19
     lines {
-      width: 3.2
-      color: 4456516
-      priority: 1533
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.0
-      color: 4456516
-      dashdot {
-        dd: 9.6
-        dd: 14.4
-      }
-      priority: 1548
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 15645678
-      priority: 1539
+      width: 1.0
+      color: 0
+      priority: 16001
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -71934,27 +61700,9 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.7
-      color: 5570645
-      dashdot {
-        dd: 3.6
-        dd: 5.4
-      }
-      priority: 1536
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 5570645
-      priority: 1530
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 1.7
-      color: 15645678
-      priority: 1533
+      width: 1.0
+      color: 0
+      priority: 16001
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -71962,141 +61710,121 @@ cont {
   element {
     scale: 15
     lines {
-      width: 3.2
-      color: 4456516
-      priority: 1533
+      width: 1.0
+      color: 0
+      priority: 16001
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 2.0
-      color: 4456516
-      dashdot {
-        dd: 7.2
-        dd: 10.8
-      }
-      priority: 1548
+      width: 5.0
+      color: 7829367
+      priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.0
-      color: 15645678
-      priority: 1539
+      width: 7.0
+      color: 7829367
+      priority: 11
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 3.2
-      color: 4456516
-      priority: 1533
+      width: 1.0
+      color: 0
+      priority: 16001
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 2.0
-      color: 4456516
-      dashdot {
-        dd: 9.6
-        dd: 14.4
-      }
-      priority: 1548
+      width: 5.0
+      color: 7829367
+      priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.0
-      color: 15645678
-      priority: 1539
+      width: 7.0
+      color: 7829367
+      priority: 11
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
     scale: 17
     lines {
-      width: 3.2
-      color: 4456516
-      priority: 1533
+      width: 1.0
+      color: 0
+      priority: 16001
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 2.0
-      color: 4456516
-      dashdot {
-        dd: 9.6
-        dd: 14.4
-      }
-      priority: 1548
+      width: 5.0
+      color: 7829367
+      priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.0
-      color: 15645678
-      priority: 1539
+      width: 7.0
+      color: 7829367
+      priority: 11
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
     scale: 18
     lines {
-      width: 3.2
-      color: 4456516
-      priority: 1533
+      width: 1.0
+      color: 0
+      priority: 16001
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 2.0
-      color: 4456516
-      dashdot {
-        dd: 9.6
-        dd: 14.4
-      }
-      priority: 1548
+      width: 5.0
+      color: 7829367
+      priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.0
-      color: 15645678
-      priority: 1539
+      width: 7.0
+      color: 7829367
+      priority: 11
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
     scale: 19
     lines {
-      width: 3.2
-      color: 4456516
-      priority: 1533
+      width: 1.0
+      color: 0
+      priority: 16001
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 2.0
-      color: 4456516
-      dashdot {
-        dd: 9.6
-        dd: 14.4
-      }
-      priority: 1548
+      width: 5.0
+      color: 7829367
+      priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.0
-      color: 15645678
-      priority: 1539
+      width: 7.0
+      color: 7829367
+      priority: 11
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
 }
@@ -72105,27 +61833,9 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.7
-      color: 5570645
-      dashdot {
-        dd: 3.6
-        dd: 5.4
-      }
-      priority: 1536
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 5570645
-      priority: 1530
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 1.7
-      color: 15645678
-      priority: 1533
+      width: 1.0
+      color: 0
+      priority: 16001
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72133,141 +61843,141 @@ cont {
   element {
     scale: 15
     lines {
-      width: 3.2
-      color: 4456516
-      priority: 1533
+      width: 1.0
+      color: 0
+      priority: 16001
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 2.0
-      color: 4456516
-      dashdot {
-        dd: 7.2
-        dd: 10.8
-      }
-      priority: 1548
+      width: 5.0
+      color: 7829367
+      priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.0
-      color: 15645678
-      priority: 1539
+      width: 7.0
+      color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 11
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 3.2
-      color: 4456516
-      priority: 1533
+      width: 1.0
+      color: 0
+      priority: 16001
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 2.0
-      color: 4456516
-      dashdot {
-        dd: 9.6
-        dd: 14.4
-      }
-      priority: 1548
+      width: 5.0
+      color: 7829367
+      priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.0
-      color: 15645678
-      priority: 1539
+      width: 7.0
+      color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 11
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
     scale: 17
     lines {
-      width: 3.2
-      color: 4456516
-      priority: 1533
+      width: 1.0
+      color: 0
+      priority: 16001
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 2.0
-      color: 4456516
-      dashdot {
-        dd: 9.6
-        dd: 14.4
-      }
-      priority: 1548
+      width: 5.0
+      color: 7829367
+      priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.0
-      color: 15645678
-      priority: 1539
+      width: 7.0
+      color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 11
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
     scale: 18
     lines {
-      width: 3.2
-      color: 4456516
-      priority: 1533
+      width: 1.0
+      color: 0
+      priority: 16001
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 2.0
-      color: 4456516
-      dashdot {
-        dd: 9.6
-        dd: 14.4
-      }
-      priority: 1548
+      width: 5.0
+      color: 7829367
+      priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.0
-      color: 15645678
-      priority: 1539
+      width: 7.0
+      color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 11
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
     scale: 19
     lines {
-      width: 3.2
-      color: 4456516
-      priority: 1533
+      width: 1.0
+      color: 0
+      priority: 16001
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 2.0
-      color: 4456516
-      dashdot {
-        dd: 9.6
-        dd: 14.4
-      }
-      priority: 1548
+      width: 5.0
+      color: 7829367
+      priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.0
-      color: 15645678
-      priority: 1539
+      width: 7.0
+      color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 11
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
 }
@@ -72275,79 +61985,108 @@ cont {
   name: "railway-tram_stop"
   element {
     scale: 15
+    symbol {
+      name: "tramway-mini"
+      priority: 16000
+    }
     caption {
       primary {
         height: 10
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "tramway-mini"
       priority: 16032
     }
     caption {
       primary {
         height: 11
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 15032
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14032
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "tramway"
       priority: 16000
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "tramway"
       priority: 16000
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:"
+      name: "tramway"
       priority: 16000
     }
     caption {
       primary {
         height: 12
-        color: 3364317
+        color: 0
         stroke_color: 16777215
         offset_y: 10
       }
       priority: 15000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
@@ -72357,7 +62096,7 @@ cont {
     lines {
       width: 0.5
       color: 4473924
-      priority: 1246
+      priority: 1244
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72367,7 +62106,7 @@ cont {
     lines {
       width: 0.85
       color: 4473924
-      priority: 1260
+      priority: 1258
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72377,7 +62116,7 @@ cont {
     lines {
       width: 1.6
       color: 4473924
-      priority: 1211
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72388,14 +62127,14 @@ cont {
         dd: 3.0
         dd: 6.0
       }
-      priority: 1340
+      priority: 1338
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658734
-      priority: 1307
+      priority: 1305
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72416,14 +62155,14 @@ cont {
         dd: 6.0
         dd: 12.0
       }
-      priority: 1413
+      priority: 1411
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.4
       color: 15658734
-      priority: 1381
+      priority: 1379
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72433,7 +62172,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1524
+      priority: 1523
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72444,14 +62183,14 @@ cont {
         dd: 8.0
         dd: 16.0
       }
-      priority: 1659
+      priority: 1658
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.2
       color: 15658734
-      priority: 1630
+      priority: 1629
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72461,7 +62200,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1568
+      priority: 1567
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72472,7 +62211,7 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1753
+      priority: 1752
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -72489,7 +62228,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1568
+      priority: 1567
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72500,7 +62239,7 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1753
+      priority: 1752
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -72517,7 +62256,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1568
+      priority: 1567
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72528,7 +62267,7 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1753
+      priority: 1752
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -72548,7 +62287,7 @@ cont {
     lines {
       width: 0.5
       color: 4473924
-      priority: 1246
+      priority: 1244
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72558,7 +62297,7 @@ cont {
     lines {
       width: 0.85
       color: 4473924
-      priority: 1260
+      priority: 1258
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72568,7 +62307,7 @@ cont {
     lines {
       width: 1.6
       color: 4473924
-      priority: 1211
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72579,14 +62318,14 @@ cont {
         dd: 3.0
         dd: 6.0
       }
-      priority: 1340
+      priority: 1338
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658734
-      priority: 1307
+      priority: 1305
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72601,31 +62340,31 @@ cont {
       cap: ROUNDCAP
     }
     lines {
+      width: 5.4
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 1.4
       color: 3355443
       dashdot {
         dd: 6.0
         dd: 12.0
       }
-      priority: 1413
+      priority: 1411
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.4
       color: 15658734
-      priority: 1381
+      priority: 1379
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
-      width: 5.4
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 7.4
       color: 7829367
       priority: 11
@@ -72638,7 +62377,7 @@ cont {
     lines {
       width: 1.2
       color: 15658734
-      priority: 1630
+      priority: 1629
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72650,9 +62389,16 @@ cont {
       cap: BUTTCAP
     }
     lines {
+      width: 7.2
+      color: 7829367
+      priority: 11
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.4
       color: 3355443
-      priority: 1524
+      priority: 1523
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72663,14 +62409,7 @@ cont {
         dd: 8.0
         dd: 16.0
       }
-      priority: 1659
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 7.2
-      color: 7829367
-      priority: 11
+      priority: 1658
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -72680,18 +62419,25 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1568
+      priority: 1567
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 5.36
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 1.36
       color: 3355443
       dashdot {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1753
+      priority: 1752
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -72703,13 +62449,6 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 5.36
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 7.36
       color: 7829367
       priority: 11
@@ -72722,18 +62461,25 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1568
+      priority: 1567
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 5.36
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 1.36
       color: 3355443
       dashdot {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1753
+      priority: 1752
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -72745,13 +62491,6 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 5.36
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 7.36
       color: 7829367
       priority: 11
@@ -72764,18 +62503,25 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1568
+      priority: 1567
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
+      width: 5.36
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 1.36
       color: 3355443
       dashdot {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1753
+      priority: 1752
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -72787,13 +62533,6 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 5.36
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
       width: 7.36
       color: 7829367
       priority: 11
@@ -72809,7 +62548,7 @@ cont {
     lines {
       width: 0.5
       color: 4473924
-      priority: 1246
+      priority: 1244
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72819,7 +62558,7 @@ cont {
     lines {
       width: 0.85
       color: 4473924
-      priority: 1260
+      priority: 1258
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72829,7 +62568,7 @@ cont {
     lines {
       width: 1.6
       color: 4473924
-      priority: 1211
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72840,14 +62579,14 @@ cont {
         dd: 3.0
         dd: 6.0
       }
-      priority: 1340
+      priority: 1338
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658734
-      priority: 1307
+      priority: 1305
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72855,6 +62594,13 @@ cont {
   element {
     scale: 15
     lines {
+      width: 5.4
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.4
       color: 3355443
       priority: 1000
@@ -72868,14 +62614,14 @@ cont {
         dd: 6.0
         dd: 12.0
       }
-      priority: 1413
+      priority: 1411
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.4
       color: 15658734
-      priority: 1381
+      priority: 1379
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72890,13 +62636,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    lines {
-      width: 5.4
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
   }
   element {
     scale: 16
@@ -72914,14 +62653,14 @@ cont {
     lines {
       width: 1.2
       color: 15658734
-      priority: 1630
+      priority: 1629
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.4
       color: 3355443
-      priority: 1524
+      priority: 1523
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72939,7 +62678,7 @@ cont {
         dd: 8.0
         dd: 16.0
       }
-      priority: 1659
+      priority: 1658
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -72947,9 +62686,16 @@ cont {
   element {
     scale: 17
     lines {
+      width: 5.36
+      color: 7829367
+      priority: 14
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
       width: 2.4
       color: 3355443
-      priority: 1568
+      priority: 1567
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -72960,7 +62706,7 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1753
+      priority: 1752
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -72982,6 +62728,9 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
       width: 5.36
       color: 7829367
@@ -72989,13 +62738,10 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
       width: 2.4
       color: 3355443
-      priority: 1568
+      priority: 1567
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -73006,7 +62752,7 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1753
+      priority: 1752
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -73028,6 +62774,9 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
       width: 5.36
       color: 7829367
@@ -73035,13 +62784,10 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
       width: 2.4
       color: 3355443
-      priority: 1568
+      priority: 1567
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -73052,7 +62798,7 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1753
+      priority: 1752
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -73074,137 +62820,6 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    lines {
-      width: 5.36
-      color: 7829367
-      priority: 14
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-}
-cont {
-  name: "religion-christian"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/religious-christian-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/religious-christian-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/religious-christian-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/religious-christian-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "religion-hindu"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/hindu-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/hindu-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/hindu-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/hindu-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "religion-jewish"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/religious-jewish-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/religious-jewish-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/religious-jewish-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/religious-jewish-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "religion-muslim"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/religious-muslim-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/religious-muslim-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/religious-muslim-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/religious-muslim-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
   }
 }
 cont {
@@ -73218,7 +62833,7 @@ cont {
         dd: 3.0
         dd: 2.0
       }
-      priority: 1167
+      priority: 1161
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -73232,7 +62847,7 @@ cont {
         dd: 3.0
         dd: 2.0
       }
-      priority: 1167
+      priority: 1161
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -73246,7 +62861,7 @@ cont {
         dd: 3.0
         dd: 2.0
       }
-      priority: 1372
+      priority: 1370
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -73260,7 +62875,7 @@ cont {
         dd: 3.0
         dd: 2.0
       }
-      priority: 1410
+      priority: 1408
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -73274,7 +62889,7 @@ cont {
         dd: 3.0
         dd: 2.0
       }
-      priority: 1469
+      priority: 1467
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -73288,7 +62903,7 @@ cont {
         dd: 7.0
         dd: 5.0
       }
-      priority: 1639
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -73302,7 +62917,7 @@ cont {
         dd: 12.0
         dd: 8.0
       }
-      priority: 1818
+      priority: 1817
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -73351,37 +62966,6 @@ cont {
   }
 }
 cont {
-  name: "seamark:type-harbour"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/harbor-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/harbor-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/harbor-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/harbor-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
   name: "shop"
   element {
     scale: 17
@@ -73423,16 +63007,9 @@ cont {
 cont {
   name: "shop-alcohol"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/alcohol-shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/maki/alcohol-shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -73444,11 +63021,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/alcohol-shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -73460,11 +63042,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/alcohol-shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -73476,6 +63063,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -73483,14 +63075,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/bakery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bakery"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/bakery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bakery"
       priority: 16008
     }
     caption {
@@ -73502,11 +63099,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/bakery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bakery"
       priority: 16008
     }
     caption {
@@ -73518,11 +63120,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/bakery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "bakery"
       priority: 16008
     }
     caption {
@@ -73534,23 +63141,17 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
   name: "shop-beverages"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/beverages-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
-    symbol {
-      name: "symbols/nori/beverages-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -73563,10 +63164,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/nori/beverages-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -73579,10 +63176,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/nori/beverages-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -73599,14 +63192,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -73618,11 +63216,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -73634,11 +63237,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -73650,21 +63258,19 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
   name: "shop-books"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/library-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/maki/library-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -73676,11 +63282,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/library-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -73692,11 +63303,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/library-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -73708,21 +63324,19 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
   name: "shop-butcher"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/slaughterhouse-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/maki/slaughterhouse-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -73734,11 +63348,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/slaughterhouse-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -73750,11 +63369,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/slaughterhouse-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -73766,62 +63390,17 @@ cont {
       }
       priority: 15008
     }
-  }
-}
-cont {
-  name: "shop-car"
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
     }
   }
 }
 cont {
-  name: "shop-car_parts"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/car_parts-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "shop-car"
   element {
     scale: 17
-    symbol {
-      name: "symbols/nori/car_parts-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -73834,10 +63413,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/nori/car_parts-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -73850,10 +63425,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/nori/car_parts-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -73870,14 +63441,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/car_repair-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "car_repair"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/car_repair-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "car_repair"
       priority: 16008
     }
     caption {
@@ -73889,11 +63465,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/car_repair-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "car_repair"
       priority: 16008
     }
     caption {
@@ -73905,11 +63486,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/car_repair-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "car_repair"
       priority: 16008
     }
     caption {
@@ -73921,6 +63507,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -73967,14 +63558,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/clothes-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "clothes"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/clothes-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "clothes"
       priority: 16008
     }
     caption {
@@ -73986,11 +63582,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/clothes-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "clothes"
       priority: 16008
     }
     caption {
@@ -74002,11 +63603,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/clothes-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "clothes"
       priority: 16008
     }
     caption {
@@ -74018,23 +63624,17 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
   name: "shop-computer"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/computer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
-    symbol {
-      name: "symbols/nori/computer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -74047,10 +63647,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/nori/computer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -74063,10 +63659,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/nori/computer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -74081,18 +63673,7 @@ cont {
 cont {
   name: "shop-confectionery"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/bakery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
-    symbol {
-      name: "symbols/maki/bakery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -74105,10 +63686,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/bakery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -74121,10 +63698,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/bakery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -74137,18 +63710,23 @@ cont {
   }
 }
 cont {
-  name: "shop-confectionery"
+  name: "shop-convenience"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bakery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bakery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -74160,11 +63738,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bakery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -74176,11 +63759,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bakery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -74192,21 +63780,31 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
-  name: "shop-convenience"
+  name: "shop-department_store"
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -74218,11 +63816,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -74234,11 +63837,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -74250,60 +63858,26 @@ cont {
       }
       priority: 15008
     }
-  }
-}
-cont {
-  name: "shop-copyshop"
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
     }
   }
 }
 cont {
-  name: "shop-department_store"
+  name: "shop-doityourself"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -74315,11 +63889,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -74331,11 +63910,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -74347,21 +63931,19 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
-  name: "shop-doityourself"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/grocery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "shop-electronics"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -74373,11 +63955,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -74389,11 +63976,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -74405,21 +63997,19 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
-  name: "shop-dry_cleaning"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/dry_cleaning-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "shop-florist"
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/dry_cleaning-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -74431,11 +64021,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/dry_cleaning-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -74447,11 +64042,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/dry_cleaning-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -74463,21 +64063,31 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
-  name: "shop-electronics"
+  name: "shop-furniture"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -74489,11 +64099,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -74505,11 +64120,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -74521,23 +64141,17 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
-  name: "shop-florist"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/garden-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "shop-garden_centre"
   element {
     scale: 17
-    symbol {
-      name: "symbols/maki/garden-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -74550,10 +64164,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/garden-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -74566,10 +64176,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/garden-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -74582,7 +64188,7 @@ cont {
   }
 }
 cont {
-  name: "shop-funeral_directors"
+  name: "shop-gift"
   element {
     scale: 17
     caption {
@@ -74621,20 +64227,9 @@ cont {
   }
 }
 cont {
-  name: "shop-furniture"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "shop-greengrocer"
   element {
     scale: 17
-    symbol {
-      name: "symbols/maki/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -74647,10 +64242,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -74663,10 +64254,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -74679,18 +64266,23 @@ cont {
   }
 }
 cont {
-  name: "shop-garden_centre"
+  name: "shop-hairdresser"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/garden-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hairdresser"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/garden-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hairdresser"
       priority: 16008
     }
     caption {
@@ -74702,11 +64294,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/garden-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hairdresser"
       priority: 16008
     }
     caption {
@@ -74718,11 +64315,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/garden-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hairdresser"
       priority: 16008
     }
     caption {
@@ -74734,49 +64336,15 @@ cont {
       }
       priority: 15008
     }
-  }
-}
-cont {
-  name: "shop-general"
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
     }
   }
 }
 cont {
-  name: "shop-gift"
+  name: "shop-hardware"
   element {
     scale: 17
     caption {
@@ -74815,7 +64383,7 @@ cont {
   }
 }
 cont {
-  name: "shop-greengrocer"
+  name: "shop-jewelry"
   element {
     scale: 17
     caption {
@@ -74854,18 +64422,23 @@ cont {
   }
 }
 cont {
-  name: "shop-hairdresser"
+  name: "shop-kiosk"
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/hairdresser-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "kiosk"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/hairdresser-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "kiosk"
       priority: 16008
     }
     caption {
@@ -74877,11 +64450,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/hairdresser-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "kiosk"
       priority: 16008
     }
     caption {
@@ -74893,11 +64471,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/hairdresser-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "kiosk"
       priority: 16008
     }
     caption {
@@ -74909,21 +64492,31 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
-  name: "shop-hardware"
+  name: "shop-mall"
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/hardware-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/hardware-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -74935,11 +64528,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/hardware-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -74951,11 +64549,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/hardware-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -74967,10 +64570,15 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
-  name: "shop-jewelry"
+  name: "shop-mobile_phone"
   element {
     scale: 17
     caption {
@@ -75009,20 +64617,9 @@ cont {
   }
 }
 cont {
-  name: "shop-kiosk"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "shop-optician"
   element {
     scale: 17
-    symbol {
-      name: "symbols/maki/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -75035,10 +64632,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -75051,10 +64644,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -75067,18 +64656,11 @@ cont {
   }
 }
 cont {
-  name: "shop-mall"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/grocery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "shop-shoes"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -75090,11 +64672,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -75106,11 +64693,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -75122,21 +64714,31 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
-  name: "shop-mobile_phone"
+  name: "shop-supermarket"
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/mobile_phone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/mobile_phone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -75148,11 +64750,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/mobile_phone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -75164,11 +64771,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/mobile_phone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -75180,23 +64792,17 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
-  name: "shop-motorcycle"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/motorcycle-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "shop-toys"
   element {
     scale: 17
-    symbol {
-      name: "symbols/nori/motorcycle-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -75209,10 +64815,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/nori/motorcycle-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -75225,10 +64827,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/nori/motorcycle-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -75241,834 +64839,739 @@ cont {
   }
 }
 cont {
-  name: "shop-music"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/music-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "sport-american_football"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/music-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "football-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/music-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "football-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/music-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "football-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
 }
 cont {
-  name: "shop-musical_instrument"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/music-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "sport-archery"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/music-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "archery-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/music-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "archery-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/music-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "archery-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
 }
 cont {
-  name: "shop-optician"
+  name: "sport-athletics"
   element {
     scale: 17
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "shop-outdoor"
-  element {
-    scale: 16
     symbol {
-      name: "symbols/nori/clothes-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "athletics-borderless"
       priority: 16000
     }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/clothes-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/clothes-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "athletics-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/clothes-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "athletics-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
 }
 cont {
-  name: "shop-photo"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/photo-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "sport-australian_football"
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/photo-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "football-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/photo-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "football-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/photo-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "football-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
 }
 cont {
-  name: "shop-photo_studio"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/photo-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "sport-baseball"
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/photo-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "baseball-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/photo-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "baseball-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/photo-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "baseball-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
 }
 cont {
-  name: "shop-shoes"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/shoes-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "sport-bowls"
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/shoes-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "bowls-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/shoes-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "bowls-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/shoes-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "bowls-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
 }
 cont {
-  name: "shop-supermarket"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/grocery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "sport-cricket"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "cricket-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "cricket-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
+      name: "cricket-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
 }
 cont {
-  name: "shop-toys"
+  name: "sport-curling"
   element {
     scale: 17
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    symbol {
+      name: "curling-borderless"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
     scale: 18
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    symbol {
+      name: "curling-borderless"
+      priority: 16000
     }
-  }
-  element {
-    scale: 19
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
-}
-cont {
-  name: "sport-american_football"
   element {
-    scale: 16
+    scale: 19
     symbol {
-      name: "symbols/maki/america-football-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "curling-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
+}
+cont {
+  name: "sport-diving"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/america-football-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "diving-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/america-football-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "diving-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/america-football-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "diving-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
-  name: "sport-australian_football"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/america-football-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "sport-equestrian"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/america-football-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "equestrian-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/america-football-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "equestrian-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/america-football-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "equestrian-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
-  name: "sport-baseball"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/baseball-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "sport-football"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/baseball-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "football-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/baseball-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "football-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/baseball-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "football-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
-  name: "sport-basketball"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/basketball-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "sport-golf"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/basketball-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "golfCourse"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/basketball-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "golfCourse"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/basketball-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "golfCourse"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
-  name: "sport-cricket"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/cricket-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "sport-gymnastics"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/cricket-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "gymnastics-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/cricket-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "gymnastics-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/cricket-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "gymnastics-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
-  name: "sport-football"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/soccer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "sport-handball"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/soccer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "handball-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/soccer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "handball-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/soccer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "handball-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
-  name: "sport-golf"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/golf-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "sport-multi"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/golf-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "gymnastics-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/golf-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "gymnastics-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/golf-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "gymnastics-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
-  name: "sport-skiing"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/skiing-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "sport-scuba_diving"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/skiing-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "diving-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/skiing-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "diving-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/skiing-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "diving-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
-  name: "sport-soccer"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/soccer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "sport-skiing"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/soccer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "gymnastics-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/soccer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "gymnastics-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/soccer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "gymnastics-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
   name: "sport-swimming"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/swimming-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/maki/swimming-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "swimming-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/swimming-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "swimming-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/swimming-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "swimming-borderless"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
-  name: "sport-tennis"
+  name: "tourism-alpine_hut"
   element {
-    scale: 16
+    scale: 15
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "alpine_hut"
       priority: 16000
     }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/tennis-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
   element {
-    scale: 18
+    scale: 16
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "alpine_hut"
       priority: 16000
     }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/tennis-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
-}
-cont {
-  name: "tourism-alpine_hut"
   element {
     scale: 17
+    symbol {
+      name: "alpine_hut"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -76078,9 +65581,18 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
+    symbol {
+      name: "alpine_hut"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -76090,9 +65602,18 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
+    symbol {
+      name: "alpine_hut"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -76102,6 +65623,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -76109,21 +65635,31 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/star-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "viewpoint"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/star-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "viewpoint"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/star-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "viewpoint"
       priority: 16008
     }
     caption {
@@ -76135,11 +65671,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/star-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "viewpoint"
       priority: 16008
     }
     caption {
@@ -76151,11 +65692,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/star-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "viewpoint"
       priority: 16008
     }
     caption {
@@ -76167,6 +65713,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -76175,7 +65726,7 @@ cont {
     scale: 15
     area {
       color: 6710886
-      priority: -16473
+      priority: -16458
     }
     caption {
       primary {
@@ -76190,7 +65741,7 @@ cont {
     scale: 16
     area {
       color: 6710886
-      priority: -16474
+      priority: -16459
     }
     caption {
       primary {
@@ -76253,88 +65804,45 @@ cont {
 cont {
   name: "tourism-camp_site"
   element {
-    scale: 15
-    symbol {
-      name: "symbols/maki/campsite-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 16
+    scale: 14
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "campsite"
       priority: 16000
     }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/campsite-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/campsite-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/campsite-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
     }
   }
-}
-cont {
-  name: "tourism-caravan_site"
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "campsite"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "campsite"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "campsite"
       priority: 16008
     }
     caption {
@@ -76346,11 +65854,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "campsite"
       priority: 16008
     }
     caption {
@@ -76362,11 +65875,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "campsite"
       priority: 16008
     }
     caption {
@@ -76378,23 +65896,17 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
-  name: "tourism-gallery"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/art-gallery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
+  name: "tourism-caravan_site"
   element {
     scale: 17
-    symbol {
-      name: "symbols/maki/art-gallery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -76407,10 +65919,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/art-gallery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -76423,10 +65931,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/art-gallery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -76443,14 +65947,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hostel"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hostel"
       priority: 16008
     }
     caption {
@@ -76462,11 +65971,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hostel"
       priority: 16008
     }
     caption {
@@ -76478,11 +65992,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hostel"
       priority: 16008
     }
     caption {
@@ -76494,6 +66013,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -76501,14 +66025,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hostel"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hostel"
       priority: 16008
     }
     caption {
@@ -76520,11 +66049,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hostel"
       priority: 16008
     }
     caption {
@@ -76536,11 +66070,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hostel"
       priority: 16008
     }
     caption {
@@ -76552,6 +66091,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -76559,14 +66103,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hotel"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hotel"
       priority: 16008
     }
     caption {
@@ -76578,11 +66127,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hotel"
       priority: 16008
     }
     caption {
@@ -76594,11 +66148,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hotel"
       priority: 16008
     }
     caption {
@@ -76610,21 +66169,19 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
   name: "tourism-information"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/information-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/nori/information-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "information"
       priority: 16008
     }
     caption {
@@ -76636,11 +66193,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/information-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "information"
       priority: 16008
     }
     caption {
@@ -76652,11 +66214,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/information-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "information"
       priority: 16008
     }
     caption {
@@ -76668,21 +66235,19 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
   name: "tourism-information-guidepost"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/information-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/nori/information-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "information"
       priority: 16008
     }
     caption {
@@ -76694,11 +66259,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/information-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "information"
       priority: 16008
     }
     caption {
@@ -76710,11 +66280,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/information-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "information"
       priority: 16008
     }
     caption {
@@ -76726,21 +66301,19 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
   name: "tourism-information-office"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/information-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/nori/information-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "information"
       priority: 16008
     }
     caption {
@@ -76752,11 +66325,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/information-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "information"
       priority: 16008
     }
     caption {
@@ -76768,11 +66346,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/information-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "information"
       priority: 16008
     }
     caption {
@@ -76784,6 +66367,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -76791,14 +66379,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hotel"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hotel"
       priority: 16008
     }
     caption {
@@ -76810,11 +66403,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hotel"
       priority: 16008
     }
     caption {
@@ -76826,11 +66424,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "hotel"
       priority: 16008
     }
     caption {
@@ -76842,6 +66445,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -76849,14 +66457,19 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/museum-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "museum"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/museum-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "museum"
       priority: 16008
     }
     caption {
@@ -76868,11 +66481,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/museum-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "museum"
       priority: 16008
     }
     caption {
@@ -76884,11 +66502,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/museum-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "museum"
       priority: 16008
     }
     caption {
@@ -76900,35 +66523,19 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
   name: "tourism-picnic_site"
   element {
-    scale: 14
-    symbol {
-      name: "symbols/nori/camp_site-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 15
-    symbol {
-      name: "symbols/nori/camp_site-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/camp_site-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/nori/camp_site-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "picnic"
       priority: 16008
     }
     caption {
@@ -76940,11 +66547,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/camp_site-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "picnic"
       priority: 16008
     }
     caption {
@@ -76956,11 +66568,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/camp_site-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "picnic"
       priority: 16008
     }
     caption {
@@ -76972,6 +66589,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -76979,21 +66601,31 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/nori/viewpoint-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "viewpoint"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/viewpoint-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "viewpoint"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/viewpoint-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "viewpoint"
       priority: 16008
     }
     caption {
@@ -77005,11 +66637,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/viewpoint-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "viewpoint"
       priority: 16008
     }
     caption {
@@ -77021,11 +66658,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/viewpoint-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
+      name: "viewpoint"
       priority: 16008
     }
     caption {
@@ -77037,6 +66679,11 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
@@ -77263,7 +66910,7 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: -15000
+      priority: 32
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -77292,7 +66939,7 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: -15000
+      priority: 32
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -77321,7 +66968,7 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: -15000
+      priority: 32
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -77567,7 +67214,7 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: -15000
+      priority: 32
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -77614,7 +67261,7 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: -15000
+      priority: 32
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -77661,7 +67308,7 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: -15000
+      priority: 32
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -77809,13 +67456,13 @@ cont {
     lines {
       width: 0.38
       color: 1118481
-      priority: 1143
+      priority: 1138
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1144
+      priority: 1139
     }
   }
   element {
@@ -77823,13 +67470,13 @@ cont {
     lines {
       width: 1.5
       color: 1118481
-      priority: 1149
+      priority: 1144
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1150
+      priority: 1145
     }
   }
   element {
@@ -77837,17 +67484,13 @@ cont {
     lines {
       width: 3.0
       color: 1118481
-      priority: 1155
+      priority: 1150
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1156
-    }
-    symbol {
-      name: "symbols/maki/dam-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16155
+      priority: 1151
     }
   }
   element {
@@ -77855,17 +67498,13 @@ cont {
     lines {
       width: 4.0
       color: 1118481
-      priority: 1161
+      priority: 1155
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1162
-    }
-    symbol {
-      name: "symbols/maki/dam-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16161
+      priority: 1156
     }
   }
   element {
@@ -77873,17 +67512,13 @@ cont {
     lines {
       width: 4.0
       color: 1118481
-      priority: 1161
+      priority: 1155
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1162
-    }
-    symbol {
-      name: "symbols/maki/dam-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16161
+      priority: 1156
     }
   }
   element {
@@ -77891,17 +67526,13 @@ cont {
     lines {
       width: 4.0
       color: 1118481
-      priority: 1161
+      priority: 1155
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1162
-    }
-    symbol {
-      name: "symbols/maki/dam-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16161
+      priority: 1156
     }
   }
 }
@@ -78024,13 +67655,13 @@ cont {
     lines {
       width: 0.3
       color: 1118481
-      priority: 1108
+      priority: 1102
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1109
+      priority: 1103
     }
   }
   element {
@@ -78038,13 +67669,13 @@ cont {
     lines {
       width: 0.6
       color: 1118481
-      priority: 1117
+      priority: 1111
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1118
+      priority: 1112
     }
   }
   element {
@@ -78052,13 +67683,13 @@ cont {
     lines {
       width: 0.6
       color: 1118481
-      priority: 1123
+      priority: 1117
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1124
+      priority: 1118
     }
     path_text {
       primary {
@@ -78066,7 +67697,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16123
+      priority: 16117
     }
   }
   element {
@@ -78074,13 +67705,13 @@ cont {
     lines {
       width: 0.8
       color: 1118481
-      priority: 1129
+      priority: 1123
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1130
+      priority: 1124
     }
     path_text {
       primary {
@@ -78088,7 +67719,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16129
+      priority: 16123
     }
   }
   element {
@@ -78096,13 +67727,13 @@ cont {
     lines {
       width: 0.8
       color: 1118481
-      priority: 1129
+      priority: 1123
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1130
+      priority: 1124
     }
     path_text {
       primary {
@@ -78110,7 +67741,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16129
+      priority: 16123
     }
   }
   element {
@@ -78118,13 +67749,13 @@ cont {
     lines {
       width: 0.8
       color: 1118481
-      priority: 1129
+      priority: 1123
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1130
+      priority: 1124
     }
     path_text {
       primary {
@@ -78132,7 +67763,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16129
+      priority: 16123
     }
   }
 }
@@ -78255,13 +67886,13 @@ cont {
     lines {
       width: 0.3
       color: 1118481
-      priority: 1108
+      priority: 1102
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1109
+      priority: 1103
     }
   }
   element {
@@ -78269,7 +67900,7 @@ cont {
     lines {
       width: 0.6
       color: 1118481
-      priority: 1117
+      priority: 1111
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -78293,7 +67924,7 @@ cont {
     }
     area {
       color: 1118481
-      priority: 1118
+      priority: 1112
     }
   }
   element {
@@ -78301,7 +67932,7 @@ cont {
     lines {
       width: 0.6
       color: 1118481
-      priority: 1123
+      priority: 1117
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -78325,7 +67956,7 @@ cont {
     }
     area {
       color: 1118481
-      priority: 1124
+      priority: 1118
     }
     path_text {
       primary {
@@ -78333,7 +67964,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16123
+      priority: 16117
     }
   }
   element {
@@ -78341,7 +67972,7 @@ cont {
     lines {
       width: 0.8
       color: 1118481
-      priority: 1129
+      priority: 1123
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -78365,7 +67996,7 @@ cont {
     }
     area {
       color: 1118481
-      priority: 1130
+      priority: 1124
     }
     path_text {
       primary {
@@ -78373,7 +68004,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16129
+      priority: 16123
     }
   }
   element {
@@ -78381,7 +68012,7 @@ cont {
     lines {
       width: 0.8
       color: 1118481
-      priority: 1129
+      priority: 1123
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -78405,7 +68036,7 @@ cont {
     }
     area {
       color: 1118481
-      priority: 1130
+      priority: 1124
     }
     path_text {
       primary {
@@ -78413,7 +68044,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16129
+      priority: 16123
     }
   }
   element {
@@ -78421,7 +68052,7 @@ cont {
     lines {
       width: 0.8
       color: 1118481
-      priority: 1129
+      priority: 1123
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -78445,7 +68076,7 @@ cont {
     }
     area {
       color: 1118481
-      priority: 1130
+      priority: 1124
     }
     path_text {
       primary {
@@ -78453,7 +68084,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16129
+      priority: 16123
     }
   }
 }
@@ -78533,70 +68164,70 @@ cont {
     scale: 10
     area {
       color: 1118481
-      priority: 1103
+      priority: 1098
     }
   }
   element {
     scale: 11
     area {
       color: 1118481
-      priority: 1103
+      priority: 1098
     }
   }
   element {
     scale: 12
     area {
       color: 1118481
-      priority: 1103
+      priority: 1098
     }
   }
   element {
     scale: 13
     area {
       color: 1118481
-      priority: 1103
+      priority: 1098
     }
   }
   element {
     scale: 14
     area {
       color: 1118481
-      priority: 1103
+      priority: 1098
     }
   }
   element {
     scale: 15
     area {
       color: 1118481
-      priority: 1103
+      priority: 1098
     }
   }
   element {
     scale: 16
     area {
       color: 1118481
-      priority: 1103
+      priority: 1098
     }
   }
   element {
     scale: 17
     area {
       color: 1118481
-      priority: 1103
+      priority: 1098
     }
   }
   element {
     scale: 18
     area {
       color: 1118481
-      priority: 1103
+      priority: 1098
     }
   }
   element {
     scale: 19
     area {
       color: 1118481
-      priority: 1103
+      priority: 1098
     }
   }
 }
@@ -78733,20 +68364,20 @@ cont {
     lines {
       width: 3.5
       color: 12303291
-      priority: -15000
+      priority: 108
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.8
       color: 1118481
-      priority: 1114
+      priority: 1108
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1115
+      priority: 1109
     }
   }
   element {
@@ -78754,20 +68385,20 @@ cont {
     lines {
       width: 5.2
       color: 12303291
-      priority: -15000
+      priority: 114
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 1118481
-      priority: 1120
+      priority: 1114
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1121
+      priority: 1115
     }
     path_text {
       primary {
@@ -78775,7 +68406,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16120
+      priority: 16114
     }
   }
   element {
@@ -78783,20 +68414,20 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: -15000
+      priority: 120
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 1118481
-      priority: 1126
+      priority: 1120
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1127
+      priority: 1121
     }
     path_text {
       primary {
@@ -78804,7 +68435,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16126
+      priority: 16120
     }
   }
   element {
@@ -78812,20 +68443,20 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: -15000
+      priority: 120
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 1118481
-      priority: 1126
+      priority: 1120
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1127
+      priority: 1121
     }
     path_text {
       primary {
@@ -78833,7 +68464,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16126
+      priority: 16120
     }
   }
   element {
@@ -78841,20 +68472,20 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: -15000
+      priority: 120
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 1118481
-      priority: 1126
+      priority: 1120
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1127
+      priority: 1121
     }
     path_text {
       primary {
@@ -78862,7 +68493,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16126
+      priority: 16120
     }
   }
 }
@@ -78999,14 +68630,14 @@ cont {
     lines {
       width: 3.5
       color: 12303291
-      priority: -15000
+      priority: 108
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.8
       color: 1118481
-      priority: 1114
+      priority: 1108
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -79030,7 +68661,7 @@ cont {
     }
     area {
       color: 1118481
-      priority: 1115
+      priority: 1109
     }
   }
   element {
@@ -79038,14 +68669,14 @@ cont {
     lines {
       width: 5.2
       color: 12303291
-      priority: -15000
+      priority: 114
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 1118481
-      priority: 1120
+      priority: 1114
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -79069,7 +68700,7 @@ cont {
     }
     area {
       color: 1118481
-      priority: 1121
+      priority: 1115
     }
     path_text {
       primary {
@@ -79077,7 +68708,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16120
+      priority: 16114
     }
   }
   element {
@@ -79085,14 +68716,14 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: -15000
+      priority: 120
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 1118481
-      priority: 1126
+      priority: 1120
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -79116,7 +68747,7 @@ cont {
     }
     area {
       color: 1118481
-      priority: 1127
+      priority: 1121
     }
     path_text {
       primary {
@@ -79124,7 +68755,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16126
+      priority: 16120
     }
   }
   element {
@@ -79132,14 +68763,14 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: -15000
+      priority: 120
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 1118481
-      priority: 1126
+      priority: 1120
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -79163,7 +68794,7 @@ cont {
     }
     area {
       color: 1118481
-      priority: 1127
+      priority: 1121
     }
     path_text {
       primary {
@@ -79171,7 +68802,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16126
+      priority: 16120
     }
   }
   element {
@@ -79179,14 +68810,14 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: -15000
+      priority: 120
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 1118481
-      priority: 1126
+      priority: 1120
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -79210,7 +68841,7 @@ cont {
     }
     area {
       color: 1118481
-      priority: 1127
+      priority: 1121
     }
     path_text {
       primary {
@@ -79218,7 +68849,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16126
+      priority: 16120
     }
   }
 }
@@ -79327,20 +68958,20 @@ cont {
     lines {
       width: 7.0
       color: 2236962
-      priority: -15000
+      priority: 0
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 1118481
-      priority: 1087
+      priority: 1000
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1088
+      priority: 1001
     }
   }
   element {
@@ -79348,20 +68979,20 @@ cont {
     lines {
       width: 10.0
       color: 2236962
-      priority: -15000
+      priority: 88
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 1118481
-      priority: 1090
+      priority: 1088
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1091
+      priority: 1089
     }
   }
   element {
@@ -79369,20 +69000,20 @@ cont {
     lines {
       width: 12.0
       color: 2236962
-      priority: -15000
+      priority: 91
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 10.0
       color: 1118481
-      priority: 1093
+      priority: 1091
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1094
+      priority: 1092
     }
   }
   element {
@@ -79390,20 +69021,20 @@ cont {
     lines {
       width: 16.0
       color: 2236962
-      priority: -15000
+      priority: 94
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 1118481
-      priority: 1096
+      priority: 1094
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1097
+      priority: 1095
     }
   }
   element {
@@ -79411,20 +69042,20 @@ cont {
     lines {
       width: 16.0
       color: 2236962
-      priority: -15000
+      priority: 94
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 1118481
-      priority: 1096
+      priority: 1094
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1097
+      priority: 1095
     }
   }
   element {
@@ -79432,20 +69063,20 @@ cont {
     lines {
       width: 16.0
       color: 2236962
-      priority: -15000
+      priority: 94
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 1118481
-      priority: 1096
+      priority: 1094
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1097
+      priority: 1095
     }
   }
 }
@@ -80466,13 +70097,13 @@ cont {
     lines {
       width: 1.0
       color: 1118481
-      priority: 1105
+      priority: 1100
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1106
+      priority: 1101
     }
   }
   element {
@@ -80480,13 +70111,13 @@ cont {
     lines {
       width: 2.0
       color: 1118481
-      priority: 1111
+      priority: 1105
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1112
+      priority: 1106
     }
   }
   element {
@@ -80494,13 +70125,13 @@ cont {
     lines {
       width: 2.0
       color: 1118481
-      priority: 1114
+      priority: 1000
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1115
+      priority: 1001
     }
     path_text {
       primary {
@@ -80508,7 +70139,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16114
+      priority: 16000
     }
   }
   element {
@@ -80516,13 +70147,13 @@ cont {
     lines {
       width: 2.2
       color: 1118481
-      priority: 1120
+      priority: 1114
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1121
+      priority: 1115
     }
     path_text {
       primary {
@@ -80530,7 +70161,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16120
+      priority: 16114
     }
   }
   element {
@@ -80538,13 +70169,13 @@ cont {
     lines {
       width: 2.2
       color: 1118481
-      priority: 1120
+      priority: 1114
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1121
+      priority: 1115
     }
     path_text {
       primary {
@@ -80552,7 +70183,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16120
+      priority: 16114
     }
   }
   element {
@@ -80560,13 +70191,13 @@ cont {
     lines {
       width: 2.2
       color: 1118481
-      priority: 1120
+      priority: 1114
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1121
+      priority: 1115
     }
     path_text {
       primary {
@@ -80574,7 +70205,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16120
+      priority: 16114
     }
   }
 }
@@ -80697,17 +70328,13 @@ cont {
     lines {
       width: 1.0
       color: 1118481
-      dashdot {
-        dd: 1.6
-        dd: 1.6
-      }
-      priority: 1105
+      priority: 1100
       join: ROUNDJOIN
-      cap: BUTTCAP
+      cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1106
+      priority: 1101
     }
   }
   element {
@@ -80715,17 +70342,13 @@ cont {
     lines {
       width: 2.0
       color: 1118481
-      dashdot {
-        dd: 1.6
-        dd: 1.6
-      }
-      priority: 1111
+      priority: 1105
       join: ROUNDJOIN
-      cap: BUTTCAP
+      cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1112
+      priority: 1106
     }
   }
   element {
@@ -80733,17 +70356,13 @@ cont {
     lines {
       width: 2.0
       color: 1118481
-      dashdot {
-        dd: 1.6
-        dd: 1.6
-      }
-      priority: 1111
+      priority: 1000
       join: ROUNDJOIN
-      cap: BUTTCAP
+      cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1112
+      priority: 1001
     }
     path_text {
       primary {
@@ -80751,7 +70370,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16111
+      priority: 16000
     }
   }
   element {
@@ -80759,17 +70378,13 @@ cont {
     lines {
       width: 2.2
       color: 1118481
-      dashdot {
-        dd: 1.6
-        dd: 1.6
-      }
-      priority: 1120
+      priority: 1114
       join: ROUNDJOIN
-      cap: BUTTCAP
+      cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1121
+      priority: 1115
     }
     path_text {
       primary {
@@ -80777,7 +70392,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16120
+      priority: 16114
     }
   }
   element {
@@ -80785,17 +70400,13 @@ cont {
     lines {
       width: 2.2
       color: 1118481
-      dashdot {
-        dd: 1.6
-        dd: 1.6
-      }
-      priority: 1120
+      priority: 1114
       join: ROUNDJOIN
-      cap: BUTTCAP
+      cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1121
+      priority: 1115
     }
     path_text {
       primary {
@@ -80803,7 +70414,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16120
+      priority: 16114
     }
   }
   element {
@@ -80811,17 +70422,13 @@ cont {
     lines {
       width: 2.2
       color: 1118481
-      dashdot {
-        dd: 1.6
-        dd: 1.6
-      }
-      priority: 1120
+      priority: 1114
       join: ROUNDJOIN
-      cap: BUTTCAP
+      cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1121
+      priority: 1115
     }
     path_text {
       primary {
@@ -80829,7 +70436,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16120
+      priority: 16114
     }
   }
 }
@@ -80952,17 +70559,13 @@ cont {
     lines {
       width: 1.0
       color: 1118481
-      dashdot {
-        dd: 2.4
-        dd: 1.0
-      }
-      priority: 1105
+      priority: 1100
       join: ROUNDJOIN
-      cap: BUTTCAP
+      cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1106
+      priority: 1101
     }
   }
   element {
@@ -80970,17 +70573,13 @@ cont {
     lines {
       width: 2.0
       color: 1118481
-      dashdot {
-        dd: 2.4
-        dd: 1.0
-      }
-      priority: 1111
+      priority: 1105
       join: ROUNDJOIN
-      cap: BUTTCAP
+      cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1112
+      priority: 1106
     }
   }
   element {
@@ -80988,17 +70587,13 @@ cont {
     lines {
       width: 2.0
       color: 1118481
-      dashdot {
-        dd: 2.4
-        dd: 1.0
-      }
-      priority: 1114
+      priority: 1000
       join: ROUNDJOIN
-      cap: BUTTCAP
+      cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1115
+      priority: 1001
     }
     path_text {
       primary {
@@ -81006,7 +70601,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16114
+      priority: 16000
     }
   }
   element {
@@ -81014,17 +70609,13 @@ cont {
     lines {
       width: 2.2
       color: 1118481
-      dashdot {
-        dd: 2.4
-        dd: 1.0
-      }
-      priority: 1120
+      priority: 1114
       join: ROUNDJOIN
-      cap: BUTTCAP
+      cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1121
+      priority: 1115
     }
     path_text {
       primary {
@@ -81032,7 +70623,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16120
+      priority: 16114
     }
   }
   element {
@@ -81040,17 +70631,13 @@ cont {
     lines {
       width: 2.2
       color: 1118481
-      dashdot {
-        dd: 2.4
-        dd: 1.0
-      }
-      priority: 1120
+      priority: 1114
       join: ROUNDJOIN
-      cap: BUTTCAP
+      cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1121
+      priority: 1115
     }
     path_text {
       primary {
@@ -81058,7 +70645,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16120
+      priority: 16114
     }
   }
   element {
@@ -81066,17 +70653,13 @@ cont {
     lines {
       width: 2.2
       color: 1118481
-      dashdot {
-        dd: 2.4
-        dd: 1.0
-      }
-      priority: 1120
+      priority: 1114
       join: ROUNDJOIN
-      cap: BUTTCAP
+      cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1121
+      priority: 1115
     }
     path_text {
       primary {
@@ -81084,7 +70667,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16120
+      priority: 16114
     }
   }
 }
@@ -81207,13 +70790,13 @@ cont {
     lines {
       width: 1.0
       color: 1118481
-      priority: 1105
+      priority: 1100
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1106
+      priority: 1101
     }
   }
   element {
@@ -81221,7 +70804,7 @@ cont {
     lines {
       width: 2.0
       color: 1118481
-      priority: 1111
+      priority: 1105
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -81245,7 +70828,7 @@ cont {
     }
     area {
       color: 1118481
-      priority: 1112
+      priority: 1106
     }
   }
   element {
@@ -81253,7 +70836,7 @@ cont {
     lines {
       width: 2.0
       color: 1118481
-      priority: 1114
+      priority: 1000
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -81277,7 +70860,7 @@ cont {
     }
     area {
       color: 1118481
-      priority: 1115
+      priority: 1001
     }
     path_text {
       primary {
@@ -81285,7 +70868,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16114
+      priority: 16000
     }
   }
   element {
@@ -81293,7 +70876,7 @@ cont {
     lines {
       width: 2.2
       color: 1118481
-      priority: 1120
+      priority: 1114
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -81317,7 +70900,7 @@ cont {
     }
     area {
       color: 1118481
-      priority: 1121
+      priority: 1115
     }
     path_text {
       primary {
@@ -81325,7 +70908,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16120
+      priority: 16114
     }
   }
   element {
@@ -81333,7 +70916,7 @@ cont {
     lines {
       width: 2.2
       color: 1118481
-      priority: 1120
+      priority: 1114
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -81357,7 +70940,7 @@ cont {
     }
     area {
       color: 1118481
-      priority: 1121
+      priority: 1115
     }
     path_text {
       primary {
@@ -81365,7 +70948,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16120
+      priority: 16114
     }
   }
   element {
@@ -81373,7 +70956,7 @@ cont {
     lines {
       width: 2.2
       color: 1118481
-      priority: 1120
+      priority: 1114
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -81397,7 +70980,7 @@ cont {
     }
     area {
       color: 1118481
-      priority: 1121
+      priority: 1115
     }
     path_text {
       primary {
@@ -81405,7 +70988,7 @@ cont {
         color: 16777215
         stroke_color: 1118481
       }
-      priority: 16120
+      priority: 16114
     }
   }
 }
@@ -81514,13 +71097,13 @@ cont {
     lines {
       width: 0.25
       color: 1118481
-      priority: 1140
+      priority: 1135
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1141
+      priority: 1136
     }
   }
   element {
@@ -81528,13 +71111,13 @@ cont {
     lines {
       width: 1.0
       color: 1118481
-      priority: 1146
+      priority: 1141
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1147
+      priority: 1142
     }
   }
   element {
@@ -81542,13 +71125,13 @@ cont {
     lines {
       width: 2.0
       color: 1118481
-      priority: 1152
+      priority: 1147
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1153
+      priority: 1148
     }
   }
   element {
@@ -81556,13 +71139,13 @@ cont {
     lines {
       width: 3.0
       color: 1118481
-      priority: 1158
+      priority: 1152
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1159
+      priority: 1153
     }
   }
   element {
@@ -81570,13 +71153,13 @@ cont {
     lines {
       width: 3.0
       color: 1118481
-      priority: 1158
+      priority: 1152
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1159
+      priority: 1153
     }
   }
   element {
@@ -81584,75 +71167,13 @@ cont {
     lines {
       width: 3.0
       color: 1118481
-      priority: 1158
+      priority: 1152
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 1118481
-      priority: 1159
-    }
-  }
-}
-cont {
-  name: "wood-coniferous"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/park-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/park-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/park-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/park-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "wood-deciduous"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/park2-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/park2-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/park2-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/park2-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:"
-      priority: 16000
+      priority: 1153
     }
   }
 }
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 6d7a9697e8..3210ab2d2c 100644
--- a/data/drules_proto.bin
+++ b/data/drules_proto.bin
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 7383cf04ad..fef2cb3a39 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -5,7 +5,7 @@ cont {
     lines {
       width: 0.8
       color: 2236962
-      priority: 1584
+      priority: 1590
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15,7 +15,7 @@ cont {
     lines {
       width: 1.6
       color: 2236962
-      priority: 1762
+      priority: 1766
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25,7 +25,7 @@ cont {
     lines {
       width: 3.2
       color: 2236962
-      priority: 1836
+      priority: 1838
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -35,7 +35,7 @@ cont {
     lines {
       width: 3.2
       color: 2236962
-      priority: 1836
+      priority: 1838
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -45,7 +45,7 @@ cont {
     lines {
       width: 3.2
       color: 2236962
-      priority: 1836
+      priority: 1838
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -58,7 +58,7 @@ cont {
     lines {
       width: 0.8
       color: 2236962
-      priority: 1590
+      priority: 1596
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68,7 +68,7 @@ cont {
     lines {
       width: 1.6
       color: 2236962
-      priority: 1768
+      priority: 1771
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -111,7 +111,7 @@ cont {
     lines {
       width: 0.8
       color: 2236962
-      priority: 1587
+      priority: 1593
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -121,7 +121,7 @@ cont {
     lines {
       width: 1.6
       color: 2236962
-      priority: 1765
+      priority: 1768
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -131,7 +131,7 @@ cont {
     lines {
       width: 3.2
       color: 2236962
-      priority: 1838
+      priority: 1841
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -141,7 +141,7 @@ cont {
     lines {
       width: 3.2
       color: 2236962
-      priority: 1838
+      priority: 1841
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -151,7 +151,7 @@ cont {
     lines {
       width: 3.2
       color: 2236962
-      priority: 1838
+      priority: 1841
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -164,7 +164,7 @@ cont {
     lines {
       width: 0.8
       color: 2236962
-      priority: 1593
+      priority: 1598
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -174,7 +174,7 @@ cont {
     lines {
       width: 1.6
       color: 2236962
-      priority: 1771
+      priority: 1774
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -184,7 +184,7 @@ cont {
     lines {
       width: 3.2
       color: 2236962
-      priority: 1841
+      priority: 1844
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -194,7 +194,7 @@ cont {
     lines {
       width: 3.2
       color: 2236962
-      priority: 1841
+      priority: 1844
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -204,7 +204,7 @@ cont {
     lines {
       width: 3.2
       color: 2236962
-      priority: 1841
+      priority: 1844
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -317,7 +317,7 @@ cont {
       priority: -16002
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -343,7 +343,7 @@ cont {
       priority: -16003
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -369,7 +369,7 @@ cont {
       priority: -16004
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -395,7 +395,7 @@ cont {
       priority: -16005
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -421,7 +421,7 @@ cont {
       priority: -16006
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -447,7 +447,7 @@ cont {
       priority: -16007
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -473,7 +473,7 @@ cont {
       priority: -16008
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -499,7 +499,7 @@ cont {
       priority: -16009
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -524,7 +524,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/airport-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -546,7 +546,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/airport-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -568,7 +568,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/airport-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -590,7 +590,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/airport-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -612,7 +612,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/airport-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -634,7 +634,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/airport-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -656,7 +656,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/airport-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -678,7 +678,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/airport-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "airport"
       priority: 16000
     }
     caption {
@@ -802,35 +802,35 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/heliport-18.svg:#444444::::"
+      name: "helipad"
       priority: 16000
     }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/heliport-18.svg:#444444::::"
+      name: "helipad"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/heliport-18.svg:#444444::::"
+      name: "helipad"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/heliport-18.svg:#444444::::"
+      name: "helipad"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/heliport-18.svg:#444444::::"
+      name: "helipad"
       priority: 16000
     }
   }
@@ -842,14 +842,14 @@ cont {
     lines {
       width: 3.0
       color: 2236962
-      priority: 242
+      priority: 250
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14540219
-      priority: 1242
+      priority: 1250
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -859,14 +859,14 @@ cont {
     lines {
       width: 3.5
       color: 2236962
-      priority: 257
+      priority: 264
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.5
       color: 14540219
-      priority: 1257
+      priority: 1264
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -876,14 +876,14 @@ cont {
     lines {
       width: 14.0
       color: 2236962
-      priority: 338
+      priority: 345
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 10.0
       color: 14540219
-      priority: 1338
+      priority: 1345
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -981,14 +981,14 @@ cont {
     lines {
       width: 0.74
       color: 2236962
-      priority: 245
+      priority: 253
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 0.5
       color: 14540219
-      priority: 1245
+      priority: 1253
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -998,14 +998,14 @@ cont {
     lines {
       width: 1.5
       color: 2236962
-      priority: 259
+      priority: 267
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 14540219
-      priority: 1259
+      priority: 1267
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -1015,14 +1015,14 @@ cont {
     lines {
       width: 6.0
       color: 2236962
-      priority: 341
+      priority: 348
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 14540219
-      priority: 1341
+      priority: 1348
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -1032,14 +1032,14 @@ cont {
     lines {
       width: 12.0
       color: 2236962
-      priority: 412
+      priority: 417
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 14540219
-      priority: 1412
+      priority: 1417
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -1049,14 +1049,14 @@ cont {
     lines {
       width: 12.0
       color: 2236962
-      priority: 412
+      priority: 417
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 14540219
-      priority: 1412
+      priority: 1417
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -1066,14 +1066,14 @@ cont {
     lines {
       width: 12.0
       color: 2236962
-      priority: 412
+      priority: 417
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 14540219
-      priority: 1412
+      priority: 1417
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -1083,14 +1083,14 @@ cont {
     lines {
       width: 12.0
       color: 2236962
-      priority: 412
+      priority: 417
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 14540219
-      priority: 1412
+      priority: 1417
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -1100,14 +1100,14 @@ cont {
     lines {
       width: 12.0
       color: 2236962
-      priority: 412
+      priority: 417
       join: BEVELJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 14540219
-      priority: 1412
+      priority: 1417
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -1214,16 +1214,9 @@ cont {
 cont {
   name: "amenity-atm"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/atm-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/nori/atm-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"
+      name: "atm"
       priority: 16008
     }
     caption {
@@ -1239,7 +1232,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/atm-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"
+      name: "atm"
       priority: 16008
     }
     caption {
@@ -1255,7 +1248,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/atm-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"
+      name: "atm"
       priority: 16008
     }
     caption {
@@ -1274,15 +1267,15 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bank-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"
-      priority: 16000
+      name: "bank"
+      priority: 16016
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bank-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"
-      priority: 16008
+      name: "bank"
+      priority: 16016
     }
     caption {
       primary {
@@ -1291,14 +1284,14 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15008
+      priority: 15016
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bank-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"
-      priority: 16008
+      name: "bank"
+      priority: 16016
     }
     caption {
       primary {
@@ -1307,14 +1300,14 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15008
+      priority: 15016
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bank-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"
-      priority: 16008
+      name: "bank"
+      priority: 16016
     }
     caption {
       primary {
@@ -1323,7 +1316,7 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15008
+      priority: 15016
     }
   }
 }
@@ -1332,14 +1325,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bar-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "bar"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bar-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "bar"
       priority: 16008
     }
     caption {
@@ -1355,7 +1348,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bar-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "bar"
       priority: 16008
     }
     caption {
@@ -1371,7 +1364,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bar-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "bar"
       priority: 16008
     }
     caption {
@@ -1388,67 +1381,16 @@ cont {
 cont {
   name: "amenity-bench"
   element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/bench-18.svg:#444444::::"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/bench-18.svg:#444444::::"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/bench-18.svg:#444444::::"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "amenity-bicycle_parking"
-  element {
     scale: 16
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "bench"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "bench"
       priority: 16008
     }
     caption {
@@ -1464,7 +1406,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "bench"
       priority: 16008
     }
     caption {
@@ -1480,7 +1422,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "bench"
       priority: 16008
     }
     caption {
@@ -1499,14 +1441,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
+      name: "bicycle_rental"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
+      name: "bicycle_rental"
       priority: 16008
     }
     caption {
@@ -1522,7 +1464,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
+      name: "bicycle_rental"
       priority: 16008
     }
     caption {
@@ -1538,7 +1480,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
+      name: "bicycle_rental"
       priority: 16008
     }
     caption {
@@ -1553,57 +1495,18 @@ cont {
   }
 }
 cont {
-  name: "amenity-brothel"
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
   name: "amenity-bureau_de_change"
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/bureau_de_change-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"
+      name: "bureau_de_change"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/bureau_de_change-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"
+      name: "bureau_de_change"
       priority: 16008
     }
     caption {
@@ -1619,7 +1522,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/bureau_de_change-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"
+      name: "bureau_de_change"
       priority: 16008
     }
     caption {
@@ -1635,7 +1538,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/bureau_de_change-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"
+      name: "bureau_de_change"
       priority: 16008
     }
     caption {
@@ -1654,15 +1557,15 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bus-18.svg:#FFFFFF:#000080:symbols/neta/square-24.svg:#0044DD:"
-      priority: 16025
+      name: "bus"
+      priority: 16033
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bus-18.svg:#FFFFFF:#000080:symbols/neta/square-24.svg:#0044DD:"
-      priority: 16025
+      name: "bus"
+      priority: 16033
     }
     caption {
       primary {
@@ -1677,14 +1580,14 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15025
+      priority: 15033
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bus-18.svg:#FFFFFF:#000080:symbols/neta/square-24.svg:#0044DD:"
-      priority: 16025
+      name: "bus"
+      priority: 16033
     }
     caption {
       primary {
@@ -1699,14 +1602,14 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15025
+      priority: 15033
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bus-18.svg:#FFFFFF:#000080:symbols/neta/square-24.svg:#0044DD:"
-      priority: 16025
+      name: "bus"
+      priority: 16033
     }
     caption {
       primary {
@@ -1721,7 +1624,7 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15025
+      priority: 15033
     }
   }
 }
@@ -1730,14 +1633,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/cafe-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "cafe"
       priority: 16008
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/cafe-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "cafe"
       priority: 16008
     }
     caption {
@@ -1753,7 +1656,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/cafe-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "cafe"
       priority: 16008
     }
     caption {
@@ -1769,7 +1672,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/cafe-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "cafe"
       priority: 16008
     }
     caption {
@@ -1788,14 +1691,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/car_rental-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "car_rental"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/car_rental-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "car_rental"
       priority: 16008
     }
     caption {
@@ -1811,7 +1714,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/car_rental-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "car_rental"
       priority: 16008
     }
     caption {
@@ -1827,7 +1730,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/car_rental-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "car_rental"
       priority: 16008
     }
     caption {
@@ -1844,55 +1747,16 @@ cont {
 cont {
   name: "amenity-car_sharing"
   element {
-    scale: 17
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "amenity-casino"
-  element {
     scale: 16
     symbol {
-      name: "symbols/nori/gambling-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "car_sharing"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/gambling-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "car_sharing"
       priority: 16008
     }
     caption {
@@ -1908,7 +1772,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/gambling-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "car_sharing"
       priority: 16008
     }
     caption {
@@ -1924,7 +1788,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/gambling-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "car_sharing"
       priority: 16008
     }
     caption {
@@ -1943,14 +1807,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/cinema-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "cinema"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/cinema-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "cinema"
       priority: 16008
     }
     caption {
@@ -1966,7 +1830,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/cinema-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "cinema"
       priority: 16008
     }
     caption {
@@ -1982,7 +1846,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/cinema-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "cinema"
       priority: 16008
     }
     caption {
@@ -2025,10 +1889,6 @@ cont {
       color: 16772829
       priority: -16030
     }
-    symbol {
-      name: "symbols/maki/college-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
-      priority: 16000
-    }
   }
   element {
     scale: 17
@@ -2037,7 +1897,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/college-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
+      name: "university"
       priority: 16008
     }
     caption {
@@ -2057,7 +1917,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/college-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
+      name: "university"
       priority: 16008
     }
     caption {
@@ -2077,181 +1937,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/college-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "amenity-community_centre"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/community_centre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/community_centre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/community_centre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/community_centre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "amenity-courthouse"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/courthouse-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/courthouse-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/courthouse-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/courthouse-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "amenity-dentist"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/dentist-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/dentist-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/dentist-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/dentist-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
+      name: "university"
       priority: 16008
     }
     caption {
@@ -2270,14 +1956,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
+      name: "pharmacy"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
+      name: "pharmacy"
       priority: 16008
     }
     caption {
@@ -2293,7 +1979,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
+      name: "pharmacy"
       priority: 16008
     }
     caption {
@@ -2309,7 +1995,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
+      name: "pharmacy"
       priority: 16008
     }
     caption {
@@ -2326,16 +2012,9 @@ cont {
 cont {
   name: "amenity-drinking_water"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/drinking_water-18.svg:#0000FF::::"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/nori/drinking_water-18.svg:#0000FF::::"
+      name: "drinking_water"
       priority: 16008
     }
     caption {
@@ -2351,7 +2030,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/drinking_water-18.svg:#0000FF::::"
+      name: "drinking_water"
       priority: 16008
     }
     caption {
@@ -2367,7 +2046,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/drinking_water-18.svg:#0000FF::::"
+      name: "drinking_water"
       priority: 16008
     }
     caption {
@@ -2386,72 +2065,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/embassy-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/embassy-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/embassy-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/embassy-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "amenity-emergency_phone"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#444444::::"
+      name: "embassy"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#444444::::"
+      name: "embassy"
       priority: 16008
     }
     caption {
@@ -2467,7 +2088,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#444444::::"
+      name: "embassy"
       priority: 16008
     }
     caption {
@@ -2483,7 +2104,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#444444::::"
+      name: "embassy"
       priority: 16008
     }
     caption {
@@ -2502,14 +2123,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/fast-food-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "fastfood"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/fast-food-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "fastfood"
       priority: 16008
     }
     caption {
@@ -2525,7 +2146,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/fast-food-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "fastfood"
       priority: 16008
     }
     caption {
@@ -2541,7 +2162,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/fast-food-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "fastfood"
       priority: 16008
     }
     caption {
@@ -2560,72 +2181,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/ferry-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/ferry-18.svg:#444444::::"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/ferry-18.svg:#444444::::"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/ferry-18.svg:#444444::::"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "amenity-fire_hydrant"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/fire_hydrant-18.svg:#444444::::"
+      name: "slipway"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/fire_hydrant-18.svg:#444444::::"
+      name: "slipway"
       priority: 16008
     }
     caption {
@@ -2641,7 +2204,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/fire_hydrant-18.svg:#444444::::"
+      name: "slipway"
       priority: 16008
     }
     caption {
@@ -2657,7 +2220,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/fire_hydrant-18.svg:#444444::::"
+      name: "slipway"
       priority: 16008
     }
     caption {
@@ -2676,14 +2239,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/fire-station-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"
+      name: "firebrigade"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/fire-station-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"
+      name: "firebrigade"
       priority: 16008
     }
     caption {
@@ -2699,7 +2262,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/fire-station-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"
+      name: "firebrigade"
       priority: 16008
     }
     caption {
@@ -2715,7 +2278,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/fire-station-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"
+      name: "firebrigade"
       priority: 16008
     }
     caption {
@@ -2735,7 +2298,11 @@ cont {
     scale: 16
     area {
       color: 12312029
-      priority: 1094
+      priority: 1101
+    }
+    symbol {
+      name: "fountain"
+      priority: 16100
     }
   }
   element {
@@ -2744,6 +2311,10 @@ cont {
       color: 12312029
       priority: 1009
     }
+    symbol {
+      name: "fountain"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -2760,6 +2331,10 @@ cont {
       color: 12312029
       priority: 1009
     }
+    symbol {
+      name: "fountain"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -2776,6 +2351,10 @@ cont {
       color: 12312029
       priority: 1009
     }
+    symbol {
+      name: "fountain"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -2792,79 +2371,21 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/fuel-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/fuel-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "petrolstation"
       priority: 16000
     }
   }
   element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/fuel-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/fuel-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/fuel-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "amenity-gambling"
-  element {
     scale: 16
     symbol {
-      name: "symbols/nori/gambling-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "petrolstation"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/gambling-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "petrolstation"
       priority: 16008
     }
     caption {
@@ -2880,7 +2401,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/gambling-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "petrolstation"
       priority: 16008
     }
     caption {
@@ -2896,7 +2417,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/gambling-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "petrolstation"
       priority: 16008
     }
     caption {
@@ -2939,10 +2460,6 @@ cont {
       color: 14544588
       priority: 1001
     }
-    symbol {
-      name: "symbols/nori/grave_yard-18.svg:#444444::::"
-      priority: 16000
-    }
   }
   element {
     scale: 17
@@ -2950,10 +2467,6 @@ cont {
       color: 14544588
       priority: 1009
     }
-    symbol {
-      name: "symbols/nori/grave_yard-18.svg:#444444::::"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -2970,10 +2483,6 @@ cont {
       color: 14544588
       priority: 1009
     }
-    symbol {
-      name: "symbols/nori/grave_yard-18.svg:#444444::::"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -2990,10 +2499,6 @@ cont {
       color: 14544588
       priority: 1009
     }
-    symbol {
-      name: "symbols/nori/grave_yard-18.svg:#444444::::"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3034,10 +2539,6 @@ cont {
       color: 14544588
       priority: 1001
     }
-    symbol {
-      name: "symbols/nori/grave_yard-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
   }
   element {
     scale: 17
@@ -3045,10 +2546,6 @@ cont {
       color: 14544588
       priority: 1009
     }
-    symbol {
-      name: "symbols/nori/grave_yard-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3065,10 +2562,6 @@ cont {
       color: 14544588
       priority: 1009
     }
-    symbol {
-      name: "symbols/nori/grave_yard-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3085,10 +2578,6 @@ cont {
       color: 14544588
       priority: 1009
     }
-    symbol {
-      name: "symbols/nori/grave_yard-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -3103,16 +2592,9 @@ cont {
 cont {
   name: "amenity-hospital"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/maki/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
+      name: "hospital"
       priority: 16008
     }
     caption {
@@ -3128,7 +2610,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
+      name: "hospital"
       priority: 16008
     }
     caption {
@@ -3144,7 +2626,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
+      name: "hospital"
       priority: 16008
     }
     caption {
@@ -3161,7 +2643,18 @@ cont {
 cont {
   name: "amenity-hunting_stand"
   element {
+    scale: 16
+    symbol {
+      name: "hunting_closed_high"
+      priority: 16000
+    }
+  }
+  element {
     scale: 17
+    symbol {
+      name: "hunting_closed_high"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -3174,6 +2667,10 @@ cont {
   }
   element {
     scale: 18
+    symbol {
+      name: "hunting_closed_high"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -3186,6 +2683,10 @@ cont {
   }
   element {
     scale: 19
+    symbol {
+      name: "hunting_closed_high"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -3226,10 +2727,6 @@ cont {
       color: 16772829
       priority: -16034
     }
-    symbol {
-      name: "symbols/nori/kindergarten-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
-      priority: 16000
-    }
   }
   element {
     scale: 17
@@ -3238,7 +2735,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/nori/kindergarten-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
+      name: "kindergarten2"
       priority: 16008
     }
     caption {
@@ -3258,7 +2755,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/nori/kindergarten-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
+      name: "kindergarten2"
       priority: 16008
     }
     caption {
@@ -3278,65 +2775,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/nori/kindergarten-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "amenity-laundry"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/dry_cleaning-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/dry_cleaning-18.svg:#444444::::"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/dry_cleaning-18.svg:#444444::::"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/dry_cleaning-18.svg:#444444::::"
+      name: "kindergarten2"
       priority: 16008
     }
     caption {
@@ -3355,14 +2794,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/library-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
+      name: "library"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/library-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
+      name: "library"
       priority: 16008
     }
     caption {
@@ -3378,7 +2817,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/library-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
+      name: "library"
       priority: 16008
     }
     caption {
@@ -3394,7 +2833,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/library-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
+      name: "library"
       priority: 16008
     }
     caption {
@@ -3413,72 +2852,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "amenity-money_transfer"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/money_transfer-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"
+      name: "supermarket"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/money_transfer-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -3494,7 +2875,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/money_transfer-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -3510,7 +2891,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/money_transfer-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -3529,14 +2910,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bar-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "bar"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bar-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "bar"
       priority: 16008
     }
     caption {
@@ -3552,7 +2933,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bar-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "bar"
       priority: 16008
     }
     caption {
@@ -3568,7 +2949,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bar-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "bar"
       priority: 16008
     }
     caption {
@@ -3588,17 +2969,17 @@ cont {
     scale: 15
     area {
       color: 16777181
-      priority: -16035
+      priority: 1001
     }
   }
   element {
     scale: 16
     area {
       color: 16777181
-      priority: -16036
+      priority: 1001
     }
     symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking-mini"
       priority: 16000
     }
   }
@@ -3606,10 +2987,10 @@ cont {
     scale: 17
     area {
       color: 16777181
-      priority: -15992
+      priority: 1009
     }
     symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking"
       priority: 16008
     }
     caption {
@@ -3626,10 +3007,10 @@ cont {
     scale: 18
     area {
       color: 16777181
-      priority: -15992
+      priority: 1009
     }
     symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking"
       priority: 16008
     }
     caption {
@@ -3646,10 +3027,10 @@ cont {
     scale: 19
     area {
       color: 16777181
-      priority: -15992
+      priority: 1009
     }
     symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking"
       priority: 16008
     }
     caption {
@@ -3669,17 +3050,17 @@ cont {
     scale: 15
     area {
       color: 16777181
-      priority: -16037
+      priority: 1001
     }
   }
   element {
     scale: 16
     area {
       color: 16777181
-      priority: -16038
+      priority: 1001
     }
     symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking_fee"
       priority: 16000
     }
   }
@@ -3687,10 +3068,10 @@ cont {
     scale: 17
     area {
       color: 16777181
-      priority: -15992
+      priority: 1009
     }
     symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking_fee"
       priority: 16008
     }
     caption {
@@ -3707,10 +3088,10 @@ cont {
     scale: 18
     area {
       color: 16777181
-      priority: -15992
+      priority: 1009
     }
     symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking_fee"
       priority: 16008
     }
     caption {
@@ -3727,10 +3108,10 @@ cont {
     scale: 19
     area {
       color: 16777181
-      priority: -15992
+      priority: 1009
     }
     symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking_fee"
       priority: 16008
     }
     caption {
@@ -3750,17 +3131,17 @@ cont {
     scale: 15
     area {
       color: 16777181
-      priority: -16039
+      priority: 1001
     }
   }
   element {
     scale: 16
     area {
       color: 16777181
-      priority: -16040
+      priority: 1001
     }
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking-mini"
       priority: 16000
     }
   }
@@ -3768,10 +3149,10 @@ cont {
     scale: 17
     area {
       color: 16777181
-      priority: -15992
+      priority: 1009
     }
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking"
       priority: 16008
     }
     caption {
@@ -3788,10 +3169,10 @@ cont {
     scale: 18
     area {
       color: 16777181
-      priority: -15992
+      priority: 1009
     }
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking"
       priority: 16008
     }
     caption {
@@ -3808,10 +3189,10 @@ cont {
     scale: 19
     area {
       color: 16777181
-      priority: -15992
+      priority: 1009
     }
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking"
       priority: 16008
     }
     caption {
@@ -3831,17 +3212,17 @@ cont {
     scale: 15
     area {
       color: 16777181
-      priority: -16041
+      priority: 1001
     }
   }
   element {
     scale: 16
     area {
       color: 16777181
-      priority: -16042
+      priority: 1001
     }
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking_fee"
       priority: 16000
     }
   }
@@ -3849,10 +3230,10 @@ cont {
     scale: 17
     area {
       color: 16777181
-      priority: -15992
+      priority: 1009
     }
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking_fee"
       priority: 16008
     }
     caption {
@@ -3869,10 +3250,10 @@ cont {
     scale: 18
     area {
       color: 16777181
-      priority: -15992
+      priority: 1009
     }
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking_fee"
       priority: 16008
     }
     caption {
@@ -3889,10 +3270,10 @@ cont {
     scale: 19
     area {
       color: 16777181
-      priority: -15992
+      priority: 1009
     }
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking_fee"
       priority: 16008
     }
     caption {
@@ -3951,17 +3332,17 @@ cont {
     scale: 15
     area {
       color: 16777181
-      priority: -16043
+      priority: 1001
     }
   }
   element {
     scale: 16
     area {
       color: 16777181
-      priority: -16044
+      priority: 1001
     }
     symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "park_and_ride-permissive"
       priority: 16000
     }
   }
@@ -3969,10 +3350,10 @@ cont {
     scale: 17
     area {
       color: 16777181
-      priority: -15992
+      priority: 1009
     }
     symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "park_and_ride-permissive"
       priority: 16008
     }
     caption {
@@ -3989,10 +3370,10 @@ cont {
     scale: 18
     area {
       color: 16777181
-      priority: -15992
+      priority: 1009
     }
     symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "park_and_ride-permissive"
       priority: 16008
     }
     caption {
@@ -4009,10 +3390,10 @@ cont {
     scale: 19
     area {
       color: 16777181
-      priority: -15992
+      priority: 1009
     }
     symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "park_and_ride-permissive"
       priority: 16008
     }
     caption {
@@ -4031,14 +3412,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking-permissive"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking-permissive"
       priority: 16008
     }
     caption {
@@ -4054,7 +3435,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking-permissive"
       priority: 16008
     }
     caption {
@@ -4070,7 +3451,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking-permissive"
       priority: 16008
     }
     caption {
@@ -4089,14 +3470,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking_fee"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking_fee"
       priority: 16008
     }
     caption {
@@ -4112,7 +3493,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking_fee"
       priority: 16008
     }
     caption {
@@ -4128,7 +3509,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking_fee"
       priority: 16008
     }
     caption {
@@ -4145,18 +3526,7 @@ cont {
 cont {
   name: "amenity-parking-private"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
-    symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -4169,10 +3539,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -4185,10 +3551,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -4206,17 +3568,17 @@ cont {
     scale: 15
     area {
       color: 16777181
-      priority: -16045
+      priority: 1001
     }
   }
   element {
     scale: 16
     area {
       color: 16777181
-      priority: -16046
+      priority: 1001
     }
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking-mini"
       priority: 16000
     }
   }
@@ -4224,10 +3586,10 @@ cont {
     scale: 17
     area {
       color: 16777181
-      priority: -15992
+      priority: 1009
     }
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking"
       priority: 16008
     }
     caption {
@@ -4244,10 +3606,10 @@ cont {
     scale: 18
     area {
       color: 16777181
-      priority: -15992
+      priority: 1009
     }
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking"
       priority: 16008
     }
     caption {
@@ -4264,10 +3626,10 @@ cont {
     scale: 19
     area {
       color: 16777181
-      priority: -15992
+      priority: 1009
     }
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking"
       priority: 16008
     }
     caption {
@@ -4287,17 +3649,17 @@ cont {
     scale: 15
     area {
       color: 16777181
-      priority: -16047
+      priority: 1001
     }
   }
   element {
     scale: 16
     area {
       color: 16777181
-      priority: -16048
+      priority: 1001
     }
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking_fee"
       priority: 16000
     }
   }
@@ -4305,10 +3667,10 @@ cont {
     scale: 17
     area {
       color: 16777181
-      priority: -15992
+      priority: 1009
     }
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking_fee"
       priority: 16008
     }
     caption {
@@ -4325,10 +3687,10 @@ cont {
     scale: 18
     area {
       color: 16777181
-      priority: -15992
+      priority: 1009
     }
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking_fee"
       priority: 16008
     }
     caption {
@@ -4345,10 +3707,10 @@ cont {
     scale: 19
     area {
       color: 16777181
-      priority: -15992
+      priority: 1009
     }
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:"
+      name: "parking_fee"
       priority: 16008
     }
     caption {
@@ -4367,14 +3729,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/pharmacy-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
+      name: "pharmacy"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/pharmacy-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
+      name: "pharmacy"
       priority: 16008
     }
     caption {
@@ -4390,7 +3752,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/pharmacy-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
+      name: "pharmacy"
       priority: 16008
     }
     caption {
@@ -4406,7 +3768,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/pharmacy-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
+      name: "pharmacy"
       priority: 16008
     }
     caption {
@@ -4425,14 +3787,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/place-of-worship-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "religion"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/place-of-worship-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "religion"
       priority: 16008
     }
     caption {
@@ -4448,7 +3810,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/place-of-worship-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "religion"
       priority: 16008
     }
     caption {
@@ -4464,7 +3826,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/place-of-worship-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "religion"
       priority: 16008
     }
     caption {
@@ -4481,16 +3843,9 @@ cont {
 cont {
   name: "amenity-police"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/police-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/maki/police-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "police"
       priority: 16008
     }
     caption {
@@ -4506,7 +3861,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/police-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "police"
       priority: 16008
     }
     caption {
@@ -4522,7 +3877,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/police-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "police"
       priority: 16008
     }
     caption {
@@ -4539,16 +3894,9 @@ cont {
 cont {
   name: "amenity-post_box"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/post-12.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/maki/post-12.svg:#444444::::"
+      name: "postbox"
       priority: 16008
     }
     caption {
@@ -4564,7 +3912,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/post-12.svg:#444444::::"
+      name: "postbox"
       priority: 16008
     }
     caption {
@@ -4580,7 +3928,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/post-12.svg:#444444::::"
+      name: "postbox"
       priority: 16008
     }
     caption {
@@ -4599,72 +3947,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/post-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/post-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/post-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/post-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "amenity-prison"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/prison-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
+      name: "postoffice"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/prison-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
+      name: "postoffice"
       priority: 16008
     }
     caption {
@@ -4680,7 +3970,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/prison-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
+      name: "postoffice"
       priority: 16008
     }
     caption {
@@ -4696,7 +3986,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/prison-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
+      name: "postoffice"
       priority: 16008
     }
     caption {
@@ -4715,14 +4005,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/pub-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "pub"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/pub-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "pub"
       priority: 16008
     }
     caption {
@@ -4738,7 +4028,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/pub-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "pub"
       priority: 16008
     }
     caption {
@@ -4754,7 +4044,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/pub-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "pub"
       priority: 16008
     }
     caption {
@@ -4771,16 +4061,10 @@ cont {
 cont {
   name: "amenity-recycling"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/recycling-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/nori/recycling-18.svg:#444444::::"
+      name: "recycling"
+      apply_for_type: 1
       priority: 16008
     }
     caption {
@@ -4796,7 +4080,8 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/recycling-18.svg:#444444::::"
+      name: "recycling"
+      apply_for_type: 1
       priority: 16008
     }
     caption {
@@ -4812,7 +4097,8 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/recycling-18.svg:#444444::::"
+      name: "recycling"
+      apply_for_type: 1
       priority: 16008
     }
     caption {
@@ -4831,14 +4117,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "restaurant"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "restaurant"
       priority: 16008
     }
     caption {
@@ -4854,7 +4140,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "restaurant"
       priority: 16008
     }
     caption {
@@ -4870,7 +4156,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "restaurant"
       priority: 16008
     }
     caption {
@@ -4889,14 +4175,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "hotel_and_restaurant"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "hotel_and_restaurant"
       priority: 16008
     }
     caption {
@@ -4912,7 +4198,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "hotel_and_restaurant"
       priority: 16008
     }
     caption {
@@ -4928,7 +4214,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "hotel_and_restaurant"
       priority: 16008
     }
     caption {
@@ -4947,14 +4233,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "restaurant"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "restaurant"
       priority: 16008
     }
     caption {
@@ -4970,7 +4256,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "restaurant"
       priority: 16008
     }
     caption {
@@ -4986,7 +4272,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "restaurant"
       priority: 16008
     }
     caption {
@@ -5005,14 +4291,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "restaurant"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "restaurant"
       priority: 16008
     }
     caption {
@@ -5028,7 +4314,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "restaurant"
       priority: 16008
     }
     caption {
@@ -5044,7 +4330,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:"
+      name: "restaurant"
       priority: 16008
     }
     caption {
@@ -5064,32 +4350,28 @@ cont {
     scale: 13
     area {
       color: 16772829
-      priority: -16049
+      priority: -16035
     }
   }
   element {
     scale: 14
     area {
       color: 16772829
-      priority: -16050
+      priority: -16036
     }
   }
   element {
     scale: 15
     area {
       color: 16772829
-      priority: -16051
+      priority: -16037
     }
   }
   element {
     scale: 16
     area {
       color: 16772829
-      priority: -16052
-    }
-    symbol {
-      name: "symbols/maki/school-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
-      priority: 16000
+      priority: -16038
     }
   }
   element {
@@ -5099,7 +4381,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/school-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
+      name: "school"
       priority: 16008
     }
     caption {
@@ -5119,7 +4401,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/school-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
+      name: "school"
       priority: 16008
     }
     caption {
@@ -5139,7 +4421,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/school-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
+      name: "school"
       priority: 16008
     }
     caption {
@@ -5156,55 +4438,30 @@ cont {
 cont {
   name: "amenity-shelter"
   element {
-    scale: 17
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    scale: 14
+    symbol {
+      name: "shelter"
+      priority: 16000
     }
   }
   element {
-    scale: 19
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    scale: 15
+    symbol {
+      name: "shelter"
+      priority: 16000
     }
   }
-}
-cont {
-  name: "amenity-shower"
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/shower-18.svg:#444444::::"
+      name: "shelter"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/shower-18.svg:#444444::::"
+      name: "shelter"
       priority: 16008
     }
     caption {
@@ -5220,7 +4477,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/shower-18.svg:#444444::::"
+      name: "shelter"
       priority: 16008
     }
     caption {
@@ -5236,7 +4493,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/shower-18.svg:#444444::::"
+      name: "shelter"
       priority: 16008
     }
     caption {
@@ -5251,18 +4508,18 @@ cont {
   }
 }
 cont {
-  name: "amenity-social_facility"
+  name: "amenity-speed_trap"
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/social_facility-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "speed_trap"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/social_facility-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "speed_trap"
       priority: 16008
     }
     caption {
@@ -5278,7 +4535,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/social_facility-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "speed_trap"
       priority: 16008
     }
     caption {
@@ -5294,7 +4551,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/social_facility-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "speed_trap"
       priority: 16008
     }
     caption {
@@ -5309,57 +4566,18 @@ cont {
   }
 }
 cont {
-  name: "amenity-speed_trap"
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
   name: "amenity-taxi"
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/taxi-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "taxi"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/taxi-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "taxi"
       priority: 16008
     }
     caption {
@@ -5375,7 +4593,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/taxi-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "taxi"
       priority: 16008
     }
     caption {
@@ -5391,7 +4609,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/taxi-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "taxi"
       priority: 16008
     }
     caption {
@@ -5410,14 +4628,16 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/telephone-18.svg:#444444::::"
+      name: "telephone"
+      apply_for_type: 1
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/telephone-18.svg:#444444::::"
+      name: "telephone"
+      apply_for_type: 1
       priority: 16008
     }
     caption {
@@ -5433,7 +4653,8 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/telephone-18.svg:#444444::::"
+      name: "telephone"
+      apply_for_type: 1
       priority: 16008
     }
     caption {
@@ -5449,7 +4670,8 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/telephone-18.svg:#444444::::"
+      name: "telephone"
+      apply_for_type: 1
       priority: 16008
     }
     caption {
@@ -5468,14 +4690,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/theatre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "theatre"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/theatre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "theatre"
       priority: 16008
     }
     caption {
@@ -5491,7 +4713,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/theatre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "theatre"
       priority: 16008
     }
     caption {
@@ -5507,7 +4729,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/theatre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "theatre"
       priority: 16008
     }
     caption {
@@ -5524,16 +4746,9 @@ cont {
 cont {
   name: "amenity-toilets"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/toilets-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/maki/toilets-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "toilets"
       priority: 16008
     }
     caption {
@@ -5549,7 +4764,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/toilets-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "toilets"
       priority: 16008
     }
     caption {
@@ -5565,7 +4780,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/toilets-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "toilets"
       priority: 16008
     }
     caption {
@@ -5635,32 +4850,28 @@ cont {
     scale: 13
     area {
       color: 16772829
-      priority: -16053
+      priority: -16039
     }
   }
   element {
     scale: 14
     area {
       color: 16772829
-      priority: -16054
+      priority: -16040
     }
   }
   element {
     scale: 15
     area {
       color: 16772829
-      priority: -16055
+      priority: -16041
     }
   }
   element {
     scale: 16
     area {
       color: 16772829
-      priority: -16056
-    }
-    symbol {
-      name: "symbols/maki/college-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
-      priority: 16000
+      priority: -16042
     }
   }
   element {
@@ -5670,7 +4881,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/college-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
+      name: "university"
       priority: 16008
     }
     caption {
@@ -5690,7 +4901,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/college-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
+      name: "university"
       priority: 16008
     }
     caption {
@@ -5710,65 +4921,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/college-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "amenity-waste_basket"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/waste_basket-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/waste_basket-18.svg:#444444::::"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/waste_basket-18.svg:#444444::::"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/waste_basket-18.svg:#444444::::"
+      name: "university"
       priority: 16008
     }
     caption {
@@ -5788,35 +4941,35 @@ cont {
     scale: 15
     area {
       color: 14535867
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 16
     area {
       color: 14535867
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 17
     area {
       color: 14535867
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 18
     area {
       color: 14535867
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 19
     area {
       color: 14535867
-      priority: 1382
+      priority: 1388
     }
   }
 }
@@ -5826,35 +4979,35 @@ cont {
     scale: 15
     area {
       color: 7829367
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 16
     area {
       color: 7829367
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 17
     area {
       color: 7829367
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 18
     area {
       color: 7829367
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 19
     area {
       color: 7829367
-      priority: 1382
+      priority: 1388
     }
   }
 }
@@ -5864,35 +5017,35 @@ cont {
     scale: 15
     area {
       color: 16746496
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 16
     area {
       color: 16746496
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 17
     area {
       color: 16746496
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 18
     area {
       color: 16746496
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 19
     area {
       color: 16746496
-      priority: 1382
+      priority: 1388
     }
   }
 }
@@ -5902,35 +5055,35 @@ cont {
     scale: 15
     area {
       color: 14535867
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 16
     area {
       color: 14535867
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 17
     area {
       color: 14535867
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 18
     area {
       color: 14535867
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 19
     area {
       color: 14535867
-      priority: 1382
+      priority: 1388
     }
   }
 }
@@ -5940,35 +5093,35 @@ cont {
     scale: 15
     area {
       color: 14535867
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 16
     area {
       color: 14535867
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 17
     area {
       color: 14535867
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 18
     area {
       color: 14535867
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 19
     area {
       color: 14535867
-      priority: 1382
+      priority: 1388
     }
   }
 }
@@ -5978,35 +5131,35 @@ cont {
     scale: 15
     area {
       color: 16772710
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 16
     area {
       color: 16772710
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 17
     area {
       color: 16772710
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 18
     area {
       color: 16772710
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 19
     area {
       color: 16772710
-      priority: 1382
+      priority: 1388
     }
   }
 }
@@ -6016,35 +5169,35 @@ cont {
     scale: 15
     area {
       color: 16777215
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 16
     area {
       color: 16777215
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 17
     area {
       color: 16777215
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 18
     area {
       color: 16777215
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 19
     area {
       color: 16777215
-      priority: 1382
+      priority: 1388
     }
   }
 }
@@ -6054,35 +5207,35 @@ cont {
     scale: 15
     area {
       color: 16777096
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 16
     area {
       color: 16777096
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 17
     area {
       color: 16777096
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 18
     area {
       color: 16777096
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 19
     area {
       color: 16777096
-      priority: 1382
+      priority: 1388
     }
   }
 }
@@ -6092,35 +5245,35 @@ cont {
     scale: 15
     area {
       color: 16777215
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 16
     area {
       color: 16777215
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 17
     area {
       color: 16777215
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 18
     area {
       color: 16777215
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 19
     area {
       color: 16777215
-      priority: 1382
+      priority: 1388
     }
   }
 }
@@ -6130,35 +5283,35 @@ cont {
     scale: 15
     area {
       color: 14535867
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 16
     area {
       color: 14535867
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 17
     area {
       color: 14535867
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 18
     area {
       color: 14535867
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 19
     area {
       color: 14535867
-      priority: 1382
+      priority: 1388
     }
   }
 }
@@ -6168,35 +5321,35 @@ cont {
     scale: 15
     area {
       color: 16777096
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 16
     area {
       color: 16777096
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 17
     area {
       color: 16777096
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 18
     area {
       color: 16777096
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 19
     area {
       color: 16777096
-      priority: 1382
+      priority: 1388
     }
   }
 }
@@ -6206,35 +5359,35 @@ cont {
     scale: 15
     area {
       color: 16763972
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 16
     area {
       color: 16763972
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 17
     area {
       color: 16763972
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 18
     area {
       color: 16763972
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 19
     area {
       color: 16763972
-      priority: 1382
+      priority: 1388
     }
   }
 }
@@ -6244,35 +5397,35 @@ cont {
     scale: 15
     area {
       color: 16777215
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 16
     area {
       color: 16777215
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 17
     area {
       color: 16777215
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 18
     area {
       color: 16777215
-      priority: 1382
+      priority: 1388
     }
   }
   element {
     scale: 19
     area {
       color: 16777215
-      priority: 1382
+      priority: 1388
     }
   }
 }
@@ -6280,30 +5433,34 @@ cont {
   name: "barrier-block"
   element {
     scale: 16
-    symbol {
-      name: "symbols/maki/roadblock-12.svg:#FF0000::::"
-      priority: 16000
+    circle {
+      radius: 1.2
+      color: 7829367
+      priority: 14000
     }
   }
   element {
     scale: 17
-    symbol {
-      name: "symbols/maki/roadblock-12.svg:#FF0000::::"
-      priority: 16000
+    circle {
+      radius: 1.6
+      color: 7829367
+      priority: 14000
     }
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/roadblock-12.svg:#FF0000::::"
-      priority: 16000
+    circle {
+      radius: 1.6
+      color: 7829367
+      priority: 14000
     }
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/roadblock-12.svg:#FF0000::::"
-      priority: 16000
+    circle {
+      radius: 1.6
+      color: 7829367
+      priority: 14000
     }
   }
 }
@@ -6311,61 +5468,34 @@ cont {
   name: "barrier-bollard"
   element {
     scale: 16
-    symbol {
-      name: "symbols/neta/bollard-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/bollard-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/bollard-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/bollard-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "barrier-border_control"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/border_control-18.svg:#444444::::"
-      priority: 16000
+    circle {
+      radius: 1.2
+      color: 7829367
+      priority: 14000
     }
   }
   element {
     scale: 17
-    symbol {
-      name: "symbols/nori/border_control-18.svg:#444444::::"
-      priority: 16000
+    circle {
+      radius: 1.6
+      color: 7829367
+      priority: 14000
     }
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/nori/border_control-18.svg:#444444::::"
-      priority: 16000
+    circle {
+      radius: 1.6
+      color: 7829367
+      priority: 14000
     }
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/nori/border_control-18.svg:#444444::::"
-      priority: 16000
+    circle {
+      radius: 1.6
+      color: 7829367
+      priority: 14000
     }
   }
 }
@@ -6380,7 +5510,7 @@ cont {
         dd: 1.0
         dd: 2.0
       }
-      priority: 1830
+      priority: 1832
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6394,7 +5524,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1943
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6408,7 +5538,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1943
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6422,7 +5552,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1943
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6435,7 +5565,7 @@ cont {
     lines {
       width: 0.1
       color: 12303291
-      priority: 1929
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6445,7 +5575,7 @@ cont {
     lines {
       width: 0.1
       color: 12303291
-      priority: 1929
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6455,7 +5585,7 @@ cont {
     lines {
       width: 0.1
       color: 12303291
-      priority: 1929
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6465,7 +5595,7 @@ cont {
     lines {
       width: 0.1
       color: 12303291
-      priority: 1929
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6474,30 +5604,23 @@ cont {
 cont {
   name: "barrier-gate"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/entrance-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/neta/entrance-18.svg:#444444::::"
+      name: "gate"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/entrance-18.svg:#444444::::"
+      name: "gate"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/entrance-18.svg:#444444::::"
+      name: "gate"
       priority: 16000
     }
   }
@@ -6513,7 +5636,7 @@ cont {
         dd: 1.0
         dd: 2.0
       }
-      priority: 1822
+      priority: 1824
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6527,7 +5650,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1923
+      priority: 1924
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6541,7 +5664,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1923
+      priority: 1924
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6555,7 +5678,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1923
+      priority: 1924
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6566,28 +5689,28 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/lift_gate-18.svg:#444444::::"
+      name: "barrier"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/lift_gate-18.svg:#444444::::"
+      name: "barrier"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/lift_gate-18.svg:#444444::::"
+      name: "barrier"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/lift_gate-18.svg:#444444::::"
+      name: "barrier"
       priority: 16000
     }
   }
@@ -6603,7 +5726,7 @@ cont {
         dd: 1.0
         dd: 2.0
       }
-      priority: 1827
+      priority: 1830
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6652,13 +5775,83 @@ cont {
   }
 }
 cont {
+  name: "barrier-stile"
+  element {
+    scale: 16
+    circle {
+      radius: 1.2
+      color: 7829367
+      priority: 14000
+    }
+  }
+  element {
+    scale: 17
+    circle {
+      radius: 1.6
+      color: 7829367
+      priority: 14000
+    }
+  }
+  element {
+    scale: 18
+    circle {
+      radius: 1.6
+      color: 7829367
+      priority: 14000
+    }
+  }
+  element {
+    scale: 19
+    circle {
+      radius: 1.6
+      color: 7829367
+      priority: 14000
+    }
+  }
+}
+cont {
+  name: "barrier-toll_booth"
+  element {
+    scale: 16
+    circle {
+      radius: 1.2
+      color: 7829367
+      priority: 14000
+    }
+  }
+  element {
+    scale: 17
+    circle {
+      radius: 1.6
+      color: 7829367
+      priority: 14000
+    }
+  }
+  element {
+    scale: 18
+    circle {
+      radius: 1.6
+      color: 7829367
+      priority: 14000
+    }
+  }
+  element {
+    scale: 19
+    circle {
+      radius: 1.6
+      color: 7829367
+      priority: 14000
+    }
+  }
+}
+cont {
   name: "barrier-wall"
   element {
     scale: 16
     lines {
       width: 1.0
       color: 12303291
-      priority: 1824
+      priority: 1827
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6668,7 +5861,7 @@ cont {
     lines {
       width: 1.0
       color: 12303291
-      priority: 1932
+      priority: 1933
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6678,7 +5871,7 @@ cont {
     lines {
       width: 1.0
       color: 12303291
-      priority: 1932
+      priority: 1933
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6688,7 +5881,7 @@ cont {
     lines {
       width: 1.0
       color: 12303291
-      priority: 1932
+      priority: 1933
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6705,7 +5898,7 @@ cont {
         dd: 4.0
         dd: 20.0
       }
-      priority: 16693
+      priority: 16697
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6719,7 +5912,7 @@ cont {
         dd: 4.0
         dd: 20.0
       }
-      priority: 16862
+      priority: 16864
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6778,7 +5971,7 @@ cont {
         dd: 1.0
         dd: 5.2
       }
-      priority: 16947
+      priority: 16948
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6792,7 +5985,7 @@ cont {
         dd: 1.0
         dd: 5.2
       }
-      priority: 16947
+      priority: 16948
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6806,7 +5999,7 @@ cont {
         dd: 1.0
         dd: 5.2
       }
-      priority: 16947
+      priority: 16948
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6823,7 +6016,7 @@ cont {
         dd: 3.12
         dd: 3.12
       }
-      priority: 16382
+      priority: 16388
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6837,7 +6030,7 @@ cont {
         dd: 3.12
         dd: 3.12
       }
-      priority: 16382
+      priority: 16388
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6851,14 +6044,14 @@ cont {
         dd: 3.12
         dd: 3.12
       }
-      priority: 16133
+      priority: 16140
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16130
+      priority: 16137
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6868,7 +6061,7 @@ cont {
     lines {
       width: 2.73
       color: 15658717
-      priority: 16133
+      priority: 16140
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6879,7 +6072,7 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 16136
+      priority: 16143
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6889,7 +6082,7 @@ cont {
     lines {
       width: 3.12
       color: 15658717
-      priority: 16133
+      priority: 16140
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6900,7 +6093,7 @@ cont {
         dd: 3.12
         dd: 3.12
       }
-      priority: 16136
+      priority: 16143
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6910,7 +6103,7 @@ cont {
     lines {
       width: 3.12
       color: 15658717
-      priority: 16133
+      priority: 16140
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6921,7 +6114,7 @@ cont {
         dd: 3.12
         dd: 3.12
       }
-      priority: 16136
+      priority: 16143
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6931,7 +6124,7 @@ cont {
     lines {
       width: 3.12
       color: 15658717
-      priority: 16133
+      priority: 16140
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6942,7 +6135,7 @@ cont {
         dd: 3.12
         dd: 3.12
       }
-      priority: 16136
+      priority: 16143
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6952,7 +6145,7 @@ cont {
     lines {
       width: 3.12
       color: 15658717
-      priority: 16133
+      priority: 16140
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6963,7 +6156,7 @@ cont {
         dd: 3.12
         dd: 3.12
       }
-      priority: 16136
+      priority: 16143
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6973,7 +6166,7 @@ cont {
     lines {
       width: 6.0
       color: 15658717
-      priority: 16396
+      priority: 16402
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6984,7 +6177,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16399
+      priority: 16404
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -6994,7 +6187,7 @@ cont {
     lines {
       width: 6.0
       color: 15658717
-      priority: 16424
+      priority: 16429
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7005,7 +6198,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16427
+      priority: 16432
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7015,7 +6208,7 @@ cont {
     lines {
       width: 6.0
       color: 15658717
-      priority: 16469
+      priority: 16477
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7026,7 +6219,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16472
+      priority: 16480
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7036,7 +6229,7 @@ cont {
     lines {
       width: 6.0
       color: 15658717
-      priority: 16715
+      priority: 16719
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7047,7 +6240,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16718
+      priority: 16722
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7057,7 +6250,7 @@ cont {
     lines {
       width: 6.0
       color: 15658717
-      priority: 16879
+      priority: 16881
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7068,7 +6261,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16882
+      priority: 16884
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7148,7 +6341,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16130
+      priority: 16137
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7162,7 +6355,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16130
+      priority: 16137
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7176,14 +6369,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16130
+      priority: 16137
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16128
+      priority: 16134
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7197,14 +6390,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16130
+      priority: 16137
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16128
+      priority: 16134
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7218,14 +6411,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16130
+      priority: 16137
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16128
+      priority: 16134
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7239,14 +6432,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16130
+      priority: 16137
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16128
+      priority: 16134
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7260,14 +6453,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16130
+      priority: 16137
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16128
+      priority: 16134
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7281,14 +6474,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16130
+      priority: 16137
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16128
+      priority: 16134
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7302,14 +6495,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16130
+      priority: 16137
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16128
+      priority: 16134
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7323,14 +6516,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16130
+      priority: 16137
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16128
+      priority: 16134
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7344,14 +6537,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16130
+      priority: 16137
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16128
+      priority: 16134
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7365,14 +6558,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16130
+      priority: 16137
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16128
+      priority: 16134
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7386,14 +6579,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16130
+      priority: 16137
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16128
+      priority: 16134
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7407,14 +6600,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16130
+      priority: 16137
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16128
+      priority: 16134
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7428,14 +6621,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16130
+      priority: 16137
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16128
+      priority: 16134
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7449,14 +6642,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16130
+      priority: 16137
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16128
+      priority: 16134
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7473,7 +6666,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16125
+      priority: 16131
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7487,14 +6680,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16125
+      priority: 16131
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16122
+      priority: 16129
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7508,14 +6701,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16125
+      priority: 16131
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16122
+      priority: 16129
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7529,14 +6722,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16125
+      priority: 16131
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16122
+      priority: 16129
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7550,14 +6743,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16125
+      priority: 16131
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16122
+      priority: 16129
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7571,7 +6764,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16020
+      priority: 16028
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7592,14 +6785,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16388
+      priority: 16393
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658717
-      priority: 16385
+      priority: 16390
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7616,14 +6809,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16125
+      priority: 16131
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16122
+      priority: 16129
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7637,14 +6830,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16125
+      priority: 16131
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16122
+      priority: 16129
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7658,14 +6851,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16125
+      priority: 16131
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658717
-      priority: 16122
+      priority: 16129
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7679,7 +6872,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16051
+      priority: 16059
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7692,7 +6885,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16054
+      priority: 16062
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7706,7 +6899,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16057
+      priority: 16065
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7719,7 +6912,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16060
+      priority: 16067
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7733,7 +6926,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16057
+      priority: 16065
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7746,7 +6939,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16060
+      priority: 16067
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7760,7 +6953,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16388
+      priority: 16393
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7773,7 +6966,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16164
+      priority: 16173
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7789,7 +6982,7 @@ cont {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1163
+      priority: 1172
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7805,7 +6998,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16407
+      priority: 16413
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7821,7 +7014,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16433
+      priority: 16438
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7837,7 +7030,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16481
+      priority: 16488
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7853,7 +7046,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16743
+      priority: 16747
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7869,7 +7062,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16899
+      priority: 16900
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7934,7 +7127,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16467
+      priority: 16474
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7948,7 +7141,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16707
+      priority: 16711
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7962,7 +7155,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16876
+      priority: 16878
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8021,7 +7214,7 @@ cont {
         dd: 4.0
         dd: 20.0
       }
-      priority: 16464
+      priority: 16471
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8035,7 +7228,7 @@ cont {
         dd: 4.0
         dd: 20.0
       }
-      priority: 16704
+      priority: 16708
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8049,7 +7242,7 @@ cont {
         dd: 4.0
         dd: 20.0
       }
-      priority: 16873
+      priority: 16875
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8063,7 +7256,7 @@ cont {
         dd: 4.0
         dd: 20.0
       }
-      priority: 16961
+      priority: 16962
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8077,7 +7270,7 @@ cont {
         dd: 4.0
         dd: 20.0
       }
-      priority: 16961
+      priority: 16962
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8091,7 +7284,7 @@ cont {
         dd: 4.0
         dd: 20.0
       }
-      priority: 16961
+      priority: 16962
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8104,7 +7297,7 @@ cont {
     lines {
       width: 1.0
       color: 16733508
-      priority: 16701
+      priority: 16705
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8114,7 +7307,7 @@ cont {
     lines {
       width: 1.0
       color: 16733508
-      priority: 16871
+      priority: 16872
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8124,7 +7317,7 @@ cont {
     lines {
       width: 0.8
       color: 16733508
-      priority: 16958
+      priority: 16959
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8134,7 +7327,7 @@ cont {
     lines {
       width: 0.8
       color: 16733508
-      priority: 16958
+      priority: 16959
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8144,7 +7337,7 @@ cont {
     lines {
       width: 0.8
       color: 16733508
-      priority: 16958
+      priority: 16959
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8179,7 +7372,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16868
+      priority: 16870
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8195,7 +7388,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16955
+      priority: 16956
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8211,7 +7404,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16955
+      priority: 16956
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8227,7 +7420,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16955
+      priority: 16956
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8244,7 +7437,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16695
+      priority: 16700
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8258,7 +7451,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16865
+      priority: 16867
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8272,7 +7465,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16952
+      priority: 16953
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8286,7 +7479,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16952
+      priority: 16953
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8300,7 +7493,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16952
+      priority: 16953
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8319,7 +7512,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16732
+      priority: 16736
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8335,7 +7528,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16890
+      priority: 16892
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8396,7 +7589,7 @@ cont {
     lines {
       width: 6.0
       color: 16776960
-      priority: 16413
+      priority: 16418
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8407,7 +7600,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16419
+      priority: 16424
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8417,7 +7610,7 @@ cont {
     lines {
       width: 6.0
       color: 16776960
-      priority: 16438
+      priority: 16443
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8428,7 +7621,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16444
+      priority: 16449
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8438,7 +7631,7 @@ cont {
     lines {
       width: 6.0
       color: 16776960
-      priority: 16486
+      priority: 16494
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8449,7 +7642,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16492
+      priority: 16499
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8459,7 +7652,7 @@ cont {
     lines {
       width: 6.0
       color: 16776960
-      priority: 16749
+      priority: 16753
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8470,7 +7663,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16755
+      priority: 16758
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8480,7 +7673,7 @@ cont {
     lines {
       width: 6.0
       color: 15658717
-      priority: 16879
+      priority: 16881
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8491,7 +7684,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16907
+      priority: 16909
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8501,7 +7694,7 @@ cont {
     lines {
       width: 6.0
       color: 16776960
-      priority: 16986
+      priority: 16987
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8522,7 +7715,7 @@ cont {
     lines {
       width: 6.0
       color: 16776960
-      priority: 16986
+      priority: 16987
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8543,7 +7736,7 @@ cont {
     lines {
       width: 6.0
       color: 16776960
-      priority: 16986
+      priority: 16987
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8571,7 +7764,7 @@ cont {
         dd: 4.0
         dd: 20.0
       }
-      priority: 16475
+      priority: 16482
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8585,7 +7778,7 @@ cont {
         dd: 4.0
         dd: 20.0
       }
-      priority: 16735
+      priority: 16739
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8599,7 +7792,7 @@ cont {
         dd: 4.0
         dd: 20.0
       }
-      priority: 16893
+      priority: 16895
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8660,7 +7853,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16729
+      priority: 16733
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8676,7 +7869,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16888
+      priority: 16889
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8692,7 +7885,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16972
+      priority: 16973
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8708,7 +7901,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16972
+      priority: 16973
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8724,7 +7917,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16972
+      priority: 16973
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8737,7 +7930,7 @@ cont {
     lines {
       width: 6.0
       color: 16776960
-      priority: 16410
+      priority: 16416
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8748,7 +7941,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16416
+      priority: 16421
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8758,7 +7951,7 @@ cont {
     lines {
       width: 6.0
       color: 16776960
-      priority: 16436
+      priority: 16441
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8769,7 +7962,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16441
+      priority: 16446
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8779,7 +7972,7 @@ cont {
     lines {
       width: 6.0
       color: 16776960
-      priority: 16484
+      priority: 16491
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8790,7 +7983,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16489
+      priority: 16496
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8800,7 +7993,7 @@ cont {
     lines {
       width: 6.0
       color: 16776960
-      priority: 16746
+      priority: 16750
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8811,7 +8004,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16752
+      priority: 16755
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8821,7 +8014,7 @@ cont {
     lines {
       width: 6.0
       color: 16776960
-      priority: 16902
+      priority: 16903
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8832,7 +8025,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 16904
+      priority: 16906
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8914,7 +8107,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16404
+      priority: 16410
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8930,7 +8123,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16430
+      priority: 16435
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8946,7 +8139,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16478
+      priority: 16485
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8962,7 +8155,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16741
+      priority: 16744
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8978,7 +8171,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16896
+      priority: 16897
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9039,7 +8232,7 @@ cont {
     lines {
       width: 1.0
       color: 16776960
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9049,7 +8242,7 @@ cont {
     lines {
       width: 0.62
       color: 16776960
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9062,7 +8255,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1053
+      priority: 1061
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9072,7 +8265,7 @@ cont {
     lines {
       width: 1.25
       color: 16776960
-      priority: 1056
+      priority: 1064
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9085,7 +8278,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16060
+      priority: 16067
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9095,7 +8288,7 @@ cont {
     lines {
       width: 1.0
       color: 16776960
-      priority: 1056
+      priority: 1064
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9108,7 +8301,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1059
+      priority: 1066
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9118,7 +8311,7 @@ cont {
     lines {
       width: 5.0
       color: 16776960
-      priority: 1161
+      priority: 1169
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9131,7 +8324,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1163
+      priority: 1172
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9147,7 +8340,7 @@ cont {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1163
+      priority: 1172
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9163,7 +8356,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16407
+      priority: 16413
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9179,7 +8372,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16433
+      priority: 16438
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9195,7 +8388,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16481
+      priority: 16488
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9211,7 +8404,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16743
+      priority: 16747
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9227,7 +8420,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16899
+      priority: 16900
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9292,7 +8485,7 @@ cont {
         dd: 4.0
         dd: 20.0
       }
-      priority: 16726
+      priority: 16730
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9306,7 +8499,7 @@ cont {
         dd: 4.0
         dd: 20.0
       }
-      priority: 16885
+      priority: 16886
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9320,7 +8513,7 @@ cont {
         dd: 4.0
         dd: 20.0
       }
-      priority: 16969
+      priority: 16970
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9334,7 +8527,7 @@ cont {
         dd: 4.0
         dd: 20.0
       }
-      priority: 16969
+      priority: 16970
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9348,7 +8541,7 @@ cont {
         dd: 4.0
         dd: 20.0
       }
-      priority: 16969
+      priority: 16970
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9367,7 +8560,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 16167
+      priority: 16176
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9383,7 +8576,7 @@ cont {
         dd: 2.0
         dd: 2.0
       }
-      priority: 16167
+      priority: 16176
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9399,7 +8592,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16421
+      priority: 16427
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9415,7 +8608,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16447
+      priority: 16452
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9431,7 +8624,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16495
+      priority: 16502
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9447,7 +8640,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16758
+      priority: 16761
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9463,7 +8656,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 16910
+      priority: 16911
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9520,25 +8713,11 @@ cont {
 cont {
   name: "building"
   element {
-    scale: 14
-    area {
-      color: 13421755
-      priority: 1001
-    }
-  }
-  element {
     scale: 15
     area {
       color: 13421755
       priority: 1001
     }
-    caption {
-      primary {
-        height: 10
-        color: 8947831
-      }
-      priority: 15000
-    }
   }
   element {
     scale: 16
@@ -9620,16 +8799,6 @@ cont {
 cont {
   name: "building-address"
   element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 8947831
-      }
-      priority: 15000
-    }
-  }
-  element {
     scale: 16
     caption {
       primary {
@@ -9687,7 +8856,7 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1799
+      priority: 1802
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9697,7 +8866,7 @@ cont {
     lines {
       width: 1.6
       color: 2164260863
-      priority: 1870
+      priority: 1871
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9708,7 +8877,7 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1878
+      priority: 1880
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9718,7 +8887,7 @@ cont {
     lines {
       width: 1.6
       color: 2164260863
-      priority: 1870
+      priority: 1871
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9729,7 +8898,7 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1878
+      priority: 1880
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9739,7 +8908,7 @@ cont {
     lines {
       width: 1.6
       color: 2164260863
-      priority: 1870
+      priority: 1871
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9750,7 +8919,7 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1878
+      priority: 1880
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9771,7 +8940,7 @@ cont {
         dd: 1.2
         dd: 4.4
       }
-      priority: 1799
+      priority: 1802
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9789,7 +8958,7 @@ cont {
         dd: 1.2
         dd: 4.4
       }
-      priority: 1872
+      priority: 1874
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9800,7 +8969,7 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1878
+      priority: 1880
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9818,7 +8987,7 @@ cont {
         dd: 1.2
         dd: 4.4
       }
-      priority: 1872
+      priority: 1874
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9829,7 +8998,7 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1878
+      priority: 1880
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9847,7 +9016,7 @@ cont {
         dd: 1.2
         dd: 4.4
       }
-      priority: 1872
+      priority: 1874
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9858,232 +9027,53 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1878
+      priority: 1880
       join: ROUNDJOIN
       cap: BUTTCAP
     }
   }
 }
 cont {
-  name: "craft"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/craft-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/craft-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/craft-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/craft-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "craft-carpenter"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/carpenter-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/carpenter-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/carpenter-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/carpenter-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "craft-shoemaker"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/shoemaker-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/shoemaker-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/shoemaker-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/shoemaker-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "craft-tailor"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/tailor-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/tailor-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/tailor-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/tailor-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-}
-cont {
   name: "earthquake:damage-spontaneous_camp"
   element {
-    scale: 15
-    symbol {
-      name: "symbols/maki/campsite-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/campsite-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/campsite-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/campsite-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/campsite-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "emergency-fire_hydrant"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/fire_hydrant-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/fire_hydrant-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
+    scale: 14
     symbol {
-      name: "symbols/nori/fire_hydrant-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"
+      name: "earthquakecamp"
       priority: 16000
     }
   }
   element {
-    scale: 19
+    scale: 15
     symbol {
-      name: "symbols/nori/fire_hydrant-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"
+      name: "earthquakecamp"
       priority: 16000
     }
   }
-}
-cont {
-  name: "emergency-phone"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"
+      name: "earthquakecamp"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"
+      name: "earthquakecamp"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"
+      name: "earthquakecamp"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:"
+      name: "earthquakecamp"
       priority: 16000
     }
   }
@@ -10091,22 +9081,6 @@ cont {
 cont {
   name: "entrance"
   element {
-    scale: 16
-    caption {
-      primary {
-        height: 9
-        color: 0
-        offset_x: 6
-      }
-      priority: 15016
-    }
-    circle {
-      radius: 2.0
-      color: 2236962
-      priority: 14016
-    }
-  }
-  element {
     scale: 17
     caption {
       primary {
@@ -10114,17 +9088,12 @@ cont {
         color: 0
         offset_x: 6
       }
-      secondary {
-        height: 9
-        color: 0
-        offset_y: 10
-      }
-      priority: 15016
+      priority: 15025
     }
     circle {
       radius: 2.0
       color: 2236962
-      priority: 14016
+      priority: 14025
     }
   }
   element {
@@ -10135,17 +9104,12 @@ cont {
         color: 0
         offset_x: 6
       }
-      secondary {
-        height: 9
-        color: 0
-        offset_y: 10
-      }
-      priority: 15016
+      priority: 15025
     }
     circle {
       radius: 2.0
       color: 2236962
-      priority: 14016
+      priority: 14025
     }
   }
   element {
@@ -10161,105 +9125,12 @@ cont {
         color: 0
         offset_y: 10
       }
-      priority: 15016
+      priority: 15025
     }
     circle {
       radius: 2.0
       color: 2236962
-      priority: 14016
-    }
-  }
-}
-cont {
-  name: "harbour"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/harbor-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/harbor-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/harbor-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/harbor-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "healthcare-dentist"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/dentist-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/dentist-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/dentist-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/dentist-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "healthcare-hospital"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:"
-      priority: 16000
+      priority: 14025
     }
   }
 }
@@ -10275,13 +9146,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 2.5
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 0.9
       color: 11197781
       priority: 1000
@@ -10299,13 +9163,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 3.2
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.6
       color: 8960836
       priority: 1000
@@ -10323,13 +9180,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 4.8
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.2
       color: 14535833
       priority: 1000
@@ -10347,13 +9197,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.4
       color: 14535833
       priority: 1000
@@ -10379,13 +9222,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.4
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.8
       color: 14535833
       priority: 1000
@@ -10411,13 +9247,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.4
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.8
       color: 14535833
       priority: 1000
@@ -10443,13 +9272,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.4
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.8
       color: 14535833
       priority: 1000
@@ -10478,13 +9300,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 2.5
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 0.9
       color: 11197781
       priority: 1000
@@ -10502,13 +9317,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 3.2
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.6
       color: 8960836
       priority: 1000
@@ -10526,13 +9334,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 4.8
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.2
       color: 14535833
       priority: 1000
@@ -10542,7 +9343,7 @@ cont {
     lines {
       width: 11.2
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10564,13 +9365,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.4
       color: 14535833
       priority: 1000
@@ -10580,7 +9374,7 @@ cont {
     lines {
       width: 14.4
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10610,13 +9404,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.4
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.8
       color: 14535833
       priority: 1000
@@ -10626,7 +9413,7 @@ cont {
     lines {
       width: 14.8
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10656,13 +9443,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.4
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.8
       color: 14535833
       priority: 1000
@@ -10672,7 +9452,7 @@ cont {
     lines {
       width: 14.8
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10702,13 +9482,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.4
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.8
       color: 14535833
       priority: 1000
@@ -10718,7 +9491,7 @@ cont {
     lines {
       width: 14.8
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10751,13 +9524,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 2.5
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 0.9
       color: 11197781
       priority: 1000
@@ -10775,13 +9541,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 3.2
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.6
       color: 8960836
       priority: 1000
@@ -10799,13 +9558,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 4.8
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.2
       color: 14535833
       priority: 1000
@@ -10823,13 +9575,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.4
       color: 14535833
       priority: 1000
@@ -10855,13 +9600,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.4
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.8
       color: 14535833
       priority: 1000
@@ -10887,13 +9625,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.4
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.8
       color: 14535833
       priority: 1000
@@ -10919,13 +9650,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.4
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.8
       color: 14535833
       priority: 1000
@@ -10954,13 +9678,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 2.5
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 0.9
       color: 11197781
       priority: 1000
@@ -10978,13 +9695,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 3.2
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.6
       color: 8960836
       priority: 1000
@@ -11002,13 +9712,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 4.8
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.2
       color: 14535833
       priority: 1000
@@ -11026,13 +9729,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.4
       color: 14535833
       priority: 1000
@@ -11058,13 +9754,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.4
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.8
       color: 14535833
       priority: 1000
@@ -11090,13 +9779,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.4
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.8
       color: 14535833
       priority: 1000
@@ -11122,13 +9804,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.4
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.8
       color: 14535833
       priority: 1000
@@ -11157,13 +9832,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 2.5
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 0.9
       color: 11197781
       priority: 1000
@@ -11181,13 +9849,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 3.2
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.6
       color: 8960836
       priority: 1000
@@ -11205,13 +9866,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 4.8
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.2
       color: 14535833
       priority: 1000
@@ -11221,7 +9875,7 @@ cont {
     lines {
       width: 11.2
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11247,13 +9901,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.4
       color: 14535833
       priority: 1000
@@ -11263,7 +9910,7 @@ cont {
     lines {
       width: 14.4
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11297,13 +9944,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.4
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.8
       color: 14535833
       priority: 1000
@@ -11313,7 +9953,7 @@ cont {
     lines {
       width: 14.8
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11347,13 +9987,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.4
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.8
       color: 14535833
       priority: 1000
@@ -11363,7 +9996,7 @@ cont {
     lines {
       width: 14.8
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11397,13 +10030,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.4
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.8
       color: 14535833
       priority: 1000
@@ -11413,7 +10039,7 @@ cont {
     lines {
       width: 14.8
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11443,8 +10069,8 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bus-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
-      priority: 16025
+      name: "bus-mini"
+      priority: 16033
     }
     caption {
       primary {
@@ -11459,14 +10085,14 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15025
+      priority: 15033
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bus-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
-      priority: 16025
+      name: "bus"
+      priority: 16033
     }
     caption {
       primary {
@@ -11481,14 +10107,14 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15025
+      priority: 15033
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bus-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
-      priority: 16025
+      name: "bus"
+      priority: 16033
     }
     caption {
       primary {
@@ -11503,14 +10129,14 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15025
+      priority: 15033
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bus-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
-      priority: 16025
+      name: "bus"
+      priority: 16033
     }
     caption {
       primary {
@@ -11525,7 +10151,7 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15025
+      priority: 15033
     }
   }
 }
@@ -11637,7 +10263,7 @@ cont {
     lines {
       width: 1.0
       color: 4504388
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -11647,7 +10273,7 @@ cont {
     lines {
       width: 1.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -11657,7 +10283,7 @@ cont {
     lines {
       width: 2.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -11667,7 +10293,7 @@ cont {
         color: 3355443
         stroke_color: 10075033
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -11675,7 +10301,7 @@ cont {
     lines {
       width: 3.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -11685,7 +10311,7 @@ cont {
         color: 3355443
         stroke_color: 10075033
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -11693,7 +10319,7 @@ cont {
     lines {
       width: 3.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -11703,7 +10329,7 @@ cont {
         color: 3355443
         stroke_color: 10075033
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -11711,7 +10337,7 @@ cont {
     lines {
       width: 3.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -11721,7 +10347,7 @@ cont {
         color: 3355443
         stroke_color: 10075033
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -11732,7 +10358,7 @@ cont {
     lines {
       width: 1.0
       color: 4504388
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -11742,14 +10368,14 @@ cont {
     lines {
       width: 1.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11766,14 +10392,14 @@ cont {
     lines {
       width: 2.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11790,7 +10416,7 @@ cont {
         color: 3355443
         stroke_color: 10075033
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -11798,14 +10424,14 @@ cont {
     lines {
       width: 3.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11822,7 +10448,7 @@ cont {
         color: 3355443
         stroke_color: 10075033
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -11830,14 +10456,14 @@ cont {
     lines {
       width: 3.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11854,7 +10480,7 @@ cont {
         color: 3355443
         stroke_color: 10075033
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -11862,14 +10488,14 @@ cont {
     lines {
       width: 3.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11886,7 +10512,7 @@ cont {
         color: 3355443
         stroke_color: 10075033
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -11897,7 +10523,7 @@ cont {
     lines {
       width: 1.0
       color: 4504388
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -11907,7 +10533,7 @@ cont {
     lines {
       width: 1.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -11917,7 +10543,7 @@ cont {
     lines {
       width: 2.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -11927,7 +10553,7 @@ cont {
         color: 3355443
         stroke_color: 10075033
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -11935,7 +10561,7 @@ cont {
     lines {
       width: 3.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -11945,7 +10571,7 @@ cont {
         color: 3355443
         stroke_color: 10075033
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -11953,7 +10579,7 @@ cont {
     lines {
       width: 3.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -11963,7 +10589,7 @@ cont {
         color: 3355443
         stroke_color: 10075033
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -11971,7 +10597,7 @@ cont {
     lines {
       width: 3.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -11981,7 +10607,7 @@ cont {
         color: 3355443
         stroke_color: 10075033
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -11992,7 +10618,7 @@ cont {
     lines {
       width: 1.0
       color: 4504388
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12002,7 +10628,7 @@ cont {
     lines {
       width: 1.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12012,7 +10638,7 @@ cont {
     lines {
       width: 2.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12022,7 +10648,7 @@ cont {
         color: 3355443
         stroke_color: 10075033
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -12030,7 +10656,7 @@ cont {
     lines {
       width: 3.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12040,7 +10666,7 @@ cont {
         color: 3355443
         stroke_color: 10075033
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -12048,7 +10674,7 @@ cont {
     lines {
       width: 3.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12058,7 +10684,7 @@ cont {
         color: 3355443
         stroke_color: 10075033
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -12066,7 +10692,7 @@ cont {
     lines {
       width: 3.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12076,7 +10702,7 @@ cont {
         color: 3355443
         stroke_color: 10075033
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -12087,7 +10713,7 @@ cont {
     lines {
       width: 1.0
       color: 4504388
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12097,14 +10723,14 @@ cont {
     lines {
       width: 1.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12125,14 +10751,14 @@ cont {
     lines {
       width: 2.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12153,7 +10779,7 @@ cont {
         color: 3355443
         stroke_color: 10075033
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -12161,14 +10787,14 @@ cont {
     lines {
       width: 3.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12189,7 +10815,7 @@ cont {
         color: 3355443
         stroke_color: 10075033
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -12197,14 +10823,14 @@ cont {
     lines {
       width: 3.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12225,7 +10851,7 @@ cont {
         color: 3355443
         stroke_color: 10075033
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -12233,14 +10859,14 @@ cont {
     lines {
       width: 3.0
       color: 10075033
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12261,7 +10887,7 @@ cont {
         color: 3355443
         stroke_color: 10075033
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -12272,7 +10898,7 @@ cont {
     lines {
       width: 1.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12282,7 +10908,7 @@ cont {
     lines {
       width: 2.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12292,7 +10918,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -12300,7 +10926,7 @@ cont {
     lines {
       width: 5.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12311,7 +10937,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12321,7 +10947,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -12329,7 +10955,7 @@ cont {
     lines {
       width: 9.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12340,7 +10966,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12350,7 +10976,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -12358,7 +10984,7 @@ cont {
     lines {
       width: 17.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12369,7 +10995,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12379,7 +11005,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -12390,7 +11016,7 @@ cont {
     lines {
       width: 1.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12400,7 +11026,7 @@ cont {
     lines {
       width: 1.2
       color: 255
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12410,7 +11036,7 @@ cont {
         color: 3355443
         stroke_color: 255
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -12418,7 +11044,7 @@ cont {
     lines {
       width: 5.0
       color: 255
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12429,7 +11055,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12439,7 +11065,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -12447,7 +11073,7 @@ cont {
     lines {
       width: 9.0
       color: 255
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12458,7 +11084,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12468,7 +11094,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -12476,7 +11102,7 @@ cont {
     lines {
       width: 17.0
       color: 255
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12487,7 +11113,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12497,7 +11123,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -12507,14 +11133,14 @@ cont {
     scale: 15
     area {
       color: 14535867
-      priority: 1029
+      priority: 1037
     }
   }
   element {
     scale: 16
     area {
       color: 14535867
-      priority: 1029
+      priority: 1037
     }
     path_text {
       primary {
@@ -12522,7 +11148,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -12534,13 +11160,13 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 14535867
-      priority: 1029
+      priority: 1037
     }
     path_text {
       primary {
@@ -12548,7 +11174,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -12560,13 +11186,13 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 14535867
-      priority: 1029
+      priority: 1037
     }
     path_text {
       primary {
@@ -12574,7 +11200,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -12586,13 +11212,13 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 14535867
-      priority: 1029
+      priority: 1037
     }
     path_text {
       primary {
@@ -12600,7 +11226,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -12611,14 +11237,14 @@ cont {
     lines {
       width: 1.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12635,14 +11261,14 @@ cont {
     lines {
       width: 2.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12659,7 +11285,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -12667,14 +11293,14 @@ cont {
     lines {
       width: 5.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12685,7 +11311,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12702,7 +11328,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -12710,14 +11336,14 @@ cont {
     lines {
       width: 9.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 16.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12728,7 +11354,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12745,7 +11371,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -12753,14 +11379,14 @@ cont {
     lines {
       width: 17.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 24.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12771,7 +11397,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12788,7 +11414,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -12799,7 +11425,7 @@ cont {
     lines {
       width: 1.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12813,7 +11439,7 @@ cont {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12823,7 +11449,7 @@ cont {
         color: 3355443
         stroke_color: 255
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -12831,7 +11457,7 @@ cont {
     lines {
       width: 5.0
       color: 255
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12842,7 +11468,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12852,7 +11478,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -12860,7 +11486,7 @@ cont {
     lines {
       width: 9.0
       color: 255
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12871,7 +11497,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12881,7 +11507,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -12889,7 +11515,7 @@ cont {
     lines {
       width: 17.0
       color: 255
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12900,7 +11526,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12910,7 +11536,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -12921,7 +11547,7 @@ cont {
     lines {
       width: 1.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12935,7 +11561,7 @@ cont {
         dd: 1.0
         dd: 2.4
       }
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12945,7 +11571,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -12953,7 +11579,7 @@ cont {
     lines {
       width: 5.0
       color: 16711680
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12964,7 +11590,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12974,7 +11600,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -12982,7 +11608,7 @@ cont {
     lines {
       width: 9.0
       color: 16711680
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12993,7 +11619,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13003,7 +11629,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13011,7 +11637,7 @@ cont {
     lines {
       width: 17.0
       color: 16711680
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13022,7 +11648,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13032,7 +11658,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -13043,7 +11669,7 @@ cont {
     lines {
       width: 1.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13057,7 +11683,7 @@ cont {
         dd: 1.0
         dd: 2.4
       }
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13067,7 +11693,7 @@ cont {
         color: 3355443
         stroke_color: 255
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13075,7 +11701,7 @@ cont {
     lines {
       width: 5.0
       color: 255
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13086,7 +11712,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13096,7 +11722,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13104,7 +11730,7 @@ cont {
     lines {
       width: 9.0
       color: 255
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13115,7 +11741,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13125,7 +11751,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13133,7 +11759,7 @@ cont {
     lines {
       width: 17.0
       color: 255
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13144,7 +11770,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13154,7 +11780,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -13165,7 +11791,7 @@ cont {
     lines {
       width: 1.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13175,7 +11801,7 @@ cont {
     lines {
       width: 2.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13185,7 +11811,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13193,7 +11819,7 @@ cont {
     lines {
       width: 0.8
       color: 16711680
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13204,7 +11830,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13214,7 +11840,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13222,7 +11848,7 @@ cont {
     lines {
       width: 0.8
       color: 16711680
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13233,7 +11859,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13243,7 +11869,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13251,7 +11877,7 @@ cont {
     lines {
       width: 0.8
       color: 16711680
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13262,7 +11888,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13272,7 +11898,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -13283,7 +11909,7 @@ cont {
     lines {
       width: 1.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13297,7 +11923,7 @@ cont {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13307,7 +11933,7 @@ cont {
         color: 3355443
         stroke_color: 16711680
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13315,7 +11941,7 @@ cont {
     lines {
       width: 5.0
       color: 16711680
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13326,7 +11952,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13336,7 +11962,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13344,7 +11970,7 @@ cont {
     lines {
       width: 9.0
       color: 16711680
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13355,7 +11981,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13365,7 +11991,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13373,7 +11999,7 @@ cont {
     lines {
       width: 17.0
       color: 16711680
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13384,7 +12010,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13394,7 +12020,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -13405,7 +12031,7 @@ cont {
     lines {
       width: 1.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13415,7 +12041,7 @@ cont {
     lines {
       width: 2.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13425,7 +12051,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13433,7 +12059,7 @@ cont {
     lines {
       width: 5.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13444,7 +12070,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13454,7 +12080,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13462,7 +12088,7 @@ cont {
     lines {
       width: 9.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13473,7 +12099,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13483,7 +12109,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13491,7 +12117,7 @@ cont {
     lines {
       width: 17.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13502,7 +12128,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13512,7 +12138,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -13523,7 +12149,7 @@ cont {
     lines {
       width: 1.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13533,7 +12159,7 @@ cont {
     lines {
       width: 2.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13543,7 +12169,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13551,7 +12177,7 @@ cont {
     lines {
       width: 5.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13562,7 +12188,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13572,7 +12198,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13580,7 +12206,7 @@ cont {
     lines {
       width: 9.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13591,7 +12217,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13601,7 +12227,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13609,7 +12235,7 @@ cont {
     lines {
       width: 17.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13620,7 +12246,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13630,7 +12256,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -13641,7 +12267,7 @@ cont {
     lines {
       width: 1.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13651,7 +12277,7 @@ cont {
     lines {
       width: 2.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13661,7 +12287,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13669,7 +12295,7 @@ cont {
     lines {
       width: 5.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13680,7 +12306,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13690,7 +12316,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13698,7 +12324,7 @@ cont {
     lines {
       width: 9.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13709,7 +12335,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13719,7 +12345,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13727,7 +12353,7 @@ cont {
     lines {
       width: 17.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13738,7 +12364,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13748,7 +12374,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -13759,14 +12385,14 @@ cont {
     lines {
       width: 1.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13787,14 +12413,14 @@ cont {
     lines {
       width: 2.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13815,7 +12441,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13823,14 +12449,14 @@ cont {
     lines {
       width: 12.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13841,7 +12467,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13862,7 +12488,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13870,14 +12496,14 @@ cont {
     lines {
       width: 16.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13888,7 +12514,7 @@ cont {
         dd: 1.0
         dd: 3.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13909,7 +12535,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -13917,14 +12543,14 @@ cont {
     lines {
       width: 24.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 14535867
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13935,7 +12561,7 @@ cont {
         dd: 1.0
         dd: 4.0
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13956,7 +12582,7 @@ cont {
         color: 3355443
         stroke_color: 14535867
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -13972,13 +12598,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 4.35
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.75
       color: 12312029
       priority: 1000
@@ -13996,13 +12615,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 5.1
-      color: 1118481
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.5
       color: 12312029
       priority: 1000
@@ -14020,13 +12632,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
-      color: 7829367
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 7.0
       color: 12312029
       priority: 1000
@@ -14044,13 +12649,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 10.6
-      color: 7829367
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 9.0
       color: 12312029
       priority: 1000
@@ -14068,13 +12666,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 11.6
-      color: 7829367
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 10.0
       color: 12312029
       priority: 1000
@@ -14092,13 +12683,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 11.6
-      color: 7829367
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 10.0
       color: 12312029
       priority: 1000
@@ -14116,13 +12700,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 11.6
-      color: 7829367
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 10.0
       color: 12312029
       priority: 1000
@@ -14138,21 +12715,14 @@ cont {
     lines {
       width: 2.6
       color: 13421738
-      priority: 28
+      priority: 36
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777215
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -14162,21 +12732,14 @@ cont {
     lines {
       width: 4.6
       color: 13421738
-      priority: 28
+      priority: 36
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777215
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -14186,21 +12749,14 @@ cont {
     lines {
       width: 5.6
       color: 13421738
-      priority: 28
+      priority: 36
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16777215
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -14210,7 +12766,7 @@ cont {
         color: 2236962
         stroke_color: 16777215
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -14218,21 +12774,14 @@ cont {
     lines {
       width: 7.6
       color: 13421738
-      priority: 28
+      priority: 36
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.0
       color: 16777215
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -14242,7 +12791,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -14250,21 +12799,14 @@ cont {
     lines {
       width: 9.6
       color: 13421738
-      priority: 28
+      priority: 36
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16777215
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -14274,7 +12816,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -14282,21 +12824,14 @@ cont {
     lines {
       width: 24.6
       color: 13421738
-      priority: 28
+      priority: 36
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777215
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -14306,7 +12841,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -14314,21 +12849,14 @@ cont {
     lines {
       width: 42.6
       color: 13421738
-      priority: 28
+      priority: 36
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777215
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -14338,7 +12866,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -14349,21 +12877,14 @@ cont {
     lines {
       width: 2.6
       color: 13421738
-      priority: 28
+      priority: 36
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777215
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -14373,21 +12894,14 @@ cont {
     lines {
       width: 4.6
       color: 13421738
-      priority: 28
+      priority: 36
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777215
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -14397,28 +12911,21 @@ cont {
     lines {
       width: 5.6
       color: 13421738
-      priority: 28
+      priority: 36
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16777215
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14435,7 +12942,7 @@ cont {
         color: 2236962
         stroke_color: 16777215
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -14443,28 +12950,21 @@ cont {
     lines {
       width: 7.6
       color: 13421738
-      priority: 28
+      priority: 36
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.0
       color: 16777215
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14481,7 +12981,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -14489,28 +12989,21 @@ cont {
     lines {
       width: 9.6
       color: 13421738
-      priority: 28
+      priority: 36
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16777215
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 16.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14527,7 +13020,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -14535,28 +13028,21 @@ cont {
     lines {
       width: 24.6
       color: 13421738
-      priority: 28
+      priority: 36
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777215
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14573,7 +13059,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -14581,28 +13067,21 @@ cont {
     lines {
       width: 42.6
       color: 13421738
-      priority: 28
+      priority: 36
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777215
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14619,7 +13098,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -14630,21 +13109,14 @@ cont {
     lines {
       width: 2.6
       color: 13421738
-      priority: 28
+      priority: 36
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777215
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -14654,21 +13126,14 @@ cont {
     lines {
       width: 4.6
       color: 13421738
-      priority: 28
+      priority: 36
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777215
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -14678,28 +13143,21 @@ cont {
     lines {
       width: 5.6
       color: 13421738
-      priority: 28
+      priority: 36
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16777215
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14720,7 +13178,7 @@ cont {
         color: 2236962
         stroke_color: 16777215
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -14728,28 +13186,21 @@ cont {
     lines {
       width: 7.6
       color: 13421738
-      priority: 28
+      priority: 36
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.0
       color: 16777215
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14770,7 +13221,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -14778,28 +13229,21 @@ cont {
     lines {
       width: 9.6
       color: 13421738
-      priority: 28
+      priority: 36
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16777215
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 16.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14820,7 +13264,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -14828,28 +13272,21 @@ cont {
     lines {
       width: 24.6
       color: 13421738
-      priority: 28
+      priority: 36
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777215
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14870,7 +13307,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -14878,28 +13315,21 @@ cont {
     lines {
       width: 42.6
       color: 13421738
-      priority: 28
+      priority: 36
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777215
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14920,7 +13350,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -14931,23 +13361,16 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 15645542
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -14955,23 +13378,16 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 15636770
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -14979,23 +13395,16 @@ cont {
     lines {
       width: 4.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -15003,23 +13412,16 @@ cont {
     lines {
       width: 5.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -15027,7 +13429,7 @@ cont {
         color: 3355443
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15035,21 +13437,14 @@ cont {
     lines {
       width: 5.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15059,7 +13454,7 @@ cont {
         color: 3355443
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15067,21 +13462,14 @@ cont {
     lines {
       width: 7.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15091,7 +13479,7 @@ cont {
         color: 3355443
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15099,21 +13487,14 @@ cont {
     lines {
       width: 9.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15123,7 +13504,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15131,21 +13512,14 @@ cont {
     lines {
       width: 13.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15155,7 +13529,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15163,21 +13537,14 @@ cont {
     lines {
       width: 17.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 17.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 16.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15187,7 +13554,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15195,21 +13562,14 @@ cont {
     lines {
       width: 17.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 17.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 16.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15219,7 +13579,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15227,21 +13587,14 @@ cont {
     lines {
       width: 18.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 18.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 17.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15251,7 +13604,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15259,21 +13612,14 @@ cont {
     lines {
       width: 24.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15283,7 +13629,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15291,21 +13637,14 @@ cont {
     lines {
       width: 42.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15315,7 +13654,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
 }
@@ -15326,23 +13665,16 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 15645542
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -15350,23 +13682,16 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 15636770
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -15374,23 +13699,16 @@ cont {
     lines {
       width: 4.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -15398,23 +13716,16 @@ cont {
     lines {
       width: 5.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -15422,7 +13733,7 @@ cont {
         color: 3355443
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15430,21 +13741,14 @@ cont {
     lines {
       width: 5.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15454,7 +13758,7 @@ cont {
         color: 3355443
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15462,21 +13766,14 @@ cont {
     lines {
       width: 7.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15486,7 +13783,7 @@ cont {
         color: 3355443
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15494,21 +13791,14 @@ cont {
     lines {
       width: 9.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15518,7 +13808,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15526,21 +13816,14 @@ cont {
     lines {
       width: 13.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15550,7 +13833,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15558,28 +13841,21 @@ cont {
     lines {
       width: 17.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 17.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 16.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 24.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15596,7 +13872,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15604,28 +13880,21 @@ cont {
     lines {
       width: 17.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 17.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 16.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 24.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15642,7 +13911,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15650,28 +13919,21 @@ cont {
     lines {
       width: 18.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 18.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 17.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 25.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15688,7 +13950,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15696,28 +13958,21 @@ cont {
     lines {
       width: 24.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15734,7 +13989,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15742,28 +13997,21 @@ cont {
     lines {
       width: 42.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15780,7 +14028,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
 }
@@ -15791,23 +14039,16 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 15645542
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -15815,23 +14056,16 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 15636770
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -15839,23 +14073,16 @@ cont {
     lines {
       width: 4.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -15863,23 +14090,16 @@ cont {
     lines {
       width: 5.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -15887,7 +14107,7 @@ cont {
         color: 3355443
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15895,21 +14115,14 @@ cont {
     lines {
       width: 5.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15919,7 +14132,7 @@ cont {
         color: 3355443
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15927,21 +14140,14 @@ cont {
     lines {
       width: 7.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15951,7 +14157,7 @@ cont {
         color: 3355443
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15959,21 +14165,14 @@ cont {
     lines {
       width: 9.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15983,7 +14182,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -15991,21 +14190,14 @@ cont {
     lines {
       width: 13.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16015,7 +14207,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -16023,28 +14215,21 @@ cont {
     lines {
       width: 17.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 17.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 16.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 24.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16065,7 +14250,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -16073,28 +14258,21 @@ cont {
     lines {
       width: 17.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 17.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 16.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 24.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16115,7 +14293,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -16123,28 +14301,21 @@ cont {
     lines {
       width: 18.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 18.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 17.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 25.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16165,7 +14336,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -16173,28 +14344,21 @@ cont {
     lines {
       width: 24.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16215,7 +14379,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -16223,28 +14387,21 @@ cont {
     lines {
       width: 42.6
       color: 12285696
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 12285696
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16265,7 +14422,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
 }
@@ -16356,21 +14513,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16380,21 +14530,14 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16404,21 +14547,14 @@ cont {
     lines {
       width: 5.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16428,7 +14564,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -16436,21 +14572,14 @@ cont {
     lines {
       width: 9.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16460,7 +14589,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -16468,21 +14597,14 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16492,7 +14614,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -16500,21 +14622,14 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16524,7 +14639,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -16532,21 +14647,14 @@ cont {
     lines {
       width: 24.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16556,7 +14664,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -16564,21 +14672,14 @@ cont {
     lines {
       width: 42.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16588,7 +14689,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
 }
@@ -16599,21 +14700,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16623,21 +14717,14 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16647,21 +14734,14 @@ cont {
     lines {
       width: 5.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16671,7 +14751,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -16679,28 +14759,21 @@ cont {
     lines {
       width: 9.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 16.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16717,7 +14790,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -16725,28 +14798,21 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16763,7 +14829,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -16771,28 +14837,21 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16809,7 +14868,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -16817,28 +14876,21 @@ cont {
     lines {
       width: 24.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16855,7 +14907,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -16863,28 +14915,21 @@ cont {
     lines {
       width: 42.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16901,7 +14946,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
 }
@@ -16912,21 +14957,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16936,21 +14974,14 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16960,21 +14991,14 @@ cont {
     lines {
       width: 5.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16984,7 +15008,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -16992,28 +15016,21 @@ cont {
     lines {
       width: 9.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 16.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17034,7 +15051,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -17042,28 +15059,21 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17084,7 +15094,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -17092,28 +15102,21 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17134,7 +15137,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -17142,28 +15145,21 @@ cont {
     lines {
       width: 24.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17184,7 +15180,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
   element {
@@ -17192,28 +15188,21 @@ cont {
     lines {
       width: 42.6
       color: 12294468
-      priority: 48
+      priority: 55
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16746496
-      priority: 1048
+      priority: 1055
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17234,7 +15223,7 @@ cont {
         color: 2236962
         stroke_color: 16746496
       }
-      priority: 16048
+      priority: 16055
     }
   }
 }
@@ -17245,7 +15234,7 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17255,7 +15244,7 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17265,7 +15254,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -17273,7 +15262,7 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17283,7 +15272,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -17291,7 +15280,7 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17301,7 +15290,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -17309,7 +15298,7 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17319,7 +15308,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -17330,7 +15319,7 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17340,7 +15329,7 @@ cont {
     lines {
       width: 1.2
       color: 255
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17350,7 +15339,7 @@ cont {
         color: 6710886
         stroke_color: 255
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -17358,7 +15347,7 @@ cont {
     lines {
       width: 0.8
       color: 255
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17368,7 +15357,7 @@ cont {
         color: 6710886
         stroke_color: 255
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -17376,7 +15365,7 @@ cont {
     lines {
       width: 0.8
       color: 255
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17386,7 +15375,7 @@ cont {
         color: 6710886
         stroke_color: 255
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -17394,7 +15383,7 @@ cont {
     lines {
       width: 0.8
       color: 255
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17404,7 +15393,7 @@ cont {
         color: 6710886
         stroke_color: 255
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -17415,7 +15404,7 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17425,7 +15414,7 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17435,7 +15424,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -17443,7 +15432,7 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17453,7 +15442,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -17461,7 +15450,7 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17471,7 +15460,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -17479,7 +15468,7 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17489,7 +15478,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -17500,14 +15489,14 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17524,14 +15513,14 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17548,7 +15537,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -17556,14 +15545,14 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17580,7 +15569,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -17588,14 +15577,14 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17612,7 +15601,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -17620,14 +15609,14 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17644,7 +15633,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -17655,14 +15644,14 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17683,14 +15672,14 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17711,7 +15700,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -17719,14 +15708,14 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17747,7 +15736,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -17755,14 +15744,14 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17783,7 +15772,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -17791,14 +15780,14 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17819,7 +15808,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -17830,14 +15819,14 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17854,14 +15843,14 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17878,7 +15867,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -17886,14 +15875,14 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17910,7 +15899,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -17918,14 +15907,14 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17942,7 +15931,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -17950,14 +15939,14 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17974,7 +15963,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -17985,7 +15974,7 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17999,7 +15988,7 @@ cont {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18009,7 +15998,7 @@ cont {
         color: 6710886
         stroke_color: 255
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18021,7 +16010,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18031,7 +16020,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18043,7 +16032,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18053,7 +16042,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18065,7 +16054,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18075,7 +16064,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -18086,7 +16075,7 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18100,7 +16089,7 @@ cont {
         dd: 1.0
         dd: 2.4
       }
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18110,7 +16099,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18122,7 +16111,7 @@ cont {
         dd: 1.0
         dd: 1.2
       }
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18132,7 +16121,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18144,7 +16133,7 @@ cont {
         dd: 1.0
         dd: 1.2
       }
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18154,7 +16143,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18166,7 +16155,7 @@ cont {
         dd: 1.0
         dd: 1.2
       }
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18176,7 +16165,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -18187,7 +16176,7 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18201,7 +16190,7 @@ cont {
         dd: 1.0
         dd: 2.4
       }
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18211,7 +16200,7 @@ cont {
         color: 6710886
         stroke_color: 255
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18223,7 +16212,7 @@ cont {
         dd: 1.0
         dd: 1.2
       }
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18233,7 +16222,7 @@ cont {
         color: 6710886
         stroke_color: 255
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18245,7 +16234,7 @@ cont {
         dd: 1.0
         dd: 1.2
       }
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18255,7 +16244,7 @@ cont {
         color: 6710886
         stroke_color: 255
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18267,7 +16256,7 @@ cont {
         dd: 1.0
         dd: 1.2
       }
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18277,7 +16266,7 @@ cont {
         color: 6710886
         stroke_color: 255
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -18288,7 +16277,7 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18298,7 +16287,7 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18308,7 +16297,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18316,7 +16305,7 @@ cont {
     lines {
       width: 0.8
       color: 16711680
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18326,7 +16315,7 @@ cont {
         color: 6710886
         stroke_color: 16711680
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18334,7 +16323,7 @@ cont {
     lines {
       width: 0.8
       color: 16711680
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18344,7 +16333,7 @@ cont {
         color: 6710886
         stroke_color: 16711680
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18352,7 +16341,7 @@ cont {
     lines {
       width: 0.8
       color: 16711680
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18362,7 +16351,7 @@ cont {
         color: 6710886
         stroke_color: 16711680
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -18373,7 +16362,7 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18383,7 +16372,7 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18393,7 +16382,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18401,7 +16390,7 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18411,7 +16400,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18419,7 +16408,7 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18429,7 +16418,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18437,7 +16426,7 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18447,7 +16436,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -18458,7 +16447,7 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18472,7 +16461,7 @@ cont {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18482,7 +16471,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18494,7 +16483,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18504,7 +16493,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18516,7 +16505,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18526,7 +16515,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18538,7 +16527,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18548,7 +16537,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -18559,7 +16548,7 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18569,7 +16558,7 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18579,7 +16568,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18587,7 +16576,7 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18597,7 +16586,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18605,7 +16594,7 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18615,7 +16604,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18623,7 +16612,7 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18633,7 +16622,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -18644,7 +16633,7 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18654,7 +16643,7 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18664,7 +16653,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18672,7 +16661,7 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18682,7 +16671,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18690,7 +16679,7 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18700,7 +16689,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18708,7 +16697,7 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18718,7 +16707,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -18729,7 +16718,7 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18739,7 +16728,7 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18749,7 +16738,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18757,7 +16746,7 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18767,7 +16756,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18775,7 +16764,7 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18785,7 +16774,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18793,7 +16782,7 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18803,7 +16792,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -18814,14 +16803,14 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18842,14 +16831,14 @@ cont {
     lines {
       width: 2.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18870,7 +16859,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18878,14 +16867,14 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18906,7 +16895,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18914,14 +16903,14 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18942,7 +16931,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -18950,14 +16939,14 @@ cont {
     lines {
       width: 3.0
       color: 13421772
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18978,7 +16967,7 @@ cont {
         color: 6710886
         stroke_color: 13421772
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -18989,7 +16978,7 @@ cont {
     lines {
       width: 1.0
       color: 14535850
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18999,7 +16988,7 @@ cont {
         color: 5592405
         stroke_color: 14535850
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -19007,7 +16996,7 @@ cont {
     lines {
       width: 3.0
       color: 15658734
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19017,7 +17006,7 @@ cont {
         color: 5592405
         stroke_color: 15658734
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -19025,7 +17014,7 @@ cont {
     lines {
       width: 4.0
       color: 15658734
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19035,7 +17024,7 @@ cont {
         color: 3355443
         stroke_color: 15658734
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -19043,7 +17032,7 @@ cont {
     lines {
       width: 7.0
       color: 15658734
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19053,7 +17042,7 @@ cont {
         color: 3355443
         stroke_color: 15658734
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -19061,7 +17050,7 @@ cont {
     lines {
       width: 9.0
       color: 15658734
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19071,7 +17060,7 @@ cont {
         color: 3355443
         stroke_color: 15658734
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -19079,7 +17068,7 @@ cont {
     lines {
       width: 17.0
       color: 15658734
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19089,7 +17078,7 @@ cont {
         color: 3355443
         stroke_color: 15658734
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -19099,7 +17088,7 @@ cont {
     scale: 14
     area {
       color: 14535850
-      priority: 1029
+      priority: 1037
     }
     path_text {
       primary {
@@ -19107,14 +17096,14 @@ cont {
         color: 5592405
         stroke_color: 14535850
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
     scale: 15
     area {
       color: 15658734
-      priority: 1029
+      priority: 1037
     }
     path_text {
       primary {
@@ -19122,14 +17111,14 @@ cont {
         color: 5592405
         stroke_color: 15658734
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
     scale: 16
     area {
       color: 15658734
-      priority: 1029
+      priority: 1037
     }
     path_text {
       primary {
@@ -19137,14 +17126,14 @@ cont {
         color: 3355443
         stroke_color: 15658734
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
     scale: 17
     area {
       color: 15658734
-      priority: 1029
+      priority: 1037
     }
     path_text {
       primary {
@@ -19152,14 +17141,14 @@ cont {
         color: 3355443
         stroke_color: 15658734
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
     scale: 18
     area {
       color: 15658734
-      priority: 1029
+      priority: 1037
     }
     path_text {
       primary {
@@ -19167,14 +17156,14 @@ cont {
         color: 3355443
         stroke_color: 15658734
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
     scale: 19
     area {
       color: 15658734
-      priority: 1029
+      priority: 1037
     }
     path_text {
       primary {
@@ -19182,7 +17171,7 @@ cont {
         color: 3355443
         stroke_color: 15658734
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -19193,7 +17182,7 @@ cont {
     lines {
       width: 1.0
       color: 14535850
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19203,7 +17192,7 @@ cont {
         color: 5592405
         stroke_color: 14535850
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -19211,14 +17200,14 @@ cont {
     lines {
       width: 3.0
       color: 15658734
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19235,7 +17224,7 @@ cont {
         color: 5592405
         stroke_color: 15658734
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -19243,14 +17232,14 @@ cont {
     lines {
       width: 4.0
       color: 15658734
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19267,7 +17256,7 @@ cont {
         color: 3355443
         stroke_color: 15658734
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -19275,14 +17264,14 @@ cont {
     lines {
       width: 7.0
       color: 15658734
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 15.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19299,7 +17288,7 @@ cont {
         color: 3355443
         stroke_color: 15658734
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -19307,14 +17296,14 @@ cont {
     lines {
       width: 9.0
       color: 15658734
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 17.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19331,7 +17320,7 @@ cont {
         color: 3355443
         stroke_color: 15658734
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -19339,14 +17328,14 @@ cont {
     lines {
       width: 17.0
       color: 15658734
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 25.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19363,7 +17352,7 @@ cont {
         color: 3355443
         stroke_color: 15658734
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -19374,7 +17363,7 @@ cont {
     lines {
       width: 1.0
       color: 14535850
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19384,7 +17373,7 @@ cont {
         color: 5592405
         stroke_color: 14535850
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -19392,14 +17381,14 @@ cont {
     lines {
       width: 3.0
       color: 15658734
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19420,7 +17409,7 @@ cont {
         color: 5592405
         stroke_color: 15658734
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -19428,14 +17417,14 @@ cont {
     lines {
       width: 4.0
       color: 15658734
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19456,7 +17445,7 @@ cont {
         color: 3355443
         stroke_color: 15658734
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -19464,14 +17453,14 @@ cont {
     lines {
       width: 7.0
       color: 15658734
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 15.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19492,7 +17481,7 @@ cont {
         color: 3355443
         stroke_color: 15658734
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -19500,14 +17489,14 @@ cont {
     lines {
       width: 9.0
       color: 15658734
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 17.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19528,7 +17517,7 @@ cont {
         color: 3355443
         stroke_color: 15658734
       }
-      priority: 16028
+      priority: 16036
     }
   }
   element {
@@ -19536,14 +17525,14 @@ cont {
     lines {
       width: 17.0
       color: 15658734
-      priority: 1028
+      priority: 1036
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 25.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19564,7 +17553,7 @@ cont {
         color: 3355443
         stroke_color: 15658734
       }
-      priority: 16028
+      priority: 16036
     }
   }
 }
@@ -19575,23 +17564,16 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -19599,23 +17581,16 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -19623,23 +17598,16 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -19647,7 +17615,7 @@ cont {
         color: 3355443
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -19655,23 +17623,16 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -19679,7 +17640,7 @@ cont {
         color: 3355443
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -19687,21 +17648,14 @@ cont {
     lines {
       width: 4.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19711,7 +17665,7 @@ cont {
         color: 3355443
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -19719,21 +17673,14 @@ cont {
     lines {
       width: 6.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 5.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19743,7 +17690,7 @@ cont {
         color: 3355443
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -19751,21 +17698,14 @@ cont {
     lines {
       width: 8.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 7.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19775,7 +17715,7 @@ cont {
         color: 3355443
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -19783,21 +17723,14 @@ cont {
     lines {
       width: 15.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 15.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 14.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19807,7 +17740,7 @@ cont {
         color: 3355443
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -19815,21 +17748,14 @@ cont {
     lines {
       width: 15.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 15.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 14.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19839,7 +17765,7 @@ cont {
         color: 4473924
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -19847,21 +17773,14 @@ cont {
     lines {
       width: 17.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 17.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 16.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19871,7 +17790,7 @@ cont {
         color: 4473924
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -19879,21 +17798,14 @@ cont {
     lines {
       width: 24.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19903,7 +17815,7 @@ cont {
         color: 4473924
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -19911,21 +17823,14 @@ cont {
     lines {
       width: 42.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19935,7 +17840,7 @@ cont {
         color: 4473924
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
 }
@@ -19946,23 +17851,16 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -19970,23 +17868,16 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -19994,23 +17885,16 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -20018,7 +17902,7 @@ cont {
         color: 3355443
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -20026,23 +17910,16 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -20050,7 +17927,7 @@ cont {
         color: 3355443
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -20058,21 +17935,14 @@ cont {
     lines {
       width: 4.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20082,7 +17952,7 @@ cont {
         color: 3355443
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -20090,21 +17960,14 @@ cont {
     lines {
       width: 6.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 5.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20114,7 +17977,7 @@ cont {
         color: 3355443
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -20122,21 +17985,14 @@ cont {
     lines {
       width: 8.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 7.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20146,7 +18002,7 @@ cont {
         color: 3355443
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -20154,28 +18010,21 @@ cont {
     lines {
       width: 15.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 15.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 14.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 22.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20192,7 +18041,7 @@ cont {
         color: 3355443
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -20200,28 +18049,21 @@ cont {
     lines {
       width: 15.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 15.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 14.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 22.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20238,7 +18080,7 @@ cont {
         color: 4473924
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -20246,28 +18088,21 @@ cont {
     lines {
       width: 17.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 17.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 16.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 24.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20284,7 +18119,7 @@ cont {
         color: 4473924
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -20292,28 +18127,21 @@ cont {
     lines {
       width: 24.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20330,7 +18158,7 @@ cont {
         color: 4473924
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -20338,28 +18166,21 @@ cont {
     lines {
       width: 42.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20376,7 +18197,7 @@ cont {
         color: 4473924
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
 }
@@ -20387,23 +18208,16 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -20411,23 +18225,16 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -20435,23 +18242,16 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -20459,7 +18259,7 @@ cont {
         color: 3355443
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -20467,23 +18267,16 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -20491,7 +18284,7 @@ cont {
         color: 3355443
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -20499,21 +18292,14 @@ cont {
     lines {
       width: 4.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20523,7 +18309,7 @@ cont {
         color: 3355443
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -20531,21 +18317,14 @@ cont {
     lines {
       width: 6.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 5.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20555,7 +18334,7 @@ cont {
         color: 3355443
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -20563,21 +18342,14 @@ cont {
     lines {
       width: 8.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 7.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20587,7 +18359,7 @@ cont {
         color: 3355443
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -20595,28 +18367,21 @@ cont {
     lines {
       width: 15.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 15.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 14.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 22.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20637,7 +18402,7 @@ cont {
         color: 3355443
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -20645,28 +18410,21 @@ cont {
     lines {
       width: 15.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 15.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 14.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 22.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20687,7 +18445,7 @@ cont {
         color: 4473924
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -20695,28 +18453,21 @@ cont {
     lines {
       width: 17.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 17.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 16.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 24.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20737,7 +18488,7 @@ cont {
         color: 4473924
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -20745,28 +18496,21 @@ cont {
     lines {
       width: 24.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20787,7 +18531,7 @@ cont {
         color: 4473924
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -20795,28 +18539,21 @@ cont {
     lines {
       width: 42.6
       color: 14527061
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20837,7 +18574,7 @@ cont {
         color: 4473924
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
 }
@@ -20848,21 +18585,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20872,21 +18602,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20896,21 +18619,14 @@ cont {
     lines {
       width: 4.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20920,21 +18636,14 @@ cont {
     lines {
       width: 4.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20944,21 +18653,14 @@ cont {
     lines {
       width: 6.1
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.1
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.5
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20968,7 +18670,7 @@ cont {
         color: 2236962
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -20976,21 +18678,14 @@ cont {
     lines {
       width: 10.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 10.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 9.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21000,7 +18695,7 @@ cont {
         color: 2236962
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -21008,21 +18703,14 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21032,7 +18720,7 @@ cont {
         color: 2236962
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -21040,21 +18728,14 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21064,7 +18745,7 @@ cont {
         color: 2236962
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -21072,21 +18753,14 @@ cont {
     lines {
       width: 24.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21096,7 +18770,7 @@ cont {
         color: 2236962
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -21104,21 +18778,14 @@ cont {
     lines {
       width: 42.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21128,7 +18795,7 @@ cont {
         color: 2236962
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
 }
@@ -21139,21 +18806,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21163,21 +18823,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21187,21 +18840,14 @@ cont {
     lines {
       width: 4.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21211,21 +18857,14 @@ cont {
     lines {
       width: 4.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21235,21 +18874,14 @@ cont {
     lines {
       width: 6.1
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.1
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.5
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21259,7 +18891,7 @@ cont {
         color: 2236962
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -21267,28 +18899,21 @@ cont {
     lines {
       width: 10.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 10.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 9.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 17.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21305,7 +18930,7 @@ cont {
         color: 2236962
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -21313,28 +18938,21 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21351,7 +18969,7 @@ cont {
         color: 2236962
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -21359,28 +18977,21 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21397,7 +19008,7 @@ cont {
         color: 2236962
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -21405,28 +19016,21 @@ cont {
     lines {
       width: 24.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21443,7 +19047,7 @@ cont {
         color: 2236962
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -21451,28 +19055,21 @@ cont {
     lines {
       width: 42.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21489,7 +19086,7 @@ cont {
         color: 2236962
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
 }
@@ -21500,21 +19097,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21524,21 +19114,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21548,21 +19131,14 @@ cont {
     lines {
       width: 4.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21572,21 +19148,14 @@ cont {
     lines {
       width: 4.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21596,21 +19165,14 @@ cont {
     lines {
       width: 6.1
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.1
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.5
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21620,7 +19182,7 @@ cont {
         color: 2236962
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -21628,28 +19190,21 @@ cont {
     lines {
       width: 10.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 10.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 9.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 17.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21670,7 +19225,7 @@ cont {
         color: 2236962
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -21678,28 +19233,21 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21720,7 +19268,7 @@ cont {
         color: 2236962
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -21728,28 +19276,21 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21770,7 +19311,7 @@ cont {
         color: 2236962
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -21778,28 +19319,21 @@ cont {
     lines {
       width: 24.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21820,7 +19354,7 @@ cont {
         color: 2236962
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
   element {
@@ -21828,28 +19362,21 @@ cont {
     lines {
       width: 42.6
       color: 12294468
-      priority: 45
+      priority: 52
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16772710
-      priority: 1045
+      priority: 1052
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21870,7 +19397,7 @@ cont {
         color: 2236962
         stroke_color: 16772710
       }
-      priority: 16045
+      priority: 16052
     }
   }
 }
@@ -21890,17 +19417,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 11.6
-      color: 12294468
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-      }
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 10.0
       color: 14540253
       dashdot {
@@ -21926,17 +19442,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 11.6
-      color: 12294468
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-      }
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 10.0
       color: 14540253
       dashdot {
@@ -21962,17 +19467,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 11.6
-      color: 12294468
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-      }
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 10.0
       color: 14540253
       dashdot {
@@ -21997,13 +19491,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.98
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 0.38
       color: 15658717
       priority: 1000
@@ -22021,13 +19508,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 2.35
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 0.75
       color: 15658717
       priority: 1000
@@ -22045,13 +19525,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 15658717
       priority: 1000
@@ -22064,28 +19537,21 @@ cont {
     lines {
       width: 5.0
       color: 12294468
-      priority: 175
+      priority: 183
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.0
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.4
       color: 16777215
-      priority: 1175
+      priority: 1183
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 6.0
       color: 15658717
-      priority: 1344
+      priority: 1350
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22096,7 +19562,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1177
+      priority: 1186
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22106,21 +19572,14 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 573
+      priority: 579
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 15658717
-      priority: 1573
+      priority: 1579
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22131,14 +19590,14 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1449
+      priority: 1454
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 15658717
-      priority: 1576
+      priority: 1582
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22148,21 +19607,14 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 451
+      priority: 456
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 15658717
-      priority: 1451
+      priority: 1456
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22173,14 +19625,14 @@ cont {
         dd: 1.6
         dd: 1.6
       }
-      priority: 1454
+      priority: 1459
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 15658717
-      priority: 1618
+      priority: 1623
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22190,21 +19642,14 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 451
+      priority: 456
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 15658717
-      priority: 1451
+      priority: 1456
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22215,14 +19660,14 @@ cont {
         dd: 1.6
         dd: 1.6
       }
-      priority: 1454
+      priority: 1459
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 15658717
-      priority: 1618
+      priority: 1623
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22232,21 +19677,14 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 451
+      priority: 456
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 15658717
-      priority: 1451
+      priority: 1456
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22257,14 +19695,14 @@ cont {
         dd: 1.6
         dd: 1.6
       }
-      priority: 1454
+      priority: 1459
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 15658717
-      priority: 1618
+      priority: 1623
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22277,21 +19715,14 @@ cont {
     lines {
       width: 2.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22301,21 +19732,14 @@ cont {
     lines {
       width: 4.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22325,7 +19749,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -22333,21 +19757,14 @@ cont {
     lines {
       width: 5.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22357,7 +19774,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -22365,21 +19782,14 @@ cont {
     lines {
       width: 7.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22389,7 +19799,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -22397,21 +19807,14 @@ cont {
     lines {
       width: 9.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22421,7 +19824,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -22429,21 +19832,14 @@ cont {
     lines {
       width: 24.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22453,7 +19849,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -22461,21 +19857,14 @@ cont {
     lines {
       width: 42.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22485,7 +19874,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
 }
@@ -22495,14 +19884,14 @@ cont {
     scale: 13
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
   }
   element {
     scale: 14
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
     path_text {
       primary {
@@ -22510,14 +19899,14 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
     scale: 15
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
     path_text {
       primary {
@@ -22525,14 +19914,14 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
     scale: 16
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
     path_text {
       primary {
@@ -22540,14 +19929,14 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
     scale: 17
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
     path_text {
       primary {
@@ -22555,14 +19944,14 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
     scale: 18
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
     path_text {
       primary {
@@ -22570,14 +19959,14 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
     scale: 19
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
     path_text {
       primary {
@@ -22585,7 +19974,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
 }
@@ -22596,21 +19985,14 @@ cont {
     lines {
       width: 2.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22620,21 +20002,14 @@ cont {
     lines {
       width: 4.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22644,7 +20019,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -22652,28 +20027,21 @@ cont {
     lines {
       width: 5.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22690,7 +20058,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -22698,28 +20066,21 @@ cont {
     lines {
       width: 7.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22736,7 +20097,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -22744,28 +20105,21 @@ cont {
     lines {
       width: 9.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 16.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22782,7 +20136,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -22790,28 +20144,21 @@ cont {
     lines {
       width: 24.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22828,7 +20175,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -22836,28 +20183,21 @@ cont {
     lines {
       width: 42.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22874,7 +20214,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
 }
@@ -22885,21 +20225,14 @@ cont {
     lines {
       width: 2.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22909,21 +20242,14 @@ cont {
     lines {
       width: 4.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22933,7 +20259,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -22941,21 +20267,14 @@ cont {
     lines {
       width: 5.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22965,7 +20284,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -22973,21 +20292,14 @@ cont {
     lines {
       width: 7.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22997,7 +20309,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -23005,21 +20317,14 @@ cont {
     lines {
       width: 9.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23029,7 +20334,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -23037,21 +20342,14 @@ cont {
     lines {
       width: 24.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23061,7 +20359,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -23069,21 +20367,14 @@ cont {
     lines {
       width: 42.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23093,7 +20384,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
 }
@@ -23104,21 +20395,14 @@ cont {
     lines {
       width: 2.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23128,21 +20412,14 @@ cont {
     lines {
       width: 4.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23152,7 +20429,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -23160,28 +20437,21 @@ cont {
     lines {
       width: 5.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23202,7 +20472,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -23210,28 +20480,21 @@ cont {
     lines {
       width: 7.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23252,7 +20515,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -23260,28 +20523,21 @@ cont {
     lines {
       width: 9.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 16.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23302,7 +20558,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -23310,28 +20566,21 @@ cont {
     lines {
       width: 24.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23352,7 +20601,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -23360,28 +20609,21 @@ cont {
     lines {
       width: 42.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23402,7 +20644,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
 }
@@ -23418,13 +20660,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 5.1
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.5
       color: 14540253
       priority: 1000
@@ -23450,13 +20685,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 7.0
       color: 14540253
       priority: 1000
@@ -23482,13 +20710,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 10.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 9.0
       color: 14540253
       priority: 1000
@@ -23514,13 +20735,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 11.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 10.0
       color: 14540253
       priority: 1000
@@ -23546,13 +20760,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 11.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 10.0
       color: 14540253
       priority: 1000
@@ -23578,13 +20785,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 11.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 10.0
       color: 14540253
       priority: 1000
@@ -23613,13 +20813,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 5.1
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.5
       color: 14540253
       priority: 1000
@@ -23645,13 +20838,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 7.0
       color: 14540253
       priority: 1000
@@ -23661,7 +20847,7 @@ cont {
     lines {
       width: 15.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23691,13 +20877,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 10.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 9.0
       color: 14540253
       priority: 1000
@@ -23707,7 +20886,7 @@ cont {
     lines {
       width: 17.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23737,13 +20916,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 11.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 10.0
       color: 14540253
       priority: 1000
@@ -23753,7 +20925,7 @@ cont {
     lines {
       width: 18.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23783,13 +20955,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 11.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 10.0
       color: 14540253
       priority: 1000
@@ -23799,7 +20964,7 @@ cont {
     lines {
       width: 18.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23829,13 +20994,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 11.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 10.0
       color: 14540253
       priority: 1000
@@ -23845,7 +21003,7 @@ cont {
     lines {
       width: 18.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23878,13 +21036,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 5.1
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.5
       color: 14540253
       priority: 1000
@@ -23910,13 +21061,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 7.0
       color: 14540253
       priority: 1000
@@ -23926,7 +21070,7 @@ cont {
     lines {
       width: 15.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23960,13 +21104,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 10.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 9.0
       color: 14540253
       priority: 1000
@@ -23976,7 +21113,7 @@ cont {
     lines {
       width: 17.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24010,13 +21147,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 11.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 10.0
       color: 14540253
       priority: 1000
@@ -24026,7 +21156,7 @@ cont {
     lines {
       width: 18.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24060,13 +21190,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 11.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 10.0
       color: 14540253
       priority: 1000
@@ -24076,7 +21199,7 @@ cont {
     lines {
       width: 18.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24110,13 +21233,6 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 11.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 10.0
       color: 14540253
       priority: 1000
@@ -24126,7 +21242,7 @@ cont {
     lines {
       width: 18.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24158,21 +21274,14 @@ cont {
     lines {
       width: 2.6
       color: 13421738
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24182,21 +21291,14 @@ cont {
     lines {
       width: 2.6
       color: 13421738
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24206,21 +21308,14 @@ cont {
     lines {
       width: 3.6
       color: 13421738
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24230,21 +21325,14 @@ cont {
     lines {
       width: 4.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24254,21 +21342,14 @@ cont {
     lines {
       width: 5.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24278,7 +21359,7 @@ cont {
         color: 4473924
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -24286,21 +21367,14 @@ cont {
     lines {
       width: 6.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 5.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24310,7 +21384,7 @@ cont {
         color: 4473924
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -24318,21 +21392,14 @@ cont {
     lines {
       width: 8.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 7.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24342,7 +21409,7 @@ cont {
         color: 4473924
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -24350,21 +21417,14 @@ cont {
     lines {
       width: 12.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 12.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 11.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24374,7 +21434,7 @@ cont {
         color: 4473924
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -24382,21 +21442,14 @@ cont {
     lines {
       width: 15.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 15.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 14.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24406,7 +21459,7 @@ cont {
         color: 4473924
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -24414,21 +21467,14 @@ cont {
     lines {
       width: 24.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24438,7 +21484,7 @@ cont {
         color: 4473924
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -24446,21 +21492,14 @@ cont {
     lines {
       width: 42.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24470,7 +21509,7 @@ cont {
         color: 4473924
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
 }
@@ -24481,21 +21520,14 @@ cont {
     lines {
       width: 2.6
       color: 13421738
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24505,21 +21537,14 @@ cont {
     lines {
       width: 2.6
       color: 13421738
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24529,21 +21554,14 @@ cont {
     lines {
       width: 3.6
       color: 13421738
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24553,21 +21571,14 @@ cont {
     lines {
       width: 4.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24577,21 +21588,14 @@ cont {
     lines {
       width: 5.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24601,7 +21605,7 @@ cont {
         color: 4473924
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -24609,21 +21613,14 @@ cont {
     lines {
       width: 6.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 5.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24633,7 +21630,7 @@ cont {
         color: 4473924
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -24641,28 +21638,21 @@ cont {
     lines {
       width: 8.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 7.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 15.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24679,7 +21669,7 @@ cont {
         color: 4473924
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -24687,28 +21677,21 @@ cont {
     lines {
       width: 12.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 12.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 11.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 19.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24725,7 +21708,7 @@ cont {
         color: 4473924
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -24733,28 +21716,21 @@ cont {
     lines {
       width: 15.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 15.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 14.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 22.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24771,7 +21747,7 @@ cont {
         color: 4473924
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -24779,28 +21755,21 @@ cont {
     lines {
       width: 24.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24817,7 +21786,7 @@ cont {
         color: 4473924
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -24825,28 +21794,21 @@ cont {
     lines {
       width: 42.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24863,7 +21825,7 @@ cont {
         color: 4473924
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
 }
@@ -24874,21 +21836,14 @@ cont {
     lines {
       width: 2.6
       color: 13421738
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24898,21 +21853,14 @@ cont {
     lines {
       width: 2.6
       color: 13421738
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24922,21 +21870,14 @@ cont {
     lines {
       width: 3.6
       color: 13421738
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24946,21 +21887,14 @@ cont {
     lines {
       width: 4.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24970,21 +21904,14 @@ cont {
     lines {
       width: 5.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24994,7 +21921,7 @@ cont {
         color: 4473924
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -25002,21 +21929,14 @@ cont {
     lines {
       width: 6.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 5.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25026,7 +21946,7 @@ cont {
         color: 4473924
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -25034,28 +21954,21 @@ cont {
     lines {
       width: 8.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 7.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 15.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25076,7 +21989,7 @@ cont {
         color: 4473924
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -25084,28 +21997,21 @@ cont {
     lines {
       width: 12.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 12.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 11.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 19.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25126,7 +22032,7 @@ cont {
         color: 4473924
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -25134,28 +22040,21 @@ cont {
     lines {
       width: 15.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 15.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 14.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 22.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25176,7 +22075,7 @@ cont {
         color: 4473924
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -25184,28 +22083,21 @@ cont {
     lines {
       width: 24.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25226,7 +22118,7 @@ cont {
         color: 4473924
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -25234,28 +22126,21 @@ cont {
     lines {
       width: 42.6
       color: 13421670
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25276,7 +22161,7 @@ cont {
         color: 4473924
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
 }
@@ -25287,21 +22172,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25311,21 +22189,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25335,21 +22206,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25359,21 +22223,14 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25383,21 +22240,14 @@ cont {
     lines {
       width: 6.1
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.1
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.5
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25407,7 +22257,7 @@ cont {
         color: 2236962
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -25415,21 +22265,14 @@ cont {
     lines {
       width: 10.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 10.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 9.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25439,7 +22282,7 @@ cont {
         color: 2236962
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -25447,21 +22290,14 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25471,7 +22307,7 @@ cont {
         color: 2236962
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -25479,21 +22315,14 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25503,7 +22332,7 @@ cont {
         color: 2236962
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -25511,21 +22340,14 @@ cont {
     lines {
       width: 24.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25535,7 +22357,7 @@ cont {
         color: 2236962
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -25543,21 +22365,14 @@ cont {
     lines {
       width: 42.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25567,7 +22382,7 @@ cont {
         color: 2236962
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
 }
@@ -25578,21 +22393,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25602,21 +22410,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25626,21 +22427,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25650,21 +22444,14 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25674,21 +22461,14 @@ cont {
     lines {
       width: 6.1
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.1
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.5
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25698,7 +22478,7 @@ cont {
         color: 2236962
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -25706,28 +22486,21 @@ cont {
     lines {
       width: 10.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 10.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 9.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 17.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25744,7 +22517,7 @@ cont {
         color: 2236962
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -25752,28 +22525,21 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25790,7 +22556,7 @@ cont {
         color: 2236962
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -25798,28 +22564,21 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25836,7 +22595,7 @@ cont {
         color: 2236962
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -25844,28 +22603,21 @@ cont {
     lines {
       width: 24.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25882,7 +22634,7 @@ cont {
         color: 2236962
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -25890,28 +22642,21 @@ cont {
     lines {
       width: 42.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25928,7 +22673,7 @@ cont {
         color: 2236962
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
 }
@@ -25939,21 +22684,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25963,21 +22701,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25987,21 +22718,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -26011,21 +22735,14 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -26035,21 +22752,14 @@ cont {
     lines {
       width: 6.1
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.1
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.5
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -26059,7 +22769,7 @@ cont {
         color: 2236962
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -26067,28 +22777,21 @@ cont {
     lines {
       width: 10.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 10.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 9.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 17.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26109,7 +22812,7 @@ cont {
         color: 2236962
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -26117,28 +22820,21 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26159,7 +22855,7 @@ cont {
         color: 2236962
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -26167,28 +22863,21 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26209,7 +22898,7 @@ cont {
         color: 2236962
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -26217,28 +22906,21 @@ cont {
     lines {
       width: 24.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26259,7 +22941,7 @@ cont {
         color: 2236962
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
   element {
@@ -26267,28 +22949,21 @@ cont {
     lines {
       width: 42.6
       color: 12294468
-      priority: 42
+      priority: 50
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777096
-      priority: 1042
+      priority: 1050
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26309,7 +22984,7 @@ cont {
         color: 2236962
         stroke_color: 16777096
       }
-      priority: 16042
+      priority: 16050
     }
   }
 }
@@ -26320,21 +22995,14 @@ cont {
     lines {
       width: 4.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -26344,21 +23012,14 @@ cont {
     lines {
       width: 6.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 5.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -26368,7 +23029,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -26376,21 +23037,14 @@ cont {
     lines {
       width: 8.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 7.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -26400,7 +23054,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -26408,21 +23062,14 @@ cont {
     lines {
       width: 10.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 10.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 9.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -26432,7 +23079,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -26440,21 +23087,14 @@ cont {
     lines {
       width: 18.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 18.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 17.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -26464,7 +23104,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
 }
@@ -26474,14 +23114,14 @@ cont {
     scale: 15
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
   }
   element {
     scale: 16
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
     path_text {
       primary {
@@ -26489,14 +23129,14 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
     scale: 17
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
     path_text {
       primary {
@@ -26504,14 +23144,14 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
     scale: 18
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
     path_text {
       primary {
@@ -26519,14 +23159,14 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
     scale: 19
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
     path_text {
       primary {
@@ -26534,7 +23174,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
 }
@@ -26545,28 +23185,21 @@ cont {
     lines {
       width: 4.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26583,28 +23216,21 @@ cont {
     lines {
       width: 6.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 5.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 13.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26621,7 +23247,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -26629,28 +23255,21 @@ cont {
     lines {
       width: 8.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 7.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 15.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26667,7 +23286,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -26675,28 +23294,21 @@ cont {
     lines {
       width: 10.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 10.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 9.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 17.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26713,7 +23325,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -26721,28 +23333,21 @@ cont {
     lines {
       width: 18.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 18.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 17.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 25.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -26759,7 +23364,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
 }
@@ -26770,21 +23375,14 @@ cont {
     lines {
       width: 4.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -26794,21 +23392,14 @@ cont {
     lines {
       width: 6.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 5.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -26818,7 +23409,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -26826,21 +23417,14 @@ cont {
     lines {
       width: 8.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 7.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -26850,7 +23434,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -26858,21 +23442,14 @@ cont {
     lines {
       width: 10.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 10.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 9.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -26882,7 +23459,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -26890,21 +23467,14 @@ cont {
     lines {
       width: 18.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 18.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 17.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -26914,7 +23484,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
 }
@@ -26924,14 +23494,14 @@ cont {
     scale: 15
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
   }
   element {
     scale: 16
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
     path_text {
       primary {
@@ -26939,14 +23509,14 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
     scale: 17
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
     path_text {
       primary {
@@ -26954,14 +23524,14 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
     scale: 18
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
     path_text {
       primary {
@@ -26969,14 +23539,14 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
     scale: 19
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
     path_text {
       primary {
@@ -26984,7 +23554,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
 }
@@ -26995,28 +23565,21 @@ cont {
     lines {
       width: 4.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27033,28 +23596,21 @@ cont {
     lines {
       width: 6.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 5.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 13.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27071,7 +23627,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -27079,28 +23635,21 @@ cont {
     lines {
       width: 8.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 7.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 15.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27117,7 +23666,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -27125,28 +23674,21 @@ cont {
     lines {
       width: 10.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 10.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 9.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 17.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27163,7 +23705,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -27171,28 +23713,21 @@ cont {
     lines {
       width: 18.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 18.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 17.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 25.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27209,7 +23744,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
 }
@@ -27220,28 +23755,21 @@ cont {
     lines {
       width: 4.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27262,28 +23790,21 @@ cont {
     lines {
       width: 6.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 5.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 13.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27304,7 +23825,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -27312,28 +23833,21 @@ cont {
     lines {
       width: 8.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 7.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 15.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27354,7 +23868,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -27362,28 +23876,21 @@ cont {
     lines {
       width: 10.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 10.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 9.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 17.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27404,7 +23911,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -27412,28 +23919,21 @@ cont {
     lines {
       width: 18.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 18.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 17.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 25.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27454,7 +23954,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
 }
@@ -27465,21 +23965,14 @@ cont {
     lines {
       width: 4.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -27489,21 +23982,14 @@ cont {
     lines {
       width: 6.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 5.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -27513,7 +23999,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -27521,21 +24007,14 @@ cont {
     lines {
       width: 8.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 7.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -27545,7 +24024,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -27553,21 +24032,14 @@ cont {
     lines {
       width: 10.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 10.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 9.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -27577,7 +24049,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -27585,21 +24057,14 @@ cont {
     lines {
       width: 18.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 18.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 17.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -27609,7 +24074,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
 }
@@ -27620,28 +24085,21 @@ cont {
     lines {
       width: 4.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27662,28 +24120,21 @@ cont {
     lines {
       width: 6.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 5.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 13.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27704,7 +24155,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -27712,28 +24163,21 @@ cont {
     lines {
       width: 8.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 7.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 15.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27754,7 +24198,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -27762,28 +24206,21 @@ cont {
     lines {
       width: 10.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 10.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 9.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 17.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27804,7 +24241,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -27812,28 +24249,21 @@ cont {
     lines {
       width: 18.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 18.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 17.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 25.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27854,7 +24284,7 @@ cont {
         color: 6710886
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
 }
@@ -27869,7 +24299,7 @@ cont {
         dd: 2.4
         dd: 1.0
       }
-      priority: 1033
+      priority: 1041
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27879,7 +24309,7 @@ cont {
         color: 3355443
         stroke_color: 14535850
       }
-      priority: 16033
+      priority: 16041
     }
   }
   element {
@@ -27887,7 +24317,7 @@ cont {
     lines {
       width: 6.0
       color: 11184793
-      priority: 1033
+      priority: 1041
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27898,7 +24328,7 @@ cont {
         dd: 2.4
         dd: 1.0
       }
-      priority: 1316
+      priority: 1323
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27908,7 +24338,7 @@ cont {
         color: 3355443
         stroke_color: 14535850
       }
-      priority: 16033
+      priority: 16041
     }
   }
   element {
@@ -27916,7 +24346,7 @@ cont {
     lines {
       width: 10.0
       color: 11184793
-      priority: 1033
+      priority: 1041
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27927,7 +24357,7 @@ cont {
         dd: 3.0
         dd: 1.0
       }
-      priority: 1316
+      priority: 1323
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27937,7 +24367,7 @@ cont {
         color: 3355443
         stroke_color: 14535850
       }
-      priority: 16033
+      priority: 16041
     }
   }
   element {
@@ -27945,7 +24375,7 @@ cont {
     lines {
       width: 18.0
       color: 11184793
-      priority: 1033
+      priority: 1041
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27956,7 +24386,7 @@ cont {
         dd: 4.0
         dd: 1.0
       }
-      priority: 1316
+      priority: 1323
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -27966,7 +24396,7 @@ cont {
         color: 3355443
         stroke_color: 14535850
       }
-      priority: 16033
+      priority: 16041
     }
   }
 }
@@ -27981,14 +24411,14 @@ cont {
         dd: 2.4
         dd: 1.0
       }
-      priority: 1033
+      priority: 1041
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -28005,7 +24435,7 @@ cont {
         color: 3355443
         stroke_color: 14535850
       }
-      priority: 16033
+      priority: 16041
     }
   }
   element {
@@ -28013,14 +24443,14 @@ cont {
     lines {
       width: 6.0
       color: 11184793
-      priority: 1033
+      priority: 1041
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -28031,7 +24461,7 @@ cont {
         dd: 2.4
         dd: 1.0
       }
-      priority: 1316
+      priority: 1323
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -28048,7 +24478,7 @@ cont {
         color: 3355443
         stroke_color: 14535850
       }
-      priority: 16033
+      priority: 16041
     }
   }
   element {
@@ -28056,14 +24486,14 @@ cont {
     lines {
       width: 10.0
       color: 11184793
-      priority: 1033
+      priority: 1041
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -28074,7 +24504,7 @@ cont {
         dd: 3.0
         dd: 1.0
       }
-      priority: 1316
+      priority: 1323
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -28091,7 +24521,7 @@ cont {
         color: 3355443
         stroke_color: 14535850
       }
-      priority: 16033
+      priority: 16041
     }
   }
   element {
@@ -28099,14 +24529,14 @@ cont {
     lines {
       width: 18.0
       color: 11184793
-      priority: 1033
+      priority: 1041
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 24.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -28117,7 +24547,7 @@ cont {
         dd: 4.0
         dd: 1.0
       }
-      priority: 1316
+      priority: 1323
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -28134,7 +24564,7 @@ cont {
         color: 3355443
         stroke_color: 14535850
       }
-      priority: 16033
+      priority: 16041
     }
   }
 }
@@ -28149,14 +24579,14 @@ cont {
         dd: 2.4
         dd: 1.0
       }
-      priority: 1033
+      priority: 1041
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -28177,7 +24607,7 @@ cont {
         color: 3355443
         stroke_color: 14535850
       }
-      priority: 16033
+      priority: 16041
     }
   }
   element {
@@ -28185,14 +24615,14 @@ cont {
     lines {
       width: 6.0
       color: 11184793
-      priority: 1033
+      priority: 1041
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -28203,7 +24633,7 @@ cont {
         dd: 2.4
         dd: 1.0
       }
-      priority: 1316
+      priority: 1323
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -28224,7 +24654,7 @@ cont {
         color: 3355443
         stroke_color: 14535850
       }
-      priority: 16033
+      priority: 16041
     }
   }
   element {
@@ -28232,14 +24662,14 @@ cont {
     lines {
       width: 10.0
       color: 11184793
-      priority: 1033
+      priority: 1041
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -28250,7 +24680,7 @@ cont {
         dd: 3.0
         dd: 1.0
       }
-      priority: 1316
+      priority: 1323
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -28271,7 +24701,7 @@ cont {
         color: 3355443
         stroke_color: 14535850
       }
-      priority: 16033
+      priority: 16041
     }
   }
   element {
@@ -28279,14 +24709,14 @@ cont {
     lines {
       width: 18.0
       color: 11184793
-      priority: 1033
+      priority: 1041
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 24.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -28297,7 +24727,7 @@ cont {
         dd: 4.0
         dd: 1.0
       }
-      priority: 1316
+      priority: 1323
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -28318,94 +24748,7 @@ cont {
         color: 3355443
         stroke_color: 14535850
       }
-      priority: 16033
-    }
-  }
-}
-cont {
-  name: "highway-street_lamp"
-  element {
-    scale: 16
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: 0
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    symbol {
-      name: "symbols/nori/street_lamp-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: 0
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    symbol {
-      name: "symbols/nori/street_lamp-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: 0
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    symbol {
-      name: "symbols/nori/street_lamp-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: 0
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    symbol {
-      name: "symbols/nori/street_lamp-18.svg:#444444::::"
-      priority: 16000
+      priority: 16041
     }
   }
 }
@@ -28416,21 +24759,14 @@ cont {
     lines {
       width: 2.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28440,21 +24776,14 @@ cont {
     lines {
       width: 3.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28464,21 +24793,14 @@ cont {
     lines {
       width: 4.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28488,7 +24810,7 @@ cont {
         color: 4473924
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -28496,21 +24818,14 @@ cont {
     lines {
       width: 5.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28520,7 +24835,7 @@ cont {
         color: 4473924
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -28528,21 +24843,14 @@ cont {
     lines {
       width: 7.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28552,7 +24860,7 @@ cont {
         color: 4473924
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -28560,21 +24868,14 @@ cont {
     lines {
       width: 13.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28584,7 +24885,7 @@ cont {
         color: 4473924
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -28592,21 +24893,14 @@ cont {
     lines {
       width: 24.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28616,7 +24910,7 @@ cont {
         color: 4473924
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -28624,21 +24918,14 @@ cont {
     lines {
       width: 42.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28648,7 +24935,7 @@ cont {
         color: 4473924
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
 }
@@ -28659,21 +24946,14 @@ cont {
     lines {
       width: 2.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28683,21 +24963,14 @@ cont {
     lines {
       width: 3.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28707,21 +24980,14 @@ cont {
     lines {
       width: 4.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28731,7 +24997,7 @@ cont {
         color: 4473924
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -28739,28 +25005,21 @@ cont {
     lines {
       width: 5.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -28777,7 +25036,7 @@ cont {
         color: 4473924
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -28785,28 +25044,21 @@ cont {
     lines {
       width: 7.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -28823,7 +25075,7 @@ cont {
         color: 4473924
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -28831,28 +25083,21 @@ cont {
     lines {
       width: 13.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -28869,7 +25114,7 @@ cont {
         color: 4473924
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -28877,28 +25122,21 @@ cont {
     lines {
       width: 24.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -28915,7 +25153,7 @@ cont {
         color: 4473924
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -28923,28 +25161,21 @@ cont {
     lines {
       width: 42.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -28961,7 +25192,7 @@ cont {
         color: 4473924
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
 }
@@ -28972,21 +25203,14 @@ cont {
     lines {
       width: 2.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -28996,21 +25220,14 @@ cont {
     lines {
       width: 3.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -29020,21 +25237,14 @@ cont {
     lines {
       width: 4.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -29044,7 +25254,7 @@ cont {
         color: 4473924
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -29052,28 +25262,21 @@ cont {
     lines {
       width: 5.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29094,7 +25297,7 @@ cont {
         color: 4473924
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -29102,28 +25305,21 @@ cont {
     lines {
       width: 7.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29144,7 +25340,7 @@ cont {
         color: 4473924
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -29152,28 +25348,21 @@ cont {
     lines {
       width: 13.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29194,7 +25383,7 @@ cont {
         color: 4473924
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -29202,28 +25391,21 @@ cont {
     lines {
       width: 24.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29244,7 +25426,7 @@ cont {
         color: 4473924
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -29252,28 +25434,21 @@ cont {
     lines {
       width: 42.6
       color: 13421670
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 13421670
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29294,7 +25469,7 @@ cont {
         color: 4473924
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
 }
@@ -29305,21 +25480,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -29329,21 +25497,14 @@ cont {
     lines {
       width: 4.35
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.35
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.75
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -29353,21 +25514,14 @@ cont {
     lines {
       width: 6.1
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.1
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.5
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -29377,21 +25531,14 @@ cont {
     lines {
       width: 10.6
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 10.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 9.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -29401,7 +25548,7 @@ cont {
         color: 2236962
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -29409,21 +25556,14 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -29433,7 +25573,7 @@ cont {
         color: 2236962
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -29441,21 +25581,14 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -29465,7 +25598,7 @@ cont {
         color: 2236962
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -29473,21 +25606,14 @@ cont {
     lines {
       width: 24.6
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -29497,7 +25623,7 @@ cont {
         color: 2236962
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -29505,21 +25631,14 @@ cont {
     lines {
       width: 42.6
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -29529,7 +25648,7 @@ cont {
         color: 2236962
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
 }
@@ -29540,21 +25659,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -29564,21 +25676,14 @@ cont {
     lines {
       width: 4.35
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.35
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.75
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -29588,21 +25693,14 @@ cont {
     lines {
       width: 6.1
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.1
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.5
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -29612,28 +25710,21 @@ cont {
     lines {
       width: 10.6
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 10.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 9.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 17.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29650,7 +25741,7 @@ cont {
         color: 2236962
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -29658,28 +25749,21 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29696,7 +25780,7 @@ cont {
         color: 2236962
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -29704,28 +25788,21 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29742,7 +25819,7 @@ cont {
         color: 2236962
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -29750,28 +25827,21 @@ cont {
     lines {
       width: 24.6
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29788,7 +25858,7 @@ cont {
         color: 2236962
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -29796,28 +25866,21 @@ cont {
     lines {
       width: 42.6
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29834,7 +25897,7 @@ cont {
         color: 2236962
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
 }
@@ -29845,21 +25908,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -29869,21 +25925,14 @@ cont {
     lines {
       width: 4.35
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.35
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.75
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -29893,21 +25942,14 @@ cont {
     lines {
       width: 6.1
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.1
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.5
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -29917,28 +25959,21 @@ cont {
     lines {
       width: 10.6
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 10.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 9.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 17.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -29959,7 +25994,7 @@ cont {
         color: 2236962
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -29967,28 +26002,21 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -30009,7 +26037,7 @@ cont {
         color: 2236962
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -30017,28 +26045,21 @@ cont {
     lines {
       width: 13.6
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 13.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -30059,7 +26080,7 @@ cont {
         color: 2236962
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -30067,28 +26088,21 @@ cont {
     lines {
       width: 24.6
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -30109,7 +26123,7 @@ cont {
         color: 2236962
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
   element {
@@ -30117,28 +26131,21 @@ cont {
     lines {
       width: 42.6
       color: 12294468
-      priority: 39
+      priority: 47
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777113
-      priority: 1039
+      priority: 1047
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -30159,7 +26166,7 @@ cont {
         color: 2236962
         stroke_color: 16777113
       }
-      priority: 16039
+      priority: 16047
     }
   }
 }
@@ -30170,9 +26177,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -30180,9 +26187,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -30190,7 +26197,7 @@ cont {
     lines {
       width: 2.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30200,7 +26207,7 @@ cont {
     lines {
       width: 4.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30210,7 +26217,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -30218,7 +26225,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30228,7 +26235,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -30236,7 +26243,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30246,7 +26253,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -30254,7 +26261,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30264,7 +26271,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -30274,28 +26281,28 @@ cont {
     scale: 13
     area {
       color: 14522675
-      priority: 1032
+      priority: 1039
     }
   }
   element {
     scale: 14
     area {
       color: 14522675
-      priority: 1032
+      priority: 1039
     }
   }
   element {
     scale: 15
     area {
       color: 13412983
-      priority: 1032
+      priority: 1039
     }
   }
   element {
     scale: 16
     area {
       color: 13412983
-      priority: 1032
+      priority: 1039
     }
     path_text {
       primary {
@@ -30303,14 +26310,14 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
     scale: 17
     area {
       color: 13412983
-      priority: 1032
+      priority: 1039
     }
     path_text {
       primary {
@@ -30318,14 +26325,14 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
     scale: 18
     area {
       color: 13412983
-      priority: 1032
+      priority: 1039
     }
     path_text {
       primary {
@@ -30333,14 +26340,14 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
     scale: 19
     area {
       color: 13412983
-      priority: 1032
+      priority: 1039
     }
     path_text {
       primary {
@@ -30348,7 +26355,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -30359,9 +26366,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -30369,9 +26376,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -30379,14 +26386,14 @@ cont {
     lines {
       width: 2.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -30403,14 +26410,14 @@ cont {
     lines {
       width: 4.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -30427,7 +26434,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -30435,14 +26442,14 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -30459,7 +26466,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -30467,14 +26474,14 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -30491,7 +26498,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -30499,14 +26506,14 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -30523,7 +26530,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -30534,9 +26541,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -30544,9 +26551,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -30554,7 +26561,7 @@ cont {
     lines {
       width: 2.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30564,7 +26571,7 @@ cont {
     lines {
       width: 4.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30574,7 +26581,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -30582,7 +26589,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30592,7 +26599,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -30600,7 +26607,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30610,7 +26617,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -30618,7 +26625,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30628,7 +26635,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -30639,9 +26646,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -30649,9 +26656,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -30659,7 +26666,7 @@ cont {
     lines {
       width: 2.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30669,7 +26676,7 @@ cont {
     lines {
       width: 4.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30679,7 +26686,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -30687,7 +26694,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30697,7 +26704,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -30705,7 +26712,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30715,7 +26722,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -30723,7 +26730,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30733,7 +26740,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -30744,9 +26751,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -30754,9 +26761,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -30764,7 +26771,7 @@ cont {
     lines {
       width: 2.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30774,7 +26781,7 @@ cont {
     lines {
       width: 4.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30784,7 +26791,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -30792,7 +26799,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30802,7 +26809,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -30810,7 +26817,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30820,7 +26827,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -30828,7 +26835,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30838,7 +26845,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -30849,9 +26856,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -30859,9 +26866,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -30869,7 +26876,7 @@ cont {
     lines {
       width: 2.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30879,7 +26886,7 @@ cont {
     lines {
       width: 4.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30889,7 +26896,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -30897,7 +26904,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30907,7 +26914,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -30915,7 +26922,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30925,7 +26932,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -30933,7 +26940,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30943,7 +26950,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -30954,9 +26961,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -30964,9 +26971,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -30974,7 +26981,7 @@ cont {
     lines {
       width: 2.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30984,7 +26991,7 @@ cont {
     lines {
       width: 4.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -30994,7 +27001,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31002,7 +27009,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31012,7 +27019,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31020,7 +27027,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31030,7 +27037,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31038,7 +27045,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31048,7 +27055,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -31059,9 +27066,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -31069,9 +27076,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -31079,7 +27086,7 @@ cont {
     lines {
       width: 2.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31089,7 +27096,7 @@ cont {
     lines {
       width: 4.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31099,7 +27106,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31107,7 +27114,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31117,7 +27124,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31125,7 +27132,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31135,7 +27142,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31143,7 +27150,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31153,7 +27160,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -31164,9 +27171,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -31174,9 +27181,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -31184,7 +27191,7 @@ cont {
     lines {
       width: 2.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31194,7 +27201,7 @@ cont {
     lines {
       width: 4.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31204,7 +27211,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31212,7 +27219,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31222,7 +27229,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31230,7 +27237,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31240,7 +27247,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31248,7 +27255,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31258,7 +27265,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -31269,9 +27276,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -31279,9 +27286,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -31289,7 +27296,7 @@ cont {
     lines {
       width: 2.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31299,7 +27306,7 @@ cont {
     lines {
       width: 4.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31309,7 +27316,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31317,7 +27324,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31327,7 +27334,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31335,7 +27342,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31345,7 +27352,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31353,7 +27360,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31363,7 +27370,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -31374,9 +27381,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -31384,9 +27391,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -31394,7 +27401,7 @@ cont {
     lines {
       width: 2.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31404,7 +27411,7 @@ cont {
     lines {
       width: 4.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31414,7 +27421,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31422,7 +27429,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31432,7 +27439,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31440,7 +27447,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31450,7 +27457,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31458,7 +27465,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31468,7 +27475,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -31479,9 +27486,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -31489,9 +27496,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -31499,7 +27506,7 @@ cont {
     lines {
       width: 2.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31509,7 +27516,7 @@ cont {
     lines {
       width: 4.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31519,7 +27526,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31527,7 +27534,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31537,7 +27544,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31545,7 +27552,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31555,7 +27562,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31563,7 +27570,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31573,7 +27580,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -31584,9 +27591,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -31594,9 +27601,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -31604,7 +27611,7 @@ cont {
     lines {
       width: 2.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31614,7 +27621,7 @@ cont {
     lines {
       width: 4.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31624,7 +27631,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31632,7 +27639,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31642,7 +27649,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31650,7 +27657,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31660,7 +27667,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31668,7 +27675,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31678,7 +27685,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -31689,9 +27696,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -31699,9 +27706,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -31709,7 +27716,7 @@ cont {
     lines {
       width: 2.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31719,7 +27726,7 @@ cont {
     lines {
       width: 4.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31729,7 +27736,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31737,7 +27744,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31747,7 +27754,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31755,7 +27762,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31765,7 +27772,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31773,7 +27780,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31783,7 +27790,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -31794,9 +27801,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -31804,9 +27811,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -31814,7 +27821,7 @@ cont {
     lines {
       width: 2.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31824,7 +27831,7 @@ cont {
     lines {
       width: 4.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31834,7 +27841,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31842,7 +27849,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31852,7 +27859,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31860,7 +27867,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31870,7 +27877,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31878,7 +27885,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31888,7 +27895,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -31899,9 +27906,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -31909,9 +27916,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -31919,7 +27926,7 @@ cont {
     lines {
       width: 2.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31929,7 +27936,7 @@ cont {
     lines {
       width: 4.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31939,7 +27946,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31947,7 +27954,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31957,7 +27964,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31965,7 +27972,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31975,7 +27982,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -31983,7 +27990,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -31993,7 +28000,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -32004,9 +28011,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -32014,9 +28021,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -32024,7 +28031,7 @@ cont {
     lines {
       width: 2.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32034,7 +28041,7 @@ cont {
     lines {
       width: 4.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32044,7 +28051,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -32052,7 +28059,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32062,7 +28069,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -32070,7 +28077,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32080,7 +28087,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -32088,7 +28095,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32098,7 +28105,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -32109,9 +28116,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -32119,9 +28126,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -32129,7 +28136,7 @@ cont {
     lines {
       width: 2.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32139,7 +28146,7 @@ cont {
     lines {
       width: 4.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32149,7 +28156,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -32157,7 +28164,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32167,7 +28174,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -32175,7 +28182,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32185,7 +28192,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -32193,7 +28200,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32203,7 +28210,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -32214,9 +28221,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -32224,9 +28231,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -32234,7 +28241,7 @@ cont {
     lines {
       width: 2.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32244,7 +28251,7 @@ cont {
     lines {
       width: 4.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32254,7 +28261,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -32262,7 +28269,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32272,7 +28279,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -32280,7 +28287,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32290,7 +28297,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -32298,7 +28305,7 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32308,7 +28315,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -32319,9 +28326,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -32329,9 +28336,9 @@ cont {
     lines {
       width: 1.0
       color: 14522675
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -32339,14 +28346,14 @@ cont {
     lines {
       width: 2.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -32367,14 +28374,14 @@ cont {
     lines {
       width: 4.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -32395,7 +28402,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -32403,14 +28410,14 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -32431,7 +28438,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -32439,14 +28446,14 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -32467,7 +28474,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
   element {
@@ -32475,14 +28482,14 @@ cont {
     lines {
       width: 6.0
       color: 13412983
-      priority: 1031
+      priority: 1038
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -32503,7 +28510,7 @@ cont {
         color: 3355443
         stroke_color: 13412983
       }
-      priority: 16031
+      priority: 16038
     }
   }
 }
@@ -32514,23 +28521,16 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 15654314
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -32538,23 +28538,16 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16768409
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -32562,23 +28555,16 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -32586,23 +28572,16 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -32610,7 +28589,7 @@ cont {
         color: 3355443
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -32618,23 +28597,16 @@ cont {
     lines {
       width: 4.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -32642,7 +28614,7 @@ cont {
         color: 3355443
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -32650,21 +28622,14 @@ cont {
     lines {
       width: 4.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32674,7 +28639,7 @@ cont {
         color: 3355443
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -32682,21 +28647,14 @@ cont {
     lines {
       width: 6.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 5.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32706,7 +28664,7 @@ cont {
         color: 3355443
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -32714,21 +28672,14 @@ cont {
     lines {
       width: 8.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 7.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32738,7 +28689,7 @@ cont {
         color: 3355443
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -32746,21 +28697,14 @@ cont {
     lines {
       width: 9.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32770,7 +28714,7 @@ cont {
         color: 3355443
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -32778,21 +28722,14 @@ cont {
     lines {
       width: 15.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 15.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 14.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32802,7 +28739,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -32810,21 +28747,14 @@ cont {
     lines {
       width: 17.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 17.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 16.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32834,7 +28764,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -32842,21 +28772,14 @@ cont {
     lines {
       width: 24.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32866,7 +28789,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -32874,21 +28797,14 @@ cont {
     lines {
       width: 42.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -32898,7 +28814,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
 }
@@ -32909,23 +28825,16 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 15654314
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -32933,23 +28842,16 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16768409
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -32957,23 +28859,16 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -32981,23 +28876,16 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -33005,7 +28893,7 @@ cont {
         color: 3355443
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -33013,23 +28901,16 @@ cont {
     lines {
       width: 4.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -33037,7 +28918,7 @@ cont {
         color: 3355443
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -33045,21 +28926,14 @@ cont {
     lines {
       width: 4.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33069,7 +28943,7 @@ cont {
         color: 3355443
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -33077,21 +28951,14 @@ cont {
     lines {
       width: 6.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 5.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33101,7 +28968,7 @@ cont {
         color: 3355443
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -33109,21 +28976,14 @@ cont {
     lines {
       width: 8.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 7.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33133,7 +28993,7 @@ cont {
         color: 3355443
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -33141,28 +29001,21 @@ cont {
     lines {
       width: 9.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 16.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -33179,7 +29032,7 @@ cont {
         color: 3355443
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -33187,28 +29040,21 @@ cont {
     lines {
       width: 15.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 15.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 14.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 22.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -33225,7 +29071,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -33233,28 +29079,21 @@ cont {
     lines {
       width: 17.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 17.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 16.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 24.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -33271,7 +29110,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -33279,28 +29118,21 @@ cont {
     lines {
       width: 24.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -33317,7 +29149,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -33325,28 +29157,21 @@ cont {
     lines {
       width: 42.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -33363,7 +29188,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
 }
@@ -33374,23 +29199,16 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 15654314
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -33398,23 +29216,16 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16768409
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -33422,23 +29233,16 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -33446,23 +29250,16 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -33470,7 +29267,7 @@ cont {
         color: 3355443
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -33478,23 +29275,16 @@ cont {
     lines {
       width: 4.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
     path_text {
       primary {
@@ -33502,7 +29292,7 @@ cont {
         color: 3355443
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -33510,21 +29300,14 @@ cont {
     lines {
       width: 4.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33534,7 +29317,7 @@ cont {
         color: 3355443
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -33542,21 +29325,14 @@ cont {
     lines {
       width: 6.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 5.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33566,7 +29342,7 @@ cont {
         color: 3355443
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -33574,21 +29350,14 @@ cont {
     lines {
       width: 8.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 7.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33598,7 +29367,7 @@ cont {
         color: 3355443
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -33606,28 +29375,21 @@ cont {
     lines {
       width: 9.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 16.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -33648,7 +29410,7 @@ cont {
         color: 3355443
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -33656,28 +29418,21 @@ cont {
     lines {
       width: 15.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 15.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 14.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 22.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -33698,7 +29453,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -33706,28 +29461,21 @@ cont {
     lines {
       width: 17.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 17.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 16.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 24.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -33748,7 +29496,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -33756,28 +29504,21 @@ cont {
     lines {
       width: 24.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -33798,7 +29539,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -33806,28 +29547,21 @@ cont {
     lines {
       width: 42.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -33848,7 +29582,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
 }
@@ -33859,21 +29593,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33883,21 +29610,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33907,21 +29627,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33931,21 +29644,14 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33955,21 +29661,14 @@ cont {
     lines {
       width: 5.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -33979,21 +29678,14 @@ cont {
     lines {
       width: 9.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34003,21 +29695,14 @@ cont {
     lines {
       width: 15.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 15.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 14.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34027,7 +29712,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -34035,21 +29720,14 @@ cont {
     lines {
       width: 17.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 17.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 16.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34059,7 +29737,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -34067,21 +29745,14 @@ cont {
     lines {
       width: 24.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34091,7 +29762,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -34099,21 +29770,14 @@ cont {
     lines {
       width: 42.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34123,7 +29787,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
 }
@@ -34134,21 +29798,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34158,21 +29815,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34182,21 +29832,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34206,21 +29849,14 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34230,21 +29866,14 @@ cont {
     lines {
       width: 5.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34254,28 +29883,21 @@ cont {
     lines {
       width: 9.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 16.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -34292,28 +29914,21 @@ cont {
     lines {
       width: 15.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 15.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 14.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 22.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -34330,7 +29945,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -34338,28 +29953,21 @@ cont {
     lines {
       width: 17.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 17.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 16.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 24.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -34376,7 +29984,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -34384,28 +29992,21 @@ cont {
     lines {
       width: 24.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -34422,7 +30023,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -34430,28 +30031,21 @@ cont {
     lines {
       width: 42.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -34468,7 +30062,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
 }
@@ -34479,21 +30073,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34503,21 +30090,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34527,21 +30107,14 @@ cont {
     lines {
       width: 2.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34551,21 +30124,14 @@ cont {
     lines {
       width: 3.6
       color: 12294468
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
-      color: 12294468
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34575,21 +30141,14 @@ cont {
     lines {
       width: 5.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34599,28 +30158,21 @@ cont {
     lines {
       width: 9.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 16.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -34641,28 +30193,21 @@ cont {
     lines {
       width: 15.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 15.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 14.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 22.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -34683,7 +30228,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -34691,28 +30236,21 @@ cont {
     lines {
       width: 17.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 17.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 16.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 24.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -34733,7 +30271,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -34741,28 +30279,21 @@ cont {
     lines {
       width: 24.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -34783,7 +30314,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
   element {
@@ -34791,28 +30322,21 @@ cont {
     lines {
       width: 42.6
       color: 14527061
-      priority: 50
+      priority: 58
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 14527061
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16763972
-      priority: 1050
+      priority: 1058
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -34833,7 +30357,7 @@ cont {
         color: 4473924
         stroke_color: 16763972
       }
-      priority: 16050
+      priority: 16058
     }
   }
 }
@@ -34844,23 +30368,16 @@ cont {
     lines {
       width: 2.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -34868,21 +30385,14 @@ cont {
     lines {
       width: 4.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34892,7 +30402,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -34900,21 +30410,14 @@ cont {
     lines {
       width: 5.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34924,7 +30427,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -34932,21 +30435,14 @@ cont {
     lines {
       width: 7.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34956,7 +30452,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -34964,21 +30460,14 @@ cont {
     lines {
       width: 9.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -34988,7 +30477,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -34996,21 +30485,14 @@ cont {
     lines {
       width: 24.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -35020,7 +30502,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -35028,21 +30510,14 @@ cont {
     lines {
       width: 42.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -35052,7 +30527,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
 }
@@ -35062,14 +30537,14 @@ cont {
     scale: 13
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
   }
   element {
     scale: 14
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
     path_text {
       primary {
@@ -35077,14 +30552,14 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
     scale: 15
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
     path_text {
       primary {
@@ -35092,14 +30567,14 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
     scale: 16
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
     path_text {
       primary {
@@ -35107,14 +30582,14 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
     scale: 17
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
     path_text {
       primary {
@@ -35122,14 +30597,14 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
     scale: 18
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
     path_text {
       primary {
@@ -35137,14 +30612,14 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
     scale: 19
     area {
       color: 16777215
-      priority: 1037
+      priority: 1045
     }
     path_text {
       primary {
@@ -35152,7 +30627,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
 }
@@ -35163,23 +30638,16 @@ cont {
     lines {
       width: 2.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -35187,21 +30655,14 @@ cont {
     lines {
       width: 4.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -35211,7 +30672,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -35219,28 +30680,21 @@ cont {
     lines {
       width: 5.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -35257,7 +30711,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -35265,28 +30719,21 @@ cont {
     lines {
       width: 7.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -35303,7 +30750,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -35311,28 +30758,21 @@ cont {
     lines {
       width: 9.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 16.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -35349,7 +30789,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -35357,28 +30797,21 @@ cont {
     lines {
       width: 24.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -35395,7 +30828,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -35403,28 +30836,21 @@ cont {
     lines {
       width: 42.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -35441,7 +30867,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
 }
@@ -35452,23 +30878,16 @@ cont {
     lines {
       width: 2.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 1.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
-      cap: ROUNDCAP
+      cap: BUTTCAP
     }
   }
   element {
@@ -35476,21 +30895,14 @@ cont {
     lines {
       width: 4.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 4.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 3.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -35500,7 +30912,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -35508,28 +30920,21 @@ cont {
     lines {
       width: 5.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -35550,7 +30955,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -35558,28 +30963,21 @@ cont {
     lines {
       width: 7.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -35600,7 +30998,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -35608,28 +31006,21 @@ cont {
     lines {
       width: 9.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 8.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 16.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -35650,7 +31041,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -35658,28 +31049,21 @@ cont {
     lines {
       width: 24.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 24.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 23.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 31.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -35700,7 +31084,7 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
   element {
@@ -35708,28 +31092,21 @@ cont {
     lines {
       width: 42.6
       color: 13421738
-      priority: 36
+      priority: 44
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 42.6
-      color: 13421738
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 41.0
       color: 16777215
-      priority: 1036
+      priority: 1044
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 49.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -35750,14 +31127,25 @@ cont {
         color: 5592405
         stroke_color: 16777215
       }
-      priority: 16036
+      priority: 16044
     }
   }
 }
 cont {
   name: "historic-archaeological_site"
   element {
+    scale: 16
+    symbol {
+      name: "museum"
+      priority: 16000
+    }
+  }
+  element {
     scale: 17
+    symbol {
+      name: "museum"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -35770,6 +31158,10 @@ cont {
   }
   element {
     scale: 18
+    symbol {
+      name: "museum"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -35782,6 +31174,10 @@ cont {
   }
   element {
     scale: 19
+    symbol {
+      name: "museum"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -35796,7 +31192,18 @@ cont {
 cont {
   name: "historic-battlefield"
   element {
+    scale: 16
+    symbol {
+      name: "cannon"
+      priority: 16000
+    }
+  }
+  element {
     scale: 17
+    symbol {
+      name: "cannon"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -35809,6 +31216,10 @@ cont {
   }
   element {
     scale: 18
+    symbol {
+      name: "cannon"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -35821,6 +31232,10 @@ cont {
   }
   element {
     scale: 19
+    symbol {
+      name: "cannon"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -35835,7 +31250,18 @@ cont {
 cont {
   name: "historic-castle"
   element {
+    scale: 16
+    symbol {
+      name: "castle"
+      priority: 16000
+    }
+  }
+  element {
     scale: 17
+    symbol {
+      name: "castle"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -35848,6 +31274,10 @@ cont {
   }
   element {
     scale: 18
+    symbol {
+      name: "castle"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -35860,6 +31290,10 @@ cont {
   }
   element {
     scale: 19
+    symbol {
+      name: "castle"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -35876,14 +31310,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/monument-18.svg:#444444::::"
+      name: "memorial"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/monument-18.svg:#444444::::"
+      name: "memorial"
       priority: 16008
     }
     caption {
@@ -35899,7 +31333,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/monument-18.svg:#444444::::"
+      name: "memorial"
       priority: 16008
     }
     caption {
@@ -35915,7 +31349,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/monument-18.svg:#444444::::"
+      name: "memorial"
       priority: 16008
     }
     caption {
@@ -35934,14 +31368,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/monument-18.svg:#444444::::"
+      name: "memorial"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/monument-18.svg:#444444::::"
+      name: "memorial"
       priority: 16008
     }
     caption {
@@ -35957,7 +31391,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/monument-18.svg:#444444::::"
+      name: "memorial"
       priority: 16008
     }
     caption {
@@ -35973,7 +31407,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/monument-18.svg:#444444::::"
+      name: "memorial"
       priority: 16008
     }
     caption {
@@ -35992,14 +31426,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/museum-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "museum"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/museum-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "museum"
       priority: 16008
     }
     caption {
@@ -36015,7 +31449,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/museum-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "museum"
       priority: 16008
     }
     caption {
@@ -36031,7 +31465,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/museum-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "museum"
       priority: 16008
     }
     caption {
@@ -36048,7 +31482,18 @@ cont {
 cont {
   name: "historic-ruins"
   element {
+    scale: 16
+    symbol {
+      name: "ruins"
+      priority: 16000
+    }
+  }
+  element {
     scale: 17
+    symbol {
+      name: "ruins"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -36061,6 +31506,10 @@ cont {
   }
   element {
     scale: 18
+    symbol {
+      name: "ruins"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -36073,6 +31522,10 @@ cont {
   }
   element {
     scale: 19
+    symbol {
+      name: "ruins"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -36169,28 +31622,28 @@ cont {
     scale: 12
     area {
       color: 14544588
-      priority: -16057
+      priority: -16043
     }
   }
   element {
     scale: 13
     area {
       color: 14544588
-      priority: -16058
+      priority: -16044
     }
   }
   element {
     scale: 14
     area {
       color: 14544588
-      priority: -16059
+      priority: -16045
     }
   }
   element {
     scale: 15
     area {
       color: 14544588
-      priority: -16060
+      priority: -16046
     }
     caption {
       primary {
@@ -36204,7 +31657,7 @@ cont {
     scale: 16
     area {
       color: 14544588
-      priority: -16061
+      priority: -16047
     }
     caption {
       primary {
@@ -36218,7 +31671,7 @@ cont {
     scale: 17
     area {
       color: 14544588
-      priority: -16062
+      priority: -16048
     }
     caption {
       primary {
@@ -36232,7 +31685,7 @@ cont {
     scale: 18
     area {
       color: 14544588
-      priority: -16063
+      priority: -16049
     }
     caption {
       primary {
@@ -36246,7 +31699,7 @@ cont {
     scale: 19
     area {
       color: 14544588
-      priority: -16064
+      priority: -16050
     }
     caption {
       primary {
@@ -36263,91 +31716,91 @@ cont {
     scale: 12
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 13
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 14
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 15
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 12
         color: 2236962
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 16
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 16
         color: 2236962
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 17
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 16
         color: 2236962
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 18
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 16
         color: 2236962
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 19
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 16
         color: 2236962
       }
-      priority: 15093
+      priority: 15100
     }
   }
 }
@@ -36357,28 +31810,28 @@ cont {
     scale: 12
     area {
       color: 14540236
-      priority: -16065
+      priority: -16051
     }
   }
   element {
     scale: 13
     area {
       color: 14540236
-      priority: -16066
+      priority: -16052
     }
   }
   element {
     scale: 14
     area {
       color: 14540236
-      priority: -16067
+      priority: -16053
     }
   }
   element {
     scale: 15
     area {
       color: 14540236
-      priority: -16068
+      priority: -16054
     }
     caption {
       primary {
@@ -36392,7 +31845,7 @@ cont {
     scale: 16
     area {
       color: 14540236
-      priority: -16069
+      priority: -16055
     }
     caption {
       primary {
@@ -36406,7 +31859,7 @@ cont {
     scale: 17
     area {
       color: 14540236
-      priority: -16070
+      priority: -16056
     }
     caption {
       primary {
@@ -36420,7 +31873,7 @@ cont {
     scale: 18
     area {
       color: 14540236
-      priority: -16071
+      priority: -16057
     }
     caption {
       primary {
@@ -36434,7 +31887,7 @@ cont {
     scale: 19
     area {
       color: 14540236
-      priority: -16072
+      priority: -16058
     }
     caption {
       primary {
@@ -36451,28 +31904,28 @@ cont {
     scale: 12
     area {
       color: 14540236
-      priority: -16073
+      priority: -16059
     }
   }
   element {
     scale: 13
     area {
       color: 14540236
-      priority: -16074
+      priority: -16060
     }
   }
   element {
     scale: 14
     area {
       color: 14540236
-      priority: -16075
+      priority: -16061
     }
   }
   element {
     scale: 15
     area {
       color: 14540236
-      priority: -16076
+      priority: -16062
     }
     caption {
       primary {
@@ -36486,11 +31939,7 @@ cont {
     scale: 16
     area {
       color: 14540236
-      priority: -16077
-    }
-    symbol {
-      name: "symbols/maki/cemetery-18.svg:#444444::::"
-      priority: 16000
+      priority: -16063
     }
     caption {
       primary {
@@ -36504,11 +31953,7 @@ cont {
     scale: 17
     area {
       color: 14540236
-      priority: -16078
-    }
-    symbol {
-      name: "symbols/maki/cemetery-18.svg:#444444::::"
-      priority: 16000
+      priority: -16064
     }
     caption {
       primary {
@@ -36522,11 +31967,7 @@ cont {
     scale: 18
     area {
       color: 14540236
-      priority: -16079
-    }
-    symbol {
-      name: "symbols/maki/cemetery-18.svg:#444444::::"
-      priority: 16000
+      priority: -16065
     }
     caption {
       primary {
@@ -36540,11 +31981,7 @@ cont {
     scale: 19
     area {
       color: 14540236
-      priority: -16080
-    }
-    symbol {
-      name: "symbols/maki/cemetery-18.svg:#444444::::"
-      priority: 16000
+      priority: -16066
     }
     caption {
       primary {
@@ -36561,28 +31998,28 @@ cont {
     scale: 12
     area {
       color: 14540236
-      priority: -16081
+      priority: -16067
     }
   }
   element {
     scale: 13
     area {
       color: 14540236
-      priority: -16082
+      priority: -16068
     }
   }
   element {
     scale: 14
     area {
       color: 14540236
-      priority: -16083
+      priority: -16069
     }
   }
   element {
     scale: 15
     area {
       color: 14540236
-      priority: -16084
+      priority: -16070
     }
     caption {
       primary {
@@ -36596,11 +32033,7 @@ cont {
     scale: 16
     area {
       color: 14540236
-      priority: -16085
-    }
-    symbol {
-      name: "symbols/maki/religious-christian-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
+      priority: -16071
     }
     caption {
       primary {
@@ -36614,11 +32047,7 @@ cont {
     scale: 17
     area {
       color: 14540236
-      priority: -16086
-    }
-    symbol {
-      name: "symbols/maki/religious-christian-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
+      priority: -16072
     }
     caption {
       primary {
@@ -36632,11 +32061,7 @@ cont {
     scale: 18
     area {
       color: 14540236
-      priority: -16087
-    }
-    symbol {
-      name: "symbols/maki/religious-christian-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
+      priority: -16073
     }
     caption {
       primary {
@@ -36650,11 +32075,7 @@ cont {
     scale: 19
     area {
       color: 14540236
-      priority: -16088
-    }
-    symbol {
-      name: "symbols/maki/religious-christian-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
+      priority: -16074
     }
     caption {
       primary {
@@ -36671,28 +32092,28 @@ cont {
     scale: 12
     area {
       color: 16777181
-      priority: -16089
+      priority: -16075
     }
   }
   element {
     scale: 13
     area {
       color: 16777181
-      priority: -16090
+      priority: -16076
     }
   }
   element {
     scale: 14
     area {
       color: 16777181
-      priority: -16091
+      priority: -16077
     }
   }
   element {
     scale: 15
     area {
       color: 16777181
-      priority: -16092
+      priority: -16078
     }
     caption {
       primary {
@@ -36706,7 +32127,7 @@ cont {
     scale: 16
     area {
       color: 16777181
-      priority: -16093
+      priority: -16079
     }
     caption {
       primary {
@@ -36720,7 +32141,7 @@ cont {
     scale: 17
     area {
       color: 16777181
-      priority: -16094
+      priority: -16080
     }
     caption {
       primary {
@@ -36734,7 +32155,7 @@ cont {
     scale: 18
     area {
       color: 16777181
-      priority: -16095
+      priority: -16081
     }
     caption {
       primary {
@@ -36748,7 +32169,7 @@ cont {
     scale: 19
     area {
       color: 16777181
-      priority: -16096
+      priority: -16082
     }
     caption {
       primary {
@@ -36765,28 +32186,28 @@ cont {
     scale: 12
     area {
       color: 14540236
-      priority: -16097
+      priority: -16083
     }
   }
   element {
     scale: 13
     area {
       color: 14540236
-      priority: -16098
+      priority: -16084
     }
   }
   element {
     scale: 14
     area {
       color: 14540236
-      priority: -16099
+      priority: -16085
     }
   }
   element {
     scale: 15
     area {
       color: 14540236
-      priority: -16100
+      priority: -16086
     }
     caption {
       primary {
@@ -36800,7 +32221,7 @@ cont {
     scale: 16
     area {
       color: 14540236
-      priority: -16101
+      priority: -16087
     }
     caption {
       primary {
@@ -36814,7 +32235,7 @@ cont {
     scale: 17
     area {
       color: 14540236
-      priority: -16102
+      priority: -16088
     }
     caption {
       primary {
@@ -36828,7 +32249,7 @@ cont {
     scale: 18
     area {
       color: 14540236
-      priority: -16103
+      priority: -16089
     }
     caption {
       primary {
@@ -36842,7 +32263,7 @@ cont {
     scale: 19
     area {
       color: 14540236
-      priority: -16104
+      priority: -16090
     }
     caption {
       primary {
@@ -36859,28 +32280,28 @@ cont {
     scale: 12
     area {
       color: 14540185
-      priority: -16105
+      priority: -16091
     }
   }
   element {
     scale: 13
     area {
       color: 14540185
-      priority: -16106
+      priority: -16092
     }
   }
   element {
     scale: 14
     area {
       color: 14540185
-      priority: -16107
+      priority: -16093
     }
   }
   element {
     scale: 15
     area {
       color: 14540185
-      priority: -16108
+      priority: -16094
     }
     caption {
       primary {
@@ -36894,7 +32315,7 @@ cont {
     scale: 16
     area {
       color: 14540185
-      priority: -16109
+      priority: -16095
     }
     caption {
       primary {
@@ -36908,7 +32329,7 @@ cont {
     scale: 17
     area {
       color: 14540185
-      priority: -16110
+      priority: -16096
     }
     caption {
       primary {
@@ -36922,7 +32343,7 @@ cont {
     scale: 18
     area {
       color: 14540185
-      priority: -16111
+      priority: -16097
     }
     caption {
       primary {
@@ -36936,7 +32357,7 @@ cont {
     scale: 19
     area {
       color: 14540185
-      priority: -16112
+      priority: -16098
     }
     caption {
       primary {
@@ -36953,28 +32374,28 @@ cont {
     scale: 12
     area {
       color: 14540185
-      priority: -16113
+      priority: -16099
     }
   }
   element {
     scale: 13
     area {
       color: 14540185
-      priority: -16114
+      priority: -16100
     }
   }
   element {
     scale: 14
     area {
       color: 14540185
-      priority: -16115
+      priority: -16101
     }
   }
   element {
     scale: 15
     area {
       color: 14540185
-      priority: -16116
+      priority: -16102
     }
     caption {
       primary {
@@ -36988,7 +32409,7 @@ cont {
     scale: 16
     area {
       color: 14540185
-      priority: -16117
+      priority: -16103
     }
     caption {
       primary {
@@ -37002,7 +32423,7 @@ cont {
     scale: 17
     area {
       color: 14540185
-      priority: -16118
+      priority: -16104
     }
     caption {
       primary {
@@ -37016,7 +32437,7 @@ cont {
     scale: 18
     area {
       color: 14540185
-      priority: -16119
+      priority: -16105
     }
     caption {
       primary {
@@ -37030,7 +32451,7 @@ cont {
     scale: 19
     area {
       color: 14540185
-      priority: -16120
+      priority: -16106
     }
     caption {
       primary {
@@ -37047,28 +32468,28 @@ cont {
     scale: 12
     area {
       color: 14540236
-      priority: -16121
+      priority: -16107
     }
   }
   element {
     scale: 13
     area {
       color: 15658734
-      priority: -16122
+      priority: -16108
     }
   }
   element {
     scale: 14
     area {
       color: 15658734
-      priority: -16123
+      priority: -16109
     }
   }
   element {
     scale: 15
     area {
       color: 15658734
-      priority: -16124
+      priority: -16110
     }
     caption {
       primary {
@@ -37082,7 +32503,7 @@ cont {
     scale: 16
     area {
       color: 15658734
-      priority: -16125
+      priority: -16111
     }
     caption {
       primary {
@@ -37096,7 +32517,7 @@ cont {
     scale: 17
     area {
       color: 15658734
-      priority: -16126
+      priority: -16112
     }
     caption {
       primary {
@@ -37110,7 +32531,7 @@ cont {
     scale: 18
     area {
       color: 15658734
-      priority: -16127
+      priority: -16113
     }
     caption {
       primary {
@@ -37124,7 +32545,7 @@ cont {
     scale: 19
     area {
       color: 15658734
-      priority: -16128
+      priority: -16114
     }
     caption {
       primary {
@@ -37141,21 +32562,21 @@ cont {
     scale: 12
     area {
       color: 14544588
-      priority: -16129
+      priority: -16115
     }
   }
   element {
     scale: 13
     area {
       color: 14544588
-      priority: -16130
+      priority: -16116
     }
   }
   element {
     scale: 14
     area {
       color: 14544588
-      priority: -16131
+      priority: -16117
     }
     caption {
       primary {
@@ -37169,7 +32590,7 @@ cont {
     scale: 15
     area {
       color: 14544588
-      priority: -16132
+      priority: -16118
     }
     caption {
       primary {
@@ -37183,7 +32604,7 @@ cont {
     scale: 16
     area {
       color: 14544588
-      priority: -16133
+      priority: -16119
     }
     caption {
       primary {
@@ -37197,7 +32618,7 @@ cont {
     scale: 17
     area {
       color: 14544588
-      priority: -16134
+      priority: -16120
     }
     caption {
       primary {
@@ -37211,7 +32632,7 @@ cont {
     scale: 18
     area {
       color: 14544588
-      priority: -16135
+      priority: -16121
     }
     caption {
       primary {
@@ -37225,7 +32646,7 @@ cont {
     scale: 19
     area {
       color: 14544588
-      priority: -16136
+      priority: -16122
     }
     caption {
       primary {
@@ -37242,42 +32663,42 @@ cont {
     scale: 10
     area {
       color: 12311978
-      priority: -16137
+      priority: -16123
     }
   }
   element {
     scale: 11
     area {
       color: 12311978
-      priority: -16138
+      priority: -16124
     }
   }
   element {
     scale: 12
     area {
       color: 12311978
-      priority: -16139
+      priority: -16125
     }
   }
   element {
     scale: 13
     area {
       color: 12311978
-      priority: -16140
+      priority: -16126
     }
   }
   element {
     scale: 14
     area {
       color: 12311978
-      priority: -16141
+      priority: -16127
     }
   }
   element {
     scale: 15
     area {
       color: 12311978
-      priority: -16142
+      priority: -16128
     }
     caption {
       primary {
@@ -37291,7 +32712,7 @@ cont {
     scale: 16
     area {
       color: 12311978
-      priority: -16143
+      priority: -16129
     }
     caption {
       primary {
@@ -37306,7 +32727,7 @@ cont {
     scale: 17
     area {
       color: 12311978
-      priority: -16144
+      priority: -16130
     }
     caption {
       primary {
@@ -37321,7 +32742,7 @@ cont {
     scale: 18
     area {
       color: 12311978
-      priority: -16145
+      priority: -16131
     }
     caption {
       primary {
@@ -37336,7 +32757,7 @@ cont {
     scale: 19
     area {
       color: 12311978
-      priority: -16146
+      priority: -16132
     }
     caption {
       primary {
@@ -37354,42 +32775,42 @@ cont {
     scale: 10
     area {
       color: 12311978
-      priority: -16147
+      priority: -16133
     }
   }
   element {
     scale: 11
     area {
       color: 12311978
-      priority: -16148
+      priority: -16134
     }
   }
   element {
     scale: 12
     area {
       color: 12311978
-      priority: -16149
+      priority: -16135
     }
   }
   element {
     scale: 13
     area {
       color: 12311978
-      priority: -16150
+      priority: -16136
     }
   }
   element {
     scale: 14
     area {
       color: 12311978
-      priority: -16151
+      priority: -16137
     }
   }
   element {
     scale: 15
     area {
       color: 12311978
-      priority: -16152
+      priority: -16138
     }
     caption {
       primary {
@@ -37403,11 +32824,7 @@ cont {
     scale: 16
     area {
       color: 12311978
-      priority: -16153
-    }
-    symbol {
-      name: "symbols/maki/park-18.svg:#008000::::"
-      priority: 16000
+      priority: -16139
     }
     caption {
       primary {
@@ -37422,11 +32839,7 @@ cont {
     scale: 17
     area {
       color: 12311978
-      priority: -16154
-    }
-    symbol {
-      name: "symbols/maki/park-18.svg:#008000::::"
-      priority: 16000
+      priority: -16140
     }
     caption {
       primary {
@@ -37441,11 +32854,7 @@ cont {
     scale: 18
     area {
       color: 12311978
-      priority: -16155
-    }
-    symbol {
-      name: "symbols/maki/park-18.svg:#008000::::"
-      priority: 16000
+      priority: -16141
     }
     caption {
       primary {
@@ -37460,11 +32869,7 @@ cont {
     scale: 19
     area {
       color: 12311978
-      priority: -16156
-    }
-    symbol {
-      name: "symbols/maki/park-18.svg:#008000::::"
-      priority: 16000
+      priority: -16142
     }
     caption {
       primary {
@@ -37482,42 +32887,42 @@ cont {
     scale: 10
     area {
       color: 12311978
-      priority: -16157
+      priority: -16143
     }
   }
   element {
     scale: 11
     area {
       color: 12311978
-      priority: -16158
+      priority: -16144
     }
   }
   element {
     scale: 12
     area {
       color: 12311978
-      priority: -16159
+      priority: -16145
     }
   }
   element {
     scale: 13
     area {
       color: 12311978
-      priority: -16160
+      priority: -16146
     }
   }
   element {
     scale: 14
     area {
       color: 12311978
-      priority: -16161
+      priority: -16147
     }
   }
   element {
     scale: 15
     area {
       color: 12311978
-      priority: -16162
+      priority: -16148
     }
     caption {
       primary {
@@ -37531,18 +32936,13 @@ cont {
     scale: 16
     area {
       color: 12311978
-      priority: -16163
-    }
-    symbol {
-      name: "symbols/maki/park2-18.svg:#008000::::"
-      priority: 16000
+      priority: -16149
     }
     caption {
       primary {
         height: 16
         color: 2236962
         stroke_color: 16777215
-        offset_y: 10
       }
       priority: 15000
     }
@@ -37551,18 +32951,13 @@ cont {
     scale: 17
     area {
       color: 12311978
-      priority: -16164
-    }
-    symbol {
-      name: "symbols/maki/park2-18.svg:#008000::::"
-      priority: 16000
+      priority: -16150
     }
     caption {
       primary {
         height: 16
         color: 2236962
         stroke_color: 16777215
-        offset_y: 10
       }
       priority: 15000
     }
@@ -37571,18 +32966,13 @@ cont {
     scale: 18
     area {
       color: 12311978
-      priority: -16165
-    }
-    symbol {
-      name: "symbols/maki/park2-18.svg:#008000::::"
-      priority: 16000
+      priority: -16151
     }
     caption {
       primary {
         height: 16
         color: 2236962
         stroke_color: 16777215
-        offset_y: 10
       }
       priority: 15000
     }
@@ -37591,18 +32981,13 @@ cont {
     scale: 19
     area {
       color: 12311978
-      priority: -16166
-    }
-    symbol {
-      name: "symbols/maki/park2-18.svg:#008000::::"
-      priority: 16000
+      priority: -16152
     }
     caption {
       primary {
         height: 16
         color: 2236962
         stroke_color: 16777215
-        offset_y: 10
       }
       priority: 15000
     }
@@ -37614,42 +32999,42 @@ cont {
     scale: 10
     area {
       color: 12311978
-      priority: -16167
+      priority: -16153
     }
   }
   element {
     scale: 11
     area {
       color: 12311978
-      priority: -16168
+      priority: -16154
     }
   }
   element {
     scale: 12
     area {
       color: 12311978
-      priority: -16169
+      priority: -16155
     }
   }
   element {
     scale: 13
     area {
       color: 12311978
-      priority: -16170
+      priority: -16156
     }
   }
   element {
     scale: 14
     area {
       color: 12311978
-      priority: -16171
+      priority: -16157
     }
   }
   element {
     scale: 15
     area {
       color: 12311978
-      priority: -16172
+      priority: -16158
     }
     caption {
       primary {
@@ -37663,7 +33048,7 @@ cont {
     scale: 16
     area {
       color: 12311978
-      priority: -16173
+      priority: -16159
     }
     caption {
       primary {
@@ -37678,7 +33063,7 @@ cont {
     scale: 17
     area {
       color: 12311978
-      priority: -16174
+      priority: -16160
     }
     caption {
       primary {
@@ -37693,7 +33078,7 @@ cont {
     scale: 18
     area {
       color: 12311978
-      priority: -16175
+      priority: -16161
     }
     caption {
       primary {
@@ -37708,7 +33093,7 @@ cont {
     scale: 19
     area {
       color: 12311978
-      priority: -16176
+      priority: -16162
     }
     caption {
       primary {
@@ -37726,7 +33111,7 @@ cont {
     scale: 15
     area {
       color: 15658734
-      priority: -16177
+      priority: -16163
     }
     caption {
       primary {
@@ -37740,7 +33125,7 @@ cont {
     scale: 16
     area {
       color: 15658734
-      priority: -16178
+      priority: -16164
     }
     caption {
       primary {
@@ -37754,7 +33139,7 @@ cont {
     scale: 17
     area {
       color: 15658734
-      priority: -16179
+      priority: -16165
     }
     caption {
       primary {
@@ -37768,7 +33153,7 @@ cont {
     scale: 18
     area {
       color: 15658734
-      priority: -16180
+      priority: -16166
     }
     caption {
       primary {
@@ -37782,7 +33167,7 @@ cont {
     scale: 19
     area {
       color: 15658734
-      priority: -16181
+      priority: -16167
     }
     caption {
       primary {
@@ -37799,28 +33184,28 @@ cont {
     scale: 12
     area {
       color: 14544588
-      priority: -16182
+      priority: -16168
     }
   }
   element {
     scale: 13
     area {
       color: 14544588
-      priority: -16183
+      priority: -16169
     }
   }
   element {
     scale: 14
     area {
       color: 14544588
-      priority: -16184
+      priority: -16170
     }
   }
   element {
     scale: 15
     area {
       color: 14544588
-      priority: -16185
+      priority: -16171
     }
     caption {
       primary {
@@ -37834,7 +33219,7 @@ cont {
     scale: 16
     area {
       color: 14544588
-      priority: -16186
+      priority: -16172
     }
     caption {
       primary {
@@ -37848,7 +33233,7 @@ cont {
     scale: 17
     area {
       color: 14544588
-      priority: -16187
+      priority: -16173
     }
     caption {
       primary {
@@ -37862,7 +33247,7 @@ cont {
     scale: 18
     area {
       color: 14544588
-      priority: -16188
+      priority: -16174
     }
     caption {
       primary {
@@ -37876,7 +33261,7 @@ cont {
     scale: 19
     area {
       color: 14544588
-      priority: -16189
+      priority: -16175
     }
     caption {
       primary {
@@ -37893,28 +33278,28 @@ cont {
     scale: 12
     area {
       color: 14540236
-      priority: -16190
+      priority: -16176
     }
   }
   element {
     scale: 13
     area {
       color: 14540236
-      priority: -16191
+      priority: -16177
     }
   }
   element {
     scale: 14
     area {
       color: 14540236
-      priority: -16192
+      priority: -16178
     }
   }
   element {
     scale: 15
     area {
       color: 14540236
-      priority: -16193
+      priority: -16179
     }
     caption {
       primary {
@@ -37928,7 +33313,7 @@ cont {
     scale: 16
     area {
       color: 14540236
-      priority: -16194
+      priority: -16180
     }
     caption {
       primary {
@@ -37942,7 +33327,7 @@ cont {
     scale: 17
     area {
       color: 14540236
-      priority: -16195
+      priority: -16181
     }
     caption {
       primary {
@@ -37956,7 +33341,7 @@ cont {
     scale: 18
     area {
       color: 14540236
-      priority: -16196
+      priority: -16182
     }
     caption {
       primary {
@@ -37970,7 +33355,7 @@ cont {
     scale: 19
     area {
       color: 14540236
-      priority: -16197
+      priority: -16183
     }
     caption {
       primary {
@@ -38040,28 +33425,28 @@ cont {
     scale: 12
     area {
       color: 14540236
-      priority: -16198
+      priority: -16184
     }
   }
   element {
     scale: 13
     area {
       color: 14540236
-      priority: -16199
+      priority: -16185
     }
   }
   element {
     scale: 14
     area {
       color: 14540236
-      priority: -16200
+      priority: -16186
     }
   }
   element {
     scale: 15
     area {
       color: 14540236
-      priority: -16201
+      priority: -16187
     }
     caption {
       primary {
@@ -38075,7 +33460,7 @@ cont {
     scale: 16
     area {
       color: 14540236
-      priority: -16202
+      priority: -16188
     }
     caption {
       primary {
@@ -38089,7 +33474,7 @@ cont {
     scale: 17
     area {
       color: 14540236
-      priority: -16203
+      priority: -16189
     }
     caption {
       primary {
@@ -38103,7 +33488,7 @@ cont {
     scale: 18
     area {
       color: 14540236
-      priority: -16204
+      priority: -16190
     }
     caption {
       primary {
@@ -38117,7 +33502,7 @@ cont {
     scale: 19
     area {
       color: 14540236
-      priority: -16205
+      priority: -16191
     }
     caption {
       primary {
@@ -38134,21 +33519,21 @@ cont {
     scale: 13
     area {
       color: 15654263
-      priority: -16206
+      priority: -16192
     }
   }
   element {
     scale: 14
     area {
       color: 15654263
-      priority: -16207
+      priority: -16193
     }
   }
   element {
     scale: 15
     area {
       color: 15654263
-      priority: -16208
+      priority: -16194
     }
     caption {
       primary {
@@ -38162,7 +33547,7 @@ cont {
     scale: 16
     area {
       color: 15654263
-      priority: -16209
+      priority: -16195
     }
     caption {
       primary {
@@ -38176,7 +33561,7 @@ cont {
     scale: 17
     area {
       color: 15654263
-      priority: -16210
+      priority: -16196
     }
     caption {
       primary {
@@ -38190,7 +33575,7 @@ cont {
     scale: 18
     area {
       color: 15654263
-      priority: -16211
+      priority: -16197
     }
     caption {
       primary {
@@ -38204,7 +33589,7 @@ cont {
     scale: 19
     area {
       color: 15654263
-      priority: -16212
+      priority: -16198
     }
     caption {
       primary {
@@ -38221,28 +33606,28 @@ cont {
     scale: 12
     area {
       color: 14544588
-      priority: -16213
+      priority: -16199
     }
   }
   element {
     scale: 13
     area {
       color: 14544588
-      priority: -16214
+      priority: -16200
     }
   }
   element {
     scale: 14
     area {
       color: 14544588
-      priority: -16215
+      priority: -16201
     }
   }
   element {
     scale: 15
     area {
       color: 14544588
-      priority: -16216
+      priority: -16202
     }
     caption {
       primary {
@@ -38256,7 +33641,7 @@ cont {
     scale: 16
     area {
       color: 14544588
-      priority: -16217
+      priority: -16203
     }
     caption {
       primary {
@@ -38270,7 +33655,7 @@ cont {
     scale: 17
     area {
       color: 14544588
-      priority: -16218
+      priority: -16204
     }
     caption {
       primary {
@@ -38284,7 +33669,7 @@ cont {
     scale: 18
     area {
       color: 14544588
-      priority: -16219
+      priority: -16205
     }
     caption {
       primary {
@@ -38298,7 +33683,7 @@ cont {
     scale: 19
     area {
       color: 14544588
-      priority: -16220
+      priority: -16206
     }
     caption {
       primary {
@@ -38315,28 +33700,28 @@ cont {
     scale: 12
     area {
       color: 14540117
-      priority: -16221
+      priority: -16207
     }
   }
   element {
     scale: 13
     area {
       color: 14540117
-      priority: -16222
+      priority: -16208
     }
   }
   element {
     scale: 14
     area {
       color: 14540117
-      priority: -16223
+      priority: -16209
     }
   }
   element {
     scale: 15
     area {
       color: 14540117
-      priority: -16224
+      priority: -16210
     }
     caption {
       primary {
@@ -38350,7 +33735,7 @@ cont {
     scale: 16
     area {
       color: 14540117
-      priority: -16225
+      priority: -16211
     }
     caption {
       primary {
@@ -38364,7 +33749,7 @@ cont {
     scale: 17
     area {
       color: 14540117
-      priority: -16226
+      priority: -16212
     }
     caption {
       primary {
@@ -38378,7 +33763,7 @@ cont {
     scale: 18
     area {
       color: 14540117
-      priority: -16227
+      priority: -16213
     }
     caption {
       primary {
@@ -38392,7 +33777,7 @@ cont {
     scale: 19
     area {
       color: 14540117
-      priority: -16228
+      priority: -16214
     }
     caption {
       primary {
@@ -38462,28 +33847,28 @@ cont {
     scale: 12
     area {
       color: 14540236
-      priority: -16229
+      priority: -16215
     }
   }
   element {
     scale: 13
     area {
       color: 15654263
-      priority: -16230
+      priority: -16216
     }
   }
   element {
     scale: 14
     area {
       color: 15654263
-      priority: -16231
+      priority: -16217
     }
   }
   element {
     scale: 15
     area {
       color: 15654263
-      priority: -16232
+      priority: -16218
     }
     caption {
       primary {
@@ -38497,7 +33882,7 @@ cont {
     scale: 16
     area {
       color: 15654263
-      priority: -16233
+      priority: -16219
     }
     caption {
       primary {
@@ -38511,7 +33896,7 @@ cont {
     scale: 17
     area {
       color: 15654263
-      priority: -16234
+      priority: -16220
     }
     caption {
       primary {
@@ -38525,7 +33910,7 @@ cont {
     scale: 18
     area {
       color: 15654263
-      priority: -16235
+      priority: -16221
     }
     caption {
       primary {
@@ -38539,7 +33924,7 @@ cont {
     scale: 19
     area {
       color: 15654263
-      priority: -16236
+      priority: -16222
     }
     caption {
       primary {
@@ -38556,28 +33941,28 @@ cont {
     scale: 12
     area {
       color: 14540236
-      priority: -16237
+      priority: -16223
     }
   }
   element {
     scale: 13
     area {
       color: 14540236
-      priority: -16238
+      priority: -16224
     }
   }
   element {
     scale: 14
     area {
       color: 14540236
-      priority: -16239
+      priority: -16225
     }
   }
   element {
     scale: 15
     area {
       color: 14540236
-      priority: -16240
+      priority: -16226
     }
     caption {
       primary {
@@ -38591,7 +33976,7 @@ cont {
     scale: 16
     area {
       color: 14540236
-      priority: -16241
+      priority: -16227
     }
     caption {
       primary {
@@ -38605,7 +33990,7 @@ cont {
     scale: 17
     area {
       color: 14540236
-      priority: -16242
+      priority: -16228
     }
     caption {
       primary {
@@ -38619,7 +34004,7 @@ cont {
     scale: 18
     area {
       color: 14540236
-      priority: -16243
+      priority: -16229
     }
     caption {
       primary {
@@ -38633,7 +34018,7 @@ cont {
     scale: 19
     area {
       color: 14540236
-      priority: -16244
+      priority: -16230
     }
     caption {
       primary {
@@ -38650,28 +34035,28 @@ cont {
     scale: 12
     area {
       color: 14544588
-      priority: -16245
+      priority: -16231
     }
   }
   element {
     scale: 13
     area {
       color: 14544588
-      priority: -16246
+      priority: -16232
     }
   }
   element {
     scale: 14
     area {
       color: 14544588
-      priority: -16247
+      priority: -16233
     }
   }
   element {
     scale: 15
     area {
       color: 14544588
-      priority: -16248
+      priority: -16234
     }
     caption {
       primary {
@@ -38685,7 +34070,7 @@ cont {
     scale: 16
     area {
       color: 14544588
-      priority: -16249
+      priority: -16235
     }
     caption {
       primary {
@@ -38699,7 +34084,7 @@ cont {
     scale: 17
     area {
       color: 14544588
-      priority: -16250
+      priority: -16236
     }
     caption {
       primary {
@@ -38713,7 +34098,7 @@ cont {
     scale: 18
     area {
       color: 14544588
-      priority: -16251
+      priority: -16237
     }
     caption {
       primary {
@@ -38727,7 +34112,7 @@ cont {
     scale: 19
     area {
       color: 14544588
-      priority: -16252
+      priority: -16238
     }
     caption {
       primary {
@@ -38744,91 +34129,91 @@ cont {
     scale: 12
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 13
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 14
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 15
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 12
         color: 2236962
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 16
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 16
         color: 2236962
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 17
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 16
         color: 2236962
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 18
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 16
         color: 2236962
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 19
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 16
         color: 2236962
       }
-      priority: 15093
+      priority: 15100
     }
   }
 }
@@ -38838,28 +34223,28 @@ cont {
     scale: 12
     area {
       color: 15658717
-      priority: -16253
+      priority: -16239
     }
   }
   element {
     scale: 13
     area {
       color: 15658717
-      priority: -16254
+      priority: -16240
     }
   }
   element {
     scale: 14
     area {
       color: 15658717
-      priority: -16255
+      priority: -16241
     }
   }
   element {
     scale: 15
     area {
       color: 15658717
-      priority: -16256
+      priority: -16242
     }
     caption {
       primary {
@@ -38873,7 +34258,7 @@ cont {
     scale: 16
     area {
       color: 15658717
-      priority: -16257
+      priority: -16243
     }
     caption {
       primary {
@@ -38887,7 +34272,7 @@ cont {
     scale: 17
     area {
       color: 15658717
-      priority: -16258
+      priority: -16244
     }
     caption {
       primary {
@@ -38901,7 +34286,7 @@ cont {
     scale: 18
     area {
       color: 15658717
-      priority: -16259
+      priority: -16245
     }
     caption {
       primary {
@@ -38915,7 +34300,7 @@ cont {
     scale: 19
     area {
       color: 15658717
-      priority: -16260
+      priority: -16246
     }
     caption {
       primary {
@@ -38932,28 +34317,28 @@ cont {
     scale: 12
     area {
       color: 16777164
-      priority: -16261
+      priority: -16247
     }
   }
   element {
     scale: 13
     area {
       color: 16777164
-      priority: -16262
+      priority: -16248
     }
   }
   element {
     scale: 14
     area {
       color: 16777164
-      priority: -16263
+      priority: -16249
     }
   }
   element {
     scale: 15
     area {
       color: 16777164
-      priority: -16264
+      priority: -16250
     }
     caption {
       primary {
@@ -38967,7 +34352,7 @@ cont {
     scale: 16
     area {
       color: 16777164
-      priority: -16265
+      priority: -16251
     }
     caption {
       primary {
@@ -38981,7 +34366,7 @@ cont {
     scale: 17
     area {
       color: 16777164
-      priority: -16266
+      priority: -16252
     }
     caption {
       primary {
@@ -38995,7 +34380,7 @@ cont {
     scale: 18
     area {
       color: 16777164
-      priority: -16267
+      priority: -16253
     }
     caption {
       primary {
@@ -39009,7 +34394,7 @@ cont {
     scale: 19
     area {
       color: 16777164
-      priority: -16268
+      priority: -16254
     }
     caption {
       primary {
@@ -39026,28 +34411,28 @@ cont {
     scale: 12
     area {
       color: 15658734
-      priority: -16269
+      priority: -16255
     }
   }
   element {
     scale: 13
     area {
       color: 15658734
-      priority: -16270
+      priority: -16256
     }
   }
   element {
     scale: 14
     area {
       color: 15658734
-      priority: -16271
+      priority: -16257
     }
   }
   element {
     scale: 15
     area {
       color: 15658734
-      priority: -16272
+      priority: -16258
     }
     caption {
       primary {
@@ -39061,7 +34446,7 @@ cont {
     scale: 16
     area {
       color: 15658734
-      priority: -16273
+      priority: -16259
     }
     caption {
       primary {
@@ -39075,7 +34460,7 @@ cont {
     scale: 17
     area {
       color: 15658734
-      priority: -16274
+      priority: -16260
     }
     caption {
       primary {
@@ -39089,7 +34474,7 @@ cont {
     scale: 18
     area {
       color: 15658734
-      priority: -16275
+      priority: -16261
     }
     caption {
       primary {
@@ -39103,7 +34488,7 @@ cont {
     scale: 19
     area {
       color: 15658734
-      priority: -16276
+      priority: -16262
     }
     caption {
       primary {
@@ -39120,28 +34505,28 @@ cont {
     scale: 12
     area {
       color: 16772846
-      priority: -16277
+      priority: -16263
     }
   }
   element {
     scale: 13
     area {
       color: 16772846
-      priority: -16278
+      priority: -16264
     }
   }
   element {
     scale: 14
     area {
       color: 16772846
-      priority: -16279
+      priority: -16265
     }
   }
   element {
     scale: 15
     area {
       color: 16772846
-      priority: -16280
+      priority: -16266
     }
     caption {
       primary {
@@ -39155,7 +34540,7 @@ cont {
     scale: 16
     area {
       color: 16772846
-      priority: -16281
+      priority: -16267
     }
     caption {
       primary {
@@ -39169,7 +34554,7 @@ cont {
     scale: 17
     area {
       color: 16772846
-      priority: -16282
+      priority: -16268
     }
     caption {
       primary {
@@ -39183,7 +34568,7 @@ cont {
     scale: 18
     area {
       color: 16772846
-      priority: -16283
+      priority: -16269
     }
     caption {
       primary {
@@ -39197,7 +34582,7 @@ cont {
     scale: 19
     area {
       color: 16772846
-      priority: -16284
+      priority: -16270
     }
     caption {
       primary {
@@ -39267,28 +34652,28 @@ cont {
     scale: 12
     area {
       color: 14544588
-      priority: -16285
+      priority: -16271
     }
   }
   element {
     scale: 13
     area {
       color: 14544588
-      priority: -16286
+      priority: -16272
     }
   }
   element {
     scale: 14
     area {
       color: 14544588
-      priority: -16287
+      priority: -16273
     }
   }
   element {
     scale: 15
     area {
       color: 14544588
-      priority: -16288
+      priority: -16274
     }
     caption {
       primary {
@@ -39302,7 +34687,7 @@ cont {
     scale: 16
     area {
       color: 14544588
-      priority: -16289
+      priority: -16275
     }
     caption {
       primary {
@@ -39316,7 +34701,7 @@ cont {
     scale: 17
     area {
       color: 14544588
-      priority: -16290
+      priority: -16276
     }
     caption {
       primary {
@@ -39330,7 +34715,7 @@ cont {
     scale: 18
     area {
       color: 14544588
-      priority: -16291
+      priority: -16277
     }
     caption {
       primary {
@@ -39344,7 +34729,7 @@ cont {
     scale: 19
     area {
       color: 14544588
-      priority: -16292
+      priority: -16278
     }
     caption {
       primary {
@@ -39361,21 +34746,21 @@ cont {
     scale: 13
     area {
       color: 14544605
-      priority: -16293
+      priority: -16279
     }
   }
   element {
     scale: 14
     area {
       color: 14544605
-      priority: -16294
+      priority: -16280
     }
   }
   element {
     scale: 15
     area {
       color: 14544605
-      priority: -16295
+      priority: -16281
     }
     caption {
       primary {
@@ -39389,7 +34774,7 @@ cont {
     scale: 16
     area {
       color: 14544605
-      priority: -16296
+      priority: -16282
     }
     caption {
       primary {
@@ -39403,7 +34788,7 @@ cont {
     scale: 17
     area {
       color: 14544605
-      priority: -16297
+      priority: -16283
     }
     caption {
       primary {
@@ -39417,7 +34802,7 @@ cont {
     scale: 18
     area {
       color: 14544605
-      priority: -16298
+      priority: -16284
     }
     caption {
       primary {
@@ -39431,7 +34816,7 @@ cont {
     scale: 19
     area {
       color: 14544605
-      priority: -16299
+      priority: -16285
     }
     caption {
       primary {
@@ -39443,92 +34828,61 @@ cont {
   }
 }
 cont {
-  name: "leisure-beach_resort"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/beach_resort-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/beach_resort-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/beach_resort-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/beach_resort-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-}
-cont {
   name: "leisure-common"
   element {
     scale: 12
     area {
       color: 13430459
-      priority: -16300
+      priority: -16286
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16301
+      priority: -16287
     }
   }
   element {
     scale: 14
     area {
       color: 13430459
-      priority: -16302
+      priority: -16288
     }
   }
   element {
     scale: 15
     area {
       color: 13430459
-      priority: -16303
+      priority: -16289
     }
   }
   element {
     scale: 16
     area {
       color: 13430459
-      priority: -16304
+      priority: -16290
     }
   }
   element {
     scale: 17
     area {
       color: 13430459
-      priority: -16305
+      priority: -16291
     }
   }
   element {
     scale: 18
     area {
       color: 13430459
-      priority: -16306
+      priority: -16292
     }
   }
   element {
     scale: 19
     area {
       color: 13430459
-      priority: -16307
+      priority: -16293
     }
   }
 }
@@ -39538,56 +34892,56 @@ cont {
     scale: 12
     area {
       color: 13430459
-      priority: -16308
+      priority: -16294
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16309
+      priority: -16295
     }
   }
   element {
     scale: 14
     area {
       color: 13430459
-      priority: -16310
+      priority: -16296
     }
   }
   element {
     scale: 15
     area {
       color: 13430459
-      priority: -16311
+      priority: -16297
     }
   }
   element {
     scale: 16
     area {
       color: 13430459
-      priority: -16312
+      priority: -16298
     }
   }
   element {
     scale: 17
     area {
       color: 13430459
-      priority: -16313
+      priority: -16299
     }
   }
   element {
     scale: 18
     area {
       color: 13430459
-      priority: -16314
+      priority: -16300
     }
   }
   element {
     scale: 19
     area {
       color: 13430459
-      priority: -16315
+      priority: -16301
     }
   }
 }
@@ -39597,71 +34951,67 @@ cont {
     scale: 12
     area {
       color: 13430459
-      priority: -16316
+      priority: -16302
     }
   }
   element {
     scale: 13
     area {
-      color: 13430459
-      priority: -16317
+      color: 14531481
+      priority: -16303
     }
   }
   element {
     scale: 14
     area {
-      color: 13430459
-      priority: -16318
+      color: 14531481
+      priority: -16304
     }
   }
   element {
     scale: 15
     area {
-      color: 13430459
-      priority: -16319
+      color: 14531481
+      priority: -16305
     }
   }
   element {
     scale: 16
     area {
-      color: 13430459
-      priority: -16320
-    }
-    symbol {
-      name: "symbols/maki/tennis-18.svg:#444444::::"
-      priority: 16000
+      color: 14531481
+      priority: -16306
     }
   }
   element {
     scale: 17
     area {
-      color: 13430459
-      priority: -16321
+      color: 14531481
+      priority: -16307
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#444444::::"
+      name: "tennis-borderless"
       priority: 16000
     }
   }
   element {
     scale: 18
     area {
-      color: 13430459
-      priority: -16322
+      color: 14531481
+      priority: -16308
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#444444::::"
+      name: "tennis-borderless"
       priority: 16000
     }
   }
   element {
     scale: 19
     area {
-      color: 13430459
-      priority: -16323
+      color: 14531481
+      priority: -16309
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#444444::::"
+      name: "tennis-borderless"
       priority: 16000
     }
   }
@@ -39672,42 +35022,42 @@ cont {
     scale: 12
     area {
       color: 13430459
-      priority: -16324
+      priority: -16310
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16325
+      priority: -16311
     }
   }
   element {
     scale: 14
     area {
       color: 13430459
-      priority: -16326
+      priority: -16312
     }
   }
   element {
     scale: 15
     area {
       color: 13430459
-      priority: -16327
+      priority: -16313
     }
   }
   element {
     scale: 16
     area {
       color: 13430459
-      priority: -16328
+      priority: -16314
     }
   }
   element {
     scale: 17
     area {
       color: 13430459
-      priority: -16329
+      priority: -16315
     }
     caption {
       primary {
@@ -39728,7 +35078,7 @@ cont {
     scale: 18
     area {
       color: 13430459
-      priority: -16330
+      priority: -16316
     }
     caption {
       primary {
@@ -39749,7 +35099,7 @@ cont {
     scale: 19
     area {
       color: 13430459
-      priority: -16331
+      priority: -16317
     }
     caption {
       primary {
@@ -39773,49 +35123,45 @@ cont {
     scale: 12
     area {
       color: 13430459
-      priority: -16332
+      priority: -16318
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16333
+      priority: -16319
     }
   }
   element {
     scale: 14
     area {
       color: 13430459
-      priority: -16334
+      priority: -16320
     }
   }
   element {
     scale: 15
     area {
       color: 13430459
-      priority: -16335
+      priority: -16321
     }
   }
   element {
     scale: 16
     area {
       color: 13430459
-      priority: -16336
-    }
-    symbol {
-      name: "symbols/maki/golf-18.svg:#444444::::"
-      priority: 16000
+      priority: -16322
     }
   }
   element {
     scale: 17
     area {
       color: 13430459
-      priority: -16337
+      priority: -16323
     }
     symbol {
-      name: "symbols/maki/golf-18.svg:#444444::::"
+      name: "golfCourse"
       priority: 16000
     }
   }
@@ -39823,10 +35169,10 @@ cont {
     scale: 18
     area {
       color: 13430459
-      priority: -16338
+      priority: -16324
     }
     symbol {
-      name: "symbols/maki/golf-18.svg:#444444::::"
+      name: "golfCourse"
       priority: 16000
     }
   }
@@ -39834,10 +35180,48 @@ cont {
     scale: 19
     area {
       color: 13430459
-      priority: -16339
+      priority: -16325
     }
     symbol {
-      name: "symbols/maki/golf-18.svg:#444444::::"
+      name: "golfCourse"
+      priority: 16000
+    }
+  }
+}
+cont {
+  name: "leisure-nature_reserve"
+  element {
+    scale: 15
+    symbol {
+      name: "bird"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "bird"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "bird"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "bird"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "bird"
       priority: 16000
     }
   }
@@ -39848,28 +35232,28 @@ cont {
     scale: 10
     area {
       color: 13430459
-      priority: -16340
+      priority: -16326
     }
   }
   element {
     scale: 11
     area {
       color: 13430459
-      priority: -16341
+      priority: -16327
     }
   }
   element {
     scale: 12
     area {
       color: 13430459
-      priority: -16342
+      priority: -16328
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16343
+      priority: -16329
     }
     caption {
       primary {
@@ -39888,7 +35272,7 @@ cont {
     scale: 14
     area {
       color: 13430459
-      priority: -16344
+      priority: -16330
     }
     caption {
       primary {
@@ -39907,7 +35291,7 @@ cont {
     scale: 15
     area {
       color: 13430459
-      priority: -16345
+      priority: -16331
     }
     caption {
       primary {
@@ -39928,7 +35312,7 @@ cont {
     scale: 16
     area {
       color: 13430459
-      priority: -16346
+      priority: -16332
     }
     caption {
       primary {
@@ -39949,7 +35333,7 @@ cont {
     scale: 17
     area {
       color: 13430459
-      priority: -16347
+      priority: -16333
     }
     caption {
       primary {
@@ -39970,7 +35354,7 @@ cont {
     scale: 18
     area {
       color: 13430459
-      priority: -16348
+      priority: -16334
     }
     caption {
       primary {
@@ -39991,7 +35375,7 @@ cont {
     scale: 19
     area {
       color: 13430459
-      priority: -16349
+      priority: -16335
     }
     caption {
       primary {
@@ -40015,28 +35399,28 @@ cont {
     scale: 10
     area {
       color: 13430459
-      priority: -16350
+      priority: -16336
     }
   }
   element {
     scale: 11
     area {
       color: 13430459
-      priority: -16351
+      priority: -16337
     }
   }
   element {
     scale: 12
     area {
       color: 13430459
-      priority: -16352
+      priority: -16338
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16353
+      priority: -16339
     }
     caption {
       primary {
@@ -40055,7 +35439,7 @@ cont {
     scale: 14
     area {
       color: 13430459
-      priority: -16354
+      priority: -16340
     }
     caption {
       primary {
@@ -40074,7 +35458,7 @@ cont {
     scale: 15
     area {
       color: 13430459
-      priority: -16355
+      priority: -16341
     }
     caption {
       primary {
@@ -40095,7 +35479,7 @@ cont {
     scale: 16
     area {
       color: 13430459
-      priority: -16356
+      priority: -16342
     }
     caption {
       primary {
@@ -40116,7 +35500,7 @@ cont {
     scale: 17
     area {
       color: 13430459
-      priority: -16357
+      priority: -16343
     }
     caption {
       primary {
@@ -40137,7 +35521,7 @@ cont {
     scale: 18
     area {
       color: 13430459
-      priority: -16358
+      priority: -16344
     }
     caption {
       primary {
@@ -40158,7 +35542,7 @@ cont {
     scale: 19
     area {
       color: 13430459
-      priority: -16359
+      priority: -16345
     }
     caption {
       primary {
@@ -40182,28 +35566,28 @@ cont {
     scale: 10
     area {
       color: 13430459
-      priority: -16360
+      priority: -16346
     }
   }
   element {
     scale: 11
     area {
       color: 13430459
-      priority: -16361
+      priority: -16347
     }
   }
   element {
     scale: 12
     area {
       color: 13430459
-      priority: -16362
+      priority: -16348
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16363
+      priority: -16349
     }
     caption {
       primary {
@@ -40222,7 +35606,7 @@ cont {
     scale: 14
     area {
       color: 13430459
-      priority: -16364
+      priority: -16350
     }
     caption {
       primary {
@@ -40241,7 +35625,7 @@ cont {
     scale: 15
     area {
       color: 13430459
-      priority: -16365
+      priority: -16351
     }
     caption {
       primary {
@@ -40262,7 +35646,7 @@ cont {
     scale: 16
     area {
       color: 13430459
-      priority: -16366
+      priority: -16352
     }
     caption {
       primary {
@@ -40283,7 +35667,7 @@ cont {
     scale: 17
     area {
       color: 13430459
-      priority: -16367
+      priority: -16353
     }
     caption {
       primary {
@@ -40304,7 +35688,7 @@ cont {
     scale: 18
     area {
       color: 13430459
-      priority: -16368
+      priority: -16354
     }
     caption {
       primary {
@@ -40325,7 +35709,7 @@ cont {
     scale: 19
     area {
       color: 13430459
-      priority: -16369
+      priority: -16355
     }
     caption {
       primary {
@@ -40349,28 +35733,28 @@ cont {
     scale: 10
     area {
       color: 13430459
-      priority: -16370
+      priority: -16356
     }
   }
   element {
     scale: 11
     area {
       color: 13430459
-      priority: -16371
+      priority: -16357
     }
   }
   element {
     scale: 12
     area {
       color: 13430459
-      priority: -16372
+      priority: -16358
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16373
+      priority: -16359
     }
     caption {
       primary {
@@ -40389,7 +35773,7 @@ cont {
     scale: 14
     area {
       color: 13430459
-      priority: -16374
+      priority: -16360
     }
     caption {
       primary {
@@ -40408,7 +35792,7 @@ cont {
     scale: 15
     area {
       color: 13430459
-      priority: -16375
+      priority: -16361
     }
     caption {
       primary {
@@ -40429,7 +35813,7 @@ cont {
     scale: 16
     area {
       color: 13430459
-      priority: -16376
+      priority: -16362
     }
     caption {
       primary {
@@ -40450,7 +35834,7 @@ cont {
     scale: 17
     area {
       color: 13430459
-      priority: -16377
+      priority: -16363
     }
     caption {
       primary {
@@ -40471,7 +35855,7 @@ cont {
     scale: 18
     area {
       color: 13430459
-      priority: -16378
+      priority: -16364
     }
     caption {
       primary {
@@ -40492,7 +35876,7 @@ cont {
     scale: 19
     area {
       color: 13430459
-      priority: -16379
+      priority: -16365
     }
     caption {
       primary {
@@ -40516,72 +35900,56 @@ cont {
     scale: 12
     area {
       color: 13430459
-      priority: -16380
+      priority: -16366
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16381
+      priority: -16367
     }
   }
   element {
     scale: 14
     area {
       color: 13430459
-      priority: -16382
+      priority: -16368
     }
   }
   element {
     scale: 15
     area {
       color: 13430459
-      priority: -16383
+      priority: -16369
     }
   }
   element {
     scale: 16
     area {
       color: 13430459
-      priority: -16384
-    }
-    symbol {
-      name: "symbols/maki/pitch-18.svg:#444444::::"
-      priority: 16000
+      priority: -16370
     }
   }
   element {
     scale: 17
     area {
       color: 13430459
-      priority: -16385
-    }
-    symbol {
-      name: "symbols/maki/pitch-18.svg:#444444::::"
-      priority: 16000
+      priority: -16371
     }
   }
   element {
     scale: 18
     area {
       color: 13430459
-      priority: -16386
-    }
-    symbol {
-      name: "symbols/maki/pitch-18.svg:#444444::::"
-      priority: 16000
+      priority: -16372
     }
   }
   element {
     scale: 19
     area {
       color: 13430459
-      priority: -16387
-    }
-    symbol {
-      name: "symbols/maki/pitch-18.svg:#444444::::"
-      priority: 16000
+      priority: -16373
     }
   }
 }
@@ -40591,71 +35959,67 @@ cont {
     scale: 12
     area {
       color: 13430459
-      priority: -16388
+      priority: -16374
     }
   }
   element {
     scale: 13
     area {
-      color: 13430459
-      priority: -16389
+      color: 14531481
+      priority: -16375
     }
   }
   element {
     scale: 14
     area {
-      color: 13430459
-      priority: -16390
+      color: 14531481
+      priority: -16376
     }
   }
   element {
     scale: 15
     area {
-      color: 13430459
-      priority: -16391
+      color: 14531481
+      priority: -16377
     }
   }
   element {
     scale: 16
     area {
-      color: 13430459
-      priority: -16392
-    }
-    symbol {
-      name: "symbols/maki/tennis-18.svg:#444444::::"
-      priority: 16000
+      color: 14531481
+      priority: -16378
     }
   }
   element {
     scale: 17
     area {
-      color: 13430459
-      priority: -16393
+      color: 14531481
+      priority: -16379
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#444444::::"
+      name: "tennis-borderless"
       priority: 16000
     }
   }
   element {
     scale: 18
     area {
-      color: 13430459
-      priority: -16394
+      color: 14531481
+      priority: -16380
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#444444::::"
+      name: "tennis-borderless"
       priority: 16000
     }
   }
   element {
     scale: 19
     area {
-      color: 13430459
-      priority: -16395
+      color: 14531481
+      priority: -16381
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#444444::::"
+      name: "tennis-borderless"
       priority: 16000
     }
   }
@@ -40666,49 +36030,45 @@ cont {
     scale: 12
     area {
       color: 13430459
-      priority: -16396
+      priority: -16382
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16397
+      priority: -16383
     }
   }
   element {
     scale: 14
     area {
       color: 13430459
-      priority: -16398
+      priority: -16384
     }
   }
   element {
     scale: 15
     area {
       color: 13430459
-      priority: -16399
+      priority: -16385
     }
   }
   element {
     scale: 16
     area {
       color: 13430459
-      priority: -16400
-    }
-    symbol {
-      name: "symbols/nori/playground-18.svg:#444444::::"
-      priority: 16000
+      priority: -16386
     }
   }
   element {
     scale: 17
     area {
       color: 13430459
-      priority: -16401
+      priority: -16387
     }
     symbol {
-      name: "symbols/nori/playground-18.svg:#444444::::"
+      name: "playground"
       priority: 16000
     }
   }
@@ -40716,10 +36076,10 @@ cont {
     scale: 18
     area {
       color: 13430459
-      priority: -16402
+      priority: -16388
     }
     symbol {
-      name: "symbols/nori/playground-18.svg:#444444::::"
+      name: "playground"
       priority: 16000
     }
   }
@@ -40727,10 +36087,10 @@ cont {
     scale: 19
     area {
       color: 13430459
-      priority: -16403
+      priority: -16389
     }
     symbol {
-      name: "symbols/nori/playground-18.svg:#444444::::"
+      name: "playground"
       priority: 16000
     }
   }
@@ -40741,71 +36101,67 @@ cont {
     scale: 12
     area {
       color: 13430459
-      priority: -16404
+      priority: -16390
     }
   }
   element {
     scale: 13
     area {
-      color: 13430459
-      priority: -16405
+      color: 14531481
+      priority: -16391
     }
   }
   element {
     scale: 14
     area {
-      color: 13430459
-      priority: -16406
+      color: 14531481
+      priority: -16392
     }
   }
   element {
     scale: 15
     area {
-      color: 13430459
-      priority: -16407
+      color: 14531481
+      priority: -16393
     }
   }
   element {
     scale: 16
     area {
-      color: 13430459
-      priority: -16408
-    }
-    symbol {
-      name: "symbols/nori/playground-18.svg:#444444::::"
-      priority: 16000
+      color: 14531481
+      priority: -16394
     }
   }
   element {
     scale: 17
     area {
-      color: 13430459
-      priority: -16409
+      color: 14531481
+      priority: -16395
     }
     symbol {
-      name: "symbols/nori/playground-18.svg:#444444::::"
+      name: "tennis-borderless"
       priority: 16000
     }
   }
   element {
     scale: 18
     area {
-      color: 13430459
-      priority: -16410
+      color: 14531481
+      priority: -16396
     }
     symbol {
-      name: "symbols/nori/playground-18.svg:#444444::::"
+      name: "tennis-borderless"
       priority: 16000
     }
   }
   element {
     scale: 19
     area {
-      color: 13430459
-      priority: -16411
+      color: 14531481
+      priority: -16397
     }
     symbol {
-      name: "symbols/nori/playground-18.svg:#444444::::"
+      name: "tennis-borderless"
       priority: 16000
     }
   }
@@ -40816,42 +36172,38 @@ cont {
     scale: 13
     area {
       color: 14531481
-      priority: -16412
+      priority: -16398
     }
   }
   element {
     scale: 14
     area {
       color: 14531481
-      priority: -16413
+      priority: -16399
     }
   }
   element {
     scale: 15
     area {
       color: 14531481
-      priority: -16414
+      priority: -16400
     }
   }
   element {
     scale: 16
     area {
       color: 14531481
-      priority: -16415
-    }
-    symbol {
-      name: "symbols/maki/tennis-18.svg:#444444::::"
-      priority: 16000
+      priority: -16401
     }
   }
   element {
     scale: 17
     area {
       color: 14531481
-      priority: -16416
+      priority: -16402
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#444444::::"
+      name: "tennis-borderless"
       priority: 16000
     }
   }
@@ -40859,10 +36211,10 @@ cont {
     scale: 18
     area {
       color: 14531481
-      priority: -16417
+      priority: -16403
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#444444::::"
+      name: "tennis-borderless"
       priority: 16000
     }
   }
@@ -40870,10 +36222,10 @@ cont {
     scale: 19
     area {
       color: 14531481
-      priority: -16418
+      priority: -16404
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#444444::::"
+      name: "tennis-borderless"
       priority: 16000
     }
   }
@@ -40881,30 +36233,23 @@ cont {
 cont {
   name: "leisure-slipway"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/ferry-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/maki/ferry-18.svg:#444444::::"
+      name: "slipway"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/ferry-18.svg:#444444::::"
+      name: "slipway"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/ferry-18.svg:#444444::::"
+      name: "slipway"
       priority: 16000
     }
   }
@@ -40915,42 +36260,42 @@ cont {
     scale: 12
     area {
       color: 14544588
-      priority: -16419
+      priority: -16405
     }
   }
   element {
     scale: 13
     area {
       color: 14544588
-      priority: -16420
+      priority: -16406
     }
   }
   element {
     scale: 14
     area {
       color: 14544588
-      priority: -16421
+      priority: -16407
     }
   }
   element {
     scale: 15
     area {
       color: 14544588
-      priority: -16422
+      priority: -16408
     }
   }
   element {
     scale: 16
     area {
       color: 14544588
-      priority: -16423
+      priority: -16409
     }
   }
   element {
     scale: 17
     area {
       color: 14544588
-      priority: -16424
+      priority: -16410
     }
     caption {
       primary {
@@ -40965,7 +36310,7 @@ cont {
     scale: 18
     area {
       color: 14544588
-      priority: -16425
+      priority: -16411
     }
     caption {
       primary {
@@ -40980,7 +36325,7 @@ cont {
     scale: 19
     area {
       color: 14544588
-      priority: -16426
+      priority: -16412
     }
     caption {
       primary {
@@ -40998,42 +36343,42 @@ cont {
     scale: 12
     area {
       color: 14544588
-      priority: -16427
+      priority: -16413
     }
   }
   element {
     scale: 13
     area {
       color: 14544588
-      priority: -16428
+      priority: -16414
     }
   }
   element {
     scale: 14
     area {
       color: 14544588
-      priority: -16429
+      priority: -16415
     }
   }
   element {
     scale: 15
     area {
       color: 14544588
-      priority: -16430
+      priority: -16416
     }
   }
   element {
     scale: 16
     area {
       color: 14544588
-      priority: -16431
+      priority: -16417
     }
   }
   element {
     scale: 17
     area {
       color: 14544588
-      priority: -16432
+      priority: -16418
     }
     caption {
       primary {
@@ -41048,7 +36393,7 @@ cont {
     scale: 18
     area {
       color: 14544588
-      priority: -16433
+      priority: -16419
     }
     caption {
       primary {
@@ -41063,7 +36408,7 @@ cont {
     scale: 19
     area {
       color: 14544588
-      priority: -16434
+      priority: -16420
     }
     caption {
       primary {
@@ -41081,49 +36426,49 @@ cont {
     scale: 13
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 14
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 15
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 16
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 17
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 18
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 19
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
 }
@@ -41133,56 +36478,56 @@ cont {
     scale: 12
     area {
       color: 14544588
-      priority: -16435
+      priority: -16421
     }
   }
   element {
     scale: 13
     area {
       color: 14544588
-      priority: -16436
+      priority: -16422
     }
   }
   element {
     scale: 14
     area {
       color: 14544588
-      priority: -16437
+      priority: -16423
     }
   }
   element {
     scale: 15
     area {
       color: 14544588
-      priority: -16438
+      priority: -16424
     }
   }
   element {
     scale: 16
     area {
       color: 14544588
-      priority: -16439
+      priority: -16425
     }
   }
   element {
     scale: 17
     area {
       color: 14544588
-      priority: -16440
+      priority: -16426
     }
   }
   element {
     scale: 18
     area {
       color: 14544588
-      priority: -16441
+      priority: -16427
     }
   }
   element {
     scale: 19
     area {
       color: 14544588
-      priority: -16442
+      priority: -16428
     }
   }
 }
@@ -41299,7 +36644,7 @@ cont {
     lines {
       width: 4.0
       color: 7829367
-      priority: 1774
+      priority: 1777
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41309,7 +36654,7 @@ cont {
     lines {
       width: 6.4
       color: 7829367
-      priority: 1844
+      priority: 1846
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41319,7 +36664,7 @@ cont {
     lines {
       width: 6.4
       color: 7829367
-      priority: 1844
+      priority: 1846
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41329,7 +36674,7 @@ cont {
     lines {
       width: 6.4
       color: 7829367
-      priority: 1844
+      priority: 1846
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41363,44 +36708,13 @@ cont {
   }
 }
 cont {
-  name: "man_made-communication_tower"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/communication-tower-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/communication-tower-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/communication-tower-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/communication-tower-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-}
-cont {
   name: "man_made-cutline"
   element {
     scale: 12
     lines {
       width: 1.0
       color: 16772846
-      priority: 1172
+      priority: 1181
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41410,7 +36724,7 @@ cont {
     lines {
       width: 2.0
       color: 16772846
-      priority: 1172
+      priority: 1181
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41420,7 +36734,7 @@ cont {
     lines {
       width: 4.0
       color: 16772846
-      priority: 1262
+      priority: 1270
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41450,7 +36764,7 @@ cont {
     lines {
       width: 6.0
       color: 16772846
-      priority: 1265
+      priority: 1272
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41460,7 +36774,7 @@ cont {
     lines {
       width: 6.0
       color: 16772846
-      priority: 1265
+      priority: 1272
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41470,39 +36784,32 @@ cont {
     lines {
       width: 6.0
       color: 16772846
-      priority: 1265
+      priority: 1272
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
   }
 }
 cont {
-  name: "man_made-mast"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/communication-tower-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
+  name: "man_made-lighthouse"
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/communication-tower-18.svg:#444444::::"
+      name: "lighthouse"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/communication-tower-18.svg:#444444::::"
+      name: "lighthouse"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/communication-tower-18.svg:#444444::::"
+      name: "lighthouse"
       priority: 16000
     }
   }
@@ -41514,20 +36821,20 @@ cont {
     lines {
       width: 0.1
       color: 14540253
-      priority: 1457
+      priority: 1462
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.6
       color: 15658734
-      priority: 1000
+      priority: 1465
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 16772846
-      priority: 1458
+      priority: 1463
     }
   }
   element {
@@ -41535,20 +36842,20 @@ cont {
     lines {
       width: 1.6
       color: 14540253
-      priority: 1610
+      priority: 1615
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.2
       color: 15658734
-      priority: 1612
+      priority: 1618
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 16772846
-      priority: 1611
+      priority: 1616
     }
   }
   element {
@@ -41556,14 +36863,14 @@ cont {
     lines {
       width: 0.4
       color: 14540253
-      priority: 1776
+      priority: 1779
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.4
       color: 15658734
-      priority: 1779
+      priority: 1782
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41576,7 +36883,7 @@ cont {
     }
     area {
       color: 16772846
-      priority: 1777
+      priority: 1780
     }
   }
   element {
@@ -41584,27 +36891,27 @@ cont {
     lines {
       width: 0.4
       color: 14540253
-      priority: 1847
+      priority: 1849
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.4
       color: 15658734
-      priority: 1853
+      priority: 1855
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 14540253
-      priority: 1850
+      priority: 1852
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 16772846
-      priority: 1848
+      priority: 1850
     }
   }
   element {
@@ -41612,27 +36919,27 @@ cont {
     lines {
       width: 0.4
       color: 14540253
-      priority: 1847
+      priority: 1849
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.4
       color: 15658734
-      priority: 1853
+      priority: 1855
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 14540253
-      priority: 1850
+      priority: 1852
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 16772846
-      priority: 1848
+      priority: 1850
     }
   }
   element {
@@ -41640,27 +36947,27 @@ cont {
     lines {
       width: 0.4
       color: 14540253
-      priority: 1847
+      priority: 1849
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.4
       color: 15658734
-      priority: 1853
+      priority: 1855
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 14540253
-      priority: 1850
+      priority: 1852
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 16772846
-      priority: 1848
+      priority: 1850
     }
   }
 }
@@ -41671,7 +36978,7 @@ cont {
     lines {
       width: 1.6
       color: 2164260863
-      priority: 1807
+      priority: 1810
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41686,7 +36993,7 @@ cont {
         dd: 1.2
         dd: 4.4
       }
-      priority: 1813
+      priority: 1816
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41696,7 +37003,7 @@ cont {
     lines {
       width: 1.6
       color: 2164260863
-      priority: 1912
+      priority: 1913
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41711,7 +37018,7 @@ cont {
         dd: 1.2
         dd: 4.4
       }
-      priority: 1918
+      priority: 1919
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41721,7 +37028,7 @@ cont {
     lines {
       width: 1.6
       color: 2164260863
-      priority: 1912
+      priority: 1913
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41736,7 +37043,7 @@ cont {
         dd: 1.2
         dd: 4.4
       }
-      priority: 1918
+      priority: 1919
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41746,7 +37053,7 @@ cont {
     lines {
       width: 1.6
       color: 2164260863
-      priority: 1912
+      priority: 1913
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41761,7 +37068,7 @@ cont {
         dd: 1.2
         dd: 4.4
       }
-      priority: 1918
+      priority: 1919
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41778,7 +37085,7 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1807
+      priority: 1810
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41793,7 +37100,7 @@ cont {
         dd: 1.2
         dd: 4.4
       }
-      priority: 1813
+      priority: 1816
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41807,7 +37114,7 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1915
+      priority: 1916
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41822,7 +37129,7 @@ cont {
         dd: 1.2
         dd: 4.4
       }
-      priority: 1918
+      priority: 1919
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41836,7 +37143,7 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1915
+      priority: 1916
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41851,7 +37158,7 @@ cont {
         dd: 1.2
         dd: 4.4
       }
-      priority: 1918
+      priority: 1919
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41865,7 +37172,7 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1915
+      priority: 1916
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41880,284 +37187,91 @@ cont {
         dd: 1.2
         dd: 4.4
       }
-      priority: 1918
+      priority: 1919
       join: ROUNDJOIN
       cap: BUTTCAP
     }
   }
 }
 cont {
-  name: "man_made-storage_tank"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/storage_tank-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/storage_tank-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/storage_tank-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/storage_tank-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-}
-cont {
   name: "man_made-wastewater_plant"
   element {
     scale: 12
     area {
       color: 15658734
-      priority: -16443
+      priority: -16429
     }
   }
   element {
     scale: 13
     area {
       color: 15658734
-      priority: -16444
+      priority: -16430
     }
   }
   element {
     scale: 14
     area {
       color: 15658734
-      priority: -16445
+      priority: -16431
     }
   }
   element {
     scale: 15
     area {
       color: 15658734
-      priority: -16446
+      priority: -16432
     }
   }
   element {
     scale: 16
     area {
       color: 15658734
-      priority: -16447
+      priority: -16433
     }
   }
   element {
     scale: 17
     area {
       color: 15658734
-      priority: -16448
+      priority: -16434
     }
   }
   element {
     scale: 18
     area {
       color: 15658734
-      priority: -16449
+      priority: -16435
     }
   }
   element {
     scale: 19
     area {
       color: 15658734
-      priority: -16450
-    }
-  }
-}
-cont {
-  name: "man_made-water_tower"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/water_tower-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/water_tower-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/water_tower-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/water_tower-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "man_made-water_well"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/bucket-18.svg:#0000FF::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/bucket-18.svg:#0000FF::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/bucket-18.svg:#0000FF::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/bucket-18.svg:#0000FF::::"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "man_made-water_well-drinking_water"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/drinking_water_well-18.svg:#0000FF::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/drinking_water_well-18.svg:#0000FF::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/drinking_water_well-18.svg:#0000FF::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/drinking_water_well-18.svg:#0000FF::::"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "man_made-water_well-manual"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/pump-manual-18.svg:#0000FF::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/pump-manual-18.svg:#0000FF::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/pump-manual-18.svg:#0000FF::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/pump-manual-18.svg:#0000FF::::"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "man_made-water_well-powered"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/pump-powered-18.svg:#0000FF::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/pump-powered-18.svg:#0000FF::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/pump-powered-18.svg:#0000FF::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/pump-powered-18.svg:#0000FF::::"
-      priority: 16000
+      priority: -16436
     }
   }
 }
 cont {
-  name: "man_made-watermill"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/watermill-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
+  name: "man_made-windmill"
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/watermill-18.svg:#444444::::"
+      name: "windmill"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/watermill-18.svg:#444444::::"
+      name: "windmill"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/watermill-18.svg:#444444::::"
+      name: "windmill"
       priority: 16000
     }
   }
@@ -42543,89 +37657,113 @@ cont {
   }
 }
 cont {
+  name: "military-bunker"
+  element {
+    scale: 17
+    symbol {
+      name: "cannon"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "cannon"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "cannon"
+      priority: 16000
+    }
+  }
+}
+cont {
   name: "natural-bay"
   element {
     scale: 14
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 12
         color: 2236962
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 15
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 12
         color: 2236962
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 16
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 16
         color: 2236962
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 17
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 16
         color: 2236962
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 18
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 16
         color: 2236962
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 19
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 16
         color: 2236962
       }
-      priority: 15093
+      priority: 15100
     }
   }
 }
@@ -42635,65 +37773,51 @@ cont {
     scale: 14
     area {
       color: 15649877
-      priority: -16451
+      priority: -16437
     }
   }
   element {
     scale: 15
     area {
       color: 15649877
-      priority: -16452
+      priority: -16438
     }
   }
   element {
     scale: 16
     area {
       color: 15649877
-      priority: -16453
+      priority: -16439
     }
   }
   element {
     scale: 17
     area {
       color: 15649877
-      priority: -16454
+      priority: -16440
     }
   }
   element {
     scale: 18
     area {
       color: 15649877
-      priority: -16455
+      priority: -16441
     }
   }
   element {
     scale: 19
     area {
       color: 15649877
-      priority: -16456
+      priority: -16442
     }
   }
 }
 cont {
   name: "natural-cave_entrance"
   element {
-    scale: 12
-    symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 13
-    symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
     scale: 14
     symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#444444::::"
+      name: "cave_entrance"
       priority: 16000
     }
     caption {
@@ -42708,7 +37832,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#444444::::"
+      name: "cave_entrance"
       priority: 16000
     }
     caption {
@@ -42723,7 +37847,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#444444::::"
+      name: "cave_entrance"
       priority: 16000
     }
     caption {
@@ -42738,7 +37862,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#444444::::"
+      name: "cave_entrance"
       priority: 16000
     }
     caption {
@@ -42753,7 +37877,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#444444::::"
+      name: "cave_entrance"
       priority: 16000
     }
     caption {
@@ -42768,7 +37892,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#444444::::"
+      name: "cave_entrance"
       priority: 16000
     }
     caption {
@@ -42787,140 +37911,213 @@ cont {
     scale: 0
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 1
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 2
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 3
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 4
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 5
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 6
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 7
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 8
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 9
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 10
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 11
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 12
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 13
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 14
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 15
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 16
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 17
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 18
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 19
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
+    }
+  }
+}
+cont {
+  name: "natural-glacier"
+  element {
+    scale: 13
+    lines {
+      width: 0.75
+      color: 11197934
+      priority: 1019
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 0.8
+      color: 11197934
+      priority: 1022
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.6
+      color: 11197934
+      priority: 1022
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.2
+      color: 11197934
+      priority: 1022
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 6.4
+      color: 11197934
+      priority: 1022
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 6.4
+      color: 11197934
+      priority: 1022
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 6.4
+      color: 11197934
+      priority: 1022
+      join: ROUNDJOIN
+      cap: ROUNDCAP
     }
   }
 }
@@ -43089,56 +38286,56 @@ cont {
     scale: 12
     area {
       color: 16777181
-      priority: -16457
+      priority: -16443
     }
   }
   element {
     scale: 13
     area {
       color: 16777181
-      priority: -16458
+      priority: -16444
     }
   }
   element {
     scale: 14
     area {
       color: 16777181
-      priority: -16459
+      priority: -16445
     }
   }
   element {
     scale: 15
     area {
       color: 16777181
-      priority: -16460
+      priority: -16446
     }
   }
   element {
     scale: 16
     area {
       color: 16777181
-      priority: -16461
+      priority: -16447
     }
   }
   element {
     scale: 17
     area {
       color: 16777181
-      priority: -16462
+      priority: -16448
     }
   }
   element {
     scale: 18
     area {
       color: 16777181
-      priority: -16463
+      priority: -16449
     }
   }
   element {
     scale: 19
     area {
       color: 16777181
-      priority: -16464
+      priority: -16450
     }
   }
 }
@@ -43148,112 +38345,112 @@ cont {
     scale: 10
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 11
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 12
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 13
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 14
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 12
         color: 5601245
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 15
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 12
         color: 5601245
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 16
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 12
         color: 5601245
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 17
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 12
         color: 5601245
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 18
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 12
         color: 5601245
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 19
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 12
         color: 5601245
       }
-      priority: 15093
+      priority: 15100
     }
   }
 }
@@ -43262,99 +38459,99 @@ cont {
   element {
     scale: 6
     area {
-      color: 16772846
-      priority: -16465
+      color: 16777215
+      priority: -16451
     }
   }
   element {
     scale: 7
     area {
-      color: 16772846
-      priority: -16466
+      color: 16777215
+      priority: -16452
     }
   }
   element {
     scale: 8
     area {
-      color: 16772846
-      priority: -16467
+      color: 16777215
+      priority: -16453
     }
   }
   element {
     scale: 9
     area {
-      color: 16772846
-      priority: -16468
+      color: 16777215
+      priority: -16454
     }
   }
   element {
     scale: 10
     area {
-      color: 16772846
-      priority: -16469
+      color: 16777215
+      priority: -16455
     }
   }
   element {
     scale: 11
     area {
-      color: 16772846
-      priority: -16470
+      color: 16777215
+      priority: -16456
     }
   }
   element {
     scale: 12
     area {
       color: 16777215
-      priority: -16471
+      priority: -16457
     }
   }
   element {
     scale: 13
     area {
       color: 16777215
-      priority: -16472
+      priority: -16458
     }
   }
   element {
     scale: 14
     area {
       color: 16777215
-      priority: -16473
+      priority: -16459
     }
   }
   element {
     scale: 15
     area {
       color: 16777215
-      priority: -16474
+      priority: -16460
     }
   }
   element {
     scale: 16
     area {
       color: 16777215
-      priority: -16475
+      priority: -16461
     }
   }
   element {
     scale: 17
     area {
       color: 16777215
-      priority: -16476
+      priority: -16462
     }
   }
   element {
     scale: 18
     area {
       color: 16777215
-      priority: -16477
+      priority: -16463
     }
   }
   element {
     scale: 19
     area {
       color: 16777215
-      priority: -16478
+      priority: -16464
     }
   }
 }
@@ -43469,14 +38666,14 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/triangle-12.svg:#444444::::"
+      name: "peak-mini"
       priority: 16000
     }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/triangle-12.svg:#444444::::"
+      name: "peak-mini"
       priority: 16000
     }
     caption {
@@ -43491,7 +38688,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/triangle-12.svg:#444444::::"
+      name: "peak"
       priority: 16000
     }
     caption {
@@ -43506,7 +38703,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/triangle-12.svg:#444444::::"
+      name: "peak"
       priority: 16000
     }
     caption {
@@ -43521,7 +38718,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/triangle-12.svg:#444444::::"
+      name: "peak"
       priority: 16000
     }
     caption {
@@ -43536,7 +38733,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/triangle-12.svg:#444444::::"
+      name: "peak"
       priority: 16000
     }
     caption {
@@ -43551,7 +38748,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/triangle-12.svg:#444444::::"
+      name: "peak"
       priority: 16000
     }
     caption {
@@ -43566,7 +38763,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/triangle-12.svg:#444444::::"
+      name: "peak"
       priority: 16000
     }
     caption {
@@ -43585,91 +38782,91 @@ cont {
     scale: 10
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 11
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 12
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 12
         color: 5601245
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 13
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 12
         color: 5601245
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 14
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 12
         color: 5601245
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 15
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 16
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 17
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 18
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 19
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
 }
@@ -43732,56 +38929,56 @@ cont {
     scale: 12
     area {
       color: 14544588
-      priority: -16479
+      priority: -16465
     }
   }
   element {
     scale: 13
     area {
       color: 14544588
-      priority: -16480
+      priority: -16466
     }
   }
   element {
     scale: 14
     area {
       color: 14544588
-      priority: -16481
+      priority: -16467
     }
   }
   element {
     scale: 15
     area {
       color: 14544588
-      priority: -16482
+      priority: -16468
     }
   }
   element {
     scale: 16
     area {
       color: 14544588
-      priority: -16483
+      priority: -16469
     }
   }
   element {
     scale: 17
     area {
       color: 14544588
-      priority: -16484
+      priority: -16470
     }
   }
   element {
     scale: 18
     area {
       color: 14544588
-      priority: -16485
+      priority: -16471
     }
   }
   element {
     scale: 19
     area {
       color: 14544588
-      priority: -16486
+      priority: -16472
     }
   }
 }
@@ -43895,28 +39092,32 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/park2-18.svg:#008000::::"
+      name: "tree"
+      apply_for_type: 1
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/park2-18.svg:#008000::::"
+      name: "tree"
+      apply_for_type: 1
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/park2-18.svg:#008000::::"
+      name: "tree"
+      apply_for_type: 1
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/park2-18.svg:#008000::::"
+      name: "tree"
+      apply_for_type: 1
       priority: 16000
     }
   }
@@ -43979,21 +39180,21 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/triangle-12.svg:#FF0000::::"
+      name: "vulcan"
       priority: 16000
     }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/triangle-12.svg:#FF0000::::"
+      name: "vulcan"
       priority: 16000
     }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/triangle-12.svg:#FF0000::::"
+      name: "vulcan"
       priority: 16000
     }
     caption {
@@ -44008,7 +39209,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/triangle-12.svg:#FF0000::::"
+      name: "vulcan"
       priority: 16000
     }
     caption {
@@ -44023,7 +39224,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/triangle-12.svg:#FF0000::::"
+      name: "vulcan"
       priority: 16000
     }
     caption {
@@ -44038,7 +39239,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/triangle-12.svg:#FF0000::::"
+      name: "vulcan"
       priority: 16000
     }
     caption {
@@ -44053,7 +39254,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/triangle-12.svg:#FF0000::::"
+      name: "vulcan"
       priority: 16000
     }
     caption {
@@ -44068,7 +39269,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/triangle-12.svg:#FF0000::::"
+      name: "vulcan"
       priority: 16000
     }
     caption {
@@ -44087,119 +39288,119 @@ cont {
     scale: 10
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 11
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 12
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
   }
   element {
     scale: 13
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 10
         color: 136
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 14
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 11
         color: 136
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 15
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 12
         color: 136
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 16
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 16
         color: 136
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 17
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 16
         color: 136
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 18
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 16
         color: 136
       }
-      priority: 15093
+      priority: 15100
     }
   }
   element {
     scale: 19
     area {
       color: 12312029
-      priority: -15907
+      priority: -15900
     }
     caption {
       primary {
         height: 16
         color: 136
       }
-      priority: 15093
+      priority: 15100
     }
   }
 }
@@ -44209,42 +39410,42 @@ cont {
     scale: 14
     area {
       color: 11193531
-      priority: -16487
+      priority: -16473
     }
   }
   element {
     scale: 15
     area {
       color: 11193531
-      priority: -16488
+      priority: -16474
     }
   }
   element {
     scale: 16
     area {
       color: 11193531
-      priority: -16489
+      priority: -16475
     }
   }
   element {
     scale: 17
     area {
       color: 11193531
-      priority: -16490
+      priority: -16476
     }
   }
   element {
     scale: 18
     area {
       color: 11193531
-      priority: -16491
+      priority: -16477
     }
   }
   element {
     scale: 19
     area {
       color: 11193531
-      priority: -16492
+      priority: -16478
     }
   }
 }
@@ -44254,56 +39455,56 @@ cont {
     scale: 12
     area {
       color: 11193531
-      priority: -16493
+      priority: -16479
     }
   }
   element {
     scale: 13
     area {
       color: 11193531
-      priority: -16494
+      priority: -16480
     }
   }
   element {
     scale: 14
     area {
       color: 11193531
-      priority: -16495
+      priority: -16481
     }
   }
   element {
     scale: 15
     area {
       color: 11193531
-      priority: -16496
+      priority: -16482
     }
   }
   element {
     scale: 16
     area {
       color: 11193531
-      priority: -16497
+      priority: -16483
     }
   }
   element {
     scale: 17
     area {
       color: 11193531
-      priority: -16498
+      priority: -16484
     }
   }
   element {
     scale: 18
     area {
       color: 11193531
-      priority: -16499
+      priority: -16485
     }
   }
   element {
     scale: 19
     area {
       color: 11193531
-      priority: -16500
+      priority: -16486
     }
   }
 }
@@ -44313,70 +39514,70 @@ cont {
     scale: 10
     area {
       color: 12311978
-      priority: -16501
+      priority: -16487
     }
   }
   element {
     scale: 11
     area {
       color: 12311978
-      priority: -16502
+      priority: -16488
     }
   }
   element {
     scale: 12
     area {
       color: 12311978
-      priority: -16503
+      priority: -16489
     }
   }
   element {
     scale: 13
     area {
       color: 12311978
-      priority: -16504
+      priority: -16490
     }
   }
   element {
     scale: 14
     area {
       color: 12311978
-      priority: -16505
+      priority: -16491
     }
   }
   element {
     scale: 15
     area {
       color: 12311978
-      priority: -16506
+      priority: -16492
     }
   }
   element {
     scale: 16
     area {
       color: 12311978
-      priority: -16507
+      priority: -16493
     }
   }
   element {
     scale: 17
     area {
       color: 12311978
-      priority: -16508
+      priority: -16494
     }
   }
   element {
     scale: 18
     area {
       color: 12311978
-      priority: -16509
+      priority: -16495
     }
   }
   element {
     scale: 19
     area {
       color: 12311978
-      priority: -16510
+      priority: -16496
     }
   }
 }
@@ -44386,86 +39587,70 @@ cont {
     scale: 10
     area {
       color: 12311978
-      priority: -16511
+      priority: -16497
     }
   }
   element {
     scale: 11
     area {
       color: 12311978
-      priority: -16512
+      priority: -16498
     }
   }
   element {
     scale: 12
     area {
       color: 12311978
-      priority: -16513
+      priority: -16499
     }
   }
   element {
     scale: 13
     area {
       color: 12311978
-      priority: -16514
+      priority: -16500
     }
   }
   element {
     scale: 14
     area {
       color: 12311978
-      priority: -16515
+      priority: -16501
     }
   }
   element {
     scale: 15
     area {
       color: 12311978
-      priority: -16516
+      priority: -16502
     }
   }
   element {
     scale: 16
     area {
       color: 12311978
-      priority: -16517
-    }
-    symbol {
-      name: "symbols/maki/park-18.svg:#008000::::"
-      priority: 16000
+      priority: -16503
     }
   }
   element {
     scale: 17
     area {
       color: 12311978
-      priority: -16518
-    }
-    symbol {
-      name: "symbols/maki/park-18.svg:#008000::::"
-      priority: 16000
+      priority: -16504
     }
   }
   element {
     scale: 18
     area {
       color: 12311978
-      priority: -16519
-    }
-    symbol {
-      name: "symbols/maki/park-18.svg:#008000::::"
-      priority: 16000
+      priority: -16505
     }
   }
   element {
     scale: 19
     area {
       color: 12311978
-      priority: -16520
-    }
-    symbol {
-      name: "symbols/maki/park-18.svg:#008000::::"
-      priority: 16000
+      priority: -16506
     }
   }
 }
@@ -44475,86 +39660,70 @@ cont {
     scale: 10
     area {
       color: 12311978
-      priority: -16521
+      priority: -16507
     }
   }
   element {
     scale: 11
     area {
       color: 12311978
-      priority: -16522
+      priority: -16508
     }
   }
   element {
     scale: 12
     area {
       color: 12311978
-      priority: -16523
+      priority: -16509
     }
   }
   element {
     scale: 13
     area {
       color: 12311978
-      priority: -16524
+      priority: -16510
     }
   }
   element {
     scale: 14
     area {
       color: 12311978
-      priority: -16525
+      priority: -16511
     }
   }
   element {
     scale: 15
     area {
       color: 12311978
-      priority: -16526
+      priority: -16512
     }
   }
   element {
     scale: 16
     area {
       color: 12311978
-      priority: -16527
-    }
-    symbol {
-      name: "symbols/maki/park2-18.svg:#008000::::"
-      priority: 16000
+      priority: -16513
     }
   }
   element {
     scale: 17
     area {
       color: 12311978
-      priority: -16528
-    }
-    symbol {
-      name: "symbols/maki/park2-18.svg:#008000::::"
-      priority: 16000
+      priority: -16514
     }
   }
   element {
     scale: 18
     area {
       color: 12311978
-      priority: -16529
-    }
-    symbol {
-      name: "symbols/maki/park2-18.svg:#008000::::"
-      priority: 16000
+      priority: -16515
     }
   }
   element {
     scale: 19
     area {
       color: 12311978
-      priority: -16530
-    }
-    symbol {
-      name: "symbols/maki/park2-18.svg:#008000::::"
-      priority: 16000
+      priority: -16516
     }
   }
 }
@@ -44564,70 +39733,70 @@ cont {
     scale: 10
     area {
       color: 12311978
-      priority: -16531
+      priority: -16517
     }
   }
   element {
     scale: 11
     area {
       color: 12311978
-      priority: -16532
+      priority: -16518
     }
   }
   element {
     scale: 12
     area {
       color: 12311978
-      priority: -16533
+      priority: -16519
     }
   }
   element {
     scale: 13
     area {
       color: 12311978
-      priority: -16534
+      priority: -16520
     }
   }
   element {
     scale: 14
     area {
       color: 12311978
-      priority: -16535
+      priority: -16521
     }
   }
   element {
     scale: 15
     area {
       color: 12311978
-      priority: -16536
+      priority: -16522
     }
   }
   element {
     scale: 16
     area {
       color: 12311978
-      priority: -16537
+      priority: -16523
     }
   }
   element {
     scale: 17
     area {
       color: 12311978
-      priority: -16538
+      priority: -16524
     }
   }
   element {
     scale: 18
     area {
       color: 12311978
-      priority: -16539
+      priority: -16525
     }
   }
   element {
     scale: 19
     area {
       color: 12311978
-      priority: -16540
+      priority: -16526
     }
   }
 }
@@ -44751,18 +39920,7 @@ cont {
 cont {
   name: "office-government"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/government-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
-    symbol {
-      name: "symbols/nori/government-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -44775,10 +39933,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/nori/government-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -44791,10 +39945,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/nori/government-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -44846,64 +39996,6 @@ cont {
   }
 }
 cont {
-  name: "office-ngo"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/ngo-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/ngo-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/ngo-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/ngo-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
   name: "office-telecommunication"
   element {
     scale: 17
@@ -44951,7 +40043,7 @@ cont {
       color: 0
       priority: 1997
       pathsym {
-        name: "symbols/arrow.svg:::::"
+        name: "arrow"
         step: 218.0
         offset: 200.0
       }
@@ -44964,7 +40056,7 @@ cont {
       color: 0
       priority: 1997
       pathsym {
-        name: "symbols/arrow.svg:::::"
+        name: "arrow"
         step: 218.0
         offset: 200.0
       }
@@ -44977,7 +40069,7 @@ cont {
       color: 0
       priority: 1997
       pathsym {
-        name: "symbols/arrow.svg:::::"
+        name: "arrow"
         step: 218.0
         offset: 200.0
       }
@@ -44990,7 +40082,7 @@ cont {
       color: 0
       priority: 1997
       pathsym {
-        name: "symbols/arrow.svg:::::"
+        name: "arrow"
         step: 218.0
         offset: 200.0
       }
@@ -45043,7 +40135,7 @@ cont {
         dd: 1.0
         dd: 40.0
       }
-      priority: 1579
+      priority: 1584
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -45064,7 +40156,7 @@ cont {
         dd: 1.0
         dd: 40.0
       }
-      priority: 1579
+      priority: 1584
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -45085,7 +40177,7 @@ cont {
         dd: 1.0
         dd: 40.0
       }
-      priority: 1579
+      priority: 1584
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -45106,7 +40198,7 @@ cont {
         dd: 1.0
         dd: 40.0
       }
-      priority: 1579
+      priority: 1584
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -45127,7 +40219,7 @@ cont {
         dd: 1.0
         dd: 40.0
       }
-      priority: 1579
+      priority: 1584
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -45333,7 +40425,7 @@ cont {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1581
+      priority: 1587
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -46180,7 +41272,7 @@ cont {
     lines {
       width: 10.0
       color: 16772829
-      priority: 1759
+      priority: 1763
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -46736,7 +41828,6 @@ cont {
       secondary {
         height: 14
         color: 12303274
-        offset_y: 20
       }
       priority: 15000
     }
@@ -46751,7 +41842,6 @@ cont {
       secondary {
         height: 14
         color: 12303274
-        offset_y: 20
       }
       priority: 15000
     }
@@ -46892,7 +41982,7 @@ cont {
     scale: 14
     area {
       color: 14540236
-      priority: -16541
+      priority: -16527
     }
     caption {
       primary {
@@ -46906,7 +41996,7 @@ cont {
     scale: 15
     area {
       color: 14540236
-      priority: -16542
+      priority: -16528
     }
     caption {
       primary {
@@ -46920,7 +42010,7 @@ cont {
     scale: 16
     area {
       color: 14540236
-      priority: -16543
+      priority: -16529
     }
     caption {
       primary {
@@ -46934,7 +42024,7 @@ cont {
     scale: 17
     area {
       color: 14540236
-      priority: -16544
+      priority: -16530
     }
     caption {
       primary {
@@ -46948,7 +42038,7 @@ cont {
     scale: 18
     area {
       color: 14540236
-      priority: -16545
+      priority: -16531
     }
     caption {
       primary {
@@ -46962,7 +42052,7 @@ cont {
     scale: 19
     area {
       color: 14540236
-      priority: -16546
+      priority: -16532
     }
     caption {
       primary {
@@ -47161,7 +42251,6 @@ cont {
       secondary {
         height: 12
         color: 10066329
-        offset_y: 20
       }
       priority: 15000
     }
@@ -47178,7 +42267,6 @@ cont {
         height: 12
         color: 10066329
         stroke_color: 16777215
-        offset_y: 20
       }
       priority: 15000
     }
@@ -47195,7 +42283,6 @@ cont {
         height: 12
         color: 10066329
         stroke_color: 16777215
-        offset_y: 20
       }
       priority: 15000
     }
@@ -47762,9 +42849,8 @@ cont {
       secondary {
         height: 12
         color: 11184810
-        offset_y: 20
       }
-      priority: 15025
+      priority: 15033
     }
   }
   element {
@@ -47777,9 +42863,8 @@ cont {
       secondary {
         height: 12
         color: 11184810
-        offset_y: 20
       }
-      priority: 15025
+      priority: 15033
     }
   }
   element {
@@ -47792,9 +42877,8 @@ cont {
       secondary {
         height: 12
         color: 11184810
-        offset_y: 20
       }
-      priority: 15025
+      priority: 15033
     }
   }
   element {
@@ -47807,9 +42891,8 @@ cont {
       secondary {
         height: 12
         color: 11184810
-        offset_y: 20
       }
-      priority: 15025
+      priority: 15033
     }
   }
   element {
@@ -47822,9 +42905,8 @@ cont {
       secondary {
         height: 12
         color: 11184810
-        offset_y: 20
       }
-      priority: 15025
+      priority: 15033
     }
   }
   element {
@@ -47837,9 +42919,8 @@ cont {
       secondary {
         height: 14
         color: 11184810
-        offset_y: 20
       }
-      priority: 15025
+      priority: 15033
     }
   }
   element {
@@ -47852,9 +42933,8 @@ cont {
       secondary {
         height: 14
         color: 11184810
-        offset_y: 20
       }
-      priority: 15025
+      priority: 15033
     }
   }
   element {
@@ -47867,9 +42947,8 @@ cont {
       secondary {
         height: 14
         color: 11184810
-        offset_y: 20
       }
-      priority: 15025
+      priority: 15033
     }
   }
 }
@@ -47995,14 +43074,14 @@ cont {
     scale: 11
     area {
       color: 14540236
-      priority: -16547
+      priority: -16533
     }
   }
   element {
     scale: 12
     area {
       color: 14540236
-      priority: -16548
+      priority: -16534
     }
     caption {
       primary {
@@ -48017,7 +43096,7 @@ cont {
     scale: 13
     area {
       color: 14540236
-      priority: -16549
+      priority: -16535
     }
     caption {
       primary {
@@ -48038,7 +43117,7 @@ cont {
     scale: 14
     area {
       color: 14540236
-      priority: -16550
+      priority: -16536
     }
     caption {
       primary {
@@ -48059,7 +43138,7 @@ cont {
     scale: 15
     area {
       color: 14540236
-      priority: -16551
+      priority: -16537
     }
     caption {
       primary {
@@ -48080,7 +43159,7 @@ cont {
     scale: 16
     area {
       color: 14540236
-      priority: -16552
+      priority: -16538
     }
     caption {
       primary {
@@ -48101,7 +43180,7 @@ cont {
     scale: 17
     area {
       color: 14540236
-      priority: -16553
+      priority: -16539
     }
     caption {
       primary {
@@ -48122,7 +43201,7 @@ cont {
     scale: 18
     area {
       color: 14540236
-      priority: -16554
+      priority: -16540
     }
     caption {
       primary {
@@ -48143,7 +43222,7 @@ cont {
     scale: 19
     area {
       color: 14540236
-      priority: -16555
+      priority: -16541
     }
     caption {
       primary {
@@ -48170,7 +43249,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48181,7 +43260,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48192,7 +43271,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48203,7 +43282,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48214,7 +43293,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48225,7 +43304,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48239,76 +43318,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 15
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "power-generator-nuclear"
-  element {
-    scale: 14
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator_nuclear-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48319,7 +43329,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_nuclear-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48330,7 +43340,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_nuclear-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48341,7 +43351,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_nuclear-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48352,7 +43362,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_nuclear-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48363,7 +43373,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_nuclear-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48377,76 +43387,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 15
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "power-generator-solar"
-  element {
-    scale: 14
-    area {
-      color: 12303291
-      priority: 1001
-    }
-    symbol {
-      name: "symbols/nori/generator_solar-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48457,7 +43398,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_solar-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48468,7 +43409,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_solar-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48479,7 +43420,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_solar-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48490,7 +43431,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_solar-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48501,7 +43442,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_solar-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48515,7 +43456,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_wind-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48526,7 +43467,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_wind-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48537,7 +43478,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_wind-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48548,7 +43489,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_wind-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48559,7 +43500,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_wind-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48570,7 +43511,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/nori/generator_wind-18.svg:#444444::::"
+      name: "power_generic"
       priority: 16000
     }
   }
@@ -48582,7 +43523,7 @@ cont {
     lines {
       width: 1.6
       color: 2164260863
-      priority: 1782
+      priority: 1785
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48593,7 +43534,7 @@ cont {
         dd: 16.0
         dd: 8.0
       }
-      priority: 1788
+      priority: 1791
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48603,7 +43544,7 @@ cont {
     lines {
       width: 1.6
       color: 2164260863
-      priority: 1782
+      priority: 1785
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48614,7 +43555,7 @@ cont {
         dd: 16.0
         dd: 8.0
       }
-      priority: 1788
+      priority: 1791
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48624,7 +43565,7 @@ cont {
     lines {
       width: 1.6
       color: 2164260863
-      priority: 1782
+      priority: 1785
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48635,7 +43576,7 @@ cont {
         dd: 16.0
         dd: 8.0
       }
-      priority: 1788
+      priority: 1791
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48645,7 +43586,7 @@ cont {
     lines {
       width: 1.6
       color: 2164260863
-      priority: 1782
+      priority: 1785
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48656,7 +43597,7 @@ cont {
         dd: 16.0
         dd: 8.0
       }
-      priority: 1788
+      priority: 1791
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48677,7 +43618,7 @@ cont {
         dd: 2.4
         dd: 8.8
       }
-      priority: 1785
+      priority: 1788
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48688,7 +43629,7 @@ cont {
         dd: 16.0
         dd: 8.0
       }
-      priority: 1788
+      priority: 1791
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48706,7 +43647,7 @@ cont {
         dd: 2.4
         dd: 8.8
       }
-      priority: 1785
+      priority: 1788
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48717,7 +43658,7 @@ cont {
         dd: 16.0
         dd: 8.0
       }
-      priority: 1788
+      priority: 1791
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48735,7 +43676,7 @@ cont {
         dd: 2.4
         dd: 8.8
       }
-      priority: 1785
+      priority: 1788
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48746,7 +43687,7 @@ cont {
         dd: 16.0
         dd: 8.0
       }
-      priority: 1788
+      priority: 1791
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48764,7 +43705,7 @@ cont {
         dd: 2.4
         dd: 8.8
       }
-      priority: 1785
+      priority: 1788
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48775,7 +43716,7 @@ cont {
         dd: 16.0
         dd: 8.0
       }
-      priority: 1788
+      priority: 1791
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48788,7 +43729,7 @@ cont {
     lines {
       width: 1.6
       color: 2164260863
-      priority: 1790
+      priority: 1793
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48799,7 +43740,7 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1796
+      priority: 1799
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48814,7 +43755,7 @@ cont {
         dd: 1.2
         dd: 4.4
       }
-      priority: 1793
+      priority: 1796
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48824,7 +43765,7 @@ cont {
     lines {
       width: 1.6
       color: 2164260863
-      priority: 1855
+      priority: 1857
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48835,7 +43776,7 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1858
+      priority: 1860
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48860,7 +43801,7 @@ cont {
     lines {
       width: 1.6
       color: 2164260863
-      priority: 1855
+      priority: 1857
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48871,7 +43812,7 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1858
+      priority: 1860
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48896,7 +43837,7 @@ cont {
     lines {
       width: 1.6
       color: 2164260863
-      priority: 1855
+      priority: 1857
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48907,7 +43848,7 @@ cont {
         dd: 8.0
         dd: 4.0
       }
-      priority: 1858
+      priority: 1860
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48933,28 +43874,28 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/cross-12.svg:#444444::::"
+      name: "power-pole"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/cross-12.svg:#444444::::"
+      name: "power-pole"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/cross-12.svg:#444444::::"
+      name: "power-pole"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/cross-12.svg:#444444::::"
+      name: "power-pole"
       priority: 16000
     }
   }
@@ -49054,28 +43995,28 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/power_tower-12.svg:#444444::::"
+      name: "power-tower"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/power_tower-12.svg:#444444::::"
+      name: "power-tower"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/power_tower-12.svg:#444444::::"
+      name: "power-tower"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/power_tower-12.svg:#444444::::"
+      name: "power-tower"
       priority: 16000
     }
   }
@@ -49087,7 +44028,7 @@ cont {
     lines {
       width: 0.25
       color: 3015424955
-      priority: 1214
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49097,7 +44038,7 @@ cont {
     lines {
       width: 0.55
       color: 3015424955
-      priority: 1234
+      priority: 1242
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49107,7 +44048,7 @@ cont {
     lines {
       width: 1.6
       color: 2579217339
-      priority: 1186
+      priority: 1194
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49118,14 +44059,14 @@ cont {
         dd: 4.5
         dd: 4.5
       }
-      priority: 1316
+      priority: 1323
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 2583691263
-      priority: 1276
+      priority: 1284
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49135,7 +44076,7 @@ cont {
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1282
+      priority: 1289
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49146,14 +44087,14 @@ cont {
         dd: 9.0
         dd: 9.0
       }
-      priority: 1384
+      priority: 1389
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1353
+      priority: 1359
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49163,7 +44104,7 @@ cont {
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1505
+      priority: 1512
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49174,14 +44115,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1641
+      priority: 1646
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 2583691263
-      priority: 1604
+      priority: 1610
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49191,7 +44132,7 @@ cont {
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1539
+      priority: 1545
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49202,14 +44143,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1714
+      priority: 1718
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1672
+      priority: 1676
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49219,7 +44160,7 @@ cont {
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1539
+      priority: 1545
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49230,14 +44171,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1714
+      priority: 1718
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1672
+      priority: 1676
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49247,7 +44188,7 @@ cont {
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1539
+      priority: 1545
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49258,14 +44199,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1714
+      priority: 1718
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1672
+      priority: 1676
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49278,7 +44219,7 @@ cont {
     lines {
       width: 0.25
       color: 3015424955
-      priority: 1214
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49288,7 +44229,7 @@ cont {
     lines {
       width: 0.55
       color: 3015424955
-      priority: 1234
+      priority: 1242
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49298,7 +44239,7 @@ cont {
     lines {
       width: 1.6
       color: 2579217339
-      priority: 1186
+      priority: 1194
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49309,14 +44250,14 @@ cont {
         dd: 4.5
         dd: 4.5
       }
-      priority: 1316
+      priority: 1323
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 2583691263
-      priority: 1276
+      priority: 1284
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49326,14 +44267,14 @@ cont {
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1282
+      priority: 1289
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49344,14 +44285,14 @@ cont {
         dd: 9.0
         dd: 9.0
       }
-      priority: 1384
+      priority: 1389
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1353
+      priority: 1359
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49368,14 +44309,14 @@ cont {
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1505
+      priority: 1512
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.4
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49386,14 +44327,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1641
+      priority: 1646
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 2583691263
-      priority: 1604
+      priority: 1610
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49410,14 +44351,14 @@ cont {
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1539
+      priority: 1545
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49428,14 +44369,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1714
+      priority: 1718
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1672
+      priority: 1676
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49452,14 +44393,14 @@ cont {
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1539
+      priority: 1545
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49470,14 +44411,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1714
+      priority: 1718
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1672
+      priority: 1676
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49494,14 +44435,14 @@ cont {
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1539
+      priority: 1545
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49512,14 +44453,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1714
+      priority: 1718
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1672
+      priority: 1676
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49539,7 +44480,7 @@ cont {
     lines {
       width: 0.25
       color: 3015424955
-      priority: 1214
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49549,7 +44490,7 @@ cont {
     lines {
       width: 0.55
       color: 3015424955
-      priority: 1234
+      priority: 1242
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49559,7 +44500,7 @@ cont {
     lines {
       width: 1.6
       color: 2579217339
-      priority: 1186
+      priority: 1194
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49570,14 +44511,14 @@ cont {
         dd: 4.5
         dd: 4.5
       }
-      priority: 1316
+      priority: 1323
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 2583691263
-      priority: 1276
+      priority: 1284
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49587,14 +44528,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1282
+      priority: 1289
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49605,14 +44546,14 @@ cont {
         dd: 9.0
         dd: 9.0
       }
-      priority: 1384
+      priority: 1389
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1353
+      priority: 1359
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49633,14 +44574,14 @@ cont {
     lines {
       width: 10.4
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1505
+      priority: 1512
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49651,14 +44592,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1641
+      priority: 1646
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 2583691263
-      priority: 1604
+      priority: 1610
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49679,14 +44620,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1539
+      priority: 1545
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49697,14 +44638,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1714
+      priority: 1718
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1672
+      priority: 1676
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49725,14 +44666,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1539
+      priority: 1545
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49743,14 +44684,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1714
+      priority: 1718
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1672
+      priority: 1676
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49771,14 +44712,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 2579217339
-      priority: 1539
+      priority: 1545
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49789,14 +44730,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1714
+      priority: 1718
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2583691263
-      priority: 1672
+      priority: 1676
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49814,237 +44755,33 @@ cont {
   }
 }
 cont {
-  name: "railway-construction"
-  element {
-    scale: 12
-    lines {
-      width: 0.75
-      color: 4473924
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1209
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.35
-      color: 4473924
-      dashdot {
-        dd: 1.5
-        dd: 1.5
-      }
-      priority: 1225
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 2.4
-      color: 6710886
-      dashdot {
-        dd: 1.5
-        dd: 1.5
-      }
-      priority: 1180
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.7
-      color: 6710886
-      dashdot {
-        dd: 1.5
-        dd: 1.5
-        dd: 1.5
-        dd: 4.5
-      }
-      priority: 1307
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.7
-      color: 16777215
-      priority: 1268
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 3.2
-      color: 6710886
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-      }
-      priority: 1271
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 6710886
-      dashdot {
-        dd: 3.0
-        dd: 3.0
-        dd: 3.0
-        dd: 9.0
-      }
-      priority: 1378
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 16777215
-      priority: 1347
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
+  name: "railway-crossing"
   element {
     scale: 16
-    lines {
-      width: 3.2
-      color: 6710886
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-      }
-      priority: 1497
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.4
-      color: 6710886
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-        dd: 4.0
-        dd: 12.0
-      }
-      priority: 1632
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.4
-      color: 16777215
-      priority: 1596
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+    symbol {
+      name: "railway-crossing-small"
+      priority: 16000
     }
   }
   element {
     scale: 17
-    lines {
-      width: 3.2
-      color: 6710886
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-      }
-      priority: 1533
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 6710886
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-        dd: 4.0
-        dd: 12.0
-      }
-      priority: 1700
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 16777215
-      priority: 1663
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+    symbol {
+      name: "railway-crossing-small"
+      priority: 16000
     }
   }
   element {
     scale: 18
-    lines {
-      width: 3.2
-      color: 6710886
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-      }
-      priority: 1533
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 6710886
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-        dd: 4.0
-        dd: 12.0
-      }
-      priority: 1700
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 16777215
-      priority: 1663
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+    symbol {
+      name: "railway-crossing-small"
+      priority: 16000
     }
   }
   element {
     scale: 19
-    lines {
-      width: 3.2
-      color: 6710886
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-      }
-      priority: 1533
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 6710886
-      dashdot {
-        dd: 4.0
-        dd: 4.0
-        dd: 4.0
-        dd: 12.0
-      }
-      priority: 1700
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 16777215
-      priority: 1663
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+    symbol {
+      name: "railway-crossing-small"
+      priority: 16000
     }
   }
 }
@@ -50055,7 +44792,7 @@ cont {
     lines {
       width: 0.5
       color: 2156431496
-      priority: 1211
+      priority: 1220
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50065,7 +44802,7 @@ cont {
     lines {
       width: 0.85
       color: 2156431496
-      priority: 1231
+      priority: 1239
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50075,7 +44812,7 @@ cont {
     lines {
       width: 1.6
       color: 1300793480
-      priority: 1183
+      priority: 1192
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50086,14 +44823,14 @@ cont {
         dd: 4.5
         dd: 4.5
       }
-      priority: 1313
+      priority: 1320
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 1308622847
-      priority: 1274
+      priority: 1281
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50103,7 +44840,7 @@ cont {
     lines {
       width: 3.2
       color: 1300793480
-      priority: 1279
+      priority: 1286
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50114,14 +44851,14 @@ cont {
         dd: 9.0
         dd: 9.0
       }
-      priority: 1381
+      priority: 1387
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 1308622847
-      priority: 1350
+      priority: 1356
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50131,7 +44868,7 @@ cont {
     lines {
       width: 3.2
       color: 1300793480
-      priority: 1500
+      priority: 1506
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50142,14 +44879,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1635
+      priority: 1640
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 1308622847
-      priority: 1598
+      priority: 1604
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50159,7 +44896,7 @@ cont {
     lines {
       width: 3.2
       color: 1300793480
-      priority: 1536
+      priority: 1543
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50170,14 +44907,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1709
+      priority: 1713
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 1308622847
-      priority: 1666
+      priority: 1671
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50187,7 +44924,7 @@ cont {
     lines {
       width: 3.2
       color: 1300793480
-      priority: 1536
+      priority: 1543
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50198,14 +44935,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1709
+      priority: 1713
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 1308622847
-      priority: 1666
+      priority: 1671
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50215,7 +44952,7 @@ cont {
     lines {
       width: 3.2
       color: 1300793480
-      priority: 1536
+      priority: 1543
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50226,14 +44963,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1709
+      priority: 1713
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 1308622847
-      priority: 1666
+      priority: 1671
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50246,7 +44983,7 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 1228
+      priority: 1236
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50256,7 +44993,7 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 1248
+      priority: 1256
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50266,14 +45003,14 @@ cont {
     lines {
       width: 2.4
       color: 5570560
-      priority: 1197
+      priority: 1206
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.4
       color: 5570560
-      priority: 1327
+      priority: 1334
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50284,7 +45021,7 @@ cont {
         dd: 3.6
         dd: 5.4
       }
-      priority: 1296
+      priority: 1303
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50294,14 +45031,14 @@ cont {
     lines {
       width: 3.2
       color: 4456448
-      priority: 1299
+      priority: 1306
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.5
       color: 4456448
-      priority: 1398
+      priority: 1403
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50312,7 +45049,7 @@ cont {
         dd: 7.2
         dd: 10.8
       }
-      priority: 1367
+      priority: 1373
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50322,14 +45059,14 @@ cont {
     lines {
       width: 3.2
       color: 4456448
-      priority: 1514
+      priority: 1520
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.6
       color: 4456448
-      priority: 1652
+      priority: 1657
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50340,7 +45077,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1621
+      priority: 1626
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50350,14 +45087,14 @@ cont {
     lines {
       width: 3.2
       color: 4456448
-      priority: 1559
+      priority: 1565
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.64
       color: 4456448
-      priority: 1740
+      priority: 1743
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50368,7 +45105,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1689
+      priority: 1693
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50378,14 +45115,14 @@ cont {
     lines {
       width: 3.2
       color: 4456448
-      priority: 1559
+      priority: 1565
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.64
       color: 4456448
-      priority: 1740
+      priority: 1743
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50396,7 +45133,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1689
+      priority: 1693
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50406,14 +45143,14 @@ cont {
     lines {
       width: 3.2
       color: 4456448
-      priority: 1559
+      priority: 1565
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.64
       color: 4456448
-      priority: 1740
+      priority: 1743
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50424,7 +45161,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1689
+      priority: 1693
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50437,7 +45174,7 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 1228
+      priority: 1236
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50447,7 +45184,7 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 1248
+      priority: 1256
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50457,14 +45194,14 @@ cont {
     lines {
       width: 2.4
       color: 5570560
-      priority: 1197
+      priority: 1206
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.4
       color: 5570560
-      priority: 1327
+      priority: 1334
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50475,7 +45212,7 @@ cont {
         dd: 3.6
         dd: 5.4
       }
-      priority: 1296
+      priority: 1303
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50485,21 +45222,21 @@ cont {
     lines {
       width: 3.2
       color: 4456448
-      priority: 1299
+      priority: 1306
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.5
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 0.5
       color: 4456448
-      priority: 1398
+      priority: 1403
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50510,7 +45247,7 @@ cont {
         dd: 7.2
         dd: 10.8
       }
-      priority: 1367
+      priority: 1373
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50527,21 +45264,21 @@ cont {
     lines {
       width: 3.2
       color: 4456448
-      priority: 1514
+      priority: 1520
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.6
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 0.6
       color: 4456448
-      priority: 1652
+      priority: 1657
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50552,7 +45289,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1621
+      priority: 1626
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50569,21 +45306,21 @@ cont {
     lines {
       width: 3.2
       color: 4456448
-      priority: 1559
+      priority: 1565
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.64
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 0.64
       color: 4456448
-      priority: 1740
+      priority: 1743
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50594,7 +45331,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1689
+      priority: 1693
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50611,21 +45348,21 @@ cont {
     lines {
       width: 3.2
       color: 4456448
-      priority: 1559
+      priority: 1565
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.64
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 0.64
       color: 4456448
-      priority: 1740
+      priority: 1743
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50636,7 +45373,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1689
+      priority: 1693
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50653,21 +45390,21 @@ cont {
     lines {
       width: 3.2
       color: 4456448
-      priority: 1559
+      priority: 1565
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.64
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 0.64
       color: 4456448
-      priority: 1740
+      priority: 1743
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50678,7 +45415,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1689
+      priority: 1693
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50698,7 +45435,7 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 1228
+      priority: 1236
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50708,7 +45445,7 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 1248
+      priority: 1256
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50718,14 +45455,14 @@ cont {
     lines {
       width: 2.4
       color: 5570560
-      priority: 1197
+      priority: 1206
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.4
       color: 5570560
-      priority: 1327
+      priority: 1334
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50736,7 +45473,7 @@ cont {
         dd: 3.6
         dd: 5.4
       }
-      priority: 1296
+      priority: 1303
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50746,21 +45483,21 @@ cont {
     lines {
       width: 8.5
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 4456448
-      priority: 1299
+      priority: 1306
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.5
       color: 4456448
-      priority: 1398
+      priority: 1403
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50771,7 +45508,7 @@ cont {
         dd: 7.2
         dd: 10.8
       }
-      priority: 1367
+      priority: 1373
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50792,21 +45529,21 @@ cont {
     lines {
       width: 8.6
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 4456448
-      priority: 1514
+      priority: 1520
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.6
       color: 4456448
-      priority: 1652
+      priority: 1657
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50817,7 +45554,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1621
+      priority: 1626
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50838,21 +45575,21 @@ cont {
     lines {
       width: 8.64
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 4456448
-      priority: 1559
+      priority: 1565
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.64
       color: 4456448
-      priority: 1740
+      priority: 1743
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50863,7 +45600,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1689
+      priority: 1693
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50884,21 +45621,21 @@ cont {
     lines {
       width: 8.64
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 4456448
-      priority: 1559
+      priority: 1565
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.64
       color: 4456448
-      priority: 1740
+      priority: 1743
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50909,7 +45646,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1689
+      priority: 1693
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50930,21 +45667,21 @@ cont {
     lines {
       width: 8.64
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 4456448
-      priority: 1559
+      priority: 1565
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 0.64
       color: 4456448
-      priority: 1740
+      priority: 1743
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -50955,7 +45692,7 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1689
+      priority: 1693
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50977,15 +45714,15 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/rail-above-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16000
+      name: "railway-station-mini"
+      priority: 16167
     }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/rail-above-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16000
+      name: "railway-station-mini"
+      priority: 16167
     }
     path_text {
       primary {
@@ -50994,14 +45731,14 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 16000
+      priority: 16167
     }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
-      priority: 16000
+      name: "railway-station-mini"
+      priority: 16167
     }
     path_text {
       primary {
@@ -51010,13 +45747,13 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 16000
+      priority: 16167
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "railway-station"
       priority: 16000
     }
     path_text {
@@ -51032,7 +45769,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "railway-station"
       priority: 16000
     }
     path_text {
@@ -51048,7 +45785,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "railway-station"
       priority: 16000
     }
     path_text {
@@ -51063,13 +45800,44 @@ cont {
   }
 }
 cont {
+  name: "railway-level_crossing"
+  element {
+    scale: 16
+    symbol {
+      name: "railway-crossing"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "railway-crossing"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "railway-crossing"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "railway-crossing"
+      priority: 16000
+    }
+  }
+}
+cont {
   name: "railway-light_rail"
   element {
     scale: 12
     lines {
       width: 1.0
       color: 10083737
-      priority: 1686
+      priority: 1690
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51079,7 +45847,7 @@ cont {
     lines {
       width: 1.0
       color: 10083737
-      priority: 1737
+      priority: 1740
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51089,7 +45857,7 @@ cont {
     lines {
       width: 2.4
       color: 21760
-      priority: 1686
+      priority: 1690
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51100,14 +45868,14 @@ cont {
         dd: 3.8
         dd: 5.4
       }
-      priority: 1737
+      priority: 1740
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.7
       color: 12316398
-      priority: 1709
+      priority: 1713
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51117,7 +45885,7 @@ cont {
     lines {
       width: 3.2
       color: 17408
-      priority: 1686
+      priority: 1690
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51128,14 +45896,14 @@ cont {
         dd: 7.6
         dd: 10.8
       }
-      priority: 1737
+      priority: 1740
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1709
+      priority: 1713
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51145,7 +45913,7 @@ cont {
     lines {
       width: 3.2
       color: 17408
-      priority: 1686
+      priority: 1690
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51156,14 +45924,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1737
+      priority: 1740
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1709
+      priority: 1713
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51173,7 +45941,7 @@ cont {
     lines {
       width: 3.2
       color: 17408
-      priority: 1556
+      priority: 1562
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51184,14 +45952,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1728
+      priority: 1732
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1683
+      priority: 1688
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51201,7 +45969,7 @@ cont {
     lines {
       width: 3.2
       color: 17408
-      priority: 1556
+      priority: 1562
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51212,14 +45980,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1728
+      priority: 1732
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1683
+      priority: 1688
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51229,7 +45997,7 @@ cont {
     lines {
       width: 3.2
       color: 17408
-      priority: 1556
+      priority: 1562
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51240,14 +46008,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1728
+      priority: 1732
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1683
+      priority: 1688
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51260,7 +46028,7 @@ cont {
     lines {
       width: 1.0
       color: 10083737
-      priority: 1686
+      priority: 1690
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51270,7 +46038,7 @@ cont {
     lines {
       width: 1.0
       color: 10083737
-      priority: 1737
+      priority: 1740
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51280,7 +46048,7 @@ cont {
     lines {
       width: 2.4
       color: 21760
-      priority: 1686
+      priority: 1690
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51291,14 +46059,14 @@ cont {
         dd: 3.8
         dd: 5.4
       }
-      priority: 1737
+      priority: 1740
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.7
       color: 12316398
-      priority: 1709
+      priority: 1713
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51308,14 +46076,14 @@ cont {
     lines {
       width: 3.2
       color: 17408
-      priority: 1686
+      priority: 1690
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -51326,14 +46094,14 @@ cont {
         dd: 7.6
         dd: 10.8
       }
-      priority: 1737
+      priority: 1740
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1709
+      priority: 1713
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51350,14 +46118,14 @@ cont {
     lines {
       width: 3.2
       color: 17408
-      priority: 1686
+      priority: 1690
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -51368,14 +46136,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1737
+      priority: 1740
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1709
+      priority: 1713
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51392,14 +46160,14 @@ cont {
     lines {
       width: 3.2
       color: 17408
-      priority: 1556
+      priority: 1562
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -51410,14 +46178,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1728
+      priority: 1732
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1683
+      priority: 1688
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51434,14 +46202,14 @@ cont {
     lines {
       width: 3.2
       color: 17408
-      priority: 1556
+      priority: 1562
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -51452,14 +46220,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1728
+      priority: 1732
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1683
+      priority: 1688
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51476,14 +46244,14 @@ cont {
     lines {
       width: 3.2
       color: 17408
-      priority: 1556
+      priority: 1562
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -51494,14 +46262,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1728
+      priority: 1732
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1683
+      priority: 1688
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51521,7 +46289,7 @@ cont {
     lines {
       width: 1.0
       color: 10083737
-      priority: 1686
+      priority: 1690
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51531,7 +46299,7 @@ cont {
     lines {
       width: 1.0
       color: 10083737
-      priority: 1737
+      priority: 1740
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51541,7 +46309,7 @@ cont {
     lines {
       width: 2.4
       color: 21760
-      priority: 1686
+      priority: 1690
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51552,14 +46320,14 @@ cont {
         dd: 3.8
         dd: 5.4
       }
-      priority: 1737
+      priority: 1740
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.7
       color: 12316398
-      priority: 1709
+      priority: 1713
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51569,14 +46337,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 17408
-      priority: 1686
+      priority: 1690
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51587,14 +46355,14 @@ cont {
         dd: 7.6
         dd: 10.8
       }
-      priority: 1737
+      priority: 1740
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1709
+      priority: 1713
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51615,14 +46383,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 17408
-      priority: 1686
+      priority: 1690
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51633,14 +46401,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1737
+      priority: 1740
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1709
+      priority: 1713
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51661,14 +46429,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 17408
-      priority: 1556
+      priority: 1562
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51679,14 +46447,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1728
+      priority: 1732
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1683
+      priority: 1688
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51707,14 +46475,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 17408
-      priority: 1556
+      priority: 1562
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51725,14 +46493,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1728
+      priority: 1732
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1683
+      priority: 1688
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51753,14 +46521,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 17408
-      priority: 1556
+      priority: 1562
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51771,14 +46539,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1728
+      priority: 1732
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 12316398
-      priority: 1683
+      priority: 1688
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51802,7 +46570,7 @@ cont {
     lines {
       width: 1.0
       color: 14518408
-      priority: 1231
+      priority: 1239
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51826,21 +46594,21 @@ cont {
         dd: 3.6
         dd: 5.4
       }
-      priority: 1531
+      priority: 1537
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 5570645
-      priority: 1525
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.7
       color: 14518408
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51850,7 +46618,7 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51861,14 +46629,14 @@ cont {
         dd: 7.2
         dd: 10.8
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51878,7 +46646,7 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51889,14 +46657,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51906,7 +46674,7 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51917,14 +46685,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51934,7 +46702,7 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51945,14 +46713,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51962,7 +46730,7 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51973,14 +46741,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -51993,7 +46761,7 @@ cont {
     lines {
       width: 1.0
       color: 14518408
-      priority: 1231
+      priority: 1239
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52017,21 +46785,21 @@ cont {
         dd: 3.6
         dd: 5.4
       }
-      priority: 1531
+      priority: 1537
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 5570645
-      priority: 1525
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.7
       color: 14518408
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52041,14 +46809,14 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -52059,14 +46827,14 @@ cont {
         dd: 7.2
         dd: 10.8
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52083,14 +46851,14 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -52101,14 +46869,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52125,14 +46893,14 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -52143,14 +46911,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52167,14 +46935,14 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -52185,14 +46953,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52209,14 +46977,14 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -52227,14 +46995,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52254,7 +47022,7 @@ cont {
     lines {
       width: 1.0
       color: 14518408
-      priority: 1231
+      priority: 1239
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52278,21 +47046,21 @@ cont {
         dd: 3.6
         dd: 5.4
       }
-      priority: 1531
+      priority: 1537
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 5570645
-      priority: 1525
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.7
       color: 14518408
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52302,14 +47070,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52320,14 +47088,14 @@ cont {
         dd: 7.2
         dd: 10.8
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52348,14 +47116,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52366,14 +47134,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52394,14 +47162,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52412,14 +47180,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52440,14 +47208,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52458,14 +47226,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52486,14 +47254,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52504,14 +47272,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14518408
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52535,7 +47303,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1220
+      priority: 1228
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52545,7 +47313,7 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 1242
+      priority: 1250
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52555,7 +47323,7 @@ cont {
     lines {
       width: 2.4
       color: 6710886
-      priority: 1192
+      priority: 1200
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52566,14 +47334,14 @@ cont {
         dd: 5.5
         dd: 5.5
       }
-      priority: 1322
+      priority: 1328
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.7
       color: 15658734
-      priority: 1285
+      priority: 1292
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52583,7 +47351,7 @@ cont {
     lines {
       width: 3.2
       color: 3355443
-      priority: 1290
+      priority: 1298
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52594,14 +47362,14 @@ cont {
         dd: 11.0
         dd: 11.0
       }
-      priority: 1389
+      priority: 1395
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1358
+      priority: 1364
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52611,7 +47379,7 @@ cont {
     lines {
       width: 3.2
       color: 3355443
-      priority: 1511
+      priority: 1518
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52622,14 +47390,14 @@ cont {
         dd: 14.0
         dd: 14.0
       }
-      priority: 1646
+      priority: 1651
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1612
+      priority: 1618
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52639,7 +47407,7 @@ cont {
     lines {
       width: 3.2
       color: 3355443
-      priority: 1550
+      priority: 1557
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52650,14 +47418,14 @@ cont {
         dd: 14.4
         dd: 14.4
       }
-      priority: 1723
+      priority: 1727
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1677
+      priority: 1682
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52667,7 +47435,7 @@ cont {
     lines {
       width: 3.2
       color: 3355443
-      priority: 1550
+      priority: 1557
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52678,14 +47446,14 @@ cont {
         dd: 14.4
         dd: 14.4
       }
-      priority: 1723
+      priority: 1727
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1677
+      priority: 1682
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52695,7 +47463,7 @@ cont {
     lines {
       width: 3.2
       color: 3355443
-      priority: 1550
+      priority: 1557
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52706,14 +47474,14 @@ cont {
         dd: 14.4
         dd: 14.4
       }
-      priority: 1723
+      priority: 1727
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1677
+      priority: 1682
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52726,7 +47494,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1220
+      priority: 1228
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52736,7 +47504,7 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 1242
+      priority: 1250
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52746,7 +47514,7 @@ cont {
     lines {
       width: 2.4
       color: 6710886
-      priority: 1192
+      priority: 1200
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52757,14 +47525,14 @@ cont {
         dd: 5.5
         dd: 5.5
       }
-      priority: 1322
+      priority: 1328
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.7
       color: 15658734
-      priority: 1285
+      priority: 1292
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52774,14 +47542,14 @@ cont {
     lines {
       width: 3.2
       color: 3355443
-      priority: 1290
+      priority: 1298
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -52792,14 +47560,14 @@ cont {
         dd: 11.0
         dd: 11.0
       }
-      priority: 1389
+      priority: 1395
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1358
+      priority: 1364
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52816,14 +47584,14 @@ cont {
     lines {
       width: 3.2
       color: 3355443
-      priority: 1511
+      priority: 1518
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -52834,14 +47602,14 @@ cont {
         dd: 14.0
         dd: 14.0
       }
-      priority: 1646
+      priority: 1651
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1612
+      priority: 1618
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52858,14 +47626,14 @@ cont {
     lines {
       width: 3.2
       color: 3355443
-      priority: 1550
+      priority: 1557
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -52876,14 +47644,14 @@ cont {
         dd: 14.4
         dd: 14.4
       }
-      priority: 1723
+      priority: 1727
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1677
+      priority: 1682
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52900,14 +47668,14 @@ cont {
     lines {
       width: 3.2
       color: 3355443
-      priority: 1550
+      priority: 1557
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -52918,14 +47686,14 @@ cont {
         dd: 14.4
         dd: 14.4
       }
-      priority: 1723
+      priority: 1727
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1677
+      priority: 1682
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52942,14 +47710,14 @@ cont {
     lines {
       width: 3.2
       color: 3355443
-      priority: 1550
+      priority: 1557
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -52960,14 +47728,14 @@ cont {
         dd: 14.4
         dd: 14.4
       }
-      priority: 1723
+      priority: 1727
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1677
+      priority: 1682
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52987,7 +47755,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1220
+      priority: 1228
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -52997,7 +47765,7 @@ cont {
     lines {
       width: 1.0
       color: 11184810
-      priority: 1242
+      priority: 1250
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53007,7 +47775,7 @@ cont {
     lines {
       width: 2.4
       color: 6710886
-      priority: 1192
+      priority: 1200
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53018,14 +47786,14 @@ cont {
         dd: 5.5
         dd: 5.5
       }
-      priority: 1322
+      priority: 1328
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.7
       color: 15658734
-      priority: 1285
+      priority: 1292
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53035,14 +47803,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 3355443
-      priority: 1290
+      priority: 1298
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53053,14 +47821,14 @@ cont {
         dd: 11.0
         dd: 11.0
       }
-      priority: 1389
+      priority: 1395
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1358
+      priority: 1364
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53081,14 +47849,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 3355443
-      priority: 1511
+      priority: 1518
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53099,14 +47867,14 @@ cont {
         dd: 14.0
         dd: 14.0
       }
-      priority: 1646
+      priority: 1651
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1612
+      priority: 1618
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53127,14 +47895,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 3355443
-      priority: 1550
+      priority: 1557
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53145,14 +47913,14 @@ cont {
         dd: 14.4
         dd: 14.4
       }
-      priority: 1723
+      priority: 1727
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1677
+      priority: 1682
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53173,14 +47941,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 3355443
-      priority: 1550
+      priority: 1557
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53191,14 +47959,14 @@ cont {
         dd: 14.4
         dd: 14.4
       }
-      priority: 1723
+      priority: 1727
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1677
+      priority: 1682
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53219,14 +47987,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 3355443
-      priority: 1550
+      priority: 1557
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53237,14 +48005,14 @@ cont {
         dd: 14.4
         dd: 14.4
       }
-      priority: 1723
+      priority: 1727
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1677
+      priority: 1682
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53268,13 +48036,13 @@ cont {
     lines {
       width: 4.0
       color: 12303291
-      priority: 1570
+      priority: 1576
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 12303291
-      priority: 1571
+      priority: 1577
     }
   }
   element {
@@ -53327,7 +48095,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1223
+      priority: 1231
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53337,7 +48105,7 @@ cont {
     lines {
       width: 1.35
       color: 12303291
-      priority: 1245
+      priority: 1253
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53347,7 +48115,7 @@ cont {
     lines {
       width: 2.4
       color: 10066329
-      priority: 1194
+      priority: 1203
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53358,7 +48126,7 @@ cont {
         dd: 4.5
         dd: 4.5
       }
-      priority: 1324
+      priority: 1331
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -53375,7 +48143,7 @@ cont {
     lines {
       width: 3.2
       color: 10066329
-      priority: 1293
+      priority: 1300
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53386,14 +48154,14 @@ cont {
         dd: 9.0
         dd: 9.0
       }
-      priority: 1392
+      priority: 1398
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1361
+      priority: 1367
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53414,14 +48182,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1649
+      priority: 1654
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1615
+      priority: 1621
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53431,7 +48199,7 @@ cont {
     lines {
       width: 3.2
       color: 10066329
-      priority: 1553
+      priority: 1559
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53442,14 +48210,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1725
+      priority: 1729
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1680
+      priority: 1685
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53459,7 +48227,7 @@ cont {
     lines {
       width: 3.2
       color: 10066329
-      priority: 1553
+      priority: 1559
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53470,14 +48238,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1725
+      priority: 1729
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1680
+      priority: 1685
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53487,7 +48255,7 @@ cont {
     lines {
       width: 3.2
       color: 10066329
-      priority: 1553
+      priority: 1559
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53498,14 +48266,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1725
+      priority: 1729
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1680
+      priority: 1685
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53518,7 +48286,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1223
+      priority: 1231
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53528,7 +48296,7 @@ cont {
     lines {
       width: 1.35
       color: 12303291
-      priority: 1245
+      priority: 1253
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53538,7 +48306,7 @@ cont {
     lines {
       width: 2.4
       color: 10066329
-      priority: 1194
+      priority: 1203
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53549,7 +48317,7 @@ cont {
         dd: 4.5
         dd: 4.5
       }
-      priority: 1324
+      priority: 1331
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -53566,14 +48334,14 @@ cont {
     lines {
       width: 3.2
       color: 10066329
-      priority: 1293
+      priority: 1300
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -53584,14 +48352,14 @@ cont {
         dd: 9.0
         dd: 9.0
       }
-      priority: 1392
+      priority: 1398
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1361
+      priority: 1367
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53615,7 +48383,7 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -53626,14 +48394,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1649
+      priority: 1654
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1615
+      priority: 1621
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53650,14 +48418,14 @@ cont {
     lines {
       width: 3.2
       color: 10066329
-      priority: 1553
+      priority: 1559
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -53668,14 +48436,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1725
+      priority: 1729
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1680
+      priority: 1685
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53692,14 +48460,14 @@ cont {
     lines {
       width: 3.2
       color: 10066329
-      priority: 1553
+      priority: 1559
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -53710,14 +48478,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1725
+      priority: 1729
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1680
+      priority: 1685
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53734,14 +48502,14 @@ cont {
     lines {
       width: 3.2
       color: 10066329
-      priority: 1553
+      priority: 1559
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -53752,14 +48520,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1725
+      priority: 1729
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1680
+      priority: 1685
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53779,7 +48547,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1223
+      priority: 1231
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53789,7 +48557,7 @@ cont {
     lines {
       width: 1.35
       color: 12303291
-      priority: 1245
+      priority: 1253
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53799,7 +48567,7 @@ cont {
     lines {
       width: 2.4
       color: 10066329
-      priority: 1194
+      priority: 1203
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53810,7 +48578,7 @@ cont {
         dd: 4.5
         dd: 4.5
       }
-      priority: 1324
+      priority: 1331
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -53827,14 +48595,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 10066329
-      priority: 1293
+      priority: 1300
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53845,14 +48613,14 @@ cont {
         dd: 9.0
         dd: 9.0
       }
-      priority: 1392
+      priority: 1398
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1361
+      priority: 1367
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53873,7 +48641,7 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -53891,14 +48659,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1649
+      priority: 1654
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1615
+      priority: 1621
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53919,14 +48687,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 10066329
-      priority: 1553
+      priority: 1559
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53937,14 +48705,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1725
+      priority: 1729
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1680
+      priority: 1685
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53965,14 +48733,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 10066329
-      priority: 1553
+      priority: 1559
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -53983,14 +48751,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1725
+      priority: 1729
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1680
+      priority: 1685
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54011,14 +48779,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 10066329
-      priority: 1553
+      priority: 1559
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54029,14 +48797,14 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1725
+      priority: 1729
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15658734
-      priority: 1680
+      priority: 1685
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54060,7 +48828,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1155
+      priority: 1161
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54070,7 +48838,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1155
+      priority: 1161
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54080,7 +48848,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1217
+      priority: 1225
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54090,7 +48858,7 @@ cont {
     lines {
       width: 1.85
       color: 12303291
-      priority: 1240
+      priority: 1247
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54100,14 +48868,14 @@ cont {
     lines {
       width: 3.0
       color: 8947848
-      priority: 1189
+      priority: 1197
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.8
       color: 15658734
-      priority: 1282
+      priority: 1289
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54118,7 +48886,7 @@ cont {
         dd: 4.5
         dd: 4.5
       }
-      priority: 1319
+      priority: 1325
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54128,7 +48896,7 @@ cont {
         color: 3364317
         stroke_color: 16777215
       }
-      priority: 16189
+      priority: 16197
     }
   }
   element {
@@ -54136,14 +48904,14 @@ cont {
     lines {
       width: 4.0
       color: 6710886
-      priority: 1288
+      priority: 1295
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.4
       color: 15658734
-      priority: 1355
+      priority: 1362
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54154,7 +48922,7 @@ cont {
         dd: 9.0
         dd: 9.0
       }
-      priority: 1358
+      priority: 1364
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54164,7 +48932,7 @@ cont {
         color: 3364317
         stroke_color: 16777215
       }
-      priority: 16288
+      priority: 16295
     }
   }
   element {
@@ -54172,14 +48940,14 @@ cont {
     lines {
       width: 2.4
       color: 15658734
-      priority: 1610
+      priority: 1615
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 4.0
       color: 6710886
-      priority: 1508
+      priority: 1515
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54190,7 +48958,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1644
+      priority: 1649
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54200,7 +48968,7 @@ cont {
         color: 3364317
         stroke_color: 16777215
       }
-      priority: 16610
+      priority: 16615
     }
   }
   element {
@@ -54208,14 +48976,14 @@ cont {
     lines {
       width: 4.4
       color: 6710886
-      priority: 1548
+      priority: 1554
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 15658734
-      priority: 1675
+      priority: 1679
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54226,7 +48994,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1720
+      priority: 1724
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54236,7 +49004,7 @@ cont {
         color: 3364317
         stroke_color: 16777215
       }
-      priority: 16548
+      priority: 16554
     }
   }
   element {
@@ -54244,14 +49012,14 @@ cont {
     lines {
       width: 4.4
       color: 6710886
-      priority: 1548
+      priority: 1554
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 15658734
-      priority: 1675
+      priority: 1679
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54262,7 +49030,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1720
+      priority: 1724
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54272,7 +49040,7 @@ cont {
         color: 3364317
         stroke_color: 16777215
       }
-      priority: 16548
+      priority: 16554
     }
   }
   element {
@@ -54280,14 +49048,14 @@ cont {
     lines {
       width: 4.4
       color: 6710886
-      priority: 1548
+      priority: 1554
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 15658734
-      priority: 1675
+      priority: 1679
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54298,7 +49066,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1720
+      priority: 1724
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54308,7 +49076,7 @@ cont {
         color: 3364317
         stroke_color: 16777215
       }
-      priority: 16548
+      priority: 16554
     }
   }
 }
@@ -54319,7 +49087,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1155
+      priority: 1161
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54329,7 +49097,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1155
+      priority: 1161
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54339,7 +49107,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1217
+      priority: 1225
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54349,7 +49117,7 @@ cont {
     lines {
       width: 1.85
       color: 12303291
-      priority: 1240
+      priority: 1247
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54359,14 +49127,14 @@ cont {
     lines {
       width: 3.0
       color: 8947848
-      priority: 1189
+      priority: 1197
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.8
       color: 15658734
-      priority: 1282
+      priority: 1289
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54377,7 +49145,7 @@ cont {
         dd: 4.5
         dd: 4.5
       }
-      priority: 1319
+      priority: 1325
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54387,7 +49155,7 @@ cont {
         color: 3364317
         stroke_color: 16777215
       }
-      priority: 16189
+      priority: 16197
     }
   }
   element {
@@ -54395,21 +49163,21 @@ cont {
     lines {
       width: 10.4
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 6710886
-      priority: 1288
+      priority: 1295
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.4
       color: 15658734
-      priority: 1355
+      priority: 1362
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54420,7 +49188,7 @@ cont {
         dd: 9.0
         dd: 9.0
       }
-      priority: 1358
+      priority: 1364
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54437,7 +49205,7 @@ cont {
         color: 3364317
         stroke_color: 16777215
       }
-      priority: 16288
+      priority: 16295
     }
   }
   element {
@@ -54445,21 +49213,21 @@ cont {
     lines {
       width: 2.4
       color: 15658734
-      priority: 1610
+      priority: 1615
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.4
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 6710886
-      priority: 1508
+      priority: 1515
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54470,7 +49238,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1644
+      priority: 1649
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54487,7 +49255,7 @@ cont {
         color: 3364317
         stroke_color: 16777215
       }
-      priority: 16610
+      priority: 16615
     }
   }
   element {
@@ -54495,21 +49263,21 @@ cont {
     lines {
       width: 11.2
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.4
       color: 6710886
-      priority: 1548
+      priority: 1554
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 15658734
-      priority: 1675
+      priority: 1679
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54520,7 +49288,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1720
+      priority: 1724
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54537,7 +49305,7 @@ cont {
         color: 3364317
         stroke_color: 16777215
       }
-      priority: 16548
+      priority: 16554
     }
   }
   element {
@@ -54545,21 +49313,21 @@ cont {
     lines {
       width: 11.2
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.4
       color: 6710886
-      priority: 1548
+      priority: 1554
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 15658734
-      priority: 1675
+      priority: 1679
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54570,7 +49338,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1720
+      priority: 1724
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54587,7 +49355,7 @@ cont {
         color: 3364317
         stroke_color: 16777215
       }
-      priority: 16548
+      priority: 16554
     }
   }
   element {
@@ -54595,21 +49363,21 @@ cont {
     lines {
       width: 11.2
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.4
       color: 6710886
-      priority: 1548
+      priority: 1554
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 15658734
-      priority: 1675
+      priority: 1679
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54620,7 +49388,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1720
+      priority: 1724
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54637,7 +49405,7 @@ cont {
         color: 3364317
         stroke_color: 16777215
       }
-      priority: 16548
+      priority: 16554
     }
   }
 }
@@ -54648,7 +49416,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1155
+      priority: 1161
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54658,7 +49426,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1155
+      priority: 1161
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54668,7 +49436,7 @@ cont {
     lines {
       width: 1.0
       color: 13421772
-      priority: 1217
+      priority: 1225
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54678,7 +49446,7 @@ cont {
     lines {
       width: 1.85
       color: 12303291
-      priority: 1240
+      priority: 1247
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54688,14 +49456,14 @@ cont {
     lines {
       width: 3.0
       color: 8947848
-      priority: 1189
+      priority: 1197
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.8
       color: 15658734
-      priority: 1282
+      priority: 1289
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54706,7 +49474,7 @@ cont {
         dd: 4.5
         dd: 4.5
       }
-      priority: 1319
+      priority: 1325
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54716,7 +49484,7 @@ cont {
         color: 3364317
         stroke_color: 16777215
       }
-      priority: 16189
+      priority: 16197
     }
   }
   element {
@@ -54724,21 +49492,21 @@ cont {
     lines {
       width: 4.0
       color: 6710886
-      priority: 1288
+      priority: 1295
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.4
       color: 15658734
-      priority: 1355
+      priority: 1362
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.4
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54749,7 +49517,7 @@ cont {
         dd: 9.0
         dd: 9.0
       }
-      priority: 1358
+      priority: 1364
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54770,7 +49538,7 @@ cont {
         color: 3364317
         stroke_color: 16777215
       }
-      priority: 16288
+      priority: 16295
     }
   }
   element {
@@ -54778,21 +49546,21 @@ cont {
     lines {
       width: 10.4
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 15658734
-      priority: 1610
+      priority: 1615
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 4.0
       color: 6710886
-      priority: 1508
+      priority: 1515
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -54803,7 +49571,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1644
+      priority: 1649
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54824,7 +49592,7 @@ cont {
         color: 3364317
         stroke_color: 16777215
       }
-      priority: 16610
+      priority: 16615
     }
   }
   element {
@@ -54832,21 +49600,21 @@ cont {
     lines {
       width: 4.4
       color: 6710886
-      priority: 1548
+      priority: 1554
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 15658734
-      priority: 1675
+      priority: 1679
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.2
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54857,7 +49625,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1720
+      priority: 1724
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54878,7 +49646,7 @@ cont {
         color: 3364317
         stroke_color: 16777215
       }
-      priority: 16548
+      priority: 16554
     }
   }
   element {
@@ -54886,21 +49654,21 @@ cont {
     lines {
       width: 4.4
       color: 6710886
-      priority: 1548
+      priority: 1554
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 15658734
-      priority: 1675
+      priority: 1679
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.2
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54911,7 +49679,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1720
+      priority: 1724
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54932,7 +49700,7 @@ cont {
         color: 3364317
         stroke_color: 16777215
       }
-      priority: 16548
+      priority: 16554
     }
   }
   element {
@@ -54940,21 +49708,21 @@ cont {
     lines {
       width: 4.4
       color: 6710886
-      priority: 1548
+      priority: 1554
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 15658734
-      priority: 1675
+      priority: 1679
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 11.2
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54965,7 +49733,7 @@ cont {
         dd: 12.0
         dd: 12.0
       }
-      priority: 1720
+      priority: 1724
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -54986,7 +49754,7 @@ cont {
         color: 3364317
         stroke_color: 16777215
       }
-      priority: 16548
+      priority: 16554
     }
   }
 }
@@ -55001,7 +49769,7 @@ cont {
         dd: 2.4
         dd: 2.4
       }
-      priority: 1502
+      priority: 1509
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -55016,14 +49784,14 @@ cont {
         dd: 2.4
         dd: 12.0
       }
-      priority: 1638
+      priority: 1643
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 3019898879
-      priority: 1601
+      priority: 1607
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55037,7 +49805,7 @@ cont {
         dd: 2.4
         dd: 2.4
       }
-      priority: 1545
+      priority: 1551
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -55052,14 +49820,14 @@ cont {
         dd: 2.4
         dd: 12.0
       }
-      priority: 1711
+      priority: 1715
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 3019898879
-      priority: 1669
+      priority: 1674
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55073,7 +49841,7 @@ cont {
         dd: 2.4
         dd: 2.4
       }
-      priority: 1545
+      priority: 1551
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -55088,14 +49856,14 @@ cont {
         dd: 2.4
         dd: 12.0
       }
-      priority: 1711
+      priority: 1715
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 3019898879
-      priority: 1669
+      priority: 1674
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55109,7 +49877,7 @@ cont {
         dd: 2.4
         dd: 2.4
       }
-      priority: 1545
+      priority: 1551
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -55124,14 +49892,14 @@ cont {
         dd: 2.4
         dd: 12.0
       }
-      priority: 1711
+      priority: 1715
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 3019898879
-      priority: 1669
+      priority: 1674
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55144,7 +49912,7 @@ cont {
     lines {
       width: 1.0
       color: 12303291
-      priority: 1254
+      priority: 1261
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55154,7 +49922,7 @@ cont {
     lines {
       width: 1.6
       color: 10066329
-      priority: 1206
+      priority: 1214
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55165,14 +49933,14 @@ cont {
         dd: 3.0
         dd: 6.0
       }
-      priority: 1336
+      priority: 1342
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658734
-      priority: 1305
+      priority: 1311
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55182,7 +49950,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1310
+      priority: 1317
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55193,14 +49961,14 @@ cont {
         dd: 6.0
         dd: 12.0
       }
-      priority: 1406
+      priority: 1412
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.4
       color: 15658734
-      priority: 1375
+      priority: 1381
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55210,7 +49978,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1522
+      priority: 1529
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55221,14 +49989,14 @@ cont {
         dd: 8.0
         dd: 16.0
       }
-      priority: 1661
+      priority: 1665
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.2
       color: 15658734
-      priority: 1629
+      priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55238,7 +50006,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1567
+      priority: 1573
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55249,14 +50017,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1697
+      priority: 1701
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55266,7 +50034,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1567
+      priority: 1573
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55277,14 +50045,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1697
+      priority: 1701
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55294,7 +50062,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1567
+      priority: 1573
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55305,14 +50073,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1697
+      priority: 1701
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55325,7 +50093,7 @@ cont {
     lines {
       width: 1.0
       color: 12303291
-      priority: 1254
+      priority: 1261
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55335,7 +50103,7 @@ cont {
     lines {
       width: 1.6
       color: 10066329
-      priority: 1206
+      priority: 1214
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55346,14 +50114,14 @@ cont {
         dd: 3.0
         dd: 6.0
       }
-      priority: 1336
+      priority: 1342
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658734
-      priority: 1305
+      priority: 1311
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55363,14 +50131,14 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1310
+      priority: 1317
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.4
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -55381,14 +50149,14 @@ cont {
         dd: 6.0
         dd: 12.0
       }
-      priority: 1406
+      priority: 1412
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.4
       color: 15658734
-      priority: 1375
+      priority: 1381
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55405,14 +50173,14 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1522
+      priority: 1529
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.2
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -55423,14 +50191,14 @@ cont {
         dd: 8.0
         dd: 16.0
       }
-      priority: 1661
+      priority: 1665
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.2
       color: 15658734
-      priority: 1629
+      priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55447,14 +50215,14 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1567
+      priority: 1573
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.36
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -55465,14 +50233,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1697
+      priority: 1701
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55489,14 +50257,14 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1567
+      priority: 1573
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.36
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -55507,14 +50275,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1697
+      priority: 1701
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55531,14 +50299,14 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1567
+      priority: 1573
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.36
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -55549,14 +50317,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1697
+      priority: 1701
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55576,7 +50344,7 @@ cont {
     lines {
       width: 1.0
       color: 12303291
-      priority: 1254
+      priority: 1261
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55586,7 +50354,7 @@ cont {
     lines {
       width: 1.6
       color: 10066329
-      priority: 1206
+      priority: 1214
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55597,14 +50365,14 @@ cont {
         dd: 3.0
         dd: 6.0
       }
-      priority: 1336
+      priority: 1342
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658734
-      priority: 1305
+      priority: 1311
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55614,14 +50382,14 @@ cont {
     lines {
       width: 9.4
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 3355443
-      priority: 1310
+      priority: 1317
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55632,14 +50400,14 @@ cont {
         dd: 6.0
         dd: 12.0
       }
-      priority: 1406
+      priority: 1412
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.4
       color: 15658734
-      priority: 1375
+      priority: 1381
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55660,14 +50428,14 @@ cont {
     lines {
       width: 9.2
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 3355443
-      priority: 1522
+      priority: 1529
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55678,14 +50446,14 @@ cont {
         dd: 8.0
         dd: 16.0
       }
-      priority: 1661
+      priority: 1665
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.2
       color: 15658734
-      priority: 1629
+      priority: 1635
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55706,14 +50474,14 @@ cont {
     lines {
       width: 9.36
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 3355443
-      priority: 1567
+      priority: 1573
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55724,14 +50492,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1697
+      priority: 1701
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55752,14 +50520,14 @@ cont {
     lines {
       width: 9.36
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 3355443
-      priority: 1567
+      priority: 1573
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55770,14 +50538,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1697
+      priority: 1701
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55798,14 +50566,14 @@ cont {
     lines {
       width: 9.36
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 3355443
-      priority: 1567
+      priority: 1573
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55816,14 +50584,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1751
+      priority: 1754
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1697
+      priority: 1701
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55847,7 +50615,7 @@ cont {
     lines {
       width: 1.6
       color: 12303291
-      priority: 1200
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55858,14 +50626,14 @@ cont {
         dd: 3.0
         dd: 6.0
       }
-      priority: 1330
+      priority: 1337
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 10066329
-      priority: 1299
+      priority: 1306
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55875,7 +50643,7 @@ cont {
     lines {
       width: 2.4
       color: 6710886
-      priority: 1305
+      priority: 1311
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55886,14 +50654,14 @@ cont {
         dd: 6.0
         dd: 12.0
       }
-      priority: 1401
+      priority: 1406
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.4
       color: 15658734
-      priority: 1370
+      priority: 1376
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55903,7 +50671,7 @@ cont {
     lines {
       width: 2.4
       color: 6710886
-      priority: 1516
+      priority: 1523
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55914,14 +50682,14 @@ cont {
         dd: 8.0
         dd: 16.0
       }
-      priority: 1655
+      priority: 1660
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.2
       color: 15658734
-      priority: 1624
+      priority: 1629
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55931,7 +50699,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1562
+      priority: 1568
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55942,14 +50710,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1745
+      priority: 1749
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1692
+      priority: 1696
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55959,7 +50727,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1562
+      priority: 1568
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55970,14 +50738,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1745
+      priority: 1749
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1692
+      priority: 1696
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55987,7 +50755,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1562
+      priority: 1568
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -55998,14 +50766,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1745
+      priority: 1749
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1692
+      priority: 1696
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56018,7 +50786,7 @@ cont {
     lines {
       width: 1.6
       color: 12303291
-      priority: 1200
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56029,14 +50797,14 @@ cont {
         dd: 3.0
         dd: 6.0
       }
-      priority: 1330
+      priority: 1337
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 10066329
-      priority: 1299
+      priority: 1306
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56046,14 +50814,14 @@ cont {
     lines {
       width: 2.4
       color: 6710886
-      priority: 1305
+      priority: 1311
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.4
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -56064,14 +50832,14 @@ cont {
         dd: 6.0
         dd: 12.0
       }
-      priority: 1401
+      priority: 1406
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.4
       color: 15658734
-      priority: 1370
+      priority: 1376
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56088,14 +50856,14 @@ cont {
     lines {
       width: 2.4
       color: 6710886
-      priority: 1516
+      priority: 1523
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.2
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -56106,14 +50874,14 @@ cont {
         dd: 8.0
         dd: 16.0
       }
-      priority: 1655
+      priority: 1660
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.2
       color: 15658734
-      priority: 1624
+      priority: 1629
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56130,14 +50898,14 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1562
+      priority: 1568
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.36
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -56148,14 +50916,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1745
+      priority: 1749
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1692
+      priority: 1696
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56172,14 +50940,14 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1562
+      priority: 1568
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.36
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -56190,14 +50958,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1745
+      priority: 1749
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1692
+      priority: 1696
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56214,14 +50982,14 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1562
+      priority: 1568
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.36
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -56232,14 +51000,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1745
+      priority: 1749
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1692
+      priority: 1696
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56259,7 +51027,7 @@ cont {
     lines {
       width: 1.6
       color: 12303291
-      priority: 1200
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56270,14 +51038,14 @@ cont {
         dd: 3.0
         dd: 6.0
       }
-      priority: 1330
+      priority: 1337
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 10066329
-      priority: 1299
+      priority: 1306
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56287,14 +51055,14 @@ cont {
     lines {
       width: 9.4
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 6710886
-      priority: 1305
+      priority: 1311
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56305,14 +51073,14 @@ cont {
         dd: 6.0
         dd: 12.0
       }
-      priority: 1401
+      priority: 1406
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.4
       color: 15658734
-      priority: 1370
+      priority: 1376
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56333,14 +51101,14 @@ cont {
     lines {
       width: 9.2
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 6710886
-      priority: 1516
+      priority: 1523
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56351,14 +51119,14 @@ cont {
         dd: 8.0
         dd: 16.0
       }
-      priority: 1655
+      priority: 1660
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.2
       color: 15658734
-      priority: 1624
+      priority: 1629
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56379,14 +51147,14 @@ cont {
     lines {
       width: 9.36
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 3355443
-      priority: 1562
+      priority: 1568
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56397,14 +51165,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1745
+      priority: 1749
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1692
+      priority: 1696
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56425,14 +51193,14 @@ cont {
     lines {
       width: 9.36
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 3355443
-      priority: 1562
+      priority: 1568
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56443,14 +51211,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1745
+      priority: 1749
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1692
+      priority: 1696
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56471,14 +51239,14 @@ cont {
     lines {
       width: 9.36
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 3355443
-      priority: 1562
+      priority: 1568
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56489,14 +51257,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1745
+      priority: 1749
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1692
+      priority: 1696
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56518,15 +51286,15 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/rail-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16000
+      name: "railway-station-mini"
+      priority: 16167
     }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/rail-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
-      priority: 16169
+      name: "railway-station-mini"
+      priority: 16167
     }
     caption {
       primary {
@@ -56535,14 +51303,14 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15169
+      priority: 15167
     }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
-      priority: 16169
+      name: "railway-station"
+      priority: 16178
     }
     caption {
       primary {
@@ -56551,14 +51319,14 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15169
+      priority: 15178
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
-      priority: 16169
+      name: "railway-station"
+      priority: 16178
     }
     caption {
       primary {
@@ -56567,14 +51335,14 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15169
+      priority: 15178
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
-      priority: 16169
+      name: "railway-station"
+      priority: 16178
     }
     caption {
       primary {
@@ -56583,14 +51351,14 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15169
+      priority: 15178
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
-      priority: 16169
+      name: "railway-station"
+      priority: 16178
     }
     caption {
       primary {
@@ -56599,7 +51367,7 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15169
+      priority: 15178
     }
   }
 }
@@ -56608,7 +51376,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -56630,7 +51398,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -56652,7 +51420,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -56674,7 +51442,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
@@ -56696,7 +51464,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -56718,7 +51486,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -56740,7 +51508,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -56762,7 +51530,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -56787,7 +51555,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -56809,7 +51577,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -56831,7 +51599,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -56853,7 +51621,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
@@ -56875,7 +51643,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -56897,7 +51665,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -56919,7 +51687,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -56941,7 +51709,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -56966,7 +51734,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -56988,7 +51756,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -57010,7 +51778,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -57032,7 +51800,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
@@ -57054,7 +51822,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57076,7 +51844,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57098,7 +51866,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57120,7 +51888,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57145,7 +51913,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -57167,7 +51935,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -57189,7 +51957,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -57211,7 +51979,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
@@ -57233,7 +52001,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57255,7 +52023,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57277,7 +52045,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57299,7 +52067,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57324,7 +52092,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -57346,7 +52114,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -57368,7 +52136,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -57390,7 +52158,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
@@ -57412,7 +52180,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57434,7 +52202,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57456,7 +52224,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57478,7 +52246,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57503,7 +52271,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -57525,7 +52293,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -57547,7 +52315,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -57569,7 +52337,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
@@ -57591,7 +52359,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57613,7 +52381,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57635,7 +52403,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57657,7 +52425,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57682,7 +52450,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -57704,7 +52472,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -57726,7 +52494,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -57748,7 +52516,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
@@ -57770,7 +52538,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57792,7 +52560,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57814,7 +52582,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57836,7 +52604,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57861,7 +52629,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -57883,7 +52651,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -57905,7 +52673,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -57927,7 +52695,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
@@ -57949,7 +52717,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57971,7 +52739,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -57993,7 +52761,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58015,7 +52783,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58040,7 +52808,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -58062,7 +52830,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -58084,7 +52852,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -58106,7 +52874,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
@@ -58128,7 +52896,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58150,7 +52918,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58172,7 +52940,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58194,7 +52962,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58219,7 +52987,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -58241,7 +53009,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -58263,7 +53031,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -58285,7 +53053,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
@@ -58307,7 +53075,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58329,7 +53097,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58351,7 +53119,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58373,7 +53141,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58398,7 +53166,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -58420,7 +53188,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -58442,7 +53210,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -58464,7 +53232,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
@@ -58486,7 +53254,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58508,7 +53276,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58530,7 +53298,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58552,7 +53320,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58577,7 +53345,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -58599,7 +53367,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -58621,7 +53389,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -58643,7 +53411,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
@@ -58665,7 +53433,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58687,7 +53455,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58709,7 +53477,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58731,7 +53499,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58756,7 +53524,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -58778,7 +53546,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -58800,7 +53568,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -58822,7 +53590,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
@@ -58844,7 +53612,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58866,7 +53634,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58888,7 +53656,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58910,7 +53678,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -58935,7 +53703,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -58957,7 +53725,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -58979,7 +53747,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-s"
       priority: 19100
     }
     caption {
@@ -59001,7 +53769,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
+      name: "subway-station-m"
       priority: 19100
     }
     caption {
@@ -59023,7 +53791,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -59045,7 +53813,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -59067,7 +53835,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -59089,7 +53857,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "subway-station-l"
       priority: 19100
     }
     caption {
@@ -59120,7 +53888,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59134,7 +53902,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59148,7 +53916,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59162,7 +53930,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59176,7 +53944,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59190,7 +53958,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59204,7 +53972,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59218,7 +53986,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59235,7 +54003,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59249,7 +54017,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59263,7 +54031,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59277,7 +54045,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59291,7 +54059,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59305,7 +54073,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59319,7 +54087,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59333,7 +54101,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59350,7 +54118,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59364,7 +54132,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59378,7 +54146,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59392,14 +54160,14 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59420,14 +54188,14 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59448,14 +54216,14 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59476,14 +54244,14 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59504,14 +54272,14 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 11.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59535,7 +54303,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59549,7 +54317,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59563,7 +54331,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59577,7 +54345,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59591,7 +54359,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59605,7 +54373,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59619,7 +54387,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59633,7 +54401,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59650,7 +54418,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59664,7 +54432,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59678,7 +54446,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59692,7 +54460,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59706,7 +54474,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59720,7 +54488,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59734,7 +54502,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59748,7 +54516,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59765,7 +54533,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59779,7 +54547,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59793,7 +54561,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59807,7 +54575,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59821,7 +54589,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59835,7 +54603,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59849,7 +54617,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59863,7 +54631,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59880,7 +54648,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59894,7 +54662,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59908,7 +54676,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59922,7 +54690,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59936,7 +54704,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59950,7 +54718,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59964,7 +54732,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59978,7 +54746,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -59995,7 +54763,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60009,7 +54777,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60023,7 +54791,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60037,7 +54805,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60051,7 +54819,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60065,7 +54833,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60079,7 +54847,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60093,7 +54861,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60110,7 +54878,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60124,7 +54892,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60138,7 +54906,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60152,7 +54920,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60166,7 +54934,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60180,7 +54948,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60194,7 +54962,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60208,7 +54976,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60225,7 +54993,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60239,7 +55007,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60253,7 +55021,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60267,7 +55035,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60281,7 +55049,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60295,7 +55063,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60309,7 +55077,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60323,7 +55091,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60340,7 +55108,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60354,7 +55122,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60368,7 +55136,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60382,7 +55150,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60396,7 +55164,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60410,7 +55178,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60424,7 +55192,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60438,7 +55206,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60455,7 +55223,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60469,7 +55237,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60483,7 +55251,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60497,7 +55265,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60511,7 +55279,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60525,7 +55293,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60539,7 +55307,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60553,7 +55321,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60570,7 +55338,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60584,7 +55352,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60598,7 +55366,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60612,7 +55380,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60626,7 +55394,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60640,7 +55408,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60654,7 +55422,7 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60668,24 +55436,24 @@ cont {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
   }
 }
 cont {
-  name: "railway-subway-violet"
+  name: "railway-subway-tunnel"
   element {
     scale: 12
     lines {
       width: 3.0
-      color: 3018754286
+      color: 3003121732
       dashdot {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60694,12 +55462,12 @@ cont {
     scale: 13
     lines {
       width: 3.0
-      color: 3018754286
+      color: 3003121732
       dashdot {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60708,12 +55476,12 @@ cont {
     scale: 14
     lines {
       width: 3.0
-      color: 3018754286
+      color: 3003121732
       dashdot {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60722,12 +55490,30 @@ cont {
     scale: 15
     lines {
       width: 3.0
-      color: 3018754286
+      color: 3003121732
       dashdot {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 11.0
+      color: 16777215
+      priority: 13
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 13.0
+      color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 11
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60736,12 +55522,30 @@ cont {
     scale: 16
     lines {
       width: 3.0
-      color: 3018754286
+      color: 3003121732
       dashdot {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 11.0
+      color: 16777215
+      priority: 13
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 13.0
+      color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 11
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60750,12 +55554,30 @@ cont {
     scale: 17
     lines {
       width: 3.0
-      color: 3018754286
+      color: 3003121732
       dashdot {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 11.0
+      color: 16777215
+      priority: 13
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 13.0
+      color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 11
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60764,12 +55586,30 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 3018754286
+      color: 3003121732
       dashdot {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 11.0
+      color: 16777215
+      priority: 13
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 13.0
+      color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 11
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60778,29 +55618,47 @@ cont {
     scale: 19
     lines {
       width: 3.0
-      color: 3018754286
+      color: 3003121732
       dashdot {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 11.0
+      color: 16777215
+      priority: 13
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    lines {
+      width: 13.0
+      color: 7829367
+      dashdot {
+        dd: 5.0
+        dd: 5.0
+      }
+      priority: 11
       join: ROUNDJOIN
       cap: BUTTCAP
     }
   }
 }
 cont {
-  name: "railway-subway-yellow"
+  name: "railway-subway-violet"
   element {
     scale: 12
     lines {
       width: 3.0
-      color: 3019885568
+      color: 3018754286
       dashdot {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60809,12 +55667,12 @@ cont {
     scale: 13
     lines {
       width: 3.0
-      color: 3019885568
+      color: 3018754286
       dashdot {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60823,12 +55681,12 @@ cont {
     scale: 14
     lines {
       width: 3.0
-      color: 3019885568
+      color: 3018754286
       dashdot {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60837,12 +55695,12 @@ cont {
     scale: 15
     lines {
       width: 3.0
-      color: 3019885568
+      color: 3018754286
       dashdot {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60851,12 +55709,12 @@ cont {
     scale: 16
     lines {
       width: 3.0
-      color: 3019885568
+      color: 3018754286
       dashdot {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60865,12 +55723,12 @@ cont {
     scale: 17
     lines {
       width: 3.0
-      color: 3019885568
+      color: 3018754286
       dashdot {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60879,12 +55737,12 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 3019885568
+      color: 3018754286
       dashdot {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60893,1120 +55751,160 @@ cont {
     scale: 19
     lines {
       width: 3.0
-      color: 3019885568
+      color: 3018754286
       dashdot {
         dd: 3.0
         dd: 3.0
       }
-      priority: 16023
+      priority: 16031
       join: ROUNDJOIN
       cap: BUTTCAP
     }
   }
 }
 cont {
-  name: "railway-subway_entrance"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-blue"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-brown"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-darkgreen"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-gray"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-green"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-grey"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-lightblue"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-lightgreen"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-orange"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-purple"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-}
-cont {
-  name: "railway-subway_entrance-red"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
+  name: "railway-subway-yellow"
   element {
-    scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
+    scale: 12
+    lines {
+      width: 3.0
+      color: 3019885568
+      dashdot {
+        dd: 3.0
+        dd: 3.0
       }
-      priority: 15169
+      priority: 16031
+      join: ROUNDJOIN
+      cap: BUTTCAP
     }
   }
   element {
-    scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
+    scale: 13
+    lines {
+      width: 3.0
+      color: 3019885568
+      dashdot {
+        dd: 3.0
+        dd: 3.0
       }
-      priority: 15169
+      priority: 16031
+      join: ROUNDJOIN
+      cap: BUTTCAP
     }
   }
   element {
-    scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
+    scale: 14
+    lines {
+      width: 3.0
+      color: 3019885568
+      dashdot {
+        dd: 3.0
+        dd: 3.0
       }
-      priority: 15169
+      priority: 16031
+      join: ROUNDJOIN
+      cap: BUTTCAP
     }
   }
-}
-cont {
-  name: "railway-subway_entrance-violet"
   element {
     scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
+    lines {
+      width: 3.0
+      color: 3019885568
+      dashdot {
+        dd: 3.0
+        dd: 3.0
       }
-      priority: 15169
+      priority: 16031
+      join: ROUNDJOIN
+      cap: BUTTCAP
     }
   }
   element {
     scale: 16
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
+    lines {
+      width: 3.0
+      color: 3019885568
+      dashdot {
+        dd: 3.0
+        dd: 3.0
       }
-      priority: 15169
+      priority: 16031
+      join: ROUNDJOIN
+      cap: BUTTCAP
     }
   }
   element {
     scale: 17
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
+    lines {
+      width: 3.0
+      color: 3019885568
+      dashdot {
+        dd: 3.0
+        dd: 3.0
       }
-      priority: 15169
+      priority: 16031
+      join: ROUNDJOIN
+      cap: BUTTCAP
     }
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
+    lines {
+      width: 3.0
+      color: 3019885568
+      dashdot {
+        dd: 3.0
+        dd: 3.0
       }
-      priority: 15169
+      priority: 16031
+      join: ROUNDJOIN
+      cap: BUTTCAP
     }
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
+    lines {
+      width: 3.0
+      color: 3019885568
+      dashdot {
+        dd: 3.0
+        dd: 3.0
       }
-      priority: 15169
+      priority: 16031
+      join: ROUNDJOIN
+      cap: BUTTCAP
     }
   }
 }
 cont {
-  name: "railway-subway_entrance-yellow"
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
-    }
-  }
+  name: "railway-subway_entrance"
   element {
     scale: 16
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
+      name: "subway"
+      priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
+      name: "subway"
+      priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
+      name: "subway"
+      priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:"
-      priority: 16169
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3364317
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15169
+      name: "subway"
+      priority: 16000
     }
   }
 }
@@ -62021,21 +55919,21 @@ cont {
         dd: 3.6
         dd: 5.4
       }
-      priority: 1531
+      priority: 1537
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 5570645
-      priority: 1525
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.7
       color: 15645678
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62045,7 +55943,7 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62056,14 +55954,14 @@ cont {
         dd: 7.2
         dd: 10.8
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15645678
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62073,7 +55971,7 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62084,14 +55982,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15645678
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62101,7 +55999,7 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62112,14 +56010,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15645678
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62129,7 +56027,7 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62140,14 +56038,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15645678
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62157,7 +56055,7 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62168,14 +56066,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15645678
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62192,21 +56090,21 @@ cont {
         dd: 3.6
         dd: 5.4
       }
-      priority: 1531
+      priority: 1537
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 5570645
-      priority: 1525
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.7
       color: 15645678
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62216,14 +56114,14 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -62234,14 +56132,14 @@ cont {
         dd: 7.2
         dd: 10.8
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15645678
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62258,14 +56156,14 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -62276,14 +56174,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15645678
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62300,14 +56198,14 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -62318,14 +56216,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15645678
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62342,14 +56240,14 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -62360,14 +56258,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15645678
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62384,14 +56282,14 @@ cont {
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -62402,14 +56300,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15645678
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62433,21 +56331,21 @@ cont {
         dd: 3.6
         dd: 5.4
       }
-      priority: 1531
+      priority: 1537
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 5570645
-      priority: 1525
+      priority: 1532
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 1.7
       color: 15645678
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62457,14 +56355,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62475,14 +56373,14 @@ cont {
         dd: 7.2
         dd: 10.8
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15645678
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62503,14 +56401,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62521,14 +56419,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15645678
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62549,14 +56447,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62567,14 +56465,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15645678
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62595,14 +56493,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62613,14 +56511,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15645678
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62641,14 +56539,14 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.2
       color: 4456516
-      priority: 1528
+      priority: 1534
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62659,14 +56557,14 @@ cont {
         dd: 9.6
         dd: 14.4
       }
-      priority: 1542
+      priority: 1548
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 15645678
-      priority: 1533
+      priority: 1540
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62687,6 +56585,10 @@ cont {
   name: "railway-tram_stop"
   element {
     scale: 15
+    symbol {
+      name: "tramway-mini"
+      priority: 16000
+    }
     caption {
       primary {
         height: 10
@@ -62706,8 +56608,8 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
-      priority: 16025
+      name: "tramway-mini"
+      priority: 16033
     }
     caption {
       primary {
@@ -62722,13 +56624,13 @@ cont {
         stroke_color: 16777215
         offset_y: 10
       }
-      priority: 15025
+      priority: 15033
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "tramway"
       priority: 16000
     }
     caption {
@@ -62750,7 +56652,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "tramway"
       priority: 16000
     }
     caption {
@@ -62772,7 +56674,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:"
+      name: "tramway"
       priority: 16000
     }
     caption {
@@ -62799,7 +56701,7 @@ cont {
     lines {
       width: 0.5
       color: 4473924
-      priority: 1237
+      priority: 1245
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62809,7 +56711,7 @@ cont {
     lines {
       width: 0.85
       color: 4473924
-      priority: 1251
+      priority: 1259
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62819,7 +56721,7 @@ cont {
     lines {
       width: 1.6
       color: 4473924
-      priority: 1203
+      priority: 1211
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62830,14 +56732,14 @@ cont {
         dd: 3.0
         dd: 6.0
       }
-      priority: 1333
+      priority: 1339
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658734
-      priority: 1302
+      priority: 1309
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62858,14 +56760,14 @@ cont {
         dd: 6.0
         dd: 12.0
       }
-      priority: 1403
+      priority: 1409
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.4
       color: 15658734
-      priority: 1372
+      priority: 1378
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62875,7 +56777,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1519
+      priority: 1526
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62886,14 +56788,14 @@ cont {
         dd: 8.0
         dd: 16.0
       }
-      priority: 1658
+      priority: 1662
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.2
       color: 15658734
-      priority: 1627
+      priority: 1632
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62903,7 +56805,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1564
+      priority: 1571
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62914,14 +56816,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1748
+      priority: 1752
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1694
+      priority: 1699
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62931,7 +56833,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1564
+      priority: 1571
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62942,14 +56844,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1748
+      priority: 1752
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1694
+      priority: 1699
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62959,7 +56861,7 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1564
+      priority: 1571
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62970,14 +56872,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1748
+      priority: 1752
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1694
+      priority: 1699
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62990,7 +56892,7 @@ cont {
     lines {
       width: 0.5
       color: 4473924
-      priority: 1237
+      priority: 1245
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63000,7 +56902,7 @@ cont {
     lines {
       width: 0.85
       color: 4473924
-      priority: 1251
+      priority: 1259
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63010,7 +56912,7 @@ cont {
     lines {
       width: 1.6
       color: 4473924
-      priority: 1203
+      priority: 1211
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63021,14 +56923,14 @@ cont {
         dd: 3.0
         dd: 6.0
       }
-      priority: 1333
+      priority: 1339
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658734
-      priority: 1302
+      priority: 1309
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63045,7 +56947,7 @@ cont {
     lines {
       width: 9.4
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -63056,14 +56958,14 @@ cont {
         dd: 6.0
         dd: 12.0
       }
-      priority: 1403
+      priority: 1409
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.4
       color: 15658734
-      priority: 1372
+      priority: 1378
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63080,14 +56982,14 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1519
+      priority: 1526
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.2
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -63098,14 +57000,14 @@ cont {
         dd: 8.0
         dd: 16.0
       }
-      priority: 1658
+      priority: 1662
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.2
       color: 15658734
-      priority: 1627
+      priority: 1632
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63122,14 +57024,14 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1564
+      priority: 1571
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.36
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -63140,14 +57042,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1748
+      priority: 1752
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1694
+      priority: 1699
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63164,14 +57066,14 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1564
+      priority: 1571
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.36
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -63182,14 +57084,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1748
+      priority: 1752
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1694
+      priority: 1699
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63206,14 +57108,14 @@ cont {
     lines {
       width: 2.4
       color: 3355443
-      priority: 1564
+      priority: 1571
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.36
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -63224,14 +57126,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1748
+      priority: 1752
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1694
+      priority: 1699
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63251,7 +57153,7 @@ cont {
     lines {
       width: 0.5
       color: 4473924
-      priority: 1237
+      priority: 1245
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63261,7 +57163,7 @@ cont {
     lines {
       width: 0.85
       color: 4473924
-      priority: 1251
+      priority: 1259
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63271,7 +57173,7 @@ cont {
     lines {
       width: 1.6
       color: 4473924
-      priority: 1203
+      priority: 1211
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63282,14 +57184,14 @@ cont {
         dd: 3.0
         dd: 6.0
       }
-      priority: 1333
+      priority: 1339
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 15658734
-      priority: 1302
+      priority: 1309
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63299,7 +57201,7 @@ cont {
     lines {
       width: 9.4
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -63317,14 +57219,14 @@ cont {
         dd: 6.0
         dd: 12.0
       }
-      priority: 1403
+      priority: 1409
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.4
       color: 15658734
-      priority: 1372
+      priority: 1378
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63345,14 +57247,14 @@ cont {
     lines {
       width: 9.2
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 3355443
-      priority: 1519
+      priority: 1526
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63363,14 +57265,14 @@ cont {
         dd: 8.0
         dd: 16.0
       }
-      priority: 1658
+      priority: 1662
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.2
       color: 15658734
-      priority: 1627
+      priority: 1632
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63391,14 +57293,14 @@ cont {
     lines {
       width: 9.36
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 3355443
-      priority: 1564
+      priority: 1571
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63409,14 +57311,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1748
+      priority: 1752
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1694
+      priority: 1699
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63437,14 +57339,14 @@ cont {
     lines {
       width: 9.36
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 3355443
-      priority: 1564
+      priority: 1571
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63455,14 +57357,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1748
+      priority: 1752
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1694
+      priority: 1699
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63483,14 +57385,14 @@ cont {
     lines {
       width: 9.36
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 3355443
-      priority: 1564
+      priority: 1571
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63501,14 +57403,14 @@ cont {
         dd: 7.2
         dd: 16.8
       }
-      priority: 1748
+      priority: 1752
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 1.36
       color: 15658734
-      priority: 1694
+      priority: 1699
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -63526,130 +57428,6 @@ cont {
   }
 }
 cont {
-  name: "religion-christian"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/religious-christian-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/religious-christian-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/religious-christian-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/religious-christian-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "religion-hindu"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/hindu-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/hindu-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/hindu-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/hindu-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "religion-jewish"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/religious-jewish-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/religious-jewish-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/religious-jewish-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/religious-jewish-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "religion-muslim"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/religious-muslim-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/religious-muslim-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/religious-muslim-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/religious-muslim-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-}
-cont {
   name: "route-ferry"
   element {
     scale: 10
@@ -63660,7 +57438,7 @@ cont {
         dd: 3.0
         dd: 2.0
       }
-      priority: 1158
+      priority: 1164
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -63674,7 +57452,7 @@ cont {
         dd: 3.0
         dd: 2.0
       }
-      priority: 1158
+      priority: 1164
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -63688,7 +57466,7 @@ cont {
         dd: 3.0
         dd: 2.0
       }
-      priority: 1364
+      priority: 1370
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -63702,7 +57480,7 @@ cont {
         dd: 3.0
         dd: 2.0
       }
-      priority: 1401
+      priority: 1406
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -63716,7 +57494,7 @@ cont {
         dd: 3.0
         dd: 2.0
       }
-      priority: 1460
+      priority: 1467
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -63730,7 +57508,7 @@ cont {
         dd: 7.0
         dd: 5.0
       }
-      priority: 1635
+      priority: 1640
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -63744,7 +57522,7 @@ cont {
         dd: 12.0
         dd: 8.0
       }
-      priority: 1816
+      priority: 1818
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -63758,7 +57536,7 @@ cont {
         dd: 12.0
         dd: 8.0
       }
-      priority: 1920
+      priority: 1922
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -63772,7 +57550,7 @@ cont {
         dd: 12.0
         dd: 8.0
       }
-      priority: 1920
+      priority: 1922
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -63786,44 +57564,13 @@ cont {
         dd: 12.0
         dd: 8.0
       }
-      priority: 1920
+      priority: 1922
       join: ROUNDJOIN
       cap: BUTTCAP
     }
   }
 }
 cont {
-  name: "seamark:type-harbour"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/harbor-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/harbor-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/harbor-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/harbor-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-}
-cont {
   name: "shop"
   element {
     scale: 17
@@ -63865,16 +57612,9 @@ cont {
 cont {
   name: "shop-alcohol"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/alcohol-shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/maki/alcohol-shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -63890,7 +57630,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/alcohol-shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -63906,7 +57646,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/alcohol-shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -63925,14 +57665,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "bakery"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "bakery"
       priority: 16008
     }
     caption {
@@ -63948,7 +57688,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "bakery"
       priority: 16008
     }
     caption {
@@ -63964,7 +57704,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "bakery"
       priority: 16008
     }
     caption {
@@ -63981,18 +57721,7 @@ cont {
 cont {
   name: "shop-beverages"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/beverages-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
-    symbol {
-      name: "symbols/nori/beverages-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -64005,10 +57734,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/nori/beverages-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -64021,10 +57746,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/nori/beverages-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -64041,14 +57762,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64064,7 +57785,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64080,7 +57801,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64097,16 +57818,9 @@ cont {
 cont {
   name: "shop-books"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/library-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/maki/library-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64122,7 +57836,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/library-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64138,7 +57852,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/library-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64155,16 +57869,9 @@ cont {
 cont {
   name: "shop-butcher"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/slaughterhouse-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/maki/slaughterhouse-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64180,7 +57887,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/slaughterhouse-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64196,7 +57903,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/slaughterhouse-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64250,76 +57957,18 @@ cont {
   }
 }
 cont {
-  name: "shop-car_parts"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/car_parts-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/nori/car_parts-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/nori/car_parts-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/nori/car_parts-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
   name: "shop-car_repair"
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/car_repair-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "car_repair"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/car_repair-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "car_repair"
       priority: 16008
     }
     caption {
@@ -64335,7 +57984,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/car_repair-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "car_repair"
       priority: 16008
     }
     caption {
@@ -64351,7 +58000,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/car_repair-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "car_repair"
       priority: 16008
     }
     caption {
@@ -64409,14 +58058,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/clothes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "clothes"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/clothes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "clothes"
       priority: 16008
     }
     caption {
@@ -64432,7 +58081,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/clothes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "clothes"
       priority: 16008
     }
     caption {
@@ -64448,7 +58097,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/clothes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "clothes"
       priority: 16008
     }
     caption {
@@ -64465,18 +58114,7 @@ cont {
 cont {
   name: "shop-computer"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/computer-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
-    symbol {
-      name: "symbols/nori/computer-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -64489,10 +58127,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/nori/computer-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -64505,10 +58139,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/nori/computer-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -64523,18 +58153,7 @@ cont {
 cont {
   name: "shop-confectionery"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
-    symbol {
-      name: "symbols/maki/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -64547,10 +58166,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -64563,10 +58178,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -64579,18 +58190,18 @@ cont {
   }
 }
 cont {
-  name: "shop-confectionery"
+  name: "shop-convenience"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64606,7 +58217,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64622,7 +58233,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64637,18 +58248,18 @@ cont {
   }
 }
 cont {
-  name: "shop-convenience"
+  name: "shop-department_store"
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64664,7 +58275,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64680,7 +58291,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64695,57 +58306,18 @@ cont {
   }
 }
 cont {
-  name: "shop-copyshop"
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "shop-department_store"
+  name: "shop-doityourself"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64761,7 +58333,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64777,7 +58349,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64792,18 +58364,11 @@ cont {
   }
 }
 cont {
-  name: "shop-doityourself"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
+  name: "shop-electronics"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64819,7 +58384,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64835,7 +58400,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64850,18 +58415,11 @@ cont {
   }
 }
 cont {
-  name: "shop-dry_cleaning"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/dry_cleaning-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
+  name: "shop-florist"
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/dry_cleaning-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64877,7 +58435,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/dry_cleaning-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64893,7 +58451,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/dry_cleaning-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64908,18 +58466,18 @@ cont {
   }
 }
 cont {
-  name: "shop-electronics"
+  name: "shop-furniture"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64935,7 +58493,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64951,7 +58509,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -64966,20 +58524,9 @@ cont {
   }
 }
 cont {
-  name: "shop-florist"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/garden-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
+  name: "shop-garden_centre"
   element {
     scale: 17
-    symbol {
-      name: "symbols/maki/garden-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -64992,10 +58539,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/garden-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -65008,10 +58551,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/garden-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -65024,7 +58563,7 @@ cont {
   }
 }
 cont {
-  name: "shop-funeral_directors"
+  name: "shop-gift"
   element {
     scale: 17
     caption {
@@ -65063,20 +58602,9 @@ cont {
   }
 }
 cont {
-  name: "shop-furniture"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
+  name: "shop-greengrocer"
   element {
     scale: 17
-    symbol {
-      name: "symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -65089,10 +58617,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -65105,10 +58629,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -65121,18 +58641,18 @@ cont {
   }
 }
 cont {
-  name: "shop-garden_centre"
+  name: "shop-hairdresser"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/garden-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "hairdresser"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/garden-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "hairdresser"
       priority: 16008
     }
     caption {
@@ -65148,7 +58668,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/garden-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "hairdresser"
       priority: 16008
     }
     caption {
@@ -65164,7 +58684,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/garden-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "hairdresser"
       priority: 16008
     }
     caption {
@@ -65179,46 +58699,7 @@ cont {
   }
 }
 cont {
-  name: "shop-general"
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "shop-gift"
+  name: "shop-hardware"
   element {
     scale: 17
     caption {
@@ -65257,7 +58738,7 @@ cont {
   }
 }
 cont {
-  name: "shop-greengrocer"
+  name: "shop-jewelry"
   element {
     scale: 17
     caption {
@@ -65296,18 +58777,18 @@ cont {
   }
 }
 cont {
-  name: "shop-hairdresser"
+  name: "shop-kiosk"
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/hairdresser-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "kiosk"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/hairdresser-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "kiosk"
       priority: 16008
     }
     caption {
@@ -65323,7 +58804,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/hairdresser-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "kiosk"
       priority: 16008
     }
     caption {
@@ -65339,7 +58820,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/hairdresser-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "kiosk"
       priority: 16008
     }
     caption {
@@ -65354,18 +58835,18 @@ cont {
   }
 }
 cont {
-  name: "shop-hardware"
+  name: "shop-mall"
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/hardware-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/hardware-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -65381,7 +58862,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/hardware-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -65397,7 +58878,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/hardware-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -65412,7 +58893,7 @@ cont {
   }
 }
 cont {
-  name: "shop-jewelry"
+  name: "shop-mobile_phone"
   element {
     scale: 17
     caption {
@@ -65451,20 +58932,9 @@ cont {
   }
 }
 cont {
-  name: "shop-kiosk"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
+  name: "shop-optician"
   element {
     scale: 17
-    symbol {
-      name: "symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -65477,10 +58947,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -65493,10 +58959,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -65509,18 +58971,11 @@ cont {
   }
 }
 cont {
-  name: "shop-mall"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
+  name: "shop-shoes"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -65536,7 +58991,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -65552,7 +59007,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -65567,18 +59022,18 @@ cont {
   }
 }
 cont {
-  name: "shop-mobile_phone"
+  name: "shop-supermarket"
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/mobile_phone-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/mobile_phone-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -65594,7 +59049,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/mobile_phone-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -65610,7 +59065,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/mobile_phone-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "supermarket"
       priority: 16008
     }
     caption {
@@ -65625,20 +59080,9 @@ cont {
   }
 }
 cont {
-  name: "shop-motorcycle"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/motorcycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
+  name: "shop-toys"
   element {
     scale: 17
-    symbol {
-      name: "symbols/nori/motorcycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -65651,10 +59095,6 @@ cont {
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/nori/motorcycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -65667,10 +59107,6 @@ cont {
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/nori/motorcycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -65683,702 +59119,433 @@ cont {
   }
 }
 cont {
-  name: "shop-music"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/music-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
+  name: "sport-american_football"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/music-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+      name: "football-borderless"
+      priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/music-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+      name: "football-borderless"
+      priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/music-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+      name: "football-borderless"
+      priority: 16000
     }
   }
 }
 cont {
-  name: "shop-musical_instrument"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/music-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16000
-    }
-  }
+  name: "sport-archery"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/music-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+      name: "archery-borderless"
+      priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/music-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+      name: "archery-borderless"
+      priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/music-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+      name: "archery-borderless"
+      priority: 16000
     }
   }
 }
 cont {
-  name: "shop-optician"
+  name: "sport-athletics"
   element {
     scale: 17
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    symbol {
+      name: "athletics-borderless"
+      priority: 16000
     }
   }
   element {
     scale: 18
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    symbol {
+      name: "athletics-borderless"
+      priority: 16000
     }
   }
   element {
     scale: 19
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "shop-outdoor"
-  element {
-    scale: 16
     symbol {
-      name: "symbols/nori/clothes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "athletics-borderless"
       priority: 16000
     }
   }
+}
+cont {
+  name: "sport-australian_football"
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/clothes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+      name: "football-borderless"
+      priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/clothes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+      name: "football-borderless"
+      priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/clothes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+      name: "football-borderless"
+      priority: 16000
     }
   }
 }
 cont {
-  name: "shop-photo"
+  name: "sport-baseball"
   element {
-    scale: 16
+    scale: 17
     symbol {
-      name: "symbols/nori/photo-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "baseball-borderless"
       priority: 16000
     }
   }
   element {
-    scale: 17
+    scale: 18
     symbol {
-      name: "symbols/nori/photo-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+      name: "baseball-borderless"
+      priority: 16000
     }
   }
   element {
-    scale: 18
+    scale: 19
     symbol {
-      name: "symbols/nori/photo-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+      name: "baseball-borderless"
+      priority: 16000
     }
   }
+}
+cont {
+  name: "sport-basketball"
   element {
-    scale: 19
+    scale: 17
     symbol {
-      name: "symbols/nori/photo-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
+      name: "basketball-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "basketball-borderless"
+      priority: 16000
     }
   }
-}
-cont {
-  name: "shop-photo_studio"
   element {
-    scale: 16
+    scale: 19
     symbol {
-      name: "symbols/nori/photo-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "basketball-borderless"
       priority: 16000
     }
   }
+}
+cont {
+  name: "sport-bowls"
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/photo-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+      name: "bowls-borderless"
+      priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/photo-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+      name: "bowls-borderless"
+      priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/photo-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+      name: "bowls-borderless"
+      priority: 16000
     }
   }
 }
 cont {
-  name: "shop-shoes"
+  name: "sport-cricket"
   element {
-    scale: 16
+    scale: 17
     symbol {
-      name: "symbols/neta/shoes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "cricket-borderless"
       priority: 16000
     }
   }
   element {
-    scale: 17
+    scale: 18
     symbol {
-      name: "symbols/neta/shoes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+      name: "cricket-borderless"
+      priority: 16000
     }
   }
   element {
-    scale: 18
+    scale: 19
     symbol {
-      name: "symbols/neta/shoes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+      name: "cricket-borderless"
+      priority: 16000
     }
   }
+}
+cont {
+  name: "sport-curling"
   element {
-    scale: 19
+    scale: 17
     symbol {
-      name: "symbols/neta/shoes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
+      name: "curling-borderless"
+      priority: 16000
     }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "curling-borderless"
+      priority: 16000
     }
   }
-}
-cont {
-  name: "shop-supermarket"
   element {
-    scale: 16
+    scale: 19
     symbol {
-      name: "symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
+      name: "curling-borderless"
       priority: 16000
     }
   }
+}
+cont {
+  name: "sport-diving"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+      name: "diving-borderless"
+      priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+      name: "diving-borderless"
+      priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+      name: "diving-borderless"
+      priority: 16000
     }
   }
 }
 cont {
-  name: "shop-toys"
+  name: "sport-equestrian"
   element {
     scale: 17
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    symbol {
+      name: "equestrian-borderless"
+      priority: 16000
     }
   }
   element {
     scale: 18
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
+    symbol {
+      name: "equestrian-borderless"
+      priority: 16000
     }
   }
   element {
     scale: 19
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "sport-american_football"
-  element {
-    scale: 16
     symbol {
-      name: "symbols/maki/america-football-18.svg:#444444::::"
+      name: "equestrian-borderless"
       priority: 16000
     }
   }
+}
+cont {
+  name: "sport-football"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/america-football-18.svg:#444444::::"
+      name: "football-borderless"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/america-football-18.svg:#444444::::"
+      name: "football-borderless"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/america-football-18.svg:#444444::::"
+      name: "football-borderless"
       priority: 16000
     }
   }
 }
 cont {
-  name: "sport-australian_football"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/america-football-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
+  name: "sport-golf"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/america-football-18.svg:#444444::::"
+      name: "golfCourse"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/america-football-18.svg:#444444::::"
+      name: "golfCourse"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/america-football-18.svg:#444444::::"
+      name: "golfCourse"
       priority: 16000
     }
   }
 }
 cont {
-  name: "sport-baseball"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/baseball-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
+  name: "sport-gymnastics"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/baseball-18.svg:#444444::::"
+      name: "gymnastics-borderless"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/baseball-18.svg:#444444::::"
+      name: "gymnastics-borderless"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/baseball-18.svg:#444444::::"
+      name: "gymnastics-borderless"
       priority: 16000
     }
   }
 }
 cont {
-  name: "sport-basketball"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/basketball-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
+  name: "sport-handball"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/basketball-18.svg:#444444::::"
+      name: "handball-borderless"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/basketball-18.svg:#444444::::"
+      name: "handball-borderless"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/basketball-18.svg:#444444::::"
+      name: "handball-borderless"
       priority: 16000
     }
   }
 }
 cont {
-  name: "sport-cricket"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/cricket-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
+  name: "sport-multi"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/cricket-18.svg:#444444::::"
+      name: "gymnastics-borderless"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/cricket-18.svg:#444444::::"
+      name: "gymnastics-borderless"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/cricket-18.svg:#444444::::"
+      name: "gymnastics-borderless"
       priority: 16000
     }
   }
 }
 cont {
-  name: "sport-football"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/soccer-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
+  name: "sport-scuba_diving"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/soccer-18.svg:#444444::::"
+      name: "diving-borderless"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/soccer-18.svg:#444444::::"
+      name: "diving-borderless"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/soccer-18.svg:#444444::::"
+      name: "diving-borderless"
       priority: 16000
     }
   }
 }
 cont {
-  name: "sport-golf"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/golf-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
+  name: "sport-shooting"
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/golf-18.svg:#444444::::"
+      name: "shooting-borderless"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/golf-18.svg:#444444::::"
+      name: "shooting-borderless"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/golf-18.svg:#444444::::"
+      name: "shooting-borderless"
       priority: 16000
     }
   }
@@ -66386,30 +59553,23 @@ cont {
 cont {
   name: "sport-skiing"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/skiing-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/maki/skiing-18.svg:#444444::::"
+      name: "gymnastics-borderless"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/skiing-18.svg:#444444::::"
+      name: "gymnastics-borderless"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/skiing-18.svg:#444444::::"
+      name: "gymnastics-borderless"
       priority: 16000
     }
   }
@@ -66417,30 +59577,23 @@ cont {
 cont {
   name: "sport-soccer"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/soccer-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/maki/soccer-18.svg:#444444::::"
+      name: "soccer-borderless"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/soccer-18.svg:#444444::::"
+      name: "soccer-borderless"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/soccer-18.svg:#444444::::"
+      name: "soccer-borderless"
       priority: 16000
     }
   }
@@ -66448,30 +59601,23 @@ cont {
 cont {
   name: "sport-swimming"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/swimming-18.svg:#0000FF::::"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/maki/swimming-18.svg:#0000FF::::"
+      name: "swimming-borderless"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/swimming-18.svg:#0000FF::::"
+      name: "swimming-borderless"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/swimming-18.svg:#0000FF::::"
+      name: "swimming-borderless"
       priority: 16000
     }
   }
@@ -66479,30 +59625,23 @@ cont {
 cont {
   name: "sport-tennis"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/tennis-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/maki/tennis-18.svg:#444444::::"
+      name: "tennis-borderless"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/tennis-18.svg:#444444::::"
+      name: "tennis-borderless"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/tennis-18.svg:#444444::::"
+      name: "tennis-borderless"
       priority: 16000
     }
   }
@@ -66510,7 +59649,25 @@ cont {
 cont {
   name: "tourism-alpine_hut"
   element {
+    scale: 15
+    symbol {
+      name: "alpine_hut"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "alpine_hut"
+      priority: 16000
+    }
+  }
+  element {
     scale: 17
+    symbol {
+      name: "alpine_hut"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -66523,6 +59680,10 @@ cont {
   }
   element {
     scale: 18
+    symbol {
+      name: "alpine_hut"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -66535,6 +59696,10 @@ cont {
   }
   element {
     scale: 19
+    symbol {
+      name: "alpine_hut"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -66551,21 +59716,21 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/star-18.svg:#444444::::"
+      name: "viewpoint"
       priority: 16000
     }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/star-18.svg:#444444::::"
+      name: "viewpoint"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/star-18.svg:#444444::::"
+      name: "viewpoint"
       priority: 16008
     }
     caption {
@@ -66581,7 +59746,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/star-18.svg:#444444::::"
+      name: "viewpoint"
       priority: 16008
     }
     caption {
@@ -66597,7 +59762,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/star-18.svg:#444444::::"
+      name: "viewpoint"
       priority: 16008
     }
     caption {
@@ -66617,7 +59782,7 @@ cont {
     scale: 15
     area {
       color: 16772829
-      priority: -16556
+      priority: -16542
     }
     caption {
       primary {
@@ -66632,7 +59797,7 @@ cont {
     scale: 16
     area {
       color: 16772829
-      priority: -16557
+      priority: -16543
     }
     caption {
       primary {
@@ -66698,31 +59863,35 @@ cont {
     scale: 12
     area {
       color: 13430459
-      priority: -16558
+      priority: -16544
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16559
+      priority: -16545
     }
   }
   element {
     scale: 14
     area {
       color: 13430459
-      priority: -16560
+      priority: -16546
+    }
+    symbol {
+      name: "campsite"
+      priority: 16000
     }
   }
   element {
     scale: 15
     area {
       color: 13430459
-      priority: -16561
+      priority: -16547
     }
     symbol {
-      name: "symbols/maki/campsite-18.svg:#444444::::"
+      name: "campsite"
       priority: 16000
     }
   }
@@ -66730,10 +59899,10 @@ cont {
     scale: 16
     area {
       color: 13430459
-      priority: -16562
+      priority: -16548
     }
     symbol {
-      name: "symbols/maki/campsite-18.svg:#444444::::"
+      name: "campsite"
       priority: 16000
     }
   }
@@ -66744,7 +59913,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/campsite-18.svg:#444444::::"
+      name: "campsite"
       priority: 16008
     }
     caption {
@@ -66764,7 +59933,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/campsite-18.svg:#444444::::"
+      name: "campsite"
       priority: 16008
     }
     caption {
@@ -66784,7 +59953,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/campsite-18.svg:#444444::::"
+      name: "campsite"
       priority: 16008
     }
     caption {
@@ -66804,43 +59973,35 @@ cont {
     scale: 12
     area {
       color: 13430459
-      priority: -16563
+      priority: -16549
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16564
+      priority: -16550
     }
   }
   element {
     scale: 14
     area {
       color: 13430459
-      priority: -16565
+      priority: -16551
     }
   }
   element {
     scale: 15
     area {
       color: 13430459
-      priority: -16566
-    }
-    symbol {
-      name: "symbols/maki/campsite-18.svg:#444444::::"
-      priority: 16000
+      priority: -16552
     }
   }
   element {
     scale: 16
     area {
       color: 13430459
-      priority: -16567
-    }
-    symbol {
-      name: "symbols/maki/campsite-18.svg:#444444::::"
-      priority: 16000
+      priority: -16553
     }
   }
   element {
@@ -66849,10 +60010,6 @@ cont {
       color: 13430459
       priority: -15992
     }
-    symbol {
-      name: "symbols/maki/campsite-18.svg:#444444::::"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -66869,10 +60026,6 @@ cont {
       color: 13430459
       priority: -15992
     }
-    symbol {
-      name: "symbols/maki/campsite-18.svg:#444444::::"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -66889,68 +60042,6 @@ cont {
       color: 13430459
       priority: -15992
     }
-    symbol {
-      name: "symbols/maki/campsite-18.svg:#444444::::"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-}
-cont {
-  name: "tourism-gallery"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/art-gallery-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/art-gallery-18.svg:#444444::::"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/art-gallery-18.svg:#444444::::"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/art-gallery-18.svg:#444444::::"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -66967,14 +60058,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "hostel"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "hostel"
       priority: 16008
     }
     caption {
@@ -66990,7 +60081,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "hostel"
       priority: 16008
     }
     caption {
@@ -67006,7 +60097,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "hostel"
       priority: 16008
     }
     caption {
@@ -67025,14 +60116,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "hostel"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "hostel"
       priority: 16008
     }
     caption {
@@ -67048,7 +60139,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "hostel"
       priority: 16008
     }
     caption {
@@ -67064,7 +60155,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "hostel"
       priority: 16008
     }
     caption {
@@ -67083,14 +60174,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "hotel"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "hotel"
       priority: 16008
     }
     caption {
@@ -67106,7 +60197,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "hotel"
       priority: 16008
     }
     caption {
@@ -67122,7 +60213,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "hotel"
       priority: 16008
     }
     caption {
@@ -67139,16 +60230,9 @@ cont {
 cont {
   name: "tourism-information"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/information-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/nori/information-18.svg:#444444::::"
+      name: "information"
       priority: 16008
     }
     caption {
@@ -67164,7 +60248,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/information-18.svg:#444444::::"
+      name: "information"
       priority: 16008
     }
     caption {
@@ -67180,7 +60264,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/information-18.svg:#444444::::"
+      name: "information"
       priority: 16008
     }
     caption {
@@ -67197,16 +60281,9 @@ cont {
 cont {
   name: "tourism-information-guidepost"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/information-18.svg:#444444::::"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/nori/information-18.svg:#444444::::"
+      name: "information"
       priority: 16008
     }
     caption {
@@ -67222,7 +60299,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/information-18.svg:#444444::::"
+      name: "information"
       priority: 16008
     }
     caption {
@@ -67238,7 +60315,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/information-18.svg:#444444::::"
+      name: "information"
       priority: 16008
     }
     caption {
@@ -67255,16 +60332,9 @@ cont {
 cont {
   name: "tourism-information-office"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/nori/information-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
-      priority: 16000
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "symbols/nori/information-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "information"
       priority: 16008
     }
     caption {
@@ -67280,7 +60350,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/information-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "information"
       priority: 16008
     }
     caption {
@@ -67296,7 +60366,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/information-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "information"
       priority: 16008
     }
     caption {
@@ -67315,14 +60385,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "hotel"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "hotel"
       priority: 16008
     }
     caption {
@@ -67338,7 +60408,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "hotel"
       priority: 16008
     }
     caption {
@@ -67354,7 +60424,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "hotel"
       priority: 16008
     }
     caption {
@@ -67373,14 +60443,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/museum-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "museum"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/museum-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "museum"
       priority: 16008
     }
     caption {
@@ -67396,7 +60466,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/museum-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "museum"
       priority: 16008
     }
     caption {
@@ -67412,7 +60482,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/museum-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:"
+      name: "museum"
       priority: 16008
     }
     caption {
@@ -67432,47 +60502,35 @@ cont {
     scale: 12
     area {
       color: 13430459
-      priority: -16568
+      priority: -16554
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16569
+      priority: -16555
     }
   }
   element {
     scale: 14
     area {
       color: 13430459
-      priority: -16570
-    }
-    symbol {
-      name: "symbols/nori/camp_site-18.svg:#444444::::"
-      priority: 16000
+      priority: -16556
     }
   }
   element {
     scale: 15
     area {
       color: 13430459
-      priority: -16571
-    }
-    symbol {
-      name: "symbols/nori/camp_site-18.svg:#444444::::"
-      priority: 16000
+      priority: -16557
     }
   }
   element {
     scale: 16
     area {
       color: 13430459
-      priority: -16572
-    }
-    symbol {
-      name: "symbols/nori/camp_site-18.svg:#444444::::"
-      priority: 16000
+      priority: -16558
     }
   }
   element {
@@ -67482,7 +60540,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/nori/camp_site-18.svg:#444444::::"
+      name: "picnic"
       priority: 16008
     }
     caption {
@@ -67502,7 +60560,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/nori/camp_site-18.svg:#444444::::"
+      name: "picnic"
       priority: 16008
     }
     caption {
@@ -67522,7 +60580,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/nori/camp_site-18.svg:#444444::::"
+      name: "picnic"
       priority: 16008
     }
     caption {
@@ -67541,21 +60599,21 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/nori/viewpoint-18.svg:#444444::::"
+      name: "viewpoint"
       priority: 16000
     }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/nori/viewpoint-18.svg:#444444::::"
+      name: "viewpoint"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/nori/viewpoint-18.svg:#444444::::"
+      name: "viewpoint"
       priority: 16008
     }
     caption {
@@ -67571,7 +60629,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/nori/viewpoint-18.svg:#444444::::"
+      name: "viewpoint"
       priority: 16008
     }
     caption {
@@ -67587,7 +60645,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/nori/viewpoint-18.svg:#444444::::"
+      name: "viewpoint"
       priority: 16008
     }
     caption {
@@ -67607,35 +60665,35 @@ cont {
     scale: 12
     area {
       color: 13430459
-      priority: -16573
+      priority: -16559
     }
   }
   element {
     scale: 13
     area {
       color: 13430459
-      priority: -16574
+      priority: -16560
     }
   }
   element {
     scale: 14
     area {
       color: 13430459
-      priority: -16575
+      priority: -16561
     }
   }
   element {
     scale: 15
     area {
       color: 13430459
-      priority: -16576
+      priority: -16562
     }
   }
   element {
     scale: 16
     area {
       color: 13430459
-      priority: -16577
+      priority: -16563
     }
   }
   element {
@@ -67694,7 +60752,7 @@ cont {
     lines {
       width: 2.5
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -67704,7 +60762,7 @@ cont {
     lines {
       width: 3.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -67714,7 +60772,7 @@ cont {
     lines {
       width: 4.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -67723,7 +60781,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
   element {
@@ -67731,7 +60789,7 @@ cont {
     lines {
       width: 4.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -67740,7 +60798,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
   element {
@@ -67748,7 +60806,7 @@ cont {
     lines {
       width: 4.8
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -67757,7 +60815,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
   element {
@@ -67765,21 +60823,14 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: 25
+      priority: 33
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
-      color: 12303291
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.4
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -67788,7 +60839,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
   element {
@@ -67796,21 +60847,14 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: 25
+      priority: 33
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
-      color: 12303291
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.4
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -67819,7 +60863,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
   element {
@@ -67827,21 +60871,14 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: 25
+      priority: 33
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
-      color: 12303291
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.4
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -67850,7 +60887,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
 }
@@ -67861,7 +60898,7 @@ cont {
     lines {
       width: 2.5
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -67871,7 +60908,7 @@ cont {
     lines {
       width: 3.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -67881,7 +60918,7 @@ cont {
     lines {
       width: 4.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -67890,7 +60927,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
   element {
@@ -67898,14 +60935,14 @@ cont {
     lines {
       width: 4.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -67925,7 +60962,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
   element {
@@ -67933,14 +60970,14 @@ cont {
     lines {
       width: 4.8
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.8
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -67960,7 +60997,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
   element {
@@ -67968,28 +61005,21 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: 25
+      priority: 33
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
-      color: 12303291
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.4
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.4
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -68009,7 +61039,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
   element {
@@ -68017,28 +61047,21 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: 25
+      priority: 33
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
-      color: 12303291
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.4
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.4
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -68058,7 +61081,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
   element {
@@ -68066,28 +61089,21 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: 25
+      priority: 33
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
-      color: 12303291
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.4
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.4
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -68107,7 +61123,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
 }
@@ -68118,7 +61134,7 @@ cont {
     lines {
       width: 0.38
       color: 2236962
-      priority: 1132
+      priority: 1139
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68128,7 +61144,7 @@ cont {
     lines {
       width: 1.5
       color: 2236962
-      priority: 1141
+      priority: 1147
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68138,56 +61154,40 @@ cont {
     lines {
       width: 3.0
       color: 2236962
-      priority: 1146
+      priority: 1153
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    symbol {
-      name: "symbols/maki/dam-18.svg:#444444::::"
-      priority: 16146
-    }
   }
   element {
     scale: 17
     lines {
       width: 4.0
       color: 2236962
-      priority: 1152
+      priority: 1158
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    symbol {
-      name: "symbols/maki/dam-18.svg:#444444::::"
-      priority: 16152
-    }
   }
   element {
     scale: 18
     lines {
       width: 4.0
       color: 2236962
-      priority: 1152
+      priority: 1158
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    symbol {
-      name: "symbols/maki/dam-18.svg:#444444::::"
-      priority: 16152
-    }
   }
   element {
     scale: 19
     lines {
       width: 4.0
       color: 2236962
-      priority: 1152
+      priority: 1158
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    symbol {
-      name: "symbols/maki/dam-18.svg:#444444::::"
-      priority: 16152
-    }
   }
 }
 cont {
@@ -68197,7 +61197,7 @@ cont {
     lines {
       width: 0.3
       color: 12312029
-      priority: 1067
+      priority: 1075
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68207,7 +61207,7 @@ cont {
     lines {
       width: 0.4
       color: 12312029
-      priority: 1076
+      priority: 1083
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68217,7 +61217,7 @@ cont {
     lines {
       width: 0.3
       color: 12312029
-      priority: 1098
+      priority: 1105
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68227,7 +61227,7 @@ cont {
     lines {
       width: 0.6
       color: 12312029
-      priority: 1107
+      priority: 1114
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68237,7 +61237,7 @@ cont {
     lines {
       width: 0.6
       color: 12312029
-      priority: 1112
+      priority: 1119
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68246,7 +61246,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16112
+      priority: 16119
     }
   }
   element {
@@ -68254,7 +61254,7 @@ cont {
     lines {
       width: 0.8
       color: 12312029
-      priority: 1118
+      priority: 1125
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68263,7 +61263,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16118
+      priority: 16125
     }
   }
   element {
@@ -68271,7 +61271,7 @@ cont {
     lines {
       width: 0.8
       color: 12312029
-      priority: 1118
+      priority: 1125
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68280,7 +61280,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16118
+      priority: 16125
     }
   }
   element {
@@ -68288,7 +61288,7 @@ cont {
     lines {
       width: 0.8
       color: 12312029
-      priority: 1118
+      priority: 1125
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68297,7 +61297,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16118
+      priority: 16125
     }
   }
 }
@@ -68308,7 +61308,7 @@ cont {
     lines {
       width: 0.3
       color: 12312029
-      priority: 1067
+      priority: 1075
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68318,7 +61318,7 @@ cont {
     lines {
       width: 0.4
       color: 12312029
-      priority: 1076
+      priority: 1083
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68328,7 +61328,7 @@ cont {
     lines {
       width: 0.3
       color: 12312029
-      priority: 1098
+      priority: 1105
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68338,14 +61338,14 @@ cont {
     lines {
       width: 0.6
       color: 12312029
-      priority: 1107
+      priority: 1114
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.6
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -68366,14 +61366,14 @@ cont {
     lines {
       width: 0.6
       color: 12312029
-      priority: 1112
+      priority: 1119
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.6
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -68393,7 +61393,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16112
+      priority: 16119
     }
   }
   element {
@@ -68401,14 +61401,14 @@ cont {
     lines {
       width: 0.8
       color: 12312029
-      priority: 1118
+      priority: 1125
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.8
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -68428,7 +61428,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16118
+      priority: 16125
     }
   }
   element {
@@ -68436,14 +61436,14 @@ cont {
     lines {
       width: 0.8
       color: 12312029
-      priority: 1118
+      priority: 1125
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.8
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -68463,7 +61463,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16118
+      priority: 16125
     }
   }
   element {
@@ -68471,14 +61471,14 @@ cont {
     lines {
       width: 0.8
       color: 12312029
-      priority: 1118
+      priority: 1125
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.8
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -68498,7 +61498,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16118
+      priority: 16125
     }
   }
 }
@@ -68508,70 +61508,70 @@ cont {
     scale: 10
     area {
       color: 12312029
-      priority: 1094
+      priority: 1101
     }
   }
   element {
     scale: 11
     area {
       color: 12312029
-      priority: 1094
+      priority: 1101
     }
   }
   element {
     scale: 12
     area {
       color: 12312029
-      priority: 1094
+      priority: 1101
     }
   }
   element {
     scale: 13
     area {
       color: 12312029
-      priority: 1094
+      priority: 1101
     }
   }
   element {
     scale: 14
     area {
       color: 12312029
-      priority: 1094
+      priority: 1101
     }
   }
   element {
     scale: 15
     area {
       color: 12312029
-      priority: 1094
+      priority: 1101
     }
   }
   element {
     scale: 16
     area {
       color: 12312029
-      priority: 1094
+      priority: 1101
     }
   }
   element {
     scale: 17
     area {
       color: 12312029
-      priority: 1094
+      priority: 1101
     }
   }
   element {
     scale: 18
     area {
       color: 12312029
-      priority: 1094
+      priority: 1101
     }
   }
   element {
     scale: 19
     area {
       color: 12312029
-      priority: 1094
+      priority: 1101
     }
   }
 }
@@ -68582,7 +61582,7 @@ cont {
     lines {
       width: 1.0
       color: 12312029
-      priority: 1064
+      priority: 1072
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68592,7 +61592,7 @@ cont {
     lines {
       width: 1.5
       color: 12312029
-      priority: 1073
+      priority: 1080
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68612,21 +61612,14 @@ cont {
     lines {
       width: 3.5
       color: 12303291
-      priority: 104
+      priority: 111
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.5
-      color: 12303291
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.8
       color: 12312029
-      priority: 1104
+      priority: 1111
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68636,21 +61629,14 @@ cont {
     lines {
       width: 5.2
       color: 12303291
-      priority: 110
+      priority: 116
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.2
-      color: 12303291
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 12312029
-      priority: 1110
+      priority: 1116
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68659,7 +61645,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16110
+      priority: 16116
     }
   }
   element {
@@ -68667,21 +61653,14 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: 115
+      priority: 122
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
-      color: 12303291
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.4
       color: 12312029
-      priority: 1115
+      priority: 1122
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68690,7 +61669,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16115
+      priority: 16122
     }
   }
   element {
@@ -68698,21 +61677,14 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: 115
+      priority: 122
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
-      color: 12303291
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.4
       color: 12312029
-      priority: 1115
+      priority: 1122
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68721,7 +61693,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16115
+      priority: 16122
     }
   }
   element {
@@ -68729,21 +61701,14 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: 115
+      priority: 122
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
-      color: 12303291
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.4
       color: 12312029
-      priority: 1115
+      priority: 1122
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68752,7 +61717,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16115
+      priority: 16122
     }
   }
 }
@@ -68763,7 +61728,7 @@ cont {
     lines {
       width: 1.0
       color: 12312029
-      priority: 1064
+      priority: 1072
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68773,7 +61738,7 @@ cont {
     lines {
       width: 1.5
       color: 12312029
-      priority: 1073
+      priority: 1080
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -68793,28 +61758,21 @@ cont {
     lines {
       width: 3.5
       color: 12303291
-      priority: 104
+      priority: 111
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.5
-      color: 12303291
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 2.8
       color: 12312029
-      priority: 1104
+      priority: 1111
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.8
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -68835,28 +61793,21 @@ cont {
     lines {
       width: 5.2
       color: 12303291
-      priority: 110
+      priority: 116
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 5.2
-      color: 12303291
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 4.0
       color: 12312029
-      priority: 1110
+      priority: 1116
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -68876,7 +61827,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16110
+      priority: 16116
     }
   }
   element {
@@ -68884,28 +61835,21 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: 115
+      priority: 122
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
-      color: 12303291
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.4
       color: 12312029
-      priority: 1115
+      priority: 1122
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.4
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -68925,7 +61869,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16115
+      priority: 16122
     }
   }
   element {
@@ -68933,28 +61877,21 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: 115
+      priority: 122
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
-      color: 12303291
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.4
       color: 12312029
-      priority: 1115
+      priority: 1122
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.4
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -68974,7 +61911,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16115
+      priority: 16122
     }
   }
   element {
@@ -68982,28 +61919,21 @@ cont {
     lines {
       width: 8.0
       color: 12303291
-      priority: 115
+      priority: 122
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
-      color: 12303291
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 6.4
       color: 12312029
-      priority: 1115
+      priority: 1122
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.4
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -69023,7 +61953,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16115
+      priority: 16122
     }
   }
 }
@@ -69034,21 +61964,14 @@ cont {
     lines {
       width: 6.0
       color: 2236962
-      priority: 79
+      priority: 86
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.0
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 5.0
       color: 16777215
-      priority: 1079
+      priority: 1086
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69058,21 +61981,14 @@ cont {
     lines {
       width: 10.0
       color: 2236962
-      priority: 81
+      priority: 89
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 10.0
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 9.0
       color: 16777215
-      priority: 1081
+      priority: 1089
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69082,21 +61998,14 @@ cont {
     lines {
       width: 12.0
       color: 2236962
-      priority: 84
+      priority: 91
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 12.0
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 10.0
       color: 16777215
-      priority: 1084
+      priority: 1091
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69106,21 +62015,14 @@ cont {
     lines {
       width: 16.0
       color: 2236962
-      priority: 87
+      priority: 94
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 16.0
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16777215
-      priority: 1087
+      priority: 1094
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69130,21 +62032,14 @@ cont {
     lines {
       width: 16.0
       color: 2236962
-      priority: 87
+      priority: 94
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 16.0
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16777215
-      priority: 1087
+      priority: 1094
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69154,21 +62049,14 @@ cont {
     lines {
       width: 16.0
       color: 2236962
-      priority: 87
+      priority: 94
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 16.0
-      color: 2236962
-      priority: -15000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
       width: 12.0
       color: 16777215
-      priority: 1087
+      priority: 1094
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69181,7 +62069,7 @@ cont {
     lines {
       width: 0.5
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69191,7 +62079,7 @@ cont {
     lines {
       width: 1.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69201,7 +62089,7 @@ cont {
     lines {
       width: 2.5
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69211,7 +62099,7 @@ cont {
     lines {
       width: 3.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69221,7 +62109,7 @@ cont {
     lines {
       width: 4.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69230,7 +62118,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
   element {
@@ -69238,7 +62126,7 @@ cont {
     lines {
       width: 5.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69247,7 +62135,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
   element {
@@ -69255,7 +62143,7 @@ cont {
     lines {
       width: 8.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69264,7 +62152,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
   element {
@@ -69272,7 +62160,7 @@ cont {
     lines {
       width: 16.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69281,7 +62169,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
   element {
@@ -69289,7 +62177,7 @@ cont {
     lines {
       width: 16.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69298,7 +62186,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
   element {
@@ -69306,7 +62194,7 @@ cont {
     lines {
       width: 16.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69315,7 +62203,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
 }
@@ -69326,7 +62214,7 @@ cont {
     lines {
       width: 0.5
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69336,7 +62224,7 @@ cont {
     lines {
       width: 1.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69346,7 +62234,7 @@ cont {
     lines {
       width: 2.5
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69356,7 +62244,7 @@ cont {
     lines {
       width: 3.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69366,7 +62254,7 @@ cont {
     lines {
       width: 4.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69375,7 +62263,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
   element {
@@ -69383,14 +62271,14 @@ cont {
     lines {
       width: 5.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 13.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -69410,7 +62298,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
   element {
@@ -69418,14 +62306,14 @@ cont {
     lines {
       width: 8.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 16.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -69445,7 +62333,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
   element {
@@ -69453,14 +62341,14 @@ cont {
     lines {
       width: 16.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 24.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -69480,7 +62368,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
   element {
@@ -69488,14 +62376,14 @@ cont {
     lines {
       width: 16.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 24.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -69515,7 +62403,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
   element {
@@ -69523,14 +62411,14 @@ cont {
     lines {
       width: 16.0
       color: 12312029
-      priority: 1025
+      priority: 1033
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 24.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -69550,7 +62438,7 @@ cont {
         height: 12
         color: 5601262
       }
-      priority: 16025
+      priority: 16033
     }
   }
 }
@@ -69560,70 +62448,70 @@ cont {
     scale: 10
     area {
       color: 12312029
-      priority: 1026
+      priority: 1034
     }
   }
   element {
     scale: 11
     area {
       color: 12312029
-      priority: 1026
+      priority: 1034
     }
   }
   element {
     scale: 12
     area {
       color: 12312029
-      priority: 1026
+      priority: 1034
     }
   }
   element {
     scale: 13
     area {
       color: 12312029
-      priority: 1026
+      priority: 1034
     }
   }
   element {
     scale: 14
     area {
       color: 12312029
-      priority: 1026
+      priority: 1034
     }
   }
   element {
     scale: 15
     area {
       color: 12312029
-      priority: 1026
+      priority: 1034
     }
   }
   element {
     scale: 16
     area {
       color: 12312029
-      priority: 1026
+      priority: 1034
     }
   }
   element {
     scale: 17
     area {
       color: 12312029
-      priority: 1026
+      priority: 1034
     }
   }
   element {
     scale: 18
     area {
       color: 12312029
-      priority: 1026
+      priority: 1034
     }
   }
   element {
     scale: 19
     area {
       color: 12312029
-      priority: 1026
+      priority: 1034
     }
   }
 }
@@ -69634,7 +62522,7 @@ cont {
     lines {
       width: 0.75
       color: 12312029
-      priority: 1062
+      priority: 1069
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69644,7 +62532,7 @@ cont {
     lines {
       width: 1.0
       color: 12312029
-      priority: 1070
+      priority: 1077
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69654,7 +62542,7 @@ cont {
     lines {
       width: 1.0
       color: 12312029
-      priority: 1096
+      priority: 1103
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69664,7 +62552,7 @@ cont {
     lines {
       width: 2.0
       color: 12312029
-      priority: 1101
+      priority: 1108
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69674,7 +62562,7 @@ cont {
     lines {
       width: 2.0
       color: 12312029
-      priority: 1104
+      priority: 1111
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69683,7 +62571,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16104
+      priority: 16111
     }
   }
   element {
@@ -69691,7 +62579,7 @@ cont {
     lines {
       width: 2.2
       color: 12312029
-      priority: 1110
+      priority: 1116
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69700,7 +62588,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16110
+      priority: 16116
     }
   }
   element {
@@ -69708,7 +62596,7 @@ cont {
     lines {
       width: 2.2
       color: 12312029
-      priority: 1110
+      priority: 1116
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69717,7 +62605,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16110
+      priority: 16116
     }
   }
   element {
@@ -69725,7 +62613,7 @@ cont {
     lines {
       width: 2.2
       color: 12312029
-      priority: 1110
+      priority: 1116
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69734,7 +62622,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16110
+      priority: 16116
     }
   }
 }
@@ -69745,7 +62633,7 @@ cont {
     lines {
       width: 0.75
       color: 12312029
-      priority: 1062
+      priority: 1069
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69755,7 +62643,7 @@ cont {
     lines {
       width: 1.0
       color: 12312029
-      priority: 1070
+      priority: 1077
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69769,7 +62657,7 @@ cont {
         dd: 1.6
         dd: 1.6
       }
-      priority: 1090
+      priority: 1097
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -69783,7 +62671,7 @@ cont {
         dd: 1.6
         dd: 1.6
       }
-      priority: 1098
+      priority: 1105
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -69797,7 +62685,7 @@ cont {
         dd: 1.6
         dd: 1.6
       }
-      priority: 1101
+      priority: 1108
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -69806,7 +62694,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16101
+      priority: 16108
     }
   }
   element {
@@ -69818,7 +62706,7 @@ cont {
         dd: 1.6
         dd: 1.6
       }
-      priority: 1107
+      priority: 1114
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -69827,7 +62715,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16107
+      priority: 16114
     }
   }
   element {
@@ -69839,7 +62727,7 @@ cont {
         dd: 1.6
         dd: 1.6
       }
-      priority: 1107
+      priority: 1114
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -69848,7 +62736,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16107
+      priority: 16114
     }
   }
   element {
@@ -69860,7 +62748,7 @@ cont {
         dd: 1.6
         dd: 1.6
       }
-      priority: 1107
+      priority: 1114
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -69869,7 +62757,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16107
+      priority: 16114
     }
   }
 }
@@ -69880,7 +62768,7 @@ cont {
     lines {
       width: 0.75
       color: 12312029
-      priority: 1062
+      priority: 1069
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69890,7 +62778,7 @@ cont {
     lines {
       width: 1.0
       color: 12312029
-      priority: 1070
+      priority: 1077
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -69904,7 +62792,7 @@ cont {
         dd: 2.4
         dd: 1.0
       }
-      priority: 1096
+      priority: 1103
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -69918,7 +62806,7 @@ cont {
         dd: 2.4
         dd: 1.0
       }
-      priority: 1101
+      priority: 1108
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -69932,7 +62820,7 @@ cont {
         dd: 2.4
         dd: 1.0
       }
-      priority: 1104
+      priority: 1111
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -69941,7 +62829,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16104
+      priority: 16111
     }
   }
   element {
@@ -69953,7 +62841,7 @@ cont {
         dd: 2.4
         dd: 1.0
       }
-      priority: 1104
+      priority: 1111
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -69962,7 +62850,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16104
+      priority: 16111
     }
   }
   element {
@@ -69974,7 +62862,7 @@ cont {
         dd: 2.4
         dd: 1.0
       }
-      priority: 1104
+      priority: 1111
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -69983,7 +62871,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16104
+      priority: 16111
     }
   }
   element {
@@ -69995,7 +62883,7 @@ cont {
         dd: 2.4
         dd: 1.0
       }
-      priority: 1104
+      priority: 1111
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -70004,7 +62892,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16104
+      priority: 16111
     }
   }
 }
@@ -70015,7 +62903,7 @@ cont {
     lines {
       width: 0.75
       color: 12312029
-      priority: 1062
+      priority: 1069
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -70025,7 +62913,7 @@ cont {
     lines {
       width: 1.0
       color: 12312029
-      priority: 1070
+      priority: 1077
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -70035,7 +62923,7 @@ cont {
     lines {
       width: 1.0
       color: 12312029
-      priority: 1096
+      priority: 1103
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -70045,14 +62933,14 @@ cont {
     lines {
       width: 2.0
       color: 12312029
-      priority: 1101
+      priority: 1108
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -70073,14 +62961,14 @@ cont {
     lines {
       width: 2.0
       color: 12312029
-      priority: 1104
+      priority: 1111
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -70100,7 +62988,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16104
+      priority: 16111
     }
   }
   element {
@@ -70108,14 +62996,14 @@ cont {
     lines {
       width: 2.2
       color: 12312029
-      priority: 1110
+      priority: 1116
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.2
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -70135,7 +63023,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16110
+      priority: 16116
     }
   }
   element {
@@ -70143,14 +63031,14 @@ cont {
     lines {
       width: 2.2
       color: 12312029
-      priority: 1110
+      priority: 1116
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.2
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -70170,7 +63058,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16110
+      priority: 16116
     }
   }
   element {
@@ -70178,14 +63066,14 @@ cont {
     lines {
       width: 2.2
       color: 12312029
-      priority: 1110
+      priority: 1116
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.2
       color: 16777215
-      priority: 14
+      priority: 13
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -70205,7 +63093,7 @@ cont {
         height: 12
         color: 136
       }
-      priority: 16110
+      priority: 16116
     }
   }
 }
@@ -70216,7 +63104,7 @@ cont {
     lines {
       width: 0.25
       color: 68
-      priority: 1129
+      priority: 1136
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -70226,7 +63114,7 @@ cont {
     lines {
       width: 1.0
       color: 68
-      priority: 1138
+      priority: 1144
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -70236,7 +63124,7 @@ cont {
     lines {
       width: 2.0
       color: 68
-      priority: 1144
+      priority: 1150
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -70246,7 +63134,7 @@ cont {
     lines {
       width: 3.0
       color: 68
-      priority: 1149
+      priority: 1155
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -70256,7 +63144,7 @@ cont {
     lines {
       width: 3.0
       color: 68
-      priority: 1149
+      priority: 1155
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -70266,71 +63154,9 @@ cont {
     lines {
       width: 3.0
       color: 68
-      priority: 1149
+      priority: 1155
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
   }
 }
-cont {
-  name: "wood-coniferous"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/park-18.svg:#008000::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/park-18.svg:#008000::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/park-18.svg:#008000::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/park-18.svg:#008000::::"
-      priority: 16000
-    }
-  }
-}
-cont {
-  name: "wood-deciduous"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/park2-18.svg:#008000::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/park2-18.svg:#008000::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/park2-18.svg:#008000::::"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/park2-18.svg:#008000::::"
-      priority: 16000
-    }
-  }
-}
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index b0feae3b2e..b87bac04e8 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -289,7 +289,7 @@ leisure|slipway;[leisure=slipway];;name;int_name;288;
 tourism|caravan_site;[tourism=caravan_site];;name;int_name;289;
 place|state;[place=state];;name;int_name;290;
 highway|path|private;[highway=path][access=private];;name;int_name;291;
-railway|subway|tunnel;[railway=subway][tunnel?];x;name;int_name;292;railway|subway
+railway|subway|tunnel;[railway=subway][tunnel?];;name;int_name;292;
 barrier|city_wall;[barrier=city_wall];;name;int_name;293;
 place|farm;[place=farm];;name;int_name;294;
 boundary|administrative|11;[boundary=administrative][admin_level=11];;name;int_name;295;
@@ -512,7 +512,7 @@ highway|tertiary_link|junction;[highway=tertiary_link][junction?];x;name;int_nam
 highway|track|grade3|destination;[highway=track][tracktype=grade3][access=destination];x;name;int_name;512;highway|track
 sport|curling;[sport=curling];;name;int_name;513;
 landuse|reservoir|evaporator;[landuse=reservoir][reservoir=evaporator];x;name;int_name;514;natural|water
-landuse|wood|coniferous;[landuse=wood][wood=coniferous];x;name;int_name;515;landuse|forest|coniferous
+landuse|wood|coniferous;[landuse=wood][wood=coniferous];x;name;int_name;515;landuse|forest
 natural|scrub|deciduous;[natural=scrub][wood=deciduous];x;name;int_name;516;
 highway|footway|disused;[highway=footway][disused?];x;name;int_name;517;
 leisure|playground|tennis;[leisure=playground][sport=tennis];;name;int_name;518;
@@ -953,77 +953,3 @@ landuse|residential|urban;[landuse=residential][residential=urban];;name;int_nam
 amenity|ferry_terminal;[amenity=ferry_terminal];;name;int_name;953;
 amenity;[amenity];;name;int_name;954;
 shop|furniture;[shop=furniture];;name;int_name;955;
-tourism|gallery;[tourism=gallery];;name;int_name;956;
-shop|car_parts;[shop=car_parts];;name;int_name;957;
-amenity|bicycle_parking;[amenity=bicycle_parking];;name;int_name;958;
-shop|general;[shop=general];;name;int_name;959;
-shop|copyshop;[shop=copyshop];;name;int_name;960;
-amenity|emergency_phone;[amenity=emergency_phone];;name;int_name;961;
-emergency|phone;[emergency=phone];;name;int_name;962;
-harbour;[harbour];;name;int_name;963;
-seamark:type|harbour;[seamark:type=harbour];;name;int_name;964;
-shop|music;[shop=music];;name;int_name;965;
-shop|musical_instrument;[shop=musical_instrument];;name;int_name;966;
-wood|deciduous;[wood=deciduous];;name;int_name;967;
-wood|coniferous;[wood=coniferous];;name;int_name;968;
-amenity|prison;[amenity=prison];;name;int_name;969;
-religion|christian;[religion=christian];;name;int_name;970;
-religion|jewish;[religion=jewish];;name;int_name;971;
-religion|muslim;[religion=muslim];;name;int_name;972;
-amenity|brothel;[amenity=brothel];;name;int_name;973;
-railway|subway_entrance|red;[railway=subway_entrance][colour=red];;name;int_name;974;
-railway|subway_entrance|blue;[railway=subway_entrance][colour=blue];;name;int_name;975;
-railway|subway_entrance|orange;[railway=subway_entrance][colour=orange];;name;int_name;976;
-railway|subway_entrance|green;[railway=subway_entrance][colour=green];;name;int_name;977;
-railway|subway_entrance|brown;[railway=subway_entrance][colour=brown];;name;int_name;978;
-railway|subway_entrance|yellow;[railway=subway_entrance][colour=yellow];;name;int_name;979;
-railway|subway_entrance|purple;[railway=subway_entrance][colour=purple];;name;int_name;980;
-railway|subway_entrance|grey;[railway=subway_entrance][colour=grey];;name;int_name;981;
-railway|subway_entrance|violet;[railway=subway_entrance][colour=violet];;name;int_name;982;
-railway|subway_entrance|lightgreen;[railway=subway_entrance][colour=lightgreen];;name;int_name;983;
-railway|subway_entrance|lightblue;[railway=subway_entrance][colour=lightblue];;name;int_name;984;
-railway|subway_entrance|gray;[railway=subway_entrance][colour=gray];;name;int_name;985;
-railway|subway_entrance|darkgreen;[railway=subway_entrance][colour=darkgreen];;name;int_name;986;
-amenity|money_transfer;[amenity=money_transfer];;name;int_name;987;
-craft|carpenter;[craft=carpenter];;name;int_name;988;
-shop|motorcycle;[shop=motorcycle];;name;int_name;989;
-craft;[craft];;name;int_name;990;
-shop|photo;[shop=photo];;name;int_name;991;
-craft|shoemaker;[craft=shoemaker];;name;int_name;992;
-shop|photo_studio;[shop=photo_studio];;name;int_name;993;
-craft|tailor;[craft=tailor];;name;int_name;994;
-man_made|water_well;[man_made=water_well];;name;int_name;995;
-leisure|beach_resort;[leisure=beach_resort];;name;int_name;996;
-amenity|waste_basket;[amenity=waste_basket];;name;int_name;997;
-man_made|watermill;[man_made=watermill];;name;int_name;998;
-man_made|water_tower;[man_made=water_tower];;name;int_name;999;
-man_made|communication_tower;[man_made=communication_tower];;name;int_name;1000;
-man_made|mast;[man_made=mast];;name;int_name;1001;
-amenity|fire_hydrant;[amenity=fire_hydrant];;name;int_name;1002;
-emergency|fire_hydrant;[emergency=fire_hydrant];;name;int_name;1003;
-highway|street_lamp;[highway=street_lamp];;name;int_name;1004;
-man_made|water_well|drinking_water;[man_made=water_well][drinking_water?];;name;int_name;1005;
-power|generator|solar;[power=generator][power_source=solar];;name;int_name;1006;
-power|generator|nuclear;[power=generator][power_source=nuclear];;name;int_name;1007;
-man_made|storage_tank;[man_made=storage_tank];;name;int_name;1008;
-man_made|water_well|manual;[man_made=water_well][pump=manual];;name;int_name;1009;
-man_made|water_well|powered;[man_made=water_well][pump=powered];;name;int_name;1010;
-barrier|border_control;[barrier=border_control];;name;int_name;1011;
-amenity|courthouse;[amenity=courthouse];;name;int_name;1012;
-amenity|social_facility;[amenity=social_facility];;name;int_name;1013;
-religion|hindu;[religion=hindu];;name;int_name;1014;
-office|ngo;[office=ngo];;name;int_name;1015;
-amenity|community_centre;[amenity=community_centre];;name;int_name;1016;
-healthcare;[healthcare?];;name;int_name;1017;
-healthcare|dentist;[healthcare=dentist];;name;int_name;1018;
-healthcare|hospital;[healthcare=hospital];;name;int_name;1019;
-amenity|dentist;[amenity=dentist];;name;int_name;1020;
-amenity|laundry;[amenity=laundry];;name;int_name;1021;
-shop|dry_cleaning;[shop=dry_cleaning];;name;int_name;1022;
-shop|funeral_directors;[shop=funeral_directors];;name;int_name;1023;
-amenity|gambling;[amenity=gambling];;name;int_name;1024;
-amenity|casino;[amenity=casino];;name;int_name;1025;
-amenity|shower;[amenity=shower];;name;int_name;1026;
-shop|confectionery;[shop=confectionery];;name;int_name;1027;
-shop|outdoor;[shop=outdoor];;name;int_name;1028;
-railway|construction;[railway=construction];;name;int_name;1029;
diff --git a/data/resources-hdpi/basic.skn b/data/resources-hdpi/basic.skn
index 893a40c1c3..2f1ae02895 100644
--- a/data/resources-hdpi/basic.skn
+++ b/data/resources-hdpi/basic.skn
@@ -1,485 +1,506 @@
 <!DOCTYPE skin>
-    <skin>
-    <page width="512" height="512" file="symbols.png">
-  <symbolStyle id="1" name="symbols/nori/motorcycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="0" y="0" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="2" name="symbols/maki/music-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="34" y="0" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="3" name="symbols/maki/campsite-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:">
-    <resourceStyle x="68" y="0" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="4" name="symbols/maki/place-of-worship-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="102" y="0" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="5" name="symbols/nori/dry_cleaning-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="136" y="0" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="6" name="symbols/nori/grave_yard-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="170" y="0" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="7" name="symbols/nori/pharmacy-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:">
-    <resourceStyle x="204" y="0" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="8" name="symbols/nori/pub-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="238" y="0" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="9" name="symbols/maki/fast-food-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="272" y="0" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="10" name="symbols/maki/library-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="306" y="0" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="11" name="symbols/nori/hindu-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="340" y="0" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="12" name="symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="374" y="0" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="13" name="symbols/maki/bicycle-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="408" y="0" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="14" name="symbols/nori/fire_hydrant-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:">
-    <resourceStyle x="442" y="0" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="15" name="symbols/maki/school-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="476" y="0" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="16" name="symbols/maki/cafe-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="0" y="34" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="17" name="symbols/maki/cinema-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="34" y="34" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="18" name="symbols/maki/prison-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="68" y="34" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="19" name="symbols/maki/post-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="102" y="34" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="20" name="symbols/nori/gambling-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="136" y="34" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="21" name="symbols/nori/carpenter-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="170" y="34" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="22" name="symbols/nori/kindergarten-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="204" y="34" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="23" name="symbols/maki/embassy-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="238" y="34" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="24" name="symbols/maki/bank-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:">
-    <resourceStyle x="272" y="34" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="25" name="symbols/nori/money_transfer-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:">
-    <resourceStyle x="306" y="34" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="26" name="symbols/maki/theatre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="340" y="34" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="27" name="symbols/nori/atm-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:">
-    <resourceStyle x="374" y="34" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="28" name="symbols/maki/restaurant-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="408" y="34" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="29" name="symbols/nori/information-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="442" y="34" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="30" name="symbols/nori/hardware-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="476" y="34" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="31" name="symbols/maki/toilets-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="0" y="68" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="32" name="symbols/maki/bar-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="34" y="68" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="33" name="symbols/nori/beverages-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="68" y="68" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="34" name="symbols/maki/religious-christian-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="102" y="68" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="35" name="symbols/nori/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="136" y="68" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="36" name="symbols/nori/photo-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="170" y="68" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="37" name="symbols/maki/museum-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="204" y="68" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="38" name="symbols/maki/college-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="238" y="68" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="39" name="symbols/nori/shoemaker-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="272" y="68" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="40" name="symbols/maki/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="306" y="68" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="41" name="symbols/nori/dentist-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:">
-    <resourceStyle x="340" y="68" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="42" name="symbols/nori/car_rental-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="374" y="68" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="43" name="symbols/maki/alcohol-shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="408" y="68" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="44" name="symbols/nori/car_parts-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="442" y="68" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="45" name="symbols/maki/fire-station-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:">
-    <resourceStyle x="476" y="68" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="46" name="symbols/nori/craft-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="0" y="102" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="47" name="symbols/nori/ngo-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="34" y="102" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="48" name="symbols/nori/social_facility-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="68" y="102" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="49" name="symbols/nori/computer-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="102" y="102" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="50" name="symbols/nori/tailor-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="136" y="102" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="51" name="symbols/maki/bicycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="170" y="102" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="52" name="symbols/nori/government-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="204" y="102" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="53" name="symbols/nori/car_repair-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="238" y="102" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="54" name="symbols/maki/emergency-telephone-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:">
-    <resourceStyle x="272" y="102" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="55" name="symbols/nori/hairdresser-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="306" y="102" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="56" name="symbols/nori/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="340" y="102" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="57" name="symbols/nori/mobile_phone-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="374" y="102" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="58" name="symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="408" y="102" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="59" name="symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="442" y="102" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="60" name="symbols/maki/police-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="476" y="102" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="61" name="symbols/maki/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:">
-    <resourceStyle x="0" y="136" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="62" name="symbols/maki/garden-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="34" y="136" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="63" name="symbols/nori/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:">
-    <resourceStyle x="68" y="136" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="64" name="symbols/nori/courthouse-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="102" y="136" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="65" name="symbols/nori/bureau_de_change-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:">
-    <resourceStyle x="136" y="136" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="66" name="symbols/nori/clothes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="170" y="136" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="67" name="symbols/neta/shoes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="204" y="136" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="68" name="symbols/maki/slaughterhouse-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="238" y="136" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="69" name="symbols/maki/religious-jewish-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="272" y="136" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="70" name="symbols/maki/religious-muslim-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="306" y="136" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="71" name="symbols/maki/library-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="340" y="136" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="72" name="symbols/nori/community_centre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="374" y="136" width="34" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="73" name="api_pin">
-    <resourceStyle x="408" y="136" width="21" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="74" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="429" y="136" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="75" name="symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="459" y="136" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="76" name="placemark-blue">
-    <resourceStyle x="489" y="136" width="20" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="77" name="symbols/nori/taxi-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="0" y="170" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="78" name="symbols/maki/bus-18.svg:#FFFFFF:#000080:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="30" y="170" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="79" name="symbols/maki/rail-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="60" y="170" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="80" name="symbols/maki/airport-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="90" y="170" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="81" name="symbols/maki/fuel-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="120" y="170" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="82" name="symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="150" y="170" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="83" name="symbols/maki/bicycle-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="180" y="170" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="84" name="symbols/maki/bus-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="210" y="170" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="85" name="symbols/maki/rail-above-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="240" y="170" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="86" name="symbols/maki/parking-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="270" y="170" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="87" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="300" y="170" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="88" name="symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="330" y="170" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="89" name="placemark-yellow">
-    <resourceStyle x="360" y="170" width="20" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="90" name="placemark-purple">
-    <resourceStyle x="380" y="170" width="20" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="91" name="placemark-brown">
-    <resourceStyle x="400" y="170" width="20" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="92" name="placemark-red">
-    <resourceStyle x="420" y="170" width="20" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="93" name="placemark-pink">
-    <resourceStyle x="440" y="170" width="20" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="94" name="placemark-orange">
-    <resourceStyle x="460" y="170" width="20" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="95" name="placemark-green">
-    <resourceStyle x="480" y="170" width="20" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="96" name="symbols/neta/bollard-18.svg:#444444::::">
-    <resourceStyle x="500" y="170" width="9" height="21"/>
-    </symbolStyle>
-  <symbolStyle id="97" name="symbols/nori/recycling-18.svg:#444444::::">
-    <resourceStyle x="0" y="200" width="27" height="27"/>
-    </symbolStyle>
-  <symbolStyle id="98" name="symbols/nori/shower-18.svg:#444444::::">
-    <resourceStyle x="27" y="200" width="27" height="27"/>
-    </symbolStyle>
-  <symbolStyle id="99" name="symbols/nori/pump-manual-18.svg:#0000FF::::">
-    <resourceStyle x="54" y="200" width="27" height="27"/>
-    </symbolStyle>
-  <symbolStyle id="100" name="symbols/nori/watermill-18.svg:#444444::::">
-    <resourceStyle x="81" y="200" width="27" height="27"/>
-    </symbolStyle>
-  <symbolStyle id="101" name="symbols/nori/pump-powered-18.svg:#0000FF::::">
-    <resourceStyle x="108" y="200" width="27" height="27"/>
-    </symbolStyle>
-  <symbolStyle id="102" name="symbols/nori/border_control-18.svg:#444444::::">
-    <resourceStyle x="135" y="200" width="27" height="27"/>
-    </symbolStyle>
-  <symbolStyle id="103" name="symbols/nori/grave_yard-18.svg:#444444::::">
-    <resourceStyle x="162" y="200" width="27" height="27"/>
-    </symbolStyle>
-  <symbolStyle id="104" name="symbols/nori/beach_resort-18.svg:#444444::::">
-    <resourceStyle x="189" y="200" width="27" height="27"/>
-    </symbolStyle>
-  <symbolStyle id="105" name="symbols/nori/camp_site-18.svg:#444444::::">
-    <resourceStyle x="216" y="200" width="27" height="27"/>
-    </symbolStyle>
-  <symbolStyle id="106" name="symbols/nori/drinking_water_well-18.svg:#0000FF::::">
-    <resourceStyle x="243" y="200" width="25" height="27"/>
-    </symbolStyle>
-  <symbolStyle id="107" name="symbols/nori/playground-18.svg:#444444::::">
-    <resourceStyle x="268" y="200" width="25" height="27"/>
-    </symbolStyle>
-  <symbolStyle id="108" name="symbols/nori/generator_wind-18.svg:#444444::::">
-    <resourceStyle x="293" y="200" width="23" height="27"/>
-    </symbolStyle>
-  <symbolStyle id="109" name="symbols/nori/bucket-18.svg:#0000FF::::">
-    <resourceStyle x="316" y="200" width="23" height="27"/>
-    </symbolStyle>
-  <symbolStyle id="110" name="symbols/nori/viewpoint-18.svg:#444444::::">
-    <resourceStyle x="339" y="200" width="23" height="27"/>
-    </symbolStyle>
-  <symbolStyle id="111" name="symbols/nori/drinking_water-18.svg:#0000FF::::">
-    <resourceStyle x="362" y="200" width="21" height="27"/>
-    </symbolStyle>
-  <symbolStyle id="112" name="symbols/nori/communication-tower-18.svg:#444444::::">
-    <resourceStyle x="383" y="200" width="21" height="27"/>
-    </symbolStyle>
-  <symbolStyle id="113" name="symbols/nori/fire_hydrant-18.svg:#444444::::">
-    <resourceStyle x="404" y="200" width="19" height="27"/>
-    </symbolStyle>
-  <symbolStyle id="114" name="symbols/nori/water_tower-18.svg:#444444::::">
-    <resourceStyle x="423" y="200" width="19" height="27"/>
-    </symbolStyle>
-  <symbolStyle id="115" name="symbols/nori/waste_basket-18.svg:#444444::::">
-    <resourceStyle x="442" y="200" width="19" height="27"/>
-    </symbolStyle>
-  <symbolStyle id="116" name="symbols/nori/street_lamp-18.svg:#444444::::">
-    <resourceStyle x="461" y="200" width="15" height="27"/>
-    </symbolStyle>
-  <symbolStyle id="117" name="symbols/nori/generator-18.svg:#444444::::">
-    <resourceStyle x="476" y="200" width="25" height="25"/>
-    </symbolStyle>
-  <symbolStyle id="118" name="symbols/nori/generator_nuclear-18.svg:#444444::::">
-    <resourceStyle x="0" y="227" width="25" height="25"/>
-    </symbolStyle>
-  <symbolStyle id="119" name="symbols/nori/generator_solar-18.svg:#444444::::">
-    <resourceStyle x="25" y="227" width="25" height="25"/>
-    </symbolStyle>
-  <symbolStyle id="120" name="symbols/nori/dry_cleaning-18.svg:#444444::::">
-    <resourceStyle x="50" y="227" width="21" height="25"/>
-    </symbolStyle>
-  <symbolStyle id="121" name="current-position">
-    <resourceStyle x="71" y="227" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="122" name="symbols/maki/ferry-18.svg:#444444::::">
-    <resourceStyle x="95" y="227" width="20" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="123" name="symbols/maki/rail-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:">
-    <resourceStyle x="115" y="227" width="23" height="23"/>
-    </symbolStyle>
-  <symbolStyle id="124" name="symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:">
-    <resourceStyle x="138" y="227" width="23" height="23"/>
-    </symbolStyle>
-  <symbolStyle id="125" name="symbols/maki/rail-above-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:">
-    <resourceStyle x="161" y="227" width="23" height="23"/>
-    </symbolStyle>
-  <symbolStyle id="126" name="symbols/maki/monument-18.svg:#444444::::">
-    <resourceStyle x="184" y="227" width="18" height="22"/>
-    </symbolStyle>
-  <symbolStyle id="127" name="symbols/maki/pitch-18.svg:#444444::::">
-    <resourceStyle x="202" y="227" width="16" height="22"/>
-    </symbolStyle>
-  <symbolStyle id="128" name="symbols/maki/golf-18.svg:#444444::::">
-    <resourceStyle x="218" y="227" width="16" height="22"/>
-    </symbolStyle>
-  <symbolStyle id="129" name="symbols/nori/storage_tank-18.svg:#444444::::">
-    <resourceStyle x="234" y="227" width="25" height="21"/>
-    </symbolStyle>
-  <symbolStyle id="130" name="symbols/nori/information-18.svg:#444444::::">
-    <resourceStyle x="259" y="227" width="21" height="21"/>
-    </symbolStyle>
-  <symbolStyle id="131" name="symbols/maki/telephone-18.svg:#444444::::">
-    <resourceStyle x="280" y="227" width="22" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="132" name="symbols/maki/emergency-telephone-18.svg:#444444::::">
-    <resourceStyle x="302" y="227" width="22" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="133" name="symbols/maki/baseball-18.svg:#444444::::">
-    <resourceStyle x="324" y="227" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="134" name="symbols/maki/tennis-18.svg:#444444::::">
-    <resourceStyle x="344" y="227" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="135" name="symbols/maki/harbor-18.svg:#444444::::">
-    <resourceStyle x="364" y="227" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="136" name="symbols/maki/soccer-18.svg:#444444::::">
-    <resourceStyle x="384" y="227" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="137" name="symbols/maki/star-18.svg:#444444::::">
-    <resourceStyle x="404" y="227" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="138" name="symbols/maki/cricket-18.svg:#444444::::">
-    <resourceStyle x="424" y="227" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="139" name="symbols/maki/basketball-18.svg:#444444::::">
-    <resourceStyle x="444" y="227" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="140" name="symbols/maki/park2-18.svg:#008000::::">
-    <resourceStyle x="464" y="227" width="16" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="141" name="symbols/maki/park-18.svg:#008000::::">
-    <resourceStyle x="480" y="227" width="16" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="142" name="symbols/nori/power_tower-12.svg:#444444::::">
-    <resourceStyle x="496" y="227" width="16" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="143" name="symbols/nori/bench-18.svg:#444444::::">
-    <resourceStyle x="0" y="252" width="27" height="19"/>
-    </symbolStyle>
-  <symbolStyle id="144" name="symbols/maki/campsite-18.svg:#444444::::">
-    <resourceStyle x="27" y="252" width="22" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="145" name="symbols/maki/art-gallery-18.svg:#444444::::">
-    <resourceStyle x="49" y="252" width="22" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="146" name="symbols/maki/skiing-18.svg:#444444::::">
-    <resourceStyle x="71" y="252" width="22" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="147" name="symbols/maki/cemetery-18.svg:#444444::::">
-    <resourceStyle x="93" y="252" width="14" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="148" name="symbols/maki/america-football-18.svg:#444444::::">
-    <resourceStyle x="107" y="252" width="24" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="149" name="symbols/maki/dam-18.svg:#444444::::">
-    <resourceStyle x="131" y="252" width="20" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="150" name="symbols/maki/swimming-18.svg:#0000FF::::">
-    <resourceStyle x="151" y="252" width="20" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="151" name="symbols/maki/cross-12.svg:#444444::::">
-    <resourceStyle x="171" y="252" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="152" name="symbols/maki/roadblock-12.svg:#FF0000::::">
-    <resourceStyle x="187" y="252" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="153" name="symbols/maki/heliport-18.svg:#444444::::">
-    <resourceStyle x="203" y="252" width="22" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="154" name="symbols/maki/triangle-stroked-12.svg:#444444::::">
-    <resourceStyle x="225" y="252" width="16" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="155" name="symbols/maki/triangle-12.svg:#444444::::">
-    <resourceStyle x="241" y="252" width="16" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="156" name="symbols/maki/triangle-12.svg:#FF0000::::">
-    <resourceStyle x="257" y="252" width="16" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="157" name="symbols/neta/entrance-18.svg:#444444::::">
-    <resourceStyle x="273" y="252" width="15" height="13"/>
-    </symbolStyle>
-  <symbolStyle id="158" name="symbols/maki/post-12.svg:#444444::::">
-    <resourceStyle x="288" y="252" width="16" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="159" name="symbols/neta/lift_gate-18.svg:#444444::::">
-    <resourceStyle x="304" y="252" width="17" height="11"/>
-    </symbolStyle>
-  <symbolStyle id="160" name="symbols/arrow.svg:::::">
-    <resourceStyle x="321" y="252" width="27" height="9"/>
-    </symbolStyle>
+<skin>
+ <page width="512" height="256" file="symbols.png">
+  <symbolStyle id="1" name="api_pin">
+   <resourceStyle width="31" x="0" y="0" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="2" name="placemark-blue">
+   <resourceStyle width="31" x="31" y="0" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="3" name="placemark-brown">
+   <resourceStyle width="31" x="62" y="0" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="4" name="placemark-yellow">
+   <resourceStyle width="31" x="93" y="0" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="5" name="placemark-red">
+   <resourceStyle width="31" x="124" y="0" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="6" name="current-position">
+   <resourceStyle width="40" x="155" y="0" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="7" name="placemark-purple">
+   <resourceStyle width="31" x="195" y="0" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="8" name="placemark-pink">
+   <resourceStyle width="31" x="226" y="0" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="9" name="placemark-orange">
+   <resourceStyle width="31" x="257" y="0" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="10" name="placemark-green">
+   <resourceStyle width="31" x="288" y="0" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="11" name="peak">
+   <resourceStyle width="28" x="319" y="0" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="12" name="petrolstation">
+   <resourceStyle width="28" x="347" y="0" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="13" name="pharmacy">
+   <resourceStyle width="28" x="375" y="0" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="14" name="playground">
+   <resourceStyle width="28" x="403" y="0" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="15" name="police">
+   <resourceStyle width="28" x="431" y="0" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="16" name="postbox">
+   <resourceStyle width="28" x="459" y="0" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="17" name="postoffice">
+   <resourceStyle width="28" x="0" y="40" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="18" name="pub">
+   <resourceStyle width="28" x="28" y="40" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="19" name="hotel">
+   <resourceStyle width="28" x="56" y="40" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="20" name="hunting_closed_high">
+   <resourceStyle width="28" x="84" y="40" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="21" name="information-guidepost">
+   <resourceStyle width="28" x="112" y="40" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="22" name="information-office">
+   <resourceStyle width="28" x="140" y="40" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="23" name="information">
+   <resourceStyle width="28" x="168" y="40" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="24" name="kindergarten">
+   <resourceStyle width="28" x="196" y="40" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="25" name="kindergarten2">
+   <resourceStyle width="28" x="224" y="40" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="26" name="kiosk">
+   <resourceStyle width="28" x="252" y="40" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="27" name="library">
+   <resourceStyle width="28" x="280" y="40" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="28" name="man-made-halfpipe">
+   <resourceStyle width="28" x="308" y="40" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="29" name="memorial">
+   <resourceStyle width="28" x="336" y="40" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="30" name="mountain_pass">
+   <resourceStyle width="28" x="364" y="40" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="31" name="museum">
+   <resourceStyle width="28" x="392" y="40" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="32" name="parking-mini">
+   <resourceStyle width="28" x="420" y="40" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="33" name="parking">
+   <resourceStyle width="28" x="448" y="40" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="34" name="parking_roof">
+   <resourceStyle width="28" x="476" y="40" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="35" name="peak-mini">
+   <resourceStyle width="28" x="0" y="68" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="36" name="subway-station-l">
+   <resourceStyle width="28" x="28" y="68" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="37" name="subway-station-m">
+   <resourceStyle width="28" x="56" y="68" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="38" name="subway-station-s">
+   <resourceStyle width="28" x="84" y="68" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="39" name="subway">
+   <resourceStyle width="28" x="112" y="68" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="40" name="supermarket">
+   <resourceStyle width="28" x="140" y="68" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="41" name="swimming-borderless">
+   <resourceStyle width="28" x="168" y="68" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="42" name="swimming">
+   <resourceStyle width="28" x="196" y="68" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="43" name="synagogue">
+   <resourceStyle width="28" x="224" y="68" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="44" name="taxi">
+   <resourceStyle width="28" x="252" y="68" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="45" name="telephone">
+   <resourceStyle width="28" x="280" y="68" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="46" name="tennis-borderless">
+   <resourceStyle width="28" x="308" y="68" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="47" name="tennis">
+   <resourceStyle width="28" x="336" y="68" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="48" name="theatre">
+   <resourceStyle width="28" x="364" y="68" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="49" name="toilets">
+   <resourceStyle width="28" x="392" y="68" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="50" name="tramway-mini">
+   <resourceStyle width="28" x="420" y="68" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="51" name="tramway">
+   <resourceStyle width="28" x="448" y="68" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="52" name="university">
+   <resourceStyle width="28" x="476" y="68" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="53" name="pubx">
+   <resourceStyle width="28" x="0" y="96" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="54" name="railway-crossing-small">
+   <resourceStyle width="28" x="28" y="96" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="55" name="railway-crossing">
+   <resourceStyle width="28" x="56" y="96" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="56" name="railway-station-mini">
+   <resourceStyle width="28" x="84" y="96" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="57" name="railway-station">
+   <resourceStyle width="28" x="112" y="96" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="58" name="recycling">
+   <resourceStyle width="28" x="140" y="96" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="59" name="religion">
+   <resourceStyle width="28" x="168" y="96" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="60" name="restaurant">
+   <resourceStyle width="28" x="196" y="96" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="61" name="ruins">
+   <resourceStyle width="28" x="224" y="96" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="62" name="school">
+   <resourceStyle width="28" x="252" y="96" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="63" name="shelter-fireplace">
+   <resourceStyle width="28" x="280" y="96" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="64" name="shelter">
+   <resourceStyle width="28" x="308" y="96" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="65" name="shooting-borderless">
+   <resourceStyle width="28" x="336" y="96" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="66" name="shooting">
+   <resourceStyle width="28" x="364" y="96" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="67" name="slipway">
+   <resourceStyle width="28" x="392" y="96" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="68" name="soccer-borderless">
+   <resourceStyle width="28" x="420" y="96" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="69" name="soccer">
+   <resourceStyle width="28" x="448" y="96" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="70" name="equestrian">
+   <resourceStyle width="28" x="476" y="96" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="71" name="equestrian-borderless">
+   <resourceStyle width="28" x="0" y="124" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="72" name="earthquakecamp">
+   <resourceStyle width="28" x="28" y="124" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="73" name="bar">
+   <resourceStyle width="28" x="56" y="124" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="74" name="barrier">
+   <resourceStyle width="28" x="84" y="124" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="75" name="dog_park">
+   <resourceStyle width="28" x="112" y="124" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="76" name="baseball-borderless">
+   <resourceStyle width="28" x="140" y="124" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="77" name="diving">
+   <resourceStyle width="28" x="168" y="124" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="78" name="diving-borderless">
+   <resourceStyle width="28" x="196" y="124" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="79" name="baseball">
+   <resourceStyle width="28" x="224" y="124" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="80" name="curling">
+   <resourceStyle width="28" x="252" y="124" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="81" name="curling-borderless">
+   <resourceStyle width="28" x="280" y="124" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="82" name="cricket">
+   <resourceStyle width="28" x="308" y="124" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="83" name="cricket-borderless">
+   <resourceStyle width="28" x="336" y="124" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="84" name="clothes">
+   <resourceStyle width="28" x="364" y="124" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="85" name="cinema">
+   <resourceStyle width="28" x="392" y="124" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="86" name="basketball">
+   <resourceStyle width="28" x="420" y="124" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="87" name="bicycle_rental">
+   <resourceStyle width="28" x="448" y="124" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="88" name="bird">
+   <resourceStyle width="28" x="476" y="124" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="89" name="bowls-borderless">
+   <resourceStyle width="28" x="0" y="152" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="90" name="bowls">
+   <resourceStyle width="28" x="28" y="152" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="91" name="bus-mini">
+   <resourceStyle width="28" x="56" y="152" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="92" name="castle">
+   <resourceStyle width="28" x="84" y="152" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="93" name="bus">
+   <resourceStyle width="28" x="112" y="152" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="94" name="car_repair">
+   <resourceStyle width="28" x="140" y="152" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="95" name="car_rental">
+   <resourceStyle width="28" x="168" y="152" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="96" name="cannon">
+   <resourceStyle width="28" x="196" y="152" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="97" name="campsite">
+   <resourceStyle width="28" x="224" y="152" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="98" name="cafe">
+   <resourceStyle width="28" x="252" y="152" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="99" name="bus_sta">
+   <resourceStyle width="28" x="280" y="152" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="100" name="hostel">
+   <resourceStyle width="28" x="308" y="152" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="101" name="airport">
+   <resourceStyle width="28" x="336" y="152" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="102" name="hospital0">
+   <resourceStyle width="28" x="364" y="152" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="103" name="hospital">
+   <resourceStyle width="28" x="392" y="152" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="104" name="helipad">
+   <resourceStyle width="28" x="420" y="152" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="105" name="handball">
+   <resourceStyle width="28" x="448" y="152" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="106" name="handball-borderless">
+   <resourceStyle width="28" x="476" y="152" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="107" name="hairdresser">
+   <resourceStyle width="28" x="0" y="180" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="108" name="gymnastics">
+   <resourceStyle width="28" x="28" y="180" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="109" name="gymnastics-borderless">
+   <resourceStyle width="28" x="56" y="180" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="110" name="alpine_hut">
+   <resourceStyle width="28" x="84" y="180" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="111" name="golfcourse">
+   <resourceStyle width="28" x="112" y="180" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="112" name="gate">
+   <resourceStyle width="28" x="140" y="180" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="113" name="archery-borderless">
+   <resourceStyle width="28" x="168" y="180" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="114" name="bakery">
+   <resourceStyle width="28" x="196" y="180" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="115" name="atm">
+   <resourceStyle width="28" x="224" y="180" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="116" name="fastfood">
+   <resourceStyle width="28" x="252" y="180" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="117" name="athletics">
+   <resourceStyle width="28" x="280" y="180" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="118" name="athletics-borderless">
+   <resourceStyle width="28" x="308" y="180" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="119" name="arrow">
+   <resourceStyle width="28" x="336" y="180" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="120" name="firebrigade">
+   <resourceStyle width="28" x="364" y="180" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="121" name="football-borderless">
+   <resourceStyle width="28" x="392" y="180" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="122" name="archery">
+   <resourceStyle width="28" x="420" y="180" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="123" name="football">
+   <resourceStyle width="28" x="448" y="180" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="124" name="fountain">
+   <resourceStyle width="28" x="476" y="180" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="125" name="basketball-borderless">
+   <resourceStyle width="28" x="0" y="208" height="27"/>
+  </symbolStyle>
+  <symbolStyle id="126" name="khanda">
+   <resourceStyle width="26" x="28" y="208" height="26"/>
+  </symbolStyle>
+  <symbolStyle id="127" name="parking-permissive">
+   <resourceStyle width="24" x="54" y="208" height="24"/>
+  </symbolStyle>
+  <symbolStyle id="128" name="parking-private">
+   <resourceStyle width="24" x="78" y="208" height="24"/>
+  </symbolStyle>
+  <symbolStyle id="129" name="speed_trap">
+   <resourceStyle width="22" x="102" y="208" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="130" name="traffic_signal">
+   <resourceStyle width="22" x="124" y="208" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="131" name="bank">
+   <resourceStyle width="22" x="146" y="208" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="132" name="windmill">
+   <resourceStyle width="22" x="168" y="208" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="133" name="housenumber">
+   <resourceStyle width="22" x="190" y="208" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="134" name="mosque">
+   <resourceStyle width="22" x="212" y="208" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="135" name="parking_roof-permissive">
+   <resourceStyle width="22" x="234" y="208" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="136" name="embassy">
+   <resourceStyle width="22" x="256" y="208" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="137" name="drinking_water">
+   <resourceStyle width="22" x="278" y="208" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="138" name="doctor">
+   <resourceStyle width="22" x="300" y="208" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="139" name="church">
+   <resourceStyle width="22" x="322" y="208" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="140" name="roundabout_right">
+   <resourceStyle width="22" x="344" y="208" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="141" name="roundabout_left">
+   <resourceStyle width="22" x="366" y="208" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="142" name="power_wind">
+   <resourceStyle width="20" x="388" y="208" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="143" name="power_photovoltaic">
+   <resourceStyle width="20" x="408" y="208" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="144" name="power_hydro">
+   <resourceStyle width="20" x="428" y="208" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="145" name="power_generic">
+   <resourceStyle width="20" x="448" y="208" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="146" name="wastewater">
+   <resourceStyle width="20" x="468" y="208" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="147" name="viewpoint">
+   <resourceStyle width="20" x="488" y="208" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="148" name="lighthouse">
+   <resourceStyle width="20" x="0" y="235" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="149" name="bureau_de_change">
+   <resourceStyle width="20" x="20" y="235" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="150" name="cave_entrance">
+   <resourceStyle width="20" x="40" y="235" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="151" name="car_sharing">
+   <resourceStyle width="20" x="60" y="235" height="19"/>
+  </symbolStyle>
+  <symbolStyle id="152" name="hotel_and_restaurant">
+   <resourceStyle width="17" x="80" y="235" height="17"/>
+  </symbolStyle>
+  <symbolStyle id="153" name="parking_roof_fee">
+   <resourceStyle width="28" x="97" y="235" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="154" name="parking_roof_fee-permissive">
+   <resourceStyle width="28" x="125" y="235" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="155" name="picnic">
+   <resourceStyle width="16" x="153" y="235" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="156" name="parking_fee">
+   <resourceStyle width="28" x="169" y="235" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="157" name="parking_fee-permissive">
+   <resourceStyle width="28" x="197" y="235" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="158" name="park_and_ride">
+   <resourceStyle width="28" x="225" y="235" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="159" name="park_and_ride-permissive">
+   <resourceStyle width="28" x="253" y="235" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="160" name="bench">
+   <resourceStyle width="16" x="281" y="235" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="161" name="building">
+   <resourceStyle width="13" x="297" y="235" height="13"/>
+  </symbolStyle>
+  <symbolStyle id="162" name="disused">
+   <resourceStyle width="13" x="310" y="235" height="13"/>
+  </symbolStyle>
+  <symbolStyle id="163" name="vulcan">
+   <resourceStyle width="13" x="323" y="235" height="13"/>
+  </symbolStyle>
+  <symbolStyle id="164" name="power-tower">
+   <resourceStyle width="13" x="336" y="235" height="13"/>
+  </symbolStyle>
+  <symbolStyle id="165" name="survey_point">
+   <resourceStyle width="12" x="349" y="235" height="12"/>
+  </symbolStyle>
+  <symbolStyle id="166" name="power-pole">
+   <resourceStyle width="9" x="361" y="235" height="9"/>
+  </symbolStyle>
+  <symbolStyle id="167" name="tree">
+   <resourceStyle width="8" x="370" y="235" height="8"/>
+  </symbolStyle>
  </page>
-    </skin>
+</skin>
diff --git a/data/resources-hdpi/symbols.png b/data/resources-hdpi/symbols.png
index fcd6bb90cd..685e4de267 100644
--- a/data/resources-hdpi/symbols.png
+++ b/data/resources-hdpi/symbols.png
diff --git a/data/resources-ldpi/basic.skn b/data/resources-ldpi/basic.skn
index 9224e0c7d3..d28cfd33bb 100644
--- a/data/resources-ldpi/basic.skn
+++ b/data/resources-ldpi/basic.skn
@@ -1,485 +1,506 @@
 <!DOCTYPE skin>
-    <skin>
-    <page width="256" height="256" file="symbols.png">
-  <symbolStyle id="1" name="symbols/nori/motorcycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="0" y="0" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="2" name="symbols/maki/music-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="18" y="0" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="3" name="symbols/maki/campsite-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:">
-    <resourceStyle x="36" y="0" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="4" name="symbols/maki/place-of-worship-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="54" y="0" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="5" name="symbols/nori/dry_cleaning-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="72" y="0" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="6" name="symbols/nori/grave_yard-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="90" y="0" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="7" name="current-position">
-    <resourceStyle x="108" y="0" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="8" name="symbols/nori/pharmacy-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:">
-    <resourceStyle x="126" y="0" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="9" name="symbols/nori/pub-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="144" y="0" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="10" name="symbols/maki/fast-food-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="162" y="0" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="11" name="symbols/maki/library-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="180" y="0" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="12" name="symbols/nori/hindu-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="198" y="0" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="13" name="symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="216" y="0" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="14" name="symbols/maki/bicycle-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="234" y="0" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="15" name="symbols/nori/fire_hydrant-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:">
-    <resourceStyle x="0" y="18" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="16" name="symbols/maki/school-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="18" y="18" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="17" name="symbols/maki/cafe-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="36" y="18" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="18" name="symbols/maki/cinema-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="54" y="18" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="19" name="symbols/maki/prison-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="72" y="18" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="20" name="symbols/maki/post-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="90" y="18" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="21" name="symbols/nori/gambling-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="108" y="18" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="22" name="symbols/nori/carpenter-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="126" y="18" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="23" name="symbols/nori/kindergarten-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="144" y="18" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="24" name="symbols/maki/embassy-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="162" y="18" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="25" name="symbols/maki/bank-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:">
-    <resourceStyle x="180" y="18" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="26" name="symbols/nori/money_transfer-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:">
-    <resourceStyle x="198" y="18" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="27" name="symbols/maki/theatre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="216" y="18" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="28" name="symbols/nori/atm-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:">
-    <resourceStyle x="234" y="18" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="29" name="symbols/maki/restaurant-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="0" y="36" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="30" name="symbols/nori/information-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="18" y="36" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="31" name="symbols/nori/hardware-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="36" y="36" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="32" name="symbols/maki/toilets-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="54" y="36" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="33" name="symbols/maki/bar-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="72" y="36" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="34" name="symbols/nori/beverages-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="90" y="36" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="35" name="symbols/maki/religious-christian-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="108" y="36" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="36" name="symbols/nori/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="126" y="36" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="37" name="symbols/nori/photo-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="144" y="36" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="38" name="symbols/maki/museum-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="162" y="36" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="39" name="symbols/maki/college-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="180" y="36" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="40" name="symbols/nori/shoemaker-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="198" y="36" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="41" name="symbols/maki/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="216" y="36" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="42" name="symbols/nori/dentist-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:">
-    <resourceStyle x="234" y="36" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="43" name="symbols/nori/car_rental-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="0" y="54" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="44" name="symbols/maki/alcohol-shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="18" y="54" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="45" name="symbols/nori/car_parts-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="36" y="54" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="46" name="symbols/maki/fire-station-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:">
-    <resourceStyle x="54" y="54" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="47" name="symbols/nori/craft-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="72" y="54" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="48" name="symbols/nori/ngo-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="90" y="54" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="49" name="symbols/nori/social_facility-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="108" y="54" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="50" name="symbols/nori/computer-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="126" y="54" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="51" name="symbols/nori/tailor-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="144" y="54" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="52" name="symbols/maki/bicycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="162" y="54" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="53" name="symbols/nori/government-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="180" y="54" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="54" name="symbols/nori/car_repair-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="198" y="54" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="55" name="symbols/maki/emergency-telephone-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:">
-    <resourceStyle x="216" y="54" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="56" name="symbols/nori/hairdresser-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="234" y="54" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="57" name="symbols/nori/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="0" y="72" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="58" name="symbols/nori/mobile_phone-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="18" y="72" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="59" name="symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="36" y="72" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="60" name="symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="54" y="72" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="61" name="symbols/maki/police-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="72" y="72" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="62" name="symbols/maki/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:">
-    <resourceStyle x="90" y="72" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="63" name="symbols/maki/garden-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="108" y="72" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="64" name="symbols/nori/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:">
-    <resourceStyle x="126" y="72" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="65" name="symbols/nori/courthouse-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="144" y="72" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="66" name="symbols/nori/bureau_de_change-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:">
-    <resourceStyle x="162" y="72" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="67" name="symbols/nori/clothes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="180" y="72" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="68" name="symbols/neta/shoes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="198" y="72" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="69" name="symbols/maki/slaughterhouse-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="216" y="72" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="70" name="symbols/maki/religious-jewish-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="234" y="72" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="71" name="symbols/maki/religious-muslim-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="0" y="90" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="72" name="symbols/maki/library-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="18" y="90" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="73" name="symbols/nori/community_centre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="36" y="90" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="74" name="api_pin">
-    <resourceStyle x="54" y="90" width="12" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="75" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="66" y="90" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="76" name="symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="82" y="90" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="77" name="symbols/nori/taxi-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="98" y="90" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="78" name="symbols/maki/bus-18.svg:#FFFFFF:#000080:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="114" y="90" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="79" name="symbols/maki/rail-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="130" y="90" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="80" name="symbols/maki/airport-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="146" y="90" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="81" name="symbols/maki/fuel-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="162" y="90" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="82" name="symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="178" y="90" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="83" name="symbols/maki/bicycle-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="194" y="90" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="84" name="symbols/maki/bus-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="210" y="90" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="85" name="symbols/maki/rail-above-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="226" y="90" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="86" name="placemark-blue">
-    <resourceStyle x="242" y="90" width="10" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="87" name="symbols/maki/parking-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="0" y="108" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="88" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="16" y="108" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="89" name="symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="32" y="108" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="90" name="placemark-yellow">
-    <resourceStyle x="48" y="108" width="10" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="91" name="placemark-purple">
-    <resourceStyle x="58" y="108" width="10" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="92" name="placemark-brown">
-    <resourceStyle x="68" y="108" width="10" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="93" name="placemark-red">
-    <resourceStyle x="78" y="108" width="10" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="94" name="placemark-pink">
-    <resourceStyle x="88" y="108" width="10" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="95" name="placemark-orange">
-    <resourceStyle x="98" y="108" width="10" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="96" name="placemark-green">
-    <resourceStyle x="108" y="108" width="10" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="97" name="symbols/nori/recycling-18.svg:#444444::::">
-    <resourceStyle x="118" y="108" width="14" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="98" name="symbols/nori/shower-18.svg:#444444::::">
-    <resourceStyle x="132" y="108" width="14" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="99" name="symbols/nori/pump-manual-18.svg:#0000FF::::">
-    <resourceStyle x="146" y="108" width="14" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="100" name="symbols/nori/watermill-18.svg:#444444::::">
-    <resourceStyle x="160" y="108" width="14" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="101" name="symbols/nori/drinking_water_well-18.svg:#0000FF::::">
-    <resourceStyle x="174" y="108" width="14" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="102" name="symbols/nori/generator-18.svg:#444444::::">
-    <resourceStyle x="188" y="108" width="14" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="103" name="symbols/nori/pump-powered-18.svg:#0000FF::::">
-    <resourceStyle x="202" y="108" width="14" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="104" name="symbols/nori/playground-18.svg:#444444::::">
-    <resourceStyle x="216" y="108" width="14" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="105" name="symbols/nori/border_control-18.svg:#444444::::">
-    <resourceStyle x="230" y="108" width="14" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="106" name="symbols/nori/drinking_water-18.svg:#0000FF::::">
-    <resourceStyle x="244" y="108" width="12" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="107" name="symbols/nori/grave_yard-18.svg:#444444::::">
-    <resourceStyle x="0" y="124" width="14" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="108" name="symbols/nori/generator_solar-18.svg:#444444::::">
-    <resourceStyle x="14" y="124" width="14" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="109" name="symbols/nori/beach_resort-18.svg:#444444::::">
-    <resourceStyle x="28" y="124" width="14" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="110" name="symbols/nori/camp_site-18.svg:#444444::::">
-    <resourceStyle x="42" y="124" width="14" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="111" name="symbols/nori/dry_cleaning-18.svg:#444444::::">
-    <resourceStyle x="56" y="124" width="12" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="112" name="symbols/nori/generator_wind-18.svg:#444444::::">
-    <resourceStyle x="68" y="124" width="12" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="113" name="symbols/nori/bucket-18.svg:#0000FF::::">
-    <resourceStyle x="80" y="124" width="12" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="114" name="symbols/nori/communication-tower-18.svg:#444444::::">
-    <resourceStyle x="92" y="124" width="12" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="115" name="symbols/nori/viewpoint-18.svg:#444444::::">
-    <resourceStyle x="104" y="124" width="12" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="116" name="symbols/nori/fire_hydrant-18.svg:#444444::::">
-    <resourceStyle x="116" y="124" width="10" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="117" name="symbols/nori/water_tower-18.svg:#444444::::">
-    <resourceStyle x="126" y="124" width="10" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="118" name="symbols/nori/waste_basket-18.svg:#444444::::">
-    <resourceStyle x="136" y="124" width="10" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="119" name="symbols/nori/street_lamp-18.svg:#444444::::">
-    <resourceStyle x="146" y="124" width="8" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="120" name="symbols/nori/generator_nuclear-18.svg:#444444::::">
-    <resourceStyle x="154" y="124" width="14" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="121" name="symbols/maki/rail-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:">
-    <resourceStyle x="168" y="124" width="12" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="122" name="symbols/maki/baseball-18.svg:#444444::::">
-    <resourceStyle x="180" y="124" width="12" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="123" name="symbols/maki/dam-18.svg:#444444::::">
-    <resourceStyle x="192" y="124" width="12" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="124" name="symbols/nori/information-18.svg:#444444::::">
-    <resourceStyle x="204" y="124" width="12" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="125" name="symbols/maki/telephone-18.svg:#444444::::">
-    <resourceStyle x="216" y="124" width="12" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="126" name="symbols/maki/ferry-18.svg:#444444::::">
-    <resourceStyle x="228" y="124" width="12" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="127" name="symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:">
-    <resourceStyle x="240" y="124" width="12" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="128" name="symbols/maki/tennis-18.svg:#444444::::">
-    <resourceStyle x="0" y="138" width="12" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="129" name="symbols/maki/harbor-18.svg:#444444::::">
-    <resourceStyle x="12" y="138" width="12" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="130" name="symbols/maki/rail-above-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:">
-    <resourceStyle x="24" y="138" width="12" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="131" name="symbols/maki/soccer-18.svg:#444444::::">
-    <resourceStyle x="36" y="138" width="12" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="132" name="symbols/maki/star-18.svg:#444444::::">
-    <resourceStyle x="48" y="138" width="12" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="133" name="symbols/maki/emergency-telephone-18.svg:#444444::::">
-    <resourceStyle x="60" y="138" width="12" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="134" name="symbols/maki/cricket-18.svg:#444444::::">
-    <resourceStyle x="72" y="138" width="12" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="135" name="symbols/maki/basketball-18.svg:#444444::::">
-    <resourceStyle x="84" y="138" width="12" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="136" name="symbols/maki/pitch-18.svg:#444444::::">
-    <resourceStyle x="96" y="138" width="10" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="137" name="symbols/maki/monument-18.svg:#444444::::">
-    <resourceStyle x="106" y="138" width="10" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="138" name="symbols/maki/golf-18.svg:#444444::::">
-    <resourceStyle x="116" y="138" width="10" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="139" name="symbols/maki/park2-18.svg:#008000::::">
-    <resourceStyle x="126" y="138" width="10" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="140" name="symbols/maki/park-18.svg:#008000::::">
-    <resourceStyle x="136" y="138" width="10" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="141" name="symbols/neta/bollard-18.svg:#444444::::">
-    <resourceStyle x="146" y="138" width="6" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="142" name="symbols/nori/storage_tank-18.svg:#444444::::">
-    <resourceStyle x="152" y="138" width="14" height="10"/>
-    </symbolStyle>
-  <symbolStyle id="143" name="symbols/nori/bench-18.svg:#444444::::">
-    <resourceStyle x="166" y="138" width="14" height="10"/>
-    </symbolStyle>
-  <symbolStyle id="144" name="symbols/maki/campsite-18.svg:#444444::::">
-    <resourceStyle x="180" y="138" width="12" height="10"/>
-    </symbolStyle>
-  <symbolStyle id="145" name="symbols/maki/art-gallery-18.svg:#444444::::">
-    <resourceStyle x="192" y="138" width="12" height="10"/>
-    </symbolStyle>
-  <symbolStyle id="146" name="symbols/maki/skiing-18.svg:#444444::::">
-    <resourceStyle x="204" y="138" width="12" height="10"/>
-    </symbolStyle>
-  <symbolStyle id="147" name="symbols/maki/swimming-18.svg:#0000FF::::">
-    <resourceStyle x="216" y="138" width="12" height="10"/>
-    </symbolStyle>
-  <symbolStyle id="148" name="symbols/maki/cemetery-18.svg:#444444::::">
-    <resourceStyle x="228" y="138" width="10" height="10"/>
-    </symbolStyle>
-  <symbolStyle id="149" name="symbols/maki/cross-12.svg:#444444::::">
-    <resourceStyle x="238" y="138" width="9" height="9"/>
-    </symbolStyle>
-  <symbolStyle id="150" name="symbols/maki/triangle-stroked-12.svg:#444444::::">
-    <resourceStyle x="247" y="138" width="9" height="9"/>
-    </symbolStyle>
-  <symbolStyle id="151" name="symbols/nori/power_tower-12.svg:#444444::::">
-    <resourceStyle x="0" y="150" width="9" height="9"/>
-    </symbolStyle>
-  <symbolStyle id="152" name="symbols/maki/triangle-12.svg:#444444::::">
-    <resourceStyle x="9" y="150" width="9" height="9"/>
-    </symbolStyle>
-  <symbolStyle id="153" name="symbols/maki/triangle-12.svg:#FF0000::::">
-    <resourceStyle x="18" y="150" width="9" height="9"/>
-    </symbolStyle>
-  <symbolStyle id="154" name="symbols/maki/roadblock-12.svg:#FF0000::::">
-    <resourceStyle x="27" y="150" width="9" height="9"/>
-    </symbolStyle>
-  <symbolStyle id="155" name="symbols/maki/america-football-18.svg:#444444::::">
-    <resourceStyle x="36" y="150" width="12" height="8"/>
-    </symbolStyle>
-  <symbolStyle id="156" name="symbols/maki/heliport-18.svg:#444444::::">
-    <resourceStyle x="48" y="150" width="12" height="8"/>
-    </symbolStyle>
-  <symbolStyle id="157" name="symbols/neta/entrance-18.svg:#444444::::">
-    <resourceStyle x="60" y="150" width="8" height="8"/>
-    </symbolStyle>
-  <symbolStyle id="158" name="symbols/maki/post-12.svg:#444444::::">
-    <resourceStyle x="68" y="150" width="9" height="7"/>
-    </symbolStyle>
-  <symbolStyle id="159" name="symbols/arrow.svg:::::">
-    <resourceStyle x="77" y="150" width="14" height="6"/>
-    </symbolStyle>
-  <symbolStyle id="160" name="symbols/neta/lift_gate-18.svg:#444444::::">
-    <resourceStyle x="91" y="150" width="10" height="6"/>
-    </symbolStyle>
+<skin>
+ <page width="256" height="256" file="symbols.png">
+  <symbolStyle id="1" name="peak-mini">
+   <resourceStyle width="20" x="0" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="2" name="peak">
+   <resourceStyle width="20" x="20" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="3" name="petrolstation">
+   <resourceStyle width="20" x="40" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="4" name="pharmacy">
+   <resourceStyle width="20" x="60" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="5" name="placemark-blue">
+   <resourceStyle width="16" x="80" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="6" name="placemark-brown">
+   <resourceStyle width="16" x="96" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="7" name="placemark-green">
+   <resourceStyle width="16" x="112" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="8" name="placemark-orange">
+   <resourceStyle width="16" x="128" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="9" name="placemark-pink">
+   <resourceStyle width="16" x="144" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="10" name="placemark-purple">
+   <resourceStyle width="16" x="160" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="11" name="placemark-red">
+   <resourceStyle width="16" x="176" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="12" name="placemark-yellow">
+   <resourceStyle width="16" x="192" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="13" name="playground">
+   <resourceStyle width="20" x="208" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="14" name="police">
+   <resourceStyle width="20" x="228" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="15" name="postbox">
+   <resourceStyle width="20" x="0" y="20" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="16" name="postoffice">
+   <resourceStyle width="20" x="20" y="20" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="17" name="pub">
+   <resourceStyle width="20" x="40" y="20" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="18" name="hostel">
+   <resourceStyle width="20" x="60" y="20" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="19" name="hotel">
+   <resourceStyle width="20" x="80" y="20" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="20" name="hunting_closed_high">
+   <resourceStyle width="20" x="100" y="20" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="21" name="information-guidepost">
+   <resourceStyle width="20" x="120" y="20" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="22" name="information-office">
+   <resourceStyle width="20" x="140" y="20" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="23" name="information">
+   <resourceStyle width="20" x="160" y="20" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="24" name="kindergarten">
+   <resourceStyle width="20" x="180" y="20" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="25" name="kindergarten2">
+   <resourceStyle width="20" x="200" y="20" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="26" name="kiosk">
+   <resourceStyle width="20" x="220" y="20" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="27" name="library">
+   <resourceStyle width="20" x="0" y="40" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="28" name="man-made-halfpipe">
+   <resourceStyle width="20" x="20" y="40" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="29" name="memorial">
+   <resourceStyle width="20" x="40" y="40" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="30" name="mountain_pass">
+   <resourceStyle width="20" x="60" y="40" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="31" name="museum">
+   <resourceStyle width="20" x="80" y="40" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="32" name="parking-mini">
+   <resourceStyle width="20" x="100" y="40" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="33" name="parking">
+   <resourceStyle width="20" x="120" y="40" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="34" name="parking_roof">
+   <resourceStyle width="20" x="140" y="40" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="35" name="subway-station-l">
+   <resourceStyle width="20" x="160" y="40" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="36" name="subway-station-m">
+   <resourceStyle width="20" x="180" y="40" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="37" name="subway-station-s">
+   <resourceStyle width="20" x="200" y="40" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="38" name="subway">
+   <resourceStyle width="20" x="220" y="40" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="39" name="supermarket">
+   <resourceStyle width="20" x="0" y="60" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="40" name="swimming-borderless">
+   <resourceStyle width="20" x="20" y="60" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="41" name="swimming">
+   <resourceStyle width="20" x="40" y="60" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="42" name="synagogue">
+   <resourceStyle width="20" x="60" y="60" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="43" name="taxi">
+   <resourceStyle width="20" x="80" y="60" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="44" name="telephone">
+   <resourceStyle width="20" x="100" y="60" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="45" name="tennis-borderless">
+   <resourceStyle width="20" x="120" y="60" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="46" name="tennis">
+   <resourceStyle width="20" x="140" y="60" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="47" name="theatre">
+   <resourceStyle width="20" x="160" y="60" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="48" name="toilets">
+   <resourceStyle width="20" x="180" y="60" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="49" name="tramway-mini">
+   <resourceStyle width="20" x="200" y="60" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="50" name="tramway">
+   <resourceStyle width="20" x="220" y="60" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="51" name="university">
+   <resourceStyle width="20" x="0" y="80" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="52" name="pubx">
+   <resourceStyle width="20" x="20" y="80" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="53" name="railway-crossing-small">
+   <resourceStyle width="20" x="40" y="80" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="54" name="railway-crossing">
+   <resourceStyle width="20" x="60" y="80" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="55" name="railway-station-mini">
+   <resourceStyle width="20" x="80" y="80" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="56" name="railway-station">
+   <resourceStyle width="20" x="100" y="80" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="57" name="recycling">
+   <resourceStyle width="20" x="120" y="80" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="58" name="religion">
+   <resourceStyle width="20" x="140" y="80" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="59" name="restaurant">
+   <resourceStyle width="20" x="160" y="80" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="60" name="ruins">
+   <resourceStyle width="20" x="180" y="80" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="61" name="school">
+   <resourceStyle width="20" x="200" y="80" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="62" name="shelter-fireplace">
+   <resourceStyle width="20" x="220" y="80" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="63" name="shelter">
+   <resourceStyle width="20" x="0" y="100" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="64" name="shooting-borderless">
+   <resourceStyle width="20" x="20" y="100" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="65" name="shooting">
+   <resourceStyle width="20" x="40" y="100" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="66" name="slipway">
+   <resourceStyle width="20" x="60" y="100" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="67" name="soccer-borderless">
+   <resourceStyle width="20" x="80" y="100" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="68" name="soccer">
+   <resourceStyle width="20" x="100" y="100" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="69" name="bakery">
+   <resourceStyle width="20" x="120" y="100" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="70" name="earthquakecamp">
+   <resourceStyle width="20" x="140" y="100" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="71" name="dog_park">
+   <resourceStyle width="20" x="160" y="100" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="72" name="bar">
+   <resourceStyle width="20" x="180" y="100" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="73" name="barrier">
+   <resourceStyle width="20" x="200" y="100" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="74" name="diving">
+   <resourceStyle width="20" x="220" y="100" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="75" name="diving-borderless">
+   <resourceStyle width="20" x="0" y="120" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="76" name="baseball-borderless">
+   <resourceStyle width="20" x="20" y="120" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="77" name="current-position">
+   <resourceStyle width="20" x="40" y="120" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="78" name="curling">
+   <resourceStyle width="20" x="60" y="120" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="79" name="curling-borderless">
+   <resourceStyle width="20" x="80" y="120" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="80" name="cricket">
+   <resourceStyle width="20" x="100" y="120" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="81" name="cricket-borderless">
+   <resourceStyle width="20" x="120" y="120" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="82" name="clothes">
+   <resourceStyle width="20" x="140" y="120" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="83" name="cinema">
+   <resourceStyle width="20" x="160" y="120" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="84" name="baseball">
+   <resourceStyle width="20" x="180" y="120" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="85" name="basketball">
+   <resourceStyle width="20" x="200" y="120" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="86" name="bicycle_rental">
+   <resourceStyle width="20" x="220" y="120" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="87" name="bird">
+   <resourceStyle width="20" x="0" y="140" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="88" name="bowls-borderless">
+   <resourceStyle width="20" x="20" y="140" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="89" name="bowls">
+   <resourceStyle width="20" x="40" y="140" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="90" name="castle">
+   <resourceStyle width="20" x="60" y="140" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="91" name="bus-mini">
+   <resourceStyle width="20" x="80" y="140" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="92" name="car_repair">
+   <resourceStyle width="20" x="100" y="140" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="93" name="car_rental">
+   <resourceStyle width="20" x="120" y="140" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="94" name="cannon">
+   <resourceStyle width="20" x="140" y="140" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="95" name="campsite">
+   <resourceStyle width="20" x="160" y="140" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="96" name="cafe">
+   <resourceStyle width="20" x="180" y="140" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="97" name="bus_sta">
+   <resourceStyle width="20" x="200" y="140" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="98" name="bus">
+   <resourceStyle width="20" x="220" y="140" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="99" name="hospital0">
+   <resourceStyle width="20" x="0" y="160" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="100" name="hospital">
+   <resourceStyle width="20" x="20" y="160" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="101" name="airport">
+   <resourceStyle width="20" x="40" y="160" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="102" name="helipad">
+   <resourceStyle width="20" x="60" y="160" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="103" name="handball">
+   <resourceStyle width="20" x="80" y="160" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="104" name="handball-borderless">
+   <resourceStyle width="20" x="100" y="160" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="105" name="hairdresser">
+   <resourceStyle width="20" x="120" y="160" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="106" name="gymnastics">
+   <resourceStyle width="20" x="140" y="160" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="107" name="gymnastics-borderless">
+   <resourceStyle width="20" x="160" y="160" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="108" name="golfcourse">
+   <resourceStyle width="20" x="180" y="160" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="109" name="gate">
+   <resourceStyle width="20" x="200" y="160" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="110" name="alpine_hut">
+   <resourceStyle width="20" x="220" y="160" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="111" name="fountain">
+   <resourceStyle width="20" x="0" y="180" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="112" name="football">
+   <resourceStyle width="20" x="20" y="180" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="113" name="api_pin">
+   <resourceStyle width="16" x="40" y="180" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="114" name="atm">
+   <resourceStyle width="20" x="56" y="180" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="115" name="athletics">
+   <resourceStyle width="20" x="76" y="180" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="116" name="equestrian-borderless">
+   <resourceStyle width="20" x="96" y="180" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="117" name="athletics-borderless">
+   <resourceStyle width="20" x="116" y="180" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="118" name="arrow">
+   <resourceStyle width="20" x="136" y="180" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="119" name="archery">
+   <resourceStyle width="20" x="156" y="180" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="120" name="equestrian">
+   <resourceStyle width="20" x="176" y="180" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="121" name="fastfood">
+   <resourceStyle width="20" x="196" y="180" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="122" name="archery-borderless">
+   <resourceStyle width="20" x="216" y="180" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="123" name="firebrigade">
+   <resourceStyle width="20" x="236" y="180" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="124" name="football-borderless">
+   <resourceStyle width="20" x="0" y="200" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="125" name="khanda">
+   <resourceStyle width="19" x="20" y="200" height="19"/>
+  </symbolStyle>
+  <symbolStyle id="126" name="basketball-borderless">
+   <resourceStyle width="20" x="39" y="200" height="19"/>
+  </symbolStyle>
+  <symbolStyle id="127" name="parking-permissive">
+   <resourceStyle width="17" x="59" y="200" height="17"/>
+  </symbolStyle>
+  <symbolStyle id="128" name="parking-private">
+   <resourceStyle width="17" x="76" y="200" height="17"/>
+  </symbolStyle>
+  <symbolStyle id="129" name="speed_trap">
+   <resourceStyle width="16" x="93" y="200" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="130" name="bank">
+   <resourceStyle width="16" x="109" y="200" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="131" name="traffic_signal">
+   <resourceStyle width="16" x="125" y="200" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="132" name="windmill">
+   <resourceStyle width="16" x="141" y="200" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="133" name="embassy">
+   <resourceStyle width="16" x="157" y="200" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="134" name="drinking_water">
+   <resourceStyle width="16" x="173" y="200" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="135" name="parking_roof-permissive">
+   <resourceStyle width="16" x="189" y="200" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="136" name="mosque">
+   <resourceStyle width="16" x="205" y="200" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="137" name="doctor">
+   <resourceStyle width="16" x="221" y="200" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="138" name="church">
+   <resourceStyle width="16" x="237" y="200" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="139" name="housenumber">
+   <resourceStyle width="16" x="0" y="220" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="140" name="roundabout_left">
+   <resourceStyle width="16" x="16" y="220" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="141" name="roundabout_right">
+   <resourceStyle width="16" x="32" y="220" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="142" name="power_photovoltaic">
+   <resourceStyle width="15" x="48" y="220" height="15"/>
+  </symbolStyle>
+  <symbolStyle id="143" name="power_hydro">
+   <resourceStyle width="15" x="63" y="220" height="15"/>
+  </symbolStyle>
+  <symbolStyle id="144" name="wastewater">
+   <resourceStyle width="15" x="78" y="220" height="15"/>
+  </symbolStyle>
+  <symbolStyle id="145" name="power_generic">
+   <resourceStyle width="15" x="93" y="220" height="15"/>
+  </symbolStyle>
+  <symbolStyle id="146" name="viewpoint">
+   <resourceStyle width="15" x="108" y="220" height="15"/>
+  </symbolStyle>
+  <symbolStyle id="147" name="power_wind">
+   <resourceStyle width="15" x="123" y="220" height="15"/>
+  </symbolStyle>
+  <symbolStyle id="148" name="cave_entrance">
+   <resourceStyle width="15" x="138" y="220" height="15"/>
+  </symbolStyle>
+  <symbolStyle id="149" name="lighthouse">
+   <resourceStyle width="15" x="153" y="220" height="15"/>
+  </symbolStyle>
+  <symbolStyle id="150" name="bureau_de_change">
+   <resourceStyle width="15" x="168" y="220" height="15"/>
+  </symbolStyle>
+  <symbolStyle id="151" name="car_sharing">
+   <resourceStyle width="15" x="183" y="220" height="14"/>
+  </symbolStyle>
+  <symbolStyle id="152" name="hotel_and_restaurant">
+   <resourceStyle width="13" x="198" y="220" height="13"/>
+  </symbolStyle>
+  <symbolStyle id="153" name="parking_roof_fee">
+   <resourceStyle width="20" x="211" y="220" height="12"/>
+  </symbolStyle>
+  <symbolStyle id="154" name="parking_roof_fee-permissive">
+   <resourceStyle width="20" x="231" y="220" height="12"/>
+  </symbolStyle>
+  <symbolStyle id="155" name="picnic">
+   <resourceStyle width="12" x="0" y="236" height="12"/>
+  </symbolStyle>
+  <symbolStyle id="156" name="parking_fee">
+   <resourceStyle width="20" x="12" y="236" height="12"/>
+  </symbolStyle>
+  <symbolStyle id="157" name="parking_fee-permissive">
+   <resourceStyle width="20" x="32" y="236" height="12"/>
+  </symbolStyle>
+  <symbolStyle id="158" name="park_and_ride">
+   <resourceStyle width="20" x="52" y="236" height="12"/>
+  </symbolStyle>
+  <symbolStyle id="159" name="park_and_ride-permissive">
+   <resourceStyle width="20" x="72" y="236" height="12"/>
+  </symbolStyle>
+  <symbolStyle id="160" name="bench">
+   <resourceStyle width="12" x="92" y="236" height="12"/>
+  </symbolStyle>
+  <symbolStyle id="161" name="disused">
+   <resourceStyle width="10" x="104" y="236" height="10"/>
+  </symbolStyle>
+  <symbolStyle id="162" name="power-tower">
+   <resourceStyle width="10" x="114" y="236" height="10"/>
+  </symbolStyle>
+  <symbolStyle id="163" name="vulcan">
+   <resourceStyle width="10" x="124" y="236" height="10"/>
+  </symbolStyle>
+  <symbolStyle id="164" name="building">
+   <resourceStyle width="10" x="134" y="236" height="10"/>
+  </symbolStyle>
+  <symbolStyle id="165" name="survey_point">
+   <resourceStyle width="9" x="144" y="236" height="9"/>
+  </symbolStyle>
+  <symbolStyle id="166" name="tree">
+   <resourceStyle width="7" x="153" y="236" height="7"/>
+  </symbolStyle>
+  <symbolStyle id="167" name="power-pole">
+   <resourceStyle width="7" x="160" y="236" height="7"/>
+  </symbolStyle>
  </page>
-    </skin>
+</skin>
diff --git a/data/resources-ldpi/symbols.png b/data/resources-ldpi/symbols.png
index 0099a70f20..b507349876 100644
--- a/data/resources-ldpi/symbols.png
+++ b/data/resources-ldpi/symbols.png
diff --git a/data/resources-mdpi/basic.skn b/data/resources-mdpi/basic.skn
index 51479b0e7d..2afa66ed88 100644
--- a/data/resources-mdpi/basic.skn
+++ b/data/resources-mdpi/basic.skn
@@ -1,485 +1,506 @@
 <!DOCTYPE skin>
-    <skin>
-    <page width="256" height="512" file="symbols.png">
-  <symbolStyle id="1" name="symbols/nori/motorcycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="0" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="2" name="symbols/maki/music-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="24" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="3" name="symbols/maki/campsite-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:">
-    <resourceStyle x="48" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="4" name="symbols/maki/place-of-worship-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="72" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="5" name="symbols/nori/dry_cleaning-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="96" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="6" name="symbols/nori/grave_yard-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="120" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="7" name="symbols/nori/pharmacy-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:">
-    <resourceStyle x="144" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="8" name="symbols/nori/pub-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="168" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="9" name="symbols/maki/fast-food-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="192" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="10" name="symbols/maki/library-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="216" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="11" name="api_pin">
-    <resourceStyle x="240" y="0" width="14" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="12" name="symbols/nori/hindu-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="0" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="13" name="symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="24" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="14" name="symbols/maki/bicycle-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="48" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="15" name="symbols/nori/fire_hydrant-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:">
-    <resourceStyle x="72" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="16" name="symbols/maki/school-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="96" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="17" name="symbols/maki/cafe-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="120" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="18" name="symbols/maki/cinema-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="144" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="19" name="symbols/maki/prison-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="168" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="20" name="symbols/maki/post-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="192" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="21" name="symbols/nori/gambling-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="216" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="22" name="placemark-blue">
-    <resourceStyle x="240" y="24" width="14" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="23" name="symbols/nori/carpenter-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="0" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="24" name="symbols/nori/kindergarten-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="24" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="25" name="symbols/maki/embassy-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="48" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="26" name="symbols/maki/bank-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:">
-    <resourceStyle x="72" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="27" name="symbols/nori/money_transfer-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:">
-    <resourceStyle x="96" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="28" name="symbols/maki/theatre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="120" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="29" name="symbols/nori/atm-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:">
-    <resourceStyle x="144" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="30" name="symbols/maki/restaurant-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="168" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="31" name="symbols/nori/information-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="192" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="32" name="symbols/nori/hardware-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="216" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="33" name="placemark-yellow">
-    <resourceStyle x="240" y="48" width="14" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="34" name="symbols/maki/toilets-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="0" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="35" name="symbols/maki/bar-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="24" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="36" name="symbols/nori/beverages-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="48" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="37" name="symbols/maki/religious-christian-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="72" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="38" name="symbols/nori/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="96" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="39" name="symbols/nori/photo-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="120" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="40" name="symbols/maki/museum-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="144" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="41" name="symbols/maki/college-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="168" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="42" name="symbols/nori/shoemaker-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="192" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="43" name="symbols/maki/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="216" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="44" name="placemark-purple">
-    <resourceStyle x="240" y="72" width="14" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="45" name="symbols/nori/dentist-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:">
-    <resourceStyle x="0" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="46" name="symbols/nori/car_rental-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="24" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="47" name="symbols/maki/alcohol-shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="48" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="48" name="symbols/nori/car_parts-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="72" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="49" name="symbols/maki/fire-station-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:">
-    <resourceStyle x="96" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="50" name="symbols/nori/craft-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="120" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="51" name="symbols/nori/ngo-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="144" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="52" name="symbols/nori/social_facility-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="168" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="53" name="symbols/nori/computer-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="192" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="54" name="symbols/nori/tailor-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="216" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="55" name="placemark-brown">
-    <resourceStyle x="240" y="96" width="14" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="56" name="symbols/maki/bicycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="0" y="120" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="57" name="symbols/nori/government-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="24" y="120" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="58" name="symbols/nori/car_repair-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="48" y="120" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="59" name="symbols/maki/emergency-telephone-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:">
-    <resourceStyle x="72" y="120" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="60" name="symbols/nori/hairdresser-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="96" y="120" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="61" name="symbols/nori/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="120" y="120" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="62" name="symbols/nori/mobile_phone-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="144" y="120" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="63" name="symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="168" y="120" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="64" name="symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="192" y="120" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="65" name="symbols/maki/police-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="216" y="120" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="66" name="placemark-red">
-    <resourceStyle x="240" y="120" width="14" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="67" name="symbols/maki/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:">
-    <resourceStyle x="0" y="144" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="68" name="symbols/maki/garden-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="24" y="144" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="69" name="symbols/nori/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:">
-    <resourceStyle x="48" y="144" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="70" name="symbols/nori/courthouse-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="72" y="144" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="71" name="symbols/nori/bureau_de_change-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:">
-    <resourceStyle x="96" y="144" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="72" name="symbols/nori/clothes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="120" y="144" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="73" name="symbols/neta/shoes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="144" y="144" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="74" name="symbols/maki/slaughterhouse-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="168" y="144" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="75" name="symbols/maki/religious-jewish-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="192" y="144" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="76" name="symbols/maki/religious-muslim-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="216" y="144" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="77" name="placemark-pink">
-    <resourceStyle x="240" y="144" width="14" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="78" name="symbols/maki/library-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="0" y="168" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="79" name="symbols/nori/community_centre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="24" y="168" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="80" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="48" y="168" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="81" name="symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="68" y="168" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="82" name="symbols/nori/taxi-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="88" y="168" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="83" name="symbols/maki/bus-18.svg:#FFFFFF:#000080:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="108" y="168" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="84" name="symbols/maki/rail-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="128" y="168" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="85" name="symbols/maki/airport-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="148" y="168" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="86" name="symbols/maki/fuel-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="168" y="168" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="87" name="symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="188" y="168" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="88" name="symbols/maki/bicycle-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="208" y="168" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="89" name="symbols/maki/bus-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="228" y="168" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="90" name="symbols/neta/bollard-18.svg:#444444::::">
-    <resourceStyle x="248" y="168" width="6" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="91" name="symbols/maki/rail-above-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="0" y="192" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="92" name="symbols/maki/parking-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="20" y="192" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="93" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="40" y="192" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="94" name="symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="60" y="192" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="95" name="placemark-orange">
-    <resourceStyle x="80" y="192" width="14" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="96" name="placemark-green">
-    <resourceStyle x="94" y="192" width="14" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="97" name="symbols/nori/recycling-18.svg:#444444::::">
-    <resourceStyle x="108" y="192" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="98" name="symbols/nori/shower-18.svg:#444444::::">
-    <resourceStyle x="126" y="192" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="99" name="symbols/nori/pump-manual-18.svg:#0000FF::::">
-    <resourceStyle x="144" y="192" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="100" name="symbols/nori/watermill-18.svg:#444444::::">
-    <resourceStyle x="162" y="192" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="101" name="symbols/maki/telephone-18.svg:#444444::::">
-    <resourceStyle x="180" y="192" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="102" name="symbols/nori/pump-powered-18.svg:#0000FF::::">
-    <resourceStyle x="198" y="192" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="103" name="symbols/nori/border_control-18.svg:#444444::::">
-    <resourceStyle x="216" y="192" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="104" name="symbols/nori/grave_yard-18.svg:#444444::::">
-    <resourceStyle x="234" y="192" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="105" name="symbols/nori/beach_resort-18.svg:#444444::::">
-    <resourceStyle x="0" y="212" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="106" name="symbols/nori/camp_site-18.svg:#444444::::">
-    <resourceStyle x="18" y="212" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="107" name="symbols/maki/ferry-18.svg:#444444::::">
-    <resourceStyle x="36" y="212" width="16" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="108" name="symbols/nori/generator_wind-18.svg:#444444::::">
-    <resourceStyle x="52" y="212" width="16" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="109" name="symbols/nori/bucket-18.svg:#0000FF::::">
-    <resourceStyle x="68" y="212" width="16" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="110" name="symbols/nori/drinking_water_well-18.svg:#0000FF::::">
-    <resourceStyle x="84" y="212" width="16" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="111" name="symbols/nori/playground-18.svg:#444444::::">
-    <resourceStyle x="100" y="212" width="16" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="112" name="symbols/maki/emergency-telephone-18.svg:#444444::::">
-    <resourceStyle x="116" y="212" width="16" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="113" name="symbols/nori/viewpoint-18.svg:#444444::::">
-    <resourceStyle x="132" y="212" width="16" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="114" name="symbols/nori/drinking_water-18.svg:#0000FF::::">
-    <resourceStyle x="148" y="212" width="14" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="115" name="symbols/nori/communication-tower-18.svg:#444444::::">
-    <resourceStyle x="162" y="212" width="14" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="116" name="symbols/nori/fire_hydrant-18.svg:#444444::::">
-    <resourceStyle x="176" y="212" width="12" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="117" name="symbols/nori/water_tower-18.svg:#444444::::">
-    <resourceStyle x="188" y="212" width="12" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="118" name="symbols/nori/waste_basket-18.svg:#444444::::">
-    <resourceStyle x="200" y="212" width="12" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="119" name="symbols/nori/street_lamp-18.svg:#444444::::">
-    <resourceStyle x="212" y="212" width="10" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="120" name="symbols/maki/rail-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:">
-    <resourceStyle x="222" y="212" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="121" name="current-position">
-    <resourceStyle x="238" y="212" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="122" name="symbols/maki/baseball-18.svg:#444444::::">
-    <resourceStyle x="0" y="230" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="123" name="symbols/maki/dam-18.svg:#444444::::">
-    <resourceStyle x="16" y="230" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="124" name="symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:">
-    <resourceStyle x="32" y="230" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="125" name="symbols/maki/tennis-18.svg:#444444::::">
-    <resourceStyle x="48" y="230" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="126" name="symbols/maki/harbor-18.svg:#444444::::">
-    <resourceStyle x="64" y="230" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="127" name="symbols/nori/generator-18.svg:#444444::::">
-    <resourceStyle x="80" y="230" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="128" name="symbols/maki/rail-above-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:">
-    <resourceStyle x="96" y="230" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="129" name="symbols/maki/soccer-18.svg:#444444::::">
-    <resourceStyle x="112" y="230" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="130" name="symbols/maki/star-18.svg:#444444::::">
-    <resourceStyle x="128" y="230" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="131" name="symbols/maki/cricket-18.svg:#444444::::">
-    <resourceStyle x="144" y="230" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="132" name="symbols/nori/generator_nuclear-18.svg:#444444::::">
-    <resourceStyle x="160" y="230" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="133" name="symbols/nori/generator_solar-18.svg:#444444::::">
-    <resourceStyle x="176" y="230" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="134" name="symbols/maki/basketball-18.svg:#444444::::">
-    <resourceStyle x="192" y="230" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="135" name="symbols/nori/dry_cleaning-18.svg:#444444::::">
-    <resourceStyle x="208" y="230" width="14" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="136" name="symbols/maki/monument-18.svg:#444444::::">
-    <resourceStyle x="222" y="230" width="14" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="137" name="symbols/maki/cemetery-18.svg:#444444::::">
-    <resourceStyle x="236" y="230" width="12" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="138" name="symbols/maki/pitch-18.svg:#444444::::">
-    <resourceStyle x="0" y="246" width="12" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="139" name="symbols/maki/golf-18.svg:#444444::::">
-    <resourceStyle x="12" y="246" width="12" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="140" name="symbols/maki/park2-18.svg:#008000::::">
-    <resourceStyle x="24" y="246" width="12" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="141" name="symbols/maki/park-18.svg:#008000::::">
-    <resourceStyle x="36" y="246" width="12" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="142" name="symbols/maki/art-gallery-18.svg:#444444::::">
-    <resourceStyle x="48" y="246" width="18" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="143" name="symbols/nori/storage_tank-18.svg:#444444::::">
-    <resourceStyle x="66" y="246" width="18" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="144" name="symbols/maki/skiing-18.svg:#444444::::">
-    <resourceStyle x="84" y="246" width="16" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="145" name="symbols/maki/swimming-18.svg:#0000FF::::">
-    <resourceStyle x="100" y="246" width="16" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="146" name="symbols/nori/information-18.svg:#444444::::">
-    <resourceStyle x="116" y="246" width="14" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="147" name="symbols/nori/bench-18.svg:#444444::::">
-    <resourceStyle x="130" y="246" width="18" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="148" name="symbols/maki/america-football-18.svg:#444444::::">
-    <resourceStyle x="148" y="246" width="18" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="149" name="symbols/maki/campsite-18.svg:#444444::::">
-    <resourceStyle x="166" y="246" width="16" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="150" name="symbols/maki/heliport-18.svg:#444444::::">
-    <resourceStyle x="182" y="246" width="16" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="151" name="symbols/maki/cross-12.svg:#444444::::">
-    <resourceStyle x="198" y="246" width="12" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="152" name="symbols/maki/roadblock-12.svg:#FF0000::::">
-    <resourceStyle x="210" y="246" width="12" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="153" name="symbols/nori/power_tower-12.svg:#444444::::">
-    <resourceStyle x="222" y="246" width="10" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="154" name="symbols/maki/triangle-stroked-12.svg:#444444::::">
-    <resourceStyle x="232" y="246" width="12" height="10"/>
-    </symbolStyle>
-  <symbolStyle id="155" name="symbols/maki/triangle-12.svg:#444444::::">
-    <resourceStyle x="244" y="246" width="12" height="10"/>
-    </symbolStyle>
-  <symbolStyle id="156" name="symbols/maki/triangle-12.svg:#FF0000::::">
-    <resourceStyle x="0" y="262" width="12" height="10"/>
-    </symbolStyle>
-  <symbolStyle id="157" name="symbols/neta/lift_gate-18.svg:#444444::::">
-    <resourceStyle x="12" y="262" width="12" height="8"/>
-    </symbolStyle>
-  <symbolStyle id="158" name="symbols/maki/post-12.svg:#444444::::">
-    <resourceStyle x="24" y="262" width="12" height="8"/>
-    </symbolStyle>
-  <symbolStyle id="159" name="symbols/neta/entrance-18.svg:#444444::::">
-    <resourceStyle x="36" y="262" width="10" height="8"/>
-    </symbolStyle>
-  <symbolStyle id="160" name="symbols/arrow.svg:::::">
-    <resourceStyle x="46" y="262" width="18" height="6"/>
-    </symbolStyle>
+<skin>
+ <page width="512" height="256" file="symbols.png">
+  <symbolStyle id="1" name="api_pin">
+   <resourceStyle width="22" x="0" y="0" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="2" name="placemark-blue">
+   <resourceStyle width="22" x="22" y="0" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="3" name="placemark-brown">
+   <resourceStyle width="22" x="44" y="0" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="4" name="placemark-yellow">
+   <resourceStyle width="22" x="66" y="0" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="5" name="placemark-red">
+   <resourceStyle width="22" x="88" y="0" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="6" name="current-position">
+   <resourceStyle width="28" x="110" y="0" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="7" name="placemark-purple">
+   <resourceStyle width="22" x="138" y="0" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="8" name="placemark-pink">
+   <resourceStyle width="22" x="160" y="0" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="9" name="placemark-orange">
+   <resourceStyle width="22" x="182" y="0" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="10" name="placemark-green">
+   <resourceStyle width="22" x="204" y="0" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="11" name="peak">
+   <resourceStyle width="20" x="226" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="12" name="petrolstation">
+   <resourceStyle width="20" x="246" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="13" name="pharmacy">
+   <resourceStyle width="20" x="266" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="14" name="playground">
+   <resourceStyle width="20" x="286" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="15" name="police">
+   <resourceStyle width="20" x="306" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="16" name="postbox">
+   <resourceStyle width="20" x="326" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="17" name="postoffice">
+   <resourceStyle width="20" x="346" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="18" name="pub">
+   <resourceStyle width="20" x="366" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="19" name="hotel">
+   <resourceStyle width="20" x="386" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="20" name="hunting_closed_high">
+   <resourceStyle width="20" x="406" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="21" name="information-guidepost">
+   <resourceStyle width="20" x="426" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="22" name="information-office">
+   <resourceStyle width="20" x="446" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="23" name="information">
+   <resourceStyle width="20" x="466" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="24" name="kindergarten">
+   <resourceStyle width="20" x="486" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="25" name="kindergarten2">
+   <resourceStyle width="20" x="0" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="26" name="kiosk">
+   <resourceStyle width="20" x="20" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="27" name="library">
+   <resourceStyle width="20" x="40" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="28" name="man-made-halfpipe">
+   <resourceStyle width="20" x="60" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="29" name="memorial">
+   <resourceStyle width="20" x="80" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="30" name="mountain_pass">
+   <resourceStyle width="20" x="100" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="31" name="museum">
+   <resourceStyle width="20" x="120" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="32" name="parking-mini">
+   <resourceStyle width="20" x="140" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="33" name="parking">
+   <resourceStyle width="20" x="160" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="34" name="parking_roof">
+   <resourceStyle width="20" x="180" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="35" name="peak-mini">
+   <resourceStyle width="20" x="200" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="36" name="subway-station-l">
+   <resourceStyle width="20" x="220" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="37" name="subway-station-m">
+   <resourceStyle width="20" x="240" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="38" name="subway-station-s">
+   <resourceStyle width="20" x="260" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="39" name="subway">
+   <resourceStyle width="20" x="280" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="40" name="supermarket">
+   <resourceStyle width="20" x="300" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="41" name="swimming-borderless">
+   <resourceStyle width="20" x="320" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="42" name="swimming">
+   <resourceStyle width="20" x="340" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="43" name="synagogue">
+   <resourceStyle width="20" x="360" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="44" name="taxi">
+   <resourceStyle width="20" x="380" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="45" name="telephone">
+   <resourceStyle width="20" x="400" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="46" name="tennis-borderless">
+   <resourceStyle width="20" x="420" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="47" name="tennis">
+   <resourceStyle width="20" x="440" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="48" name="theatre">
+   <resourceStyle width="20" x="460" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="49" name="toilets">
+   <resourceStyle width="20" x="480" y="28" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="50" name="tramway-mini">
+   <resourceStyle width="20" x="0" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="51" name="tramway">
+   <resourceStyle width="20" x="20" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="52" name="university">
+   <resourceStyle width="20" x="40" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="53" name="pubx">
+   <resourceStyle width="20" x="60" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="54" name="railway-crossing-small">
+   <resourceStyle width="20" x="80" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="55" name="railway-crossing">
+   <resourceStyle width="20" x="100" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="56" name="railway-station-mini">
+   <resourceStyle width="20" x="120" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="57" name="railway-station">
+   <resourceStyle width="20" x="140" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="58" name="recycling">
+   <resourceStyle width="20" x="160" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="59" name="religion">
+   <resourceStyle width="20" x="180" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="60" name="restaurant">
+   <resourceStyle width="20" x="200" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="61" name="ruins">
+   <resourceStyle width="20" x="220" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="62" name="school">
+   <resourceStyle width="20" x="240" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="63" name="shelter-fireplace">
+   <resourceStyle width="20" x="260" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="64" name="shelter">
+   <resourceStyle width="20" x="280" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="65" name="shooting-borderless">
+   <resourceStyle width="20" x="300" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="66" name="shooting">
+   <resourceStyle width="20" x="320" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="67" name="slipway">
+   <resourceStyle width="20" x="340" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="68" name="soccer-borderless">
+   <resourceStyle width="20" x="360" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="69" name="soccer">
+   <resourceStyle width="20" x="380" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="70" name="equestrian">
+   <resourceStyle width="20" x="400" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="71" name="equestrian-borderless">
+   <resourceStyle width="20" x="420" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="72" name="earthquakecamp">
+   <resourceStyle width="20" x="440" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="73" name="bar">
+   <resourceStyle width="20" x="460" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="74" name="barrier">
+   <resourceStyle width="20" x="480" y="48" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="75" name="dog_park">
+   <resourceStyle width="20" x="0" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="76" name="baseball-borderless">
+   <resourceStyle width="20" x="20" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="77" name="diving">
+   <resourceStyle width="20" x="40" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="78" name="diving-borderless">
+   <resourceStyle width="20" x="60" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="79" name="baseball">
+   <resourceStyle width="20" x="80" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="80" name="curling">
+   <resourceStyle width="20" x="100" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="81" name="curling-borderless">
+   <resourceStyle width="20" x="120" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="82" name="cricket">
+   <resourceStyle width="20" x="140" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="83" name="cricket-borderless">
+   <resourceStyle width="20" x="160" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="84" name="clothes">
+   <resourceStyle width="20" x="180" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="85" name="cinema">
+   <resourceStyle width="20" x="200" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="86" name="basketball">
+   <resourceStyle width="20" x="220" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="87" name="bicycle_rental">
+   <resourceStyle width="20" x="240" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="88" name="bird">
+   <resourceStyle width="20" x="260" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="89" name="bowls-borderless">
+   <resourceStyle width="20" x="280" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="90" name="bowls">
+   <resourceStyle width="20" x="300" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="91" name="bus-mini">
+   <resourceStyle width="20" x="320" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="92" name="castle">
+   <resourceStyle width="20" x="340" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="93" name="bus">
+   <resourceStyle width="20" x="360" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="94" name="car_repair">
+   <resourceStyle width="20" x="380" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="95" name="car_rental">
+   <resourceStyle width="20" x="400" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="96" name="cannon">
+   <resourceStyle width="20" x="420" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="97" name="campsite">
+   <resourceStyle width="20" x="440" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="98" name="cafe">
+   <resourceStyle width="20" x="460" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="99" name="bus_sta">
+   <resourceStyle width="20" x="480" y="68" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="100" name="hostel">
+   <resourceStyle width="20" x="0" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="101" name="airport">
+   <resourceStyle width="20" x="20" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="102" name="hospital0">
+   <resourceStyle width="20" x="40" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="103" name="hospital">
+   <resourceStyle width="20" x="60" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="104" name="helipad">
+   <resourceStyle width="20" x="80" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="105" name="handball">
+   <resourceStyle width="20" x="100" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="106" name="handball-borderless">
+   <resourceStyle width="20" x="120" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="107" name="hairdresser">
+   <resourceStyle width="20" x="140" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="108" name="gymnastics">
+   <resourceStyle width="20" x="160" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="109" name="gymnastics-borderless">
+   <resourceStyle width="20" x="180" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="110" name="alpine_hut">
+   <resourceStyle width="20" x="200" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="111" name="golfcourse">
+   <resourceStyle width="20" x="220" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="112" name="gate">
+   <resourceStyle width="20" x="240" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="113" name="archery-borderless">
+   <resourceStyle width="20" x="260" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="114" name="bakery">
+   <resourceStyle width="20" x="280" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="115" name="atm">
+   <resourceStyle width="20" x="300" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="116" name="fastfood">
+   <resourceStyle width="20" x="320" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="117" name="athletics">
+   <resourceStyle width="20" x="340" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="118" name="athletics-borderless">
+   <resourceStyle width="20" x="360" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="119" name="arrow">
+   <resourceStyle width="20" x="380" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="120" name="firebrigade">
+   <resourceStyle width="20" x="400" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="121" name="football-borderless">
+   <resourceStyle width="20" x="420" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="122" name="archery">
+   <resourceStyle width="20" x="440" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="123" name="football">
+   <resourceStyle width="20" x="460" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="124" name="fountain">
+   <resourceStyle width="20" x="480" y="88" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="125" name="khanda">
+   <resourceStyle width="19" x="0" y="108" height="19"/>
+  </symbolStyle>
+  <symbolStyle id="126" name="basketball-borderless">
+   <resourceStyle width="20" x="19" y="108" height="19"/>
+  </symbolStyle>
+  <symbolStyle id="127" name="parking-permissive">
+   <resourceStyle width="17" x="39" y="108" height="17"/>
+  </symbolStyle>
+  <symbolStyle id="128" name="parking-private">
+   <resourceStyle width="17" x="56" y="108" height="17"/>
+  </symbolStyle>
+  <symbolStyle id="129" name="speed_trap">
+   <resourceStyle width="16" x="73" y="108" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="130" name="traffic_signal">
+   <resourceStyle width="16" x="89" y="108" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="131" name="bank">
+   <resourceStyle width="16" x="105" y="108" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="132" name="windmill">
+   <resourceStyle width="16" x="121" y="108" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="133" name="housenumber">
+   <resourceStyle width="16" x="137" y="108" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="134" name="mosque">
+   <resourceStyle width="16" x="153" y="108" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="135" name="parking_roof-permissive">
+   <resourceStyle width="16" x="169" y="108" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="136" name="embassy">
+   <resourceStyle width="16" x="185" y="108" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="137" name="drinking_water">
+   <resourceStyle width="16" x="201" y="108" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="138" name="doctor">
+   <resourceStyle width="16" x="217" y="108" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="139" name="church">
+   <resourceStyle width="16" x="233" y="108" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="140" name="roundabout_right">
+   <resourceStyle width="16" x="249" y="108" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="141" name="roundabout_left">
+   <resourceStyle width="16" x="265" y="108" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="142" name="power_wind">
+   <resourceStyle width="15" x="281" y="108" height="15"/>
+  </symbolStyle>
+  <symbolStyle id="143" name="power_photovoltaic">
+   <resourceStyle width="15" x="296" y="108" height="15"/>
+  </symbolStyle>
+  <symbolStyle id="144" name="power_hydro">
+   <resourceStyle width="15" x="311" y="108" height="15"/>
+  </symbolStyle>
+  <symbolStyle id="145" name="power_generic">
+   <resourceStyle width="15" x="326" y="108" height="15"/>
+  </symbolStyle>
+  <symbolStyle id="146" name="wastewater">
+   <resourceStyle width="15" x="341" y="108" height="15"/>
+  </symbolStyle>
+  <symbolStyle id="147" name="viewpoint">
+   <resourceStyle width="15" x="356" y="108" height="15"/>
+  </symbolStyle>
+  <symbolStyle id="148" name="lighthouse">
+   <resourceStyle width="15" x="371" y="108" height="15"/>
+  </symbolStyle>
+  <symbolStyle id="149" name="bureau_de_change">
+   <resourceStyle width="15" x="386" y="108" height="15"/>
+  </symbolStyle>
+  <symbolStyle id="150" name="cave_entrance">
+   <resourceStyle width="15" x="401" y="108" height="15"/>
+  </symbolStyle>
+  <symbolStyle id="151" name="car_sharing">
+   <resourceStyle width="15" x="416" y="108" height="14"/>
+  </symbolStyle>
+  <symbolStyle id="152" name="hotel_and_restaurant">
+   <resourceStyle width="13" x="431" y="108" height="13"/>
+  </symbolStyle>
+  <symbolStyle id="153" name="parking_roof_fee">
+   <resourceStyle width="20" x="444" y="108" height="12"/>
+  </symbolStyle>
+  <symbolStyle id="154" name="parking_roof_fee-permissive">
+   <resourceStyle width="20" x="464" y="108" height="12"/>
+  </symbolStyle>
+  <symbolStyle id="155" name="picnic">
+   <resourceStyle width="12" x="484" y="108" height="12"/>
+  </symbolStyle>
+  <symbolStyle id="156" name="parking_fee">
+   <resourceStyle width="20" x="0" y="127" height="12"/>
+  </symbolStyle>
+  <symbolStyle id="157" name="parking_fee-permissive">
+   <resourceStyle width="20" x="20" y="127" height="12"/>
+  </symbolStyle>
+  <symbolStyle id="158" name="park_and_ride">
+   <resourceStyle width="20" x="40" y="127" height="12"/>
+  </symbolStyle>
+  <symbolStyle id="159" name="park_and_ride-permissive">
+   <resourceStyle width="20" x="60" y="127" height="12"/>
+  </symbolStyle>
+  <symbolStyle id="160" name="bench">
+   <resourceStyle width="12" x="80" y="127" height="12"/>
+  </symbolStyle>
+  <symbolStyle id="161" name="building">
+   <resourceStyle width="10" x="92" y="127" height="10"/>
+  </symbolStyle>
+  <symbolStyle id="162" name="disused">
+   <resourceStyle width="10" x="102" y="127" height="10"/>
+  </symbolStyle>
+  <symbolStyle id="163" name="vulcan">
+   <resourceStyle width="10" x="112" y="127" height="10"/>
+  </symbolStyle>
+  <symbolStyle id="164" name="power-tower">
+   <resourceStyle width="10" x="122" y="127" height="10"/>
+  </symbolStyle>
+  <symbolStyle id="165" name="survey_point">
+   <resourceStyle width="9" x="132" y="127" height="9"/>
+  </symbolStyle>
+  <symbolStyle id="166" name="tree">
+   <resourceStyle width="7" x="141" y="127" height="7"/>
+  </symbolStyle>
+  <symbolStyle id="167" name="power-pole">
+   <resourceStyle width="7" x="148" y="127" height="7"/>
+  </symbolStyle>
  </page>
-    </skin>
+</skin>
diff --git a/data/resources-mdpi/symbols.png b/data/resources-mdpi/symbols.png
index 9f9e568fb1..40f35afde8 100644
--- a/data/resources-mdpi/symbols.png
+++ b/data/resources-mdpi/symbols.png
diff --git a/data/resources-xhdpi/basic.skn b/data/resources-xhdpi/basic.skn
index 49c560d6e0..e24051cdd7 100644
--- a/data/resources-xhdpi/basic.skn
+++ b/data/resources-xhdpi/basic.skn
@@ -1,485 +1,506 @@
 <!DOCTYPE skin>
-    <skin>
-    <page width="512" height="512" file="symbols.png">
-  <symbolStyle id="1" name="symbols/nori/motorcycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="0" y="0" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="2" name="symbols/maki/music-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="46" y="0" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="3" name="symbols/maki/campsite-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:">
-    <resourceStyle x="92" y="0" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="4" name="symbols/maki/place-of-worship-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="138" y="0" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="5" name="symbols/nori/dry_cleaning-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="184" y="0" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="6" name="symbols/nori/grave_yard-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="230" y="0" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="7" name="symbols/nori/pharmacy-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:">
-    <resourceStyle x="276" y="0" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="8" name="symbols/nori/pub-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="322" y="0" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="9" name="symbols/maki/fast-food-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="368" y="0" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="10" name="symbols/maki/library-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="414" y="0" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="11" name="symbols/nori/hindu-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="460" y="0" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="12" name="symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="0" y="46" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="13" name="symbols/maki/bicycle-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="46" y="46" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="14" name="symbols/nori/fire_hydrant-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:">
-    <resourceStyle x="92" y="46" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="15" name="symbols/maki/school-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="138" y="46" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="16" name="symbols/maki/cafe-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="184" y="46" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="17" name="symbols/maki/cinema-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="230" y="46" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="18" name="symbols/maki/prison-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="276" y="46" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="19" name="symbols/maki/post-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="322" y="46" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="20" name="symbols/nori/gambling-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="368" y="46" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="21" name="symbols/nori/carpenter-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="414" y="46" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="22" name="symbols/nori/kindergarten-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="460" y="46" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="23" name="symbols/maki/embassy-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="0" y="92" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="24" name="symbols/maki/bank-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:">
-    <resourceStyle x="46" y="92" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="25" name="symbols/nori/money_transfer-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:">
-    <resourceStyle x="92" y="92" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="26" name="symbols/maki/theatre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="138" y="92" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="27" name="symbols/nori/atm-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:">
-    <resourceStyle x="184" y="92" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="28" name="symbols/maki/restaurant-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="230" y="92" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="29" name="symbols/nori/information-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="276" y="92" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="30" name="symbols/nori/hardware-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="322" y="92" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="31" name="symbols/maki/toilets-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="368" y="92" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="32" name="symbols/maki/bar-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="414" y="92" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="33" name="symbols/nori/beverages-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="460" y="92" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="34" name="symbols/maki/religious-christian-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="0" y="138" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="35" name="symbols/nori/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="46" y="138" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="36" name="symbols/nori/photo-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="92" y="138" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="37" name="symbols/maki/museum-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="138" y="138" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="38" name="symbols/maki/college-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="184" y="138" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="39" name="symbols/nori/shoemaker-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="230" y="138" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="40" name="symbols/maki/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="276" y="138" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="41" name="symbols/nori/dentist-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:">
-    <resourceStyle x="322" y="138" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="42" name="symbols/nori/car_rental-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="368" y="138" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="43" name="symbols/maki/alcohol-shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="414" y="138" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="44" name="symbols/nori/car_parts-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="460" y="138" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="45" name="symbols/maki/fire-station-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:">
-    <resourceStyle x="0" y="184" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="46" name="symbols/nori/craft-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="46" y="184" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="47" name="symbols/nori/ngo-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="92" y="184" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="48" name="symbols/nori/social_facility-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="138" y="184" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="49" name="symbols/nori/computer-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="184" y="184" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="50" name="symbols/nori/tailor-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="230" y="184" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="51" name="symbols/maki/bicycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="276" y="184" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="52" name="symbols/nori/government-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="322" y="184" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="53" name="symbols/nori/car_repair-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="368" y="184" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="54" name="symbols/maki/emergency-telephone-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:">
-    <resourceStyle x="414" y="184" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="55" name="symbols/nori/hairdresser-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="460" y="184" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="56" name="symbols/nori/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="0" y="230" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="57" name="symbols/nori/mobile_phone-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="46" y="230" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="58" name="symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="92" y="230" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="59" name="symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="138" y="230" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="60" name="symbols/maki/police-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="184" y="230" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="61" name="symbols/maki/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:">
-    <resourceStyle x="230" y="230" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="62" name="symbols/maki/garden-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="276" y="230" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="63" name="symbols/nori/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:">
-    <resourceStyle x="322" y="230" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="64" name="symbols/nori/courthouse-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="368" y="230" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="65" name="symbols/nori/bureau_de_change-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:">
-    <resourceStyle x="414" y="230" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="66" name="symbols/nori/clothes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="460" y="230" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="67" name="symbols/neta/shoes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="0" y="276" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="68" name="symbols/maki/slaughterhouse-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="46" y="276" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="69" name="symbols/maki/religious-jewish-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="92" y="276" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="70" name="symbols/maki/religious-muslim-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="138" y="276" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="71" name="symbols/maki/library-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="184" y="276" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="72" name="symbols/nori/community_centre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="230" y="276" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="73" name="api_pin">
-    <resourceStyle x="276" y="276" width="28" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="74" name="placemark-blue">
-    <resourceStyle x="304" y="276" width="28" height="40"/>
-    </symbolStyle>
-  <symbolStyle id="75" name="placemark-yellow">
-    <resourceStyle x="332" y="276" width="28" height="40"/>
-    </symbolStyle>
-  <symbolStyle id="76" name="placemark-purple">
-    <resourceStyle x="360" y="276" width="28" height="40"/>
-    </symbolStyle>
-  <symbolStyle id="77" name="placemark-brown">
-    <resourceStyle x="388" y="276" width="28" height="40"/>
-    </symbolStyle>
-  <symbolStyle id="78" name="placemark-red">
-    <resourceStyle x="416" y="276" width="28" height="40"/>
-    </symbolStyle>
-  <symbolStyle id="79" name="placemark-pink">
-    <resourceStyle x="444" y="276" width="28" height="40"/>
-    </symbolStyle>
-  <symbolStyle id="80" name="placemark-orange">
-    <resourceStyle x="472" y="276" width="28" height="40"/>
-    </symbolStyle>
-  <symbolStyle id="81" name="symbols/neta/bollard-18.svg:#444444::::">
-    <resourceStyle x="500" y="276" width="10" height="28"/>
-    </symbolStyle>
-  <symbolStyle id="82" name="placemark-green">
-    <resourceStyle x="0" y="322" width="28" height="40"/>
-    </symbolStyle>
-  <symbolStyle id="83" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="28" y="322" width="38" height="38"/>
-    </symbolStyle>
-  <symbolStyle id="84" name="symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="66" y="322" width="38" height="38"/>
-    </symbolStyle>
-  <symbolStyle id="85" name="symbols/nori/taxi-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="104" y="322" width="38" height="38"/>
-    </symbolStyle>
-  <symbolStyle id="86" name="symbols/maki/bus-18.svg:#FFFFFF:#000080:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="142" y="322" width="38" height="38"/>
-    </symbolStyle>
-  <symbolStyle id="87" name="symbols/maki/rail-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="180" y="322" width="38" height="38"/>
-    </symbolStyle>
-  <symbolStyle id="88" name="symbols/maki/airport-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="218" y="322" width="38" height="38"/>
-    </symbolStyle>
-  <symbolStyle id="89" name="symbols/maki/fuel-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="256" y="322" width="38" height="38"/>
-    </symbolStyle>
-  <symbolStyle id="90" name="symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="294" y="322" width="38" height="38"/>
-    </symbolStyle>
-  <symbolStyle id="91" name="symbols/maki/bicycle-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="332" y="322" width="38" height="38"/>
-    </symbolStyle>
-  <symbolStyle id="92" name="symbols/maki/bus-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="370" y="322" width="38" height="38"/>
-    </symbolStyle>
-  <symbolStyle id="93" name="symbols/maki/rail-above-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="408" y="322" width="38" height="38"/>
-    </symbolStyle>
-  <symbolStyle id="94" name="symbols/maki/parking-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="446" y="322" width="38" height="38"/>
-    </symbolStyle>
-  <symbolStyle id="95" name="symbols/nori/drinking_water-18.svg:#0000FF::::">
-    <resourceStyle x="484" y="322" width="28" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="96" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="0" y="362" width="38" height="38"/>
-    </symbolStyle>
-  <symbolStyle id="97" name="symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="38" y="362" width="38" height="38"/>
-    </symbolStyle>
-  <symbolStyle id="98" name="symbols/nori/recycling-18.svg:#444444::::">
-    <resourceStyle x="76" y="362" width="36" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="99" name="symbols/nori/shower-18.svg:#444444::::">
-    <resourceStyle x="112" y="362" width="36" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="100" name="symbols/nori/pump-manual-18.svg:#0000FF::::">
-    <resourceStyle x="148" y="362" width="36" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="101" name="symbols/nori/watermill-18.svg:#444444::::">
-    <resourceStyle x="184" y="362" width="36" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="102" name="symbols/nori/pump-powered-18.svg:#0000FF::::">
-    <resourceStyle x="220" y="362" width="36" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="103" name="symbols/nori/border_control-18.svg:#444444::::">
-    <resourceStyle x="256" y="362" width="36" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="104" name="symbols/nori/grave_yard-18.svg:#444444::::">
-    <resourceStyle x="292" y="362" width="36" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="105" name="symbols/nori/beach_resort-18.svg:#444444::::">
-    <resourceStyle x="328" y="362" width="36" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="106" name="symbols/nori/camp_site-18.svg:#444444::::">
-    <resourceStyle x="364" y="362" width="36" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="107" name="symbols/nori/drinking_water_well-18.svg:#0000FF::::">
-    <resourceStyle x="400" y="362" width="32" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="108" name="symbols/nori/playground-18.svg:#444444::::">
-    <resourceStyle x="432" y="362" width="32" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="109" name="symbols/nori/viewpoint-18.svg:#444444::::">
-    <resourceStyle x="464" y="362" width="32" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="110" name="symbols/maki/ferry-18.svg:#444444::::">
-    <resourceStyle x="0" y="400" width="30" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="111" name="symbols/nori/generator_wind-18.svg:#444444::::">
-    <resourceStyle x="30" y="400" width="30" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="112" name="symbols/nori/bucket-18.svg:#0000FF::::">
-    <resourceStyle x="60" y="400" width="30" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="113" name="symbols/nori/communication-tower-18.svg:#444444::::">
-    <resourceStyle x="90" y="400" width="28" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="114" name="symbols/nori/fire_hydrant-18.svg:#444444::::">
-    <resourceStyle x="118" y="400" width="24" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="115" name="symbols/nori/water_tower-18.svg:#444444::::">
-    <resourceStyle x="142" y="400" width="24" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="116" name="symbols/nori/waste_basket-18.svg:#444444::::">
-    <resourceStyle x="166" y="400" width="24" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="117" name="symbols/nori/street_lamp-18.svg:#444444::::">
-    <resourceStyle x="190" y="400" width="20" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="118" name="symbols/maki/monument-18.svg:#444444::::">
-    <resourceStyle x="210" y="400" width="28" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="119" name="symbols/maki/pitch-18.svg:#444444::::">
-    <resourceStyle x="238" y="400" width="24" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="120" name="symbols/maki/golf-18.svg:#444444::::">
-    <resourceStyle x="262" y="400" width="24" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="121" name="current-position">
-    <resourceStyle x="286" y="400" width="32" height="32"/>
-    </symbolStyle>
-  <symbolStyle id="122" name="symbols/nori/generator-18.svg:#444444::::">
-    <resourceStyle x="318" y="400" width="32" height="32"/>
-    </symbolStyle>
-  <symbolStyle id="123" name="symbols/nori/generator_nuclear-18.svg:#444444::::">
-    <resourceStyle x="350" y="400" width="32" height="32"/>
-    </symbolStyle>
-  <symbolStyle id="124" name="symbols/nori/generator_solar-18.svg:#444444::::">
-    <resourceStyle x="382" y="400" width="32" height="32"/>
-    </symbolStyle>
-  <symbolStyle id="125" name="symbols/nori/dry_cleaning-18.svg:#444444::::">
-    <resourceStyle x="414" y="400" width="28" height="32"/>
-    </symbolStyle>
-  <symbolStyle id="126" name="symbols/maki/emergency-telephone-18.svg:#444444::::">
-    <resourceStyle x="442" y="400" width="32" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="127" name="symbols/maki/rail-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:">
-    <resourceStyle x="474" y="400" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="128" name="symbols/maki/baseball-18.svg:#444444::::">
-    <resourceStyle x="0" y="436" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="129" name="symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:">
-    <resourceStyle x="30" y="436" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="130" name="symbols/maki/tennis-18.svg:#444444::::">
-    <resourceStyle x="60" y="436" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="131" name="symbols/maki/harbor-18.svg:#444444::::">
-    <resourceStyle x="90" y="436" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="132" name="symbols/maki/rail-above-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:">
-    <resourceStyle x="120" y="436" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="133" name="symbols/maki/soccer-18.svg:#444444::::">
-    <resourceStyle x="150" y="436" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="134" name="symbols/maki/star-18.svg:#444444::::">
-    <resourceStyle x="180" y="436" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="135" name="symbols/maki/cricket-18.svg:#444444::::">
-    <resourceStyle x="210" y="436" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="136" name="symbols/maki/basketball-18.svg:#444444::::">
-    <resourceStyle x="240" y="436" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="137" name="symbols/maki/park2-18.svg:#008000::::">
-    <resourceStyle x="270" y="436" width="24" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="138" name="symbols/maki/park-18.svg:#008000::::">
-    <resourceStyle x="294" y="436" width="24" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="139" name="symbols/maki/campsite-18.svg:#444444::::">
-    <resourceStyle x="318" y="436" width="34" height="28"/>
-    </symbolStyle>
-  <symbolStyle id="140" name="symbols/maki/art-gallery-18.svg:#444444::::">
-    <resourceStyle x="352" y="436" width="34" height="28"/>
-    </symbolStyle>
-  <symbolStyle id="141" name="symbols/nori/storage_tank-18.svg:#444444::::">
-    <resourceStyle x="386" y="436" width="34" height="28"/>
-    </symbolStyle>
-  <symbolStyle id="142" name="symbols/maki/skiing-18.svg:#444444::::">
-    <resourceStyle x="420" y="436" width="34" height="28"/>
-    </symbolStyle>
-  <symbolStyle id="143" name="symbols/maki/telephone-18.svg:#444444::::">
-    <resourceStyle x="454" y="436" width="32" height="28"/>
-    </symbolStyle>
-  <symbolStyle id="144" name="symbols/maki/cemetery-18.svg:#444444::::">
-    <resourceStyle x="486" y="436" width="22" height="28"/>
-    </symbolStyle>
-  <symbolStyle id="145" name="symbols/nori/information-18.svg:#444444::::">
-    <resourceStyle x="0" y="466" width="28" height="28"/>
-    </symbolStyle>
-  <symbolStyle id="146" name="symbols/nori/bench-18.svg:#444444::::">
-    <resourceStyle x="28" y="466" width="36" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="147" name="symbols/maki/america-football-18.svg:#444444::::">
-    <resourceStyle x="64" y="466" width="34" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="148" name="symbols/maki/dam-18.svg:#444444::::">
-    <resourceStyle x="98" y="466" width="30" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="149" name="symbols/maki/swimming-18.svg:#0000FF::::">
-    <resourceStyle x="128" y="466" width="30" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="150" name="symbols/nori/power_tower-12.svg:#444444::::">
-    <resourceStyle x="158" y="466" width="20" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="151" name="symbols/maki/heliport-18.svg:#444444::::">
-    <resourceStyle x="178" y="466" width="34" height="22"/>
-    </symbolStyle>
-  <symbolStyle id="152" name="symbols/maki/roadblock-12.svg:#FF0000::::">
-    <resourceStyle x="212" y="466" width="20" height="22"/>
-    </symbolStyle>
-  <symbolStyle id="153" name="symbols/maki/cross-12.svg:#444444::::">
-    <resourceStyle x="232" y="466" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="154" name="symbols/maki/triangle-stroked-12.svg:#444444::::">
-    <resourceStyle x="252" y="466" width="22" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="155" name="symbols/maki/triangle-12.svg:#444444::::">
-    <resourceStyle x="274" y="466" width="22" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="156" name="symbols/maki/triangle-12.svg:#FF0000::::">
-    <resourceStyle x="296" y="466" width="22" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="157" name="symbols/neta/entrance-18.svg:#444444::::">
-    <resourceStyle x="318" y="466" width="20" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="158" name="symbols/neta/lift_gate-18.svg:#444444::::">
-    <resourceStyle x="338" y="466" width="22" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="159" name="symbols/maki/post-12.svg:#444444::::">
-    <resourceStyle x="360" y="466" width="20" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="160" name="symbols/arrow.svg:::::">
-    <resourceStyle x="380" y="466" width="36" height="12"/>
-    </symbolStyle>
+<skin>
+ <page width="512" height="512" file="symbols.png">
+  <symbolStyle id="1" name="api_pin">
+   <resourceStyle width="40" x="0" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="2" name="placemark-blue">
+   <resourceStyle width="40" x="40" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="3" name="placemark-brown">
+   <resourceStyle width="40" x="80" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="4" name="placemark-yellow">
+   <resourceStyle width="40" x="120" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="5" name="placemark-red">
+   <resourceStyle width="40" x="160" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="6" name="current-position">
+   <resourceStyle width="52" x="200" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="7" name="placemark-purple">
+   <resourceStyle width="40" x="252" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="8" name="placemark-pink">
+   <resourceStyle width="40" x="292" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="9" name="placemark-orange">
+   <resourceStyle width="40" x="332" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="10" name="placemark-green">
+   <resourceStyle width="40" x="372" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="11" name="peak">
+   <resourceStyle width="40" x="412" y="0" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="12" name="petrolstation">
+   <resourceStyle width="40" x="452" y="0" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="13" name="pharmacy">
+   <resourceStyle width="40" x="0" y="52" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="14" name="playground">
+   <resourceStyle width="40" x="40" y="52" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="15" name="police">
+   <resourceStyle width="40" x="80" y="52" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="16" name="postbox">
+   <resourceStyle width="40" x="120" y="52" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="17" name="postoffice">
+   <resourceStyle width="40" x="160" y="52" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="18" name="pub">
+   <resourceStyle width="40" x="200" y="52" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="19" name="hotel">
+   <resourceStyle width="40" x="240" y="52" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="20" name="hunting_closed_high">
+   <resourceStyle width="40" x="280" y="52" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="21" name="information-guidepost">
+   <resourceStyle width="40" x="320" y="52" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="22" name="information-office">
+   <resourceStyle width="40" x="360" y="52" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="23" name="information">
+   <resourceStyle width="40" x="400" y="52" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="24" name="kindergarten">
+   <resourceStyle width="40" x="440" y="52" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="25" name="kindergarten2">
+   <resourceStyle width="40" x="0" y="92" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="26" name="kiosk">
+   <resourceStyle width="40" x="40" y="92" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="27" name="library">
+   <resourceStyle width="40" x="80" y="92" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="28" name="man-made-halfpipe">
+   <resourceStyle width="40" x="120" y="92" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="29" name="memorial">
+   <resourceStyle width="40" x="160" y="92" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="30" name="mountain_pass">
+   <resourceStyle width="40" x="200" y="92" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="31" name="museum">
+   <resourceStyle width="40" x="240" y="92" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="32" name="parking-mini">
+   <resourceStyle width="40" x="280" y="92" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="33" name="parking">
+   <resourceStyle width="40" x="320" y="92" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="34" name="parking_roof">
+   <resourceStyle width="40" x="360" y="92" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="35" name="peak-mini">
+   <resourceStyle width="40" x="400" y="92" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="36" name="subway-station-l">
+   <resourceStyle width="40" x="440" y="92" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="37" name="subway-station-m">
+   <resourceStyle width="40" x="0" y="132" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="38" name="subway-station-s">
+   <resourceStyle width="40" x="40" y="132" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="39" name="subway">
+   <resourceStyle width="40" x="80" y="132" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="40" name="supermarket">
+   <resourceStyle width="40" x="120" y="132" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="41" name="swimming-borderless">
+   <resourceStyle width="40" x="160" y="132" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="42" name="swimming">
+   <resourceStyle width="40" x="200" y="132" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="43" name="synagogue">
+   <resourceStyle width="40" x="240" y="132" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="44" name="taxi">
+   <resourceStyle width="40" x="280" y="132" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="45" name="telephone">
+   <resourceStyle width="40" x="320" y="132" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="46" name="tennis-borderless">
+   <resourceStyle width="40" x="360" y="132" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="47" name="tennis">
+   <resourceStyle width="40" x="400" y="132" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="48" name="theatre">
+   <resourceStyle width="40" x="440" y="132" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="49" name="toilets">
+   <resourceStyle width="40" x="0" y="172" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="50" name="tramway-mini">
+   <resourceStyle width="40" x="40" y="172" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="51" name="tramway">
+   <resourceStyle width="40" x="80" y="172" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="52" name="university">
+   <resourceStyle width="40" x="120" y="172" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="53" name="pubx">
+   <resourceStyle width="40" x="160" y="172" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="54" name="railway-crossing-small">
+   <resourceStyle width="40" x="200" y="172" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="55" name="railway-crossing">
+   <resourceStyle width="40" x="240" y="172" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="56" name="railway-station-mini">
+   <resourceStyle width="40" x="280" y="172" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="57" name="railway-station">
+   <resourceStyle width="40" x="320" y="172" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="58" name="recycling">
+   <resourceStyle width="40" x="360" y="172" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="59" name="religion">
+   <resourceStyle width="40" x="400" y="172" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="60" name="restaurant">
+   <resourceStyle width="40" x="440" y="172" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="61" name="ruins">
+   <resourceStyle width="40" x="0" y="212" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="62" name="school">
+   <resourceStyle width="40" x="40" y="212" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="63" name="shelter-fireplace">
+   <resourceStyle width="40" x="80" y="212" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="64" name="shelter">
+   <resourceStyle width="40" x="120" y="212" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="65" name="shooting-borderless">
+   <resourceStyle width="40" x="160" y="212" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="66" name="shooting">
+   <resourceStyle width="40" x="200" y="212" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="67" name="slipway">
+   <resourceStyle width="40" x="240" y="212" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="68" name="soccer-borderless">
+   <resourceStyle width="40" x="280" y="212" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="69" name="soccer">
+   <resourceStyle width="40" x="320" y="212" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="70" name="equestrian">
+   <resourceStyle width="40" x="360" y="212" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="71" name="equestrian-borderless">
+   <resourceStyle width="40" x="400" y="212" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="72" name="earthquakecamp">
+   <resourceStyle width="40" x="440" y="212" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="73" name="bar">
+   <resourceStyle width="40" x="0" y="252" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="74" name="barrier">
+   <resourceStyle width="40" x="40" y="252" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="75" name="dog_park">
+   <resourceStyle width="40" x="80" y="252" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="76" name="baseball-borderless">
+   <resourceStyle width="40" x="120" y="252" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="77" name="diving">
+   <resourceStyle width="40" x="160" y="252" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="78" name="diving-borderless">
+   <resourceStyle width="40" x="200" y="252" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="79" name="baseball">
+   <resourceStyle width="40" x="240" y="252" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="80" name="curling">
+   <resourceStyle width="40" x="280" y="252" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="81" name="curling-borderless">
+   <resourceStyle width="40" x="320" y="252" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="82" name="cricket">
+   <resourceStyle width="40" x="360" y="252" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="83" name="cricket-borderless">
+   <resourceStyle width="40" x="400" y="252" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="84" name="clothes">
+   <resourceStyle width="40" x="440" y="252" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="85" name="cinema">
+   <resourceStyle width="40" x="0" y="292" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="86" name="basketball">
+   <resourceStyle width="40" x="40" y="292" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="87" name="bicycle_rental">
+   <resourceStyle width="40" x="80" y="292" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="88" name="bird">
+   <resourceStyle width="40" x="120" y="292" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="89" name="bowls-borderless">
+   <resourceStyle width="40" x="160" y="292" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="90" name="bowls">
+   <resourceStyle width="40" x="200" y="292" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="91" name="bus-mini">
+   <resourceStyle width="40" x="240" y="292" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="92" name="castle">
+   <resourceStyle width="40" x="280" y="292" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="93" name="bus">
+   <resourceStyle width="40" x="320" y="292" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="94" name="car_repair">
+   <resourceStyle width="40" x="360" y="292" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="95" name="car_rental">
+   <resourceStyle width="40" x="400" y="292" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="96" name="cannon">
+   <resourceStyle width="40" x="440" y="292" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="97" name="campsite">
+   <resourceStyle width="40" x="0" y="332" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="98" name="cafe">
+   <resourceStyle width="40" x="40" y="332" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="99" name="bus_sta">
+   <resourceStyle width="40" x="80" y="332" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="100" name="hostel">
+   <resourceStyle width="40" x="120" y="332" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="101" name="airport">
+   <resourceStyle width="40" x="160" y="332" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="102" name="hospital0">
+   <resourceStyle width="40" x="200" y="332" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="103" name="hospital">
+   <resourceStyle width="40" x="240" y="332" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="104" name="helipad">
+   <resourceStyle width="40" x="280" y="332" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="105" name="handball">
+   <resourceStyle width="40" x="320" y="332" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="106" name="handball-borderless">
+   <resourceStyle width="40" x="360" y="332" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="107" name="hairdresser">
+   <resourceStyle width="40" x="400" y="332" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="108" name="gymnastics">
+   <resourceStyle width="40" x="440" y="332" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="109" name="gymnastics-borderless">
+   <resourceStyle width="40" x="0" y="372" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="110" name="alpine_hut">
+   <resourceStyle width="40" x="40" y="372" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="111" name="golfcourse">
+   <resourceStyle width="40" x="80" y="372" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="112" name="gate">
+   <resourceStyle width="40" x="120" y="372" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="113" name="archery-borderless">
+   <resourceStyle width="40" x="160" y="372" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="114" name="bakery">
+   <resourceStyle width="40" x="200" y="372" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="115" name="atm">
+   <resourceStyle width="40" x="240" y="372" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="116" name="fastfood">
+   <resourceStyle width="40" x="280" y="372" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="117" name="athletics">
+   <resourceStyle width="40" x="320" y="372" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="118" name="athletics-borderless">
+   <resourceStyle width="40" x="360" y="372" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="119" name="arrow">
+   <resourceStyle width="40" x="400" y="372" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="120" name="firebrigade">
+   <resourceStyle width="40" x="440" y="372" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="121" name="football-borderless">
+   <resourceStyle width="40" x="0" y="412" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="122" name="archery">
+   <resourceStyle width="40" x="40" y="412" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="123" name="football">
+   <resourceStyle width="40" x="80" y="412" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="124" name="fountain">
+   <resourceStyle width="40" x="120" y="412" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="125" name="basketball-borderless">
+   <resourceStyle width="40" x="160" y="412" height="38"/>
+  </symbolStyle>
+  <symbolStyle id="126" name="khanda">
+   <resourceStyle width="37" x="200" y="412" height="37"/>
+  </symbolStyle>
+  <symbolStyle id="127" name="parking-permissive">
+   <resourceStyle width="34" x="237" y="412" height="34"/>
+  </symbolStyle>
+  <symbolStyle id="128" name="parking-private">
+   <resourceStyle width="34" x="271" y="412" height="34"/>
+  </symbolStyle>
+  <symbolStyle id="129" name="speed_trap">
+   <resourceStyle width="31" x="305" y="412" height="31"/>
+  </symbolStyle>
+  <symbolStyle id="130" name="traffic_signal">
+   <resourceStyle width="31" x="336" y="412" height="31"/>
+  </symbolStyle>
+  <symbolStyle id="131" name="bank">
+   <resourceStyle width="31" x="367" y="412" height="31"/>
+  </symbolStyle>
+  <symbolStyle id="132" name="windmill">
+   <resourceStyle width="31" x="398" y="412" height="31"/>
+  </symbolStyle>
+  <symbolStyle id="133" name="housenumber">
+   <resourceStyle width="31" x="429" y="412" height="31"/>
+  </symbolStyle>
+  <symbolStyle id="134" name="mosque">
+   <resourceStyle width="31" x="460" y="412" height="31"/>
+  </symbolStyle>
+  <symbolStyle id="135" name="parking_roof-permissive">
+   <resourceStyle width="31" x="0" y="452" height="31"/>
+  </symbolStyle>
+  <symbolStyle id="136" name="embassy">
+   <resourceStyle width="31" x="31" y="452" height="31"/>
+  </symbolStyle>
+  <symbolStyle id="137" name="drinking_water">
+   <resourceStyle width="31" x="62" y="452" height="31"/>
+  </symbolStyle>
+  <symbolStyle id="138" name="doctor">
+   <resourceStyle width="31" x="93" y="452" height="31"/>
+  </symbolStyle>
+  <symbolStyle id="139" name="church">
+   <resourceStyle width="31" x="124" y="452" height="31"/>
+  </symbolStyle>
+  <symbolStyle id="140" name="roundabout_right">
+   <resourceStyle width="31" x="155" y="452" height="31"/>
+  </symbolStyle>
+  <symbolStyle id="141" name="roundabout_left">
+   <resourceStyle width="31" x="186" y="452" height="31"/>
+  </symbolStyle>
+  <symbolStyle id="142" name="power_wind">
+   <resourceStyle width="28" x="217" y="452" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="143" name="power_photovoltaic">
+   <resourceStyle width="28" x="245" y="452" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="144" name="power_hydro">
+   <resourceStyle width="28" x="273" y="452" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="145" name="power_generic">
+   <resourceStyle width="28" x="301" y="452" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="146" name="wastewater">
+   <resourceStyle width="28" x="329" y="452" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="147" name="viewpoint">
+   <resourceStyle width="28" x="357" y="452" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="148" name="lighthouse">
+   <resourceStyle width="28" x="385" y="452" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="149" name="bureau_de_change">
+   <resourceStyle width="28" x="413" y="452" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="150" name="cave_entrance">
+   <resourceStyle width="28" x="441" y="452" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="151" name="car_sharing">
+   <resourceStyle width="28" x="469" y="452" height="27"/>
+  </symbolStyle>
+  <symbolStyle id="152" name="hotel_and_restaurant">
+   <resourceStyle width="24" x="0" y="483" height="24"/>
+  </symbolStyle>
+  <symbolStyle id="153" name="parking_roof_fee">
+   <resourceStyle width="40" x="24" y="483" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="154" name="parking_roof_fee-permissive">
+   <resourceStyle width="40" x="64" y="483" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="155" name="picnic">
+   <resourceStyle width="22" x="104" y="483" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="156" name="parking_fee">
+   <resourceStyle width="40" x="126" y="483" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="157" name="parking_fee-permissive">
+   <resourceStyle width="40" x="166" y="483" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="158" name="park_and_ride">
+   <resourceStyle width="40" x="206" y="483" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="159" name="park_and_ride-permissive">
+   <resourceStyle width="40" x="246" y="483" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="160" name="bench">
+   <resourceStyle width="22" x="286" y="483" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="161" name="building">
+   <resourceStyle width="18" x="308" y="483" height="18"/>
+  </symbolStyle>
+  <symbolStyle id="162" name="disused">
+   <resourceStyle width="18" x="326" y="483" height="18"/>
+  </symbolStyle>
+  <symbolStyle id="163" name="vulcan">
+   <resourceStyle width="18" x="344" y="483" height="18"/>
+  </symbolStyle>
+  <symbolStyle id="164" name="power-tower">
+   <resourceStyle width="18" x="362" y="483" height="18"/>
+  </symbolStyle>
+  <symbolStyle id="165" name="survey_point">
+   <resourceStyle width="16" x="380" y="483" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="166" name="power-pole">
+   <resourceStyle width="12" x="396" y="483" height="12"/>
+  </symbolStyle>
+  <symbolStyle id="167" name="tree">
+   <resourceStyle width="10" x="408" y="483" height="10"/>
+  </symbolStyle>
  </page>
-    </skin>
+</skin>
diff --git a/data/resources-xhdpi/symbols.png b/data/resources-xhdpi/symbols.png
index bec06e0b79..17df96394a 100644
--- a/data/resources-xhdpi/symbols.png
+++ b/data/resources-xhdpi/symbols.png
diff --git a/data/resources-xxhdpi/basic.skn b/data/resources-xxhdpi/basic.skn
index c5c9af4f8d..23526606d7 100644
--- a/data/resources-xxhdpi/basic.skn
+++ b/data/resources-xxhdpi/basic.skn
@@ -1,485 +1,506 @@
 <!DOCTYPE skin>
-    <skin>
-    <page width="1024" height="1024" file="symbols.png">
-  <symbolStyle id="1" name="symbols/nori/motorcycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="0" y="0" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="2" name="symbols/maki/music-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="68" y="0" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="3" name="symbols/maki/campsite-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:">
-    <resourceStyle x="136" y="0" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="4" name="symbols/maki/place-of-worship-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="204" y="0" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="5" name="symbols/nori/dry_cleaning-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="272" y="0" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="6" name="symbols/nori/grave_yard-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="340" y="0" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="7" name="symbols/nori/pharmacy-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:">
-    <resourceStyle x="408" y="0" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="8" name="symbols/nori/pub-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="476" y="0" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="9" name="symbols/maki/fast-food-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="544" y="0" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="10" name="symbols/maki/library-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="612" y="0" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="11" name="symbols/nori/hindu-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="680" y="0" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="12" name="symbols/maki/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="748" y="0" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="13" name="symbols/maki/bicycle-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="816" y="0" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="14" name="symbols/nori/fire_hydrant-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:">
-    <resourceStyle x="884" y="0" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="15" name="symbols/maki/school-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="952" y="0" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="16" name="symbols/maki/cafe-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="0" y="68" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="17" name="symbols/maki/cinema-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="68" y="68" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="18" name="symbols/maki/prison-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="136" y="68" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="19" name="symbols/maki/post-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="204" y="68" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="20" name="symbols/nori/gambling-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="272" y="68" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="21" name="symbols/nori/carpenter-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="340" y="68" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="22" name="symbols/nori/kindergarten-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="408" y="68" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="23" name="symbols/maki/embassy-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="476" y="68" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="24" name="symbols/maki/bank-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:">
-    <resourceStyle x="544" y="68" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="25" name="symbols/nori/money_transfer-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:">
-    <resourceStyle x="612" y="68" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="26" name="symbols/maki/theatre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="680" y="68" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="27" name="symbols/nori/atm-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:">
-    <resourceStyle x="748" y="68" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="28" name="symbols/maki/restaurant-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="816" y="68" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="29" name="symbols/nori/information-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="884" y="68" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="30" name="symbols/nori/hardware-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="952" y="68" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="31" name="symbols/maki/toilets-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="0" y="136" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="32" name="symbols/maki/bar-18.svg:#FFFFFF:#DD7700:symbols/neta/circle-24.svg:#DD7700:">
-    <resourceStyle x="68" y="136" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="33" name="symbols/nori/beverages-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="136" y="136" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="34" name="symbols/maki/religious-christian-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="204" y="136" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="35" name="symbols/nori/shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="272" y="136" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="36" name="symbols/nori/photo-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="340" y="136" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="37" name="symbols/maki/museum-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="408" y="136" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="38" name="symbols/maki/college-18.svg:#FFFFFF:#AA8844:symbols/neta/circle-24.svg:#AA8844:">
-    <resourceStyle x="476" y="136" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="39" name="symbols/nori/shoemaker-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="544" y="136" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="40" name="symbols/maki/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="612" y="136" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="41" name="symbols/nori/dentist-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:">
-    <resourceStyle x="680" y="136" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="42" name="symbols/nori/car_rental-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="748" y="136" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="43" name="symbols/maki/alcohol-shop-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="816" y="136" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="44" name="symbols/nori/car_parts-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="884" y="136" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="45" name="symbols/maki/fire-station-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:">
-    <resourceStyle x="952" y="136" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="46" name="symbols/nori/craft-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="0" y="204" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="47" name="symbols/nori/ngo-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="68" y="204" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="48" name="symbols/nori/social_facility-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="136" y="204" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="49" name="symbols/nori/computer-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="204" y="204" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="50" name="symbols/nori/tailor-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="272" y="204" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="51" name="symbols/maki/bicycle-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="340" y="204" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="52" name="symbols/nori/government-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="408" y="204" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="53" name="symbols/nori/car_repair-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="476" y="204" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="54" name="symbols/maki/emergency-telephone-18.svg:#FFFFFF:#FF0000:symbols/neta/circle-24.svg:#FF0000:">
-    <resourceStyle x="544" y="204" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="55" name="symbols/nori/hairdresser-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="612" y="204" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="56" name="symbols/nori/bakery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="680" y="204" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="57" name="symbols/nori/mobile_phone-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="748" y="204" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="58" name="symbols/maki/lodging-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="816" y="204" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="59" name="symbols/maki/grocery-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="884" y="204" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="60" name="symbols/maki/police-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="952" y="204" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="61" name="symbols/maki/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:">
-    <resourceStyle x="0" y="272" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="62" name="symbols/maki/garden-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="68" y="272" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="63" name="symbols/nori/hospital-18.svg:#FFFFFF:#CC00CC:symbols/neta/circle-24.svg:#CC00CC:">
-    <resourceStyle x="136" y="272" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="64" name="symbols/nori/courthouse-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="204" y="272" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="65" name="symbols/nori/bureau_de_change-18.svg:#FFFFFF:#004400:symbols/neta/circle-24.svg:#004400:">
-    <resourceStyle x="272" y="272" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="66" name="symbols/nori/clothes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="340" y="272" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="67" name="symbols/neta/shoes-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="408" y="272" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="68" name="symbols/maki/slaughterhouse-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="476" y="272" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="69" name="symbols/maki/religious-jewish-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="544" y="272" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="70" name="symbols/maki/religious-muslim-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="612" y="272" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="71" name="symbols/maki/library-18.svg:#FFFFFF:#442288:symbols/neta/circle-24.svg:#442288:">
-    <resourceStyle x="680" y="272" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="72" name="symbols/nori/community_centre-18.svg:#FFFFFF:#333333:symbols/neta/circle-24.svg:#333333:">
-    <resourceStyle x="748" y="272" width="68" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="73" name="api_pin">
-    <resourceStyle x="816" y="272" width="42" height="68"/>
-    </symbolStyle>
-  <symbolStyle id="74" name="placemark-blue">
-    <resourceStyle x="858" y="272" width="40" height="62"/>
-    </symbolStyle>
-  <symbolStyle id="75" name="placemark-yellow">
-    <resourceStyle x="898" y="272" width="40" height="62"/>
-    </symbolStyle>
-  <symbolStyle id="76" name="placemark-purple">
-    <resourceStyle x="938" y="272" width="40" height="62"/>
-    </symbolStyle>
-  <symbolStyle id="77" name="placemark-brown">
-    <resourceStyle x="978" y="272" width="40" height="62"/>
-    </symbolStyle>
-  <symbolStyle id="78" name="placemark-red">
-    <resourceStyle x="0" y="340" width="40" height="62"/>
-    </symbolStyle>
-  <symbolStyle id="79" name="placemark-pink">
-    <resourceStyle x="40" y="340" width="40" height="62"/>
-    </symbolStyle>
-  <symbolStyle id="80" name="placemark-orange">
-    <resourceStyle x="80" y="340" width="40" height="62"/>
-    </symbolStyle>
-  <symbolStyle id="81" name="placemark-green">
-    <resourceStyle x="120" y="340" width="40" height="62"/>
-    </symbolStyle>
-  <symbolStyle id="82" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="160" y="340" width="58" height="58"/>
-    </symbolStyle>
-  <symbolStyle id="83" name="symbols/maki/airfield-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="218" y="340" width="58" height="58"/>
-    </symbolStyle>
-  <symbolStyle id="84" name="symbols/nori/taxi-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="276" y="340" width="58" height="58"/>
-    </symbolStyle>
-  <symbolStyle id="85" name="symbols/maki/bus-18.svg:#FFFFFF:#000080:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="334" y="340" width="58" height="58"/>
-    </symbolStyle>
-  <symbolStyle id="86" name="symbols/maki/rail-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="392" y="340" width="58" height="58"/>
-    </symbolStyle>
-  <symbolStyle id="87" name="symbols/maki/airport-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="450" y="340" width="58" height="58"/>
-    </symbolStyle>
-  <symbolStyle id="88" name="symbols/maki/fuel-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="508" y="340" width="58" height="58"/>
-    </symbolStyle>
-  <symbolStyle id="89" name="symbols/neta/subway-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="566" y="340" width="58" height="58"/>
-    </symbolStyle>
-  <symbolStyle id="90" name="symbols/maki/bicycle-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="624" y="340" width="58" height="58"/>
-    </symbolStyle>
-  <symbolStyle id="91" name="symbols/maki/bus-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="682" y="340" width="58" height="58"/>
-    </symbolStyle>
-  <symbolStyle id="92" name="symbols/maki/rail-above-18.svg:#FFFFFF:#0044DD:symbols/neta/square-24.svg:#0044DD:">
-    <resourceStyle x="740" y="340" width="58" height="58"/>
-    </symbolStyle>
-  <symbolStyle id="93" name="symbols/maki/parking-18.svg:#FFFFFF:#C0C0C0:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="798" y="340" width="58" height="58"/>
-    </symbolStyle>
-  <symbolStyle id="94" name="symbols/maki/parking-garage-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="856" y="340" width="58" height="58"/>
-    </symbolStyle>
-  <symbolStyle id="95" name="symbols/maki/parking-18.svg:#FFFFFF:#0000FF:symbols/neta/square-24.svg:#0000FF:">
-    <resourceStyle x="914" y="340" width="58" height="58"/>
-    </symbolStyle>
-  <symbolStyle id="96" name="current-position">
-    <resourceStyle x="972" y="340" width="52" height="54"/>
-    </symbolStyle>
-  <symbolStyle id="97" name="symbols/nori/recycling-18.svg:#444444::::">
-    <resourceStyle x="0" y="402" width="54" height="54"/>
-    </symbolStyle>
-  <symbolStyle id="98" name="symbols/nori/shower-18.svg:#444444::::">
-    <resourceStyle x="54" y="402" width="54" height="54"/>
-    </symbolStyle>
-  <symbolStyle id="99" name="symbols/nori/pump-manual-18.svg:#0000FF::::">
-    <resourceStyle x="108" y="402" width="54" height="54"/>
-    </symbolStyle>
-  <symbolStyle id="100" name="symbols/nori/watermill-18.svg:#444444::::">
-    <resourceStyle x="162" y="402" width="54" height="54"/>
-    </symbolStyle>
-  <symbolStyle id="101" name="symbols/nori/pump-powered-18.svg:#0000FF::::">
-    <resourceStyle x="216" y="402" width="54" height="54"/>
-    </symbolStyle>
-  <symbolStyle id="102" name="symbols/nori/border_control-18.svg:#444444::::">
-    <resourceStyle x="270" y="402" width="54" height="54"/>
-    </symbolStyle>
-  <symbolStyle id="103" name="symbols/nori/grave_yard-18.svg:#444444::::">
-    <resourceStyle x="324" y="402" width="54" height="54"/>
-    </symbolStyle>
-  <symbolStyle id="104" name="symbols/nori/beach_resort-18.svg:#444444::::">
-    <resourceStyle x="378" y="402" width="54" height="54"/>
-    </symbolStyle>
-  <symbolStyle id="105" name="symbols/nori/camp_site-18.svg:#444444::::">
-    <resourceStyle x="432" y="402" width="54" height="54"/>
-    </symbolStyle>
-  <symbolStyle id="106" name="symbols/nori/drinking_water_well-18.svg:#0000FF::::">
-    <resourceStyle x="486" y="402" width="48" height="54"/>
-    </symbolStyle>
-  <symbolStyle id="107" name="symbols/nori/playground-18.svg:#444444::::">
-    <resourceStyle x="534" y="402" width="48" height="54"/>
-    </symbolStyle>
-  <symbolStyle id="108" name="symbols/nori/bucket-18.svg:#0000FF::::">
-    <resourceStyle x="582" y="402" width="46" height="54"/>
-    </symbolStyle>
-  <symbolStyle id="109" name="symbols/nori/viewpoint-18.svg:#444444::::">
-    <resourceStyle x="628" y="402" width="46" height="54"/>
-    </symbolStyle>
-  <symbolStyle id="110" name="symbols/nori/generator_wind-18.svg:#444444::::">
-    <resourceStyle x="674" y="402" width="44" height="54"/>
-    </symbolStyle>
-  <symbolStyle id="111" name="symbols/nori/drinking_water-18.svg:#0000FF::::">
-    <resourceStyle x="718" y="402" width="42" height="54"/>
-    </symbolStyle>
-  <symbolStyle id="112" name="symbols/nori/communication-tower-18.svg:#444444::::">
-    <resourceStyle x="760" y="402" width="42" height="54"/>
-    </symbolStyle>
-  <symbolStyle id="113" name="symbols/nori/fire_hydrant-18.svg:#444444::::">
-    <resourceStyle x="802" y="402" width="36" height="54"/>
-    </symbolStyle>
-  <symbolStyle id="114" name="symbols/nori/water_tower-18.svg:#444444::::">
-    <resourceStyle x="838" y="402" width="36" height="54"/>
-    </symbolStyle>
-  <symbolStyle id="115" name="symbols/nori/waste_basket-18.svg:#444444::::">
-    <resourceStyle x="874" y="402" width="36" height="54"/>
-    </symbolStyle>
-  <symbolStyle id="116" name="symbols/nori/street_lamp-18.svg:#444444::::">
-    <resourceStyle x="910" y="402" width="30" height="54"/>
-    </symbolStyle>
-  <symbolStyle id="117" name="symbols/nori/generator-18.svg:#444444::::">
-    <resourceStyle x="940" y="402" width="48" height="48"/>
-    </symbolStyle>
-  <symbolStyle id="118" name="symbols/maki/monument-18.svg:#444444::::">
-    <resourceStyle x="988" y="402" width="36" height="44"/>
-    </symbolStyle>
-  <symbolStyle id="119" name="symbols/nori/generator_nuclear-18.svg:#444444::::">
-    <resourceStyle x="0" y="456" width="48" height="48"/>
-    </symbolStyle>
-  <symbolStyle id="120" name="symbols/nori/generator_solar-18.svg:#444444::::">
-    <resourceStyle x="48" y="456" width="48" height="48"/>
-    </symbolStyle>
-  <symbolStyle id="121" name="symbols/nori/dry_cleaning-18.svg:#444444::::">
-    <resourceStyle x="96" y="456" width="42" height="48"/>
-    </symbolStyle>
-  <symbolStyle id="122" name="symbols/maki/ferry-18.svg:#444444::::">
-    <resourceStyle x="138" y="456" width="40" height="48"/>
-    </symbolStyle>
-  <symbolStyle id="123" name="symbols/maki/rail-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:">
-    <resourceStyle x="178" y="456" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="124" name="symbols/neta/subway-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:">
-    <resourceStyle x="224" y="456" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="125" name="symbols/maki/rail-above-12.svg:#FFFFFF:#0044DD:symbols/neta/square-18.svg:#0044DD:">
-    <resourceStyle x="270" y="456" width="46" height="46"/>
-    </symbolStyle>
-  <symbolStyle id="126" name="symbols/maki/pitch-18.svg:#444444::::">
-    <resourceStyle x="316" y="456" width="32" height="44"/>
-    </symbolStyle>
-  <symbolStyle id="127" name="symbols/maki/golf-18.svg:#444444::::">
-    <resourceStyle x="348" y="456" width="32" height="44"/>
-    </symbolStyle>
-  <symbolStyle id="128" name="symbols/nori/storage_tank-18.svg:#444444::::">
-    <resourceStyle x="380" y="456" width="50" height="42"/>
-    </symbolStyle>
-  <symbolStyle id="129" name="symbols/nori/information-18.svg:#444444::::">
-    <resourceStyle x="430" y="456" width="42" height="42"/>
-    </symbolStyle>
-  <symbolStyle id="130" name="symbols/neta/bollard-18.svg:#444444::::">
-    <resourceStyle x="472" y="456" width="16" height="42"/>
-    </symbolStyle>
-  <symbolStyle id="131" name="symbols/maki/baseball-18.svg:#444444::::">
-    <resourceStyle x="488" y="456" width="40" height="40"/>
-    </symbolStyle>
-  <symbolStyle id="132" name="symbols/maki/tennis-18.svg:#444444::::">
-    <resourceStyle x="528" y="456" width="40" height="40"/>
-    </symbolStyle>
-  <symbolStyle id="133" name="symbols/maki/harbor-18.svg:#444444::::">
-    <resourceStyle x="568" y="456" width="40" height="40"/>
-    </symbolStyle>
-  <symbolStyle id="134" name="symbols/maki/soccer-18.svg:#444444::::">
-    <resourceStyle x="608" y="456" width="40" height="40"/>
-    </symbolStyle>
-  <symbolStyle id="135" name="symbols/maki/star-18.svg:#444444::::">
-    <resourceStyle x="648" y="456" width="40" height="40"/>
-    </symbolStyle>
-  <symbolStyle id="136" name="symbols/maki/cricket-18.svg:#444444::::">
-    <resourceStyle x="688" y="456" width="40" height="40"/>
-    </symbolStyle>
-  <symbolStyle id="137" name="symbols/maki/basketball-18.svg:#444444::::">
-    <resourceStyle x="728" y="456" width="40" height="40"/>
-    </symbolStyle>
-  <symbolStyle id="138" name="symbols/maki/park2-18.svg:#008000::::">
-    <resourceStyle x="768" y="456" width="32" height="40"/>
-    </symbolStyle>
-  <symbolStyle id="139" name="symbols/maki/park-18.svg:#008000::::">
-    <resourceStyle x="800" y="456" width="32" height="40"/>
-    </symbolStyle>
-  <symbolStyle id="140" name="symbols/maki/telephone-18.svg:#444444::::">
-    <resourceStyle x="832" y="456" width="42" height="38"/>
-    </symbolStyle>
-  <symbolStyle id="141" name="symbols/maki/emergency-telephone-18.svg:#444444::::">
-    <resourceStyle x="874" y="456" width="42" height="38"/>
-    </symbolStyle>
-  <symbolStyle id="142" name="symbols/nori/bench-18.svg:#444444::::">
-    <resourceStyle x="916" y="456" width="54" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="143" name="symbols/maki/campsite-18.svg:#444444::::">
-    <resourceStyle x="970" y="456" width="44" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="144" name="symbols/maki/art-gallery-18.svg:#444444::::">
-    <resourceStyle x="0" y="504" width="44" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="145" name="symbols/maki/skiing-18.svg:#444444::::">
-    <resourceStyle x="44" y="504" width="44" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="146" name="symbols/nori/power_tower-12.svg:#444444::::">
-    <resourceStyle x="88" y="504" width="30" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="147" name="symbols/maki/cemetery-18.svg:#444444::::">
-    <resourceStyle x="118" y="504" width="28" height="36"/>
-    </symbolStyle>
-  <symbolStyle id="148" name="symbols/maki/roadblock-12.svg:#FF0000::::">
-    <resourceStyle x="146" y="504" width="30" height="34"/>
-    </symbolStyle>
-  <symbolStyle id="149" name="symbols/maki/america-football-18.svg:#444444::::">
-    <resourceStyle x="176" y="504" width="46" height="32"/>
-    </symbolStyle>
-  <symbolStyle id="150" name="symbols/maki/dam-18.svg:#444444::::">
-    <resourceStyle x="222" y="504" width="40" height="32"/>
-    </symbolStyle>
-  <symbolStyle id="151" name="symbols/maki/swimming-18.svg:#0000FF::::">
-    <resourceStyle x="262" y="504" width="40" height="32"/>
-    </symbolStyle>
-  <symbolStyle id="152" name="symbols/maki/cross-12.svg:#444444::::">
-    <resourceStyle x="302" y="504" width="30" height="30"/>
-    </symbolStyle>
-  <symbolStyle id="153" name="symbols/maki/heliport-18.svg:#444444::::">
-    <resourceStyle x="332" y="504" width="44" height="28"/>
-    </symbolStyle>
-  <symbolStyle id="154" name="symbols/maki/triangle-stroked-12.svg:#444444::::">
-    <resourceStyle x="376" y="504" width="34" height="28"/>
-    </symbolStyle>
-  <symbolStyle id="155" name="symbols/maki/triangle-12.svg:#444444::::">
-    <resourceStyle x="410" y="504" width="34" height="28"/>
-    </symbolStyle>
-  <symbolStyle id="156" name="symbols/maki/triangle-12.svg:#FF0000::::">
-    <resourceStyle x="444" y="504" width="34" height="28"/>
-    </symbolStyle>
-  <symbolStyle id="157" name="symbols/neta/entrance-18.svg:#444444::::">
-    <resourceStyle x="478" y="504" width="28" height="26"/>
-    </symbolStyle>
-  <symbolStyle id="158" name="symbols/neta/lift_gate-18.svg:#444444::::">
-    <resourceStyle x="506" y="504" width="34" height="22"/>
-    </symbolStyle>
-  <symbolStyle id="159" name="symbols/maki/post-12.svg:#444444::::">
-    <resourceStyle x="540" y="504" width="30" height="22"/>
-    </symbolStyle>
-  <symbolStyle id="160" name="symbols/arrow.svg:::::">
-    <resourceStyle x="570" y="504" width="54" height="18"/>
-    </symbolStyle>
+<skin>
+ <page width="1024" height="512" file="symbols.png">
+  <symbolStyle id="1" name="api_pin">
+   <resourceStyle width="58" x="0" y="0" height="76"/>
+  </symbolStyle>
+  <symbolStyle id="2" name="placemark-blue">
+   <resourceStyle width="58" x="58" y="0" height="76"/>
+  </symbolStyle>
+  <symbolStyle id="3" name="placemark-brown">
+   <resourceStyle width="58" x="116" y="0" height="76"/>
+  </symbolStyle>
+  <symbolStyle id="4" name="placemark-yellow">
+   <resourceStyle width="58" x="174" y="0" height="76"/>
+  </symbolStyle>
+  <symbolStyle id="5" name="placemark-red">
+   <resourceStyle width="58" x="232" y="0" height="76"/>
+  </symbolStyle>
+  <symbolStyle id="6" name="current-position">
+   <resourceStyle width="76" x="290" y="0" height="76"/>
+  </symbolStyle>
+  <symbolStyle id="7" name="placemark-purple">
+   <resourceStyle width="58" x="366" y="0" height="76"/>
+  </symbolStyle>
+  <symbolStyle id="8" name="placemark-pink">
+   <resourceStyle width="58" x="424" y="0" height="76"/>
+  </symbolStyle>
+  <symbolStyle id="9" name="placemark-orange">
+   <resourceStyle width="58" x="482" y="0" height="76"/>
+  </symbolStyle>
+  <symbolStyle id="10" name="placemark-green">
+   <resourceStyle width="58" x="540" y="0" height="76"/>
+  </symbolStyle>
+  <symbolStyle id="11" name="peak">
+   <resourceStyle width="52" x="598" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="12" name="petrolstation">
+   <resourceStyle width="52" x="650" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="13" name="pharmacy">
+   <resourceStyle width="52" x="702" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="14" name="playground">
+   <resourceStyle width="52" x="754" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="15" name="police">
+   <resourceStyle width="52" x="806" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="16" name="postbox">
+   <resourceStyle width="52" x="858" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="17" name="postoffice">
+   <resourceStyle width="52" x="910" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="18" name="pub">
+   <resourceStyle width="52" x="962" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="19" name="hotel">
+   <resourceStyle width="52" x="0" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="20" name="hunting_closed_high">
+   <resourceStyle width="52" x="52" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="21" name="information-guidepost">
+   <resourceStyle width="52" x="104" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="22" name="information-office">
+   <resourceStyle width="52" x="156" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="23" name="information">
+   <resourceStyle width="52" x="208" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="24" name="kindergarten">
+   <resourceStyle width="52" x="260" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="25" name="kindergarten2">
+   <resourceStyle width="52" x="312" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="26" name="kiosk">
+   <resourceStyle width="52" x="364" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="27" name="library">
+   <resourceStyle width="52" x="416" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="28" name="man-made-halfpipe">
+   <resourceStyle width="52" x="468" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="29" name="memorial">
+   <resourceStyle width="52" x="520" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="30" name="mountain_pass">
+   <resourceStyle width="52" x="572" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="31" name="museum">
+   <resourceStyle width="52" x="624" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="32" name="parking-mini">
+   <resourceStyle width="52" x="676" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="33" name="parking">
+   <resourceStyle width="52" x="728" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="34" name="parking_roof">
+   <resourceStyle width="52" x="780" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="35" name="peak-mini">
+   <resourceStyle width="52" x="832" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="36" name="subway-station-l">
+   <resourceStyle width="52" x="884" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="37" name="subway-station-m">
+   <resourceStyle width="52" x="936" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="38" name="subway-station-s">
+   <resourceStyle width="52" x="0" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="39" name="subway">
+   <resourceStyle width="52" x="52" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="40" name="supermarket">
+   <resourceStyle width="52" x="104" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="41" name="swimming-borderless">
+   <resourceStyle width="52" x="156" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="42" name="swimming">
+   <resourceStyle width="52" x="208" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="43" name="synagogue">
+   <resourceStyle width="52" x="260" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="44" name="taxi">
+   <resourceStyle width="52" x="312" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="45" name="telephone">
+   <resourceStyle width="52" x="364" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="46" name="tennis-borderless">
+   <resourceStyle width="52" x="416" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="47" name="tennis">
+   <resourceStyle width="52" x="468" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="48" name="theatre">
+   <resourceStyle width="52" x="520" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="49" name="toilets">
+   <resourceStyle width="52" x="572" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="50" name="tramway-mini">
+   <resourceStyle width="52" x="624" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="51" name="tramway">
+   <resourceStyle width="52" x="676" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="52" name="university">
+   <resourceStyle width="52" x="728" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="53" name="pubx">
+   <resourceStyle width="52" x="780" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="54" name="railway-crossing-small">
+   <resourceStyle width="52" x="832" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="55" name="railway-crossing">
+   <resourceStyle width="52" x="884" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="56" name="railway-station-mini">
+   <resourceStyle width="52" x="936" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="57" name="railway-station">
+   <resourceStyle width="52" x="0" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="58" name="recycling">
+   <resourceStyle width="52" x="52" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="59" name="religion">
+   <resourceStyle width="52" x="104" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="60" name="restaurant">
+   <resourceStyle width="52" x="156" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="61" name="ruins">
+   <resourceStyle width="52" x="208" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="62" name="school">
+   <resourceStyle width="52" x="260" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="63" name="shelter-fireplace">
+   <resourceStyle width="52" x="312" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="64" name="shelter">
+   <resourceStyle width="52" x="364" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="65" name="shooting-borderless">
+   <resourceStyle width="52" x="416" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="66" name="shooting">
+   <resourceStyle width="52" x="468" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="67" name="slipway">
+   <resourceStyle width="52" x="520" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="68" name="soccer-borderless">
+   <resourceStyle width="52" x="572" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="69" name="soccer">
+   <resourceStyle width="52" x="624" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="70" name="equestrian">
+   <resourceStyle width="52" x="676" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="71" name="equestrian-borderless">
+   <resourceStyle width="52" x="728" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="72" name="earthquakecamp">
+   <resourceStyle width="52" x="780" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="73" name="bar">
+   <resourceStyle width="52" x="832" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="74" name="barrier">
+   <resourceStyle width="52" x="884" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="75" name="dog_park">
+   <resourceStyle width="52" x="936" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="76" name="baseball-borderless">
+   <resourceStyle width="52" x="0" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="77" name="diving">
+   <resourceStyle width="52" x="52" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="78" name="diving-borderless">
+   <resourceStyle width="52" x="104" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="79" name="baseball">
+   <resourceStyle width="52" x="156" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="80" name="curling">
+   <resourceStyle width="52" x="208" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="81" name="curling-borderless">
+   <resourceStyle width="52" x="260" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="82" name="cricket">
+   <resourceStyle width="52" x="312" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="83" name="cricket-borderless">
+   <resourceStyle width="52" x="364" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="84" name="clothes">
+   <resourceStyle width="52" x="416" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="85" name="cinema">
+   <resourceStyle width="52" x="468" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="86" name="basketball">
+   <resourceStyle width="52" x="520" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="87" name="bicycle_rental">
+   <resourceStyle width="52" x="572" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="88" name="bird">
+   <resourceStyle width="52" x="624" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="89" name="bowls-borderless">
+   <resourceStyle width="52" x="676" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="90" name="bowls">
+   <resourceStyle width="52" x="728" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="91" name="bus-mini">
+   <resourceStyle width="52" x="780" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="92" name="castle">
+   <resourceStyle width="52" x="832" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="93" name="bus">
+   <resourceStyle width="52" x="884" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="94" name="car_repair">
+   <resourceStyle width="52" x="936" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="95" name="car_rental">
+   <resourceStyle width="52" x="0" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="96" name="cannon">
+   <resourceStyle width="52" x="52" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="97" name="campsite">
+   <resourceStyle width="52" x="104" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="98" name="cafe">
+   <resourceStyle width="52" x="156" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="99" name="bus_sta">
+   <resourceStyle width="52" x="208" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="100" name="hostel">
+   <resourceStyle width="52" x="260" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="101" name="airport">
+   <resourceStyle width="52" x="312" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="102" name="hospital0">
+   <resourceStyle width="52" x="364" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="103" name="hospital">
+   <resourceStyle width="52" x="416" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="104" name="helipad">
+   <resourceStyle width="52" x="468" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="105" name="handball">
+   <resourceStyle width="52" x="520" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="106" name="handball-borderless">
+   <resourceStyle width="52" x="572" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="107" name="hairdresser">
+   <resourceStyle width="52" x="624" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="108" name="gymnastics">
+   <resourceStyle width="52" x="676" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="109" name="gymnastics-borderless">
+   <resourceStyle width="52" x="728" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="110" name="alpine_hut">
+   <resourceStyle width="52" x="780" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="111" name="golfcourse">
+   <resourceStyle width="52" x="832" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="112" name="gate">
+   <resourceStyle width="52" x="884" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="113" name="archery-borderless">
+   <resourceStyle width="52" x="936" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="114" name="bakery">
+   <resourceStyle width="52" x="0" y="336" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="115" name="atm">
+   <resourceStyle width="52" x="52" y="336" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="116" name="fastfood">
+   <resourceStyle width="52" x="104" y="336" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="117" name="athletics">
+   <resourceStyle width="52" x="156" y="336" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="118" name="athletics-borderless">
+   <resourceStyle width="52" x="208" y="336" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="119" name="arrow">
+   <resourceStyle width="52" x="260" y="336" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="120" name="firebrigade">
+   <resourceStyle width="52" x="312" y="336" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="121" name="football-borderless">
+   <resourceStyle width="52" x="364" y="336" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="122" name="archery">
+   <resourceStyle width="52" x="416" y="336" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="123" name="football">
+   <resourceStyle width="52" x="468" y="336" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="124" name="fountain">
+   <resourceStyle width="52" x="520" y="336" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="125" name="basketball-borderless">
+   <resourceStyle width="52" x="572" y="336" height="50"/>
+  </symbolStyle>
+  <symbolStyle id="126" name="khanda">
+   <resourceStyle width="48" x="624" y="336" height="48"/>
+  </symbolStyle>
+  <symbolStyle id="127" name="parking-permissive">
+   <resourceStyle width="44" x="672" y="336" height="44"/>
+  </symbolStyle>
+  <symbolStyle id="128" name="parking-private">
+   <resourceStyle width="44" x="716" y="336" height="44"/>
+  </symbolStyle>
+  <symbolStyle id="129" name="speed_trap">
+   <resourceStyle width="40" x="760" y="336" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="130" name="traffic_signal">
+   <resourceStyle width="40" x="800" y="336" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="131" name="bank">
+   <resourceStyle width="40" x="840" y="336" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="132" name="windmill">
+   <resourceStyle width="40" x="880" y="336" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="133" name="housenumber">
+   <resourceStyle width="40" x="920" y="336" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="134" name="mosque">
+   <resourceStyle width="40" x="960" y="336" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="135" name="parking_roof-permissive">
+   <resourceStyle width="40" x="0" y="388" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="136" name="embassy">
+   <resourceStyle width="40" x="40" y="388" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="137" name="drinking_water">
+   <resourceStyle width="40" x="80" y="388" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="138" name="doctor">
+   <resourceStyle width="40" x="120" y="388" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="139" name="church">
+   <resourceStyle width="40" x="160" y="388" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="140" name="roundabout_right">
+   <resourceStyle width="40" x="200" y="388" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="141" name="roundabout_left">
+   <resourceStyle width="40" x="240" y="388" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="142" name="power_wind">
+   <resourceStyle width="36" x="280" y="388" height="36"/>
+  </symbolStyle>
+  <symbolStyle id="143" name="power_photovoltaic">
+   <resourceStyle width="36" x="316" y="388" height="36"/>
+  </symbolStyle>
+  <symbolStyle id="144" name="power_hydro">
+   <resourceStyle width="36" x="352" y="388" height="36"/>
+  </symbolStyle>
+  <symbolStyle id="145" name="power_generic">
+   <resourceStyle width="36" x="388" y="388" height="36"/>
+  </symbolStyle>
+  <symbolStyle id="146" name="wastewater">
+   <resourceStyle width="36" x="424" y="388" height="36"/>
+  </symbolStyle>
+  <symbolStyle id="147" name="viewpoint">
+   <resourceStyle width="36" x="460" y="388" height="36"/>
+  </symbolStyle>
+  <symbolStyle id="148" name="lighthouse">
+   <resourceStyle width="36" x="496" y="388" height="36"/>
+  </symbolStyle>
+  <symbolStyle id="149" name="bureau_de_change">
+   <resourceStyle width="36" x="532" y="388" height="36"/>
+  </symbolStyle>
+  <symbolStyle id="150" name="cave_entrance">
+   <resourceStyle width="36" x="568" y="388" height="36"/>
+  </symbolStyle>
+  <symbolStyle id="151" name="car_sharing">
+   <resourceStyle width="36" x="604" y="388" height="34"/>
+  </symbolStyle>
+  <symbolStyle id="152" name="hotel_and_restaurant">
+   <resourceStyle width="30" x="640" y="388" height="30"/>
+  </symbolStyle>
+  <symbolStyle id="153" name="parking_roof_fee">
+   <resourceStyle width="52" x="670" y="388" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="154" name="parking_roof_fee-permissive">
+   <resourceStyle width="52" x="722" y="388" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="155" name="picnic">
+   <resourceStyle width="28" x="774" y="388" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="156" name="parking_fee">
+   <resourceStyle width="52" x="802" y="388" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="157" name="parking_fee-permissive">
+   <resourceStyle width="52" x="854" y="388" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="158" name="park_and_ride">
+   <resourceStyle width="52" x="906" y="388" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="159" name="park_and_ride-permissive">
+   <resourceStyle width="52" x="958" y="388" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="160" name="bench">
+   <resourceStyle width="28" x="0" y="428" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="161" name="building">
+   <resourceStyle width="22" x="28" y="428" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="162" name="disused">
+   <resourceStyle width="22" x="50" y="428" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="163" name="vulcan">
+   <resourceStyle width="22" x="72" y="428" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="164" name="power-tower">
+   <resourceStyle width="22" x="94" y="428" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="165" name="survey_point">
+   <resourceStyle width="20" x="116" y="428" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="166" name="power-pole">
+   <resourceStyle width="14" x="136" y="428" height="14"/>
+  </symbolStyle>
+  <symbolStyle id="167" name="tree">
+   <resourceStyle width="12" x="150" y="428" height="12"/>
+  </symbolStyle>
  </page>
-    </skin>
+</skin>
diff --git a/data/resources-xxhdpi/symbols.png b/data/resources-xxhdpi/symbols.png
index 3767e5a492..094c35db93 100644
--- a/data/resources-xxhdpi/symbols.png
+++ b/data/resources-xxhdpi/symbols.png
diff --git a/data/resources-yota/basic.skn b/data/resources-yota/basic.skn
index 68c63bb99f..2e7b43c268 100644
--- a/data/resources-yota/basic.skn
+++ b/data/resources-yota/basic.skn
@@ -1,455 +1,506 @@
 <!DOCTYPE skin>
-    <skin>
-    <page width="512" height="256" file="symbols.png">
-  <symbolStyle id="1" name="symbols/nori/kindergarten-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="0" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="2" name="symbols/nori/water_tower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="24" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="3" name="symbols/nori/social_facility-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="48" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="4" name="symbols/nori/hairdresser-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="72" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="5" name="symbols/nori/clothes-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="96" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="6" name="symbols/maki/library-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="120" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="7" name="symbols/maki/golf-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="144" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="8" name="symbols/nori/pub-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="168" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="9" name="symbols/maki/theatre-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="192" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="10" name="symbols/maki/monument-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="216" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="11" name="symbols/maki/grocery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="240" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="12" name="symbols/maki/college-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="264" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="13" name="symbols/nori/computer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="288" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="14" name="symbols/maki/swimming-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="312" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="15" name="symbols/nori/shoemaker-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="336" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="16" name="symbols/maki/school-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="360" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="17" name="symbols/nori/generator_nuclear-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="384" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="18" name="symbols/maki/cinema-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="408" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="19" name="symbols/nori/mobile_phone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="432" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="20" name="symbols/nori/photo-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="456" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="21" name="symbols/maki/america-football-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="480" y="0" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="22" name="symbols/neta/bollard-18.svg:#000000:#FFFFFF:::">
-    <resourceStyle x="504" y="0" width="6" height="14"/>
-    </symbolStyle>
-  <symbolStyle id="23" name="symbols/nori/bureau_de_change-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="0" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="24" name="symbols/maki/police-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="24" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="25" name="symbols/nori/viewpoint-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="48" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="26" name="symbols/nori/information-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="72" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="27" name="symbols/nori/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="96" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="28" name="symbols/maki/slaughterhouse-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="120" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="29" name="symbols/maki/toilets-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="144" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="30" name="symbols/maki/hospital-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="168" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="31" name="symbols/nori/watermill-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="192" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="32" name="symbols/maki/ferry-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="216" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="33" name="symbols/neta/shoes-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="240" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="34" name="symbols/maki/bakery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="264" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="35" name="symbols/nori/pump-powered-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="288" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="36" name="symbols/nori/government-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="312" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="37" name="symbols/maki/religious-jewish-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="336" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="38" name="symbols/nori/generator_wind-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="360" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="39" name="symbols/nori/carpenter-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="384" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="40" name="symbols/nori/car_rental-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="408" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="41" name="symbols/maki/shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="432" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="42" name="symbols/nori/waste_basket-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="456" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="43" name="symbols/nori/generator_solar-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="480" y="24" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="44" name="symbols/nori/communication-tower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="0" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="45" name="symbols/nori/drinking_water-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="24" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="46" name="symbols/nori/street_lamp-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="48" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="47" name="symbols/maki/religious-christian-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="72" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="48" name="symbols/maki/restaurant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="96" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="49" name="symbols/nori/bakery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="120" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="50" name="symbols/maki/park2-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="144" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="51" name="symbols/nori/drinking_water_well-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="168" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="52" name="symbols/maki/bank-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="192" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="53" name="symbols/nori/playground-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="216" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="54" name="symbols/maki/prison-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="240" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="55" name="symbols/maki/fast-food-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="264" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="56" name="symbols/maki/place-of-worship-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="288" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="57" name="symbols/maki/skiing-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="312" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="58" name="symbols/nori/car_repair-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="336" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="59" name="symbols/nori/pharmacy-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="360" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="60" name="symbols/maki/fire-station-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="384" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="61" name="symbols/nori/hospital-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="408" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="62" name="symbols/maki/triangle-stroked-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="432" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="63" name="symbols/maki/post-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="456" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="64" name="symbols/maki/garden-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="480" y="48" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="65" name="symbols/nori/tailor-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="0" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="66" name="symbols/maki/telephone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="24" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="67" name="symbols/maki/harbor-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="48" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="68" name="symbols/maki/cafe-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="72" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="69" name="symbols/nori/community_centre-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="96" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="70" name="symbols/nori/bucket-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="120" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="71" name="symbols/nori/pump-manual-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="144" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="72" name="symbols/nori/car_parts-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="168" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="73" name="symbols/maki/tennis-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="192" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="74" name="symbols/nori/beach_resort-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="216" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="75" name="symbols/maki/triangle-12.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="240" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="76" name="symbols/maki/post-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="264" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="77" name="symbols/nori/courthouse-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="288" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="78" name="symbols/nori/beverages-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="312" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="79" name="symbols/maki/lodging-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="336" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="80" name="symbols/nori/fire_hydrant-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="360" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="81" name="symbols/maki/museum-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="384" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="82" name="symbols/nori/craft-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="408" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="83" name="symbols/maki/embassy-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="432" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="84" name="symbols/nori/hardware-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="456" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="85" name="symbols/maki/emergency-telephone-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="480" y="72" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="86" name="symbols/nori/money_transfer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="0" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="87" name="symbols/nori/dry_cleaning-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="24" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="88" name="symbols/maki/cricket-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="48" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="89" name="symbols/maki/religious-muslim-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="72" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="90" name="symbols/maki/bar-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="96" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="91" name="symbols/nori/dentist-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="120" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="92" name="symbols/nori/bench-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="144" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="93" name="symbols/nori/camp_site-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="168" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="94" name="symbols/maki/baseball-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="192" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="95" name="symbols/maki/campsite-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="216" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="96" name="symbols/nori/motorcycle-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="240" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="97" name="symbols/maki/star-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="264" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="98" name="symbols/maki/alcohol-shop-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="288" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="99" name="symbols/nori/gambling-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="312" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="100" name="symbols/maki/pitch-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="336" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="101" name="symbols/nori/grave_yard-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="360" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="102" name="symbols/nori/storage_tank-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="384" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="103" name="symbols/nori/generator-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="408" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="104" name="symbols/maki/bicycle-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="432" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="105" name="symbols/maki/music-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="456" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="106" name="symbols/maki/dam-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="480" y="96" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="107" name="symbols/nori/atm-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="0" y="120" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="108" name="symbols/maki/art-gallery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="24" y="120" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="109" name="symbols/nori/recycling-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="48" y="120" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="110" name="symbols/nori/hindu-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="72" y="120" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="111" name="symbols/maki/soccer-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="96" y="120" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="112" name="symbols/maki/cemetery-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="120" y="120" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="113" name="symbols/maki/heliport-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="144" y="120" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="114" name="symbols/maki/basketball-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="168" y="120" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="115" name="symbols/nori/ngo-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="192" y="120" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="116" name="symbols/nori/shower-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="216" y="120" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="117" name="symbols/maki/park-18.svg:#000000:#FFFFFF:symbols/neta/circle-24.svg:#FFFFFF:">
-    <resourceStyle x="240" y="120" width="24" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="118" name="api_pin">
-    <resourceStyle x="264" y="120" width="14" height="24"/>
-    </symbolStyle>
-  <symbolStyle id="119" name="symbols/maki/rail-above-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:">
-    <resourceStyle x="278" y="120" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="120" name="symbols/maki/airfield-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:">
-    <resourceStyle x="298" y="120" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="121" name="symbols/nori/taxi-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:">
-    <resourceStyle x="318" y="120" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="122" name="symbols/maki/bicycle-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:">
-    <resourceStyle x="338" y="120" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="123" name="symbols/maki/parking-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:">
-    <resourceStyle x="358" y="120" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="124" name="symbols/maki/parking-garage-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:">
-    <resourceStyle x="378" y="120" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="125" name="symbols/maki/airport-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:">
-    <resourceStyle x="398" y="120" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="126" name="symbols/maki/bus-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:">
-    <resourceStyle x="418" y="120" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="127" name="symbols/maki/fuel-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:">
-    <resourceStyle x="438" y="120" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="128" name="symbols/neta/subway-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:">
-    <resourceStyle x="458" y="120" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="129" name="symbols/maki/rail-18.svg:#000000:#FFFFFF:symbols/neta/square-24.svg:#FFFFFF:">
-    <resourceStyle x="478" y="120" width="20" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="130" name="placemark-blue">
-    <resourceStyle x="498" y="120" width="14" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="131" name="placemark-yellow">
-    <resourceStyle x="0" y="144" width="14" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="132" name="placemark-purple">
-    <resourceStyle x="14" y="144" width="14" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="133" name="placemark-brown">
-    <resourceStyle x="28" y="144" width="14" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="134" name="placemark-red">
-    <resourceStyle x="42" y="144" width="14" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="135" name="placemark-pink">
-    <resourceStyle x="56" y="144" width="14" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="136" name="placemark-orange">
-    <resourceStyle x="70" y="144" width="14" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="137" name="placemark-green">
-    <resourceStyle x="84" y="144" width="14" height="20"/>
-    </symbolStyle>
-  <symbolStyle id="138" name="symbols/nori/border_control-18.svg:#000000:#FFFFFF:::">
-    <resourceStyle x="98" y="144" width="18" height="18"/>
-    </symbolStyle>
-  <symbolStyle id="139" name="symbols/neta/subway-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:">
-    <resourceStyle x="116" y="144" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="140" name="current-position">
-    <resourceStyle x="132" y="144" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="141" name="symbols/maki/rail-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:">
-    <resourceStyle x="148" y="144" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="142" name="symbols/maki/rail-above-12.svg:#000000:#FFFFFF:symbols/neta/square-18.svg:#FFFFFF:">
-    <resourceStyle x="164" y="144" width="16" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="143" name="symbols/maki/park2-18.svg:#000000:#FFFFFF:::">
-    <resourceStyle x="180" y="144" width="12" height="16"/>
-    </symbolStyle>
-  <symbolStyle id="144" name="symbols/maki/roadblock-12.svg:#000000:#FFFFFF:::">
-    <resourceStyle x="192" y="144" width="12" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="145" name="symbols/maki/cross-12.svg:#000000:#FFFFFF:::">
-    <resourceStyle x="204" y="144" width="12" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="146" name="symbols/nori/power_tower-12.svg:#000000:#FFFFFF:::">
-    <resourceStyle x="216" y="144" width="10" height="12"/>
-    </symbolStyle>
-  <symbolStyle id="147" name="symbols/maki/triangle-12.svg:#000000:#FFFFFF:::">
-    <resourceStyle x="226" y="144" width="12" height="10"/>
-    </symbolStyle>
-  <symbolStyle id="148" name="symbols/neta/lift_gate-18.svg:#000000:#FFFFFF:::">
-    <resourceStyle x="238" y="144" width="12" height="8"/>
-    </symbolStyle>
-  <symbolStyle id="149" name="symbols/neta/entrance-18.svg:#000000:#FFFFFF:::">
-    <resourceStyle x="250" y="144" width="10" height="8"/>
-    </symbolStyle>
-  <symbolStyle id="150" name="symbols/arrow.svg:::::">
-    <resourceStyle x="260" y="144" width="18" height="6"/>
-    </symbolStyle>
+<skin>
+ <page width="512" height="256" file="symbols.png">
+  <symbolStyle id="1" name="peak-mini">
+   <resourceStyle width="23" x="0" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="2" name="peak">
+   <resourceStyle width="23" x="23" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="3" name="petrolstation">
+   <resourceStyle width="23" x="46" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="4" name="pharmacy">
+   <resourceStyle width="23" x="69" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="5" name="placemark-blue">
+   <resourceStyle width="18" x="92" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="6" name="placemark-brown">
+   <resourceStyle width="18" x="110" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="7" name="placemark-green">
+   <resourceStyle width="18" x="128" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="8" name="placemark-orange">
+   <resourceStyle width="18" x="146" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="9" name="placemark-pink">
+   <resourceStyle width="18" x="164" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="10" name="placemark-purple">
+   <resourceStyle width="18" x="182" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="11" name="placemark-red">
+   <resourceStyle width="18" x="200" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="12" name="placemark-yellow">
+   <resourceStyle width="18" x="218" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="13" name="playground">
+   <resourceStyle width="23" x="236" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="14" name="police">
+   <resourceStyle width="23" x="259" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="15" name="postbox">
+   <resourceStyle width="23" x="282" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="16" name="postoffice">
+   <resourceStyle width="23" x="305" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="17" name="pub">
+   <resourceStyle width="23" x="328" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="18" name="hostel">
+   <resourceStyle width="23" x="351" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="19" name="hotel">
+   <resourceStyle width="23" x="374" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="20" name="hunting_closed_high">
+   <resourceStyle width="23" x="397" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="21" name="information-guidepost">
+   <resourceStyle width="23" x="420" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="22" name="information-office">
+   <resourceStyle width="23" x="443" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="23" name="information">
+   <resourceStyle width="23" x="466" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="24" name="kindergarten">
+   <resourceStyle width="23" x="489" y="0" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="25" name="kindergarten2">
+   <resourceStyle width="23" x="0" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="26" name="kiosk">
+   <resourceStyle width="23" x="23" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="27" name="library">
+   <resourceStyle width="23" x="46" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="28" name="man-made-halfpipe">
+   <resourceStyle width="23" x="69" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="29" name="memorial">
+   <resourceStyle width="23" x="92" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="30" name="mountain_pass">
+   <resourceStyle width="23" x="115" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="31" name="museum">
+   <resourceStyle width="23" x="138" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="32" name="parking-mini">
+   <resourceStyle width="23" x="161" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="33" name="parking">
+   <resourceStyle width="23" x="184" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="34" name="parking_roof">
+   <resourceStyle width="23" x="207" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="35" name="subway-station-l">
+   <resourceStyle width="23" x="230" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="36" name="subway-station-m">
+   <resourceStyle width="23" x="253" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="37" name="subway-station-s">
+   <resourceStyle width="23" x="276" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="38" name="subway">
+   <resourceStyle width="23" x="299" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="39" name="supermarket">
+   <resourceStyle width="23" x="322" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="40" name="swimming-borderless">
+   <resourceStyle width="23" x="345" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="41" name="swimming">
+   <resourceStyle width="23" x="368" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="42" name="synagogue">
+   <resourceStyle width="23" x="391" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="43" name="taxi">
+   <resourceStyle width="23" x="414" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="44" name="telephone">
+   <resourceStyle width="23" x="437" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="45" name="tennis-borderless">
+   <resourceStyle width="23" x="460" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="46" name="tennis">
+   <resourceStyle width="23" x="483" y="23" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="47" name="theatre">
+   <resourceStyle width="23" x="0" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="48" name="toilets">
+   <resourceStyle width="23" x="23" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="49" name="tramway-mini">
+   <resourceStyle width="23" x="46" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="50" name="tramway">
+   <resourceStyle width="23" x="69" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="51" name="university">
+   <resourceStyle width="23" x="92" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="52" name="pubx">
+   <resourceStyle width="23" x="115" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="53" name="railway-crossing-small">
+   <resourceStyle width="23" x="138" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="54" name="railway-crossing">
+   <resourceStyle width="23" x="161" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="55" name="railway-station-mini">
+   <resourceStyle width="23" x="184" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="56" name="railway-station">
+   <resourceStyle width="23" x="207" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="57" name="recycling">
+   <resourceStyle width="23" x="230" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="58" name="religion">
+   <resourceStyle width="23" x="253" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="59" name="restaurant">
+   <resourceStyle width="23" x="276" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="60" name="ruins">
+   <resourceStyle width="23" x="299" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="61" name="school">
+   <resourceStyle width="23" x="322" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="62" name="shelter-fireplace">
+   <resourceStyle width="23" x="345" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="63" name="shelter">
+   <resourceStyle width="23" x="368" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="64" name="shooting-borderless">
+   <resourceStyle width="23" x="391" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="65" name="shooting">
+   <resourceStyle width="23" x="414" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="66" name="slipway">
+   <resourceStyle width="23" x="437" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="67" name="soccer-borderless">
+   <resourceStyle width="23" x="460" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="68" name="soccer">
+   <resourceStyle width="23" x="483" y="46" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="69" name="bakery">
+   <resourceStyle width="23" x="0" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="70" name="earthquakecamp">
+   <resourceStyle width="23" x="23" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="71" name="dog_park">
+   <resourceStyle width="23" x="46" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="72" name="bar">
+   <resourceStyle width="23" x="69" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="73" name="barrier">
+   <resourceStyle width="23" x="92" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="74" name="diving">
+   <resourceStyle width="23" x="115" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="75" name="diving-borderless">
+   <resourceStyle width="23" x="138" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="76" name="baseball-borderless">
+   <resourceStyle width="23" x="161" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="77" name="current-position">
+   <resourceStyle width="23" x="184" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="78" name="curling">
+   <resourceStyle width="23" x="207" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="79" name="curling-borderless">
+   <resourceStyle width="23" x="230" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="80" name="cricket">
+   <resourceStyle width="23" x="253" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="81" name="cricket-borderless">
+   <resourceStyle width="23" x="276" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="82" name="clothes">
+   <resourceStyle width="23" x="299" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="83" name="cinema">
+   <resourceStyle width="23" x="322" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="84" name="baseball">
+   <resourceStyle width="23" x="345" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="85" name="basketball">
+   <resourceStyle width="23" x="368" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="86" name="bicycle_rental">
+   <resourceStyle width="23" x="391" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="87" name="bird">
+   <resourceStyle width="23" x="414" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="88" name="bowls-borderless">
+   <resourceStyle width="23" x="437" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="89" name="bowls">
+   <resourceStyle width="23" x="460" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="90" name="castle">
+   <resourceStyle width="23" x="483" y="69" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="91" name="bus-mini">
+   <resourceStyle width="23" x="0" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="92" name="car_repair">
+   <resourceStyle width="23" x="23" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="93" name="car_rental">
+   <resourceStyle width="23" x="46" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="94" name="cannon">
+   <resourceStyle width="23" x="69" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="95" name="campsite">
+   <resourceStyle width="23" x="92" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="96" name="cafe">
+   <resourceStyle width="23" x="115" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="97" name="bus_sta">
+   <resourceStyle width="23" x="138" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="98" name="bus">
+   <resourceStyle width="23" x="161" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="99" name="hospital0">
+   <resourceStyle width="23" x="184" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="100" name="hospital">
+   <resourceStyle width="23" x="207" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="101" name="airport">
+   <resourceStyle width="23" x="230" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="102" name="helipad">
+   <resourceStyle width="23" x="253" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="103" name="handball">
+   <resourceStyle width="23" x="276" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="104" name="handball-borderless">
+   <resourceStyle width="23" x="299" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="105" name="hairdresser">
+   <resourceStyle width="23" x="322" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="106" name="gymnastics">
+   <resourceStyle width="23" x="345" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="107" name="gymnastics-borderless">
+   <resourceStyle width="23" x="368" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="108" name="golfcourse">
+   <resourceStyle width="23" x="391" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="109" name="gate">
+   <resourceStyle width="23" x="414" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="110" name="alpine_hut">
+   <resourceStyle width="23" x="437" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="111" name="fountain">
+   <resourceStyle width="23" x="460" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="112" name="football">
+   <resourceStyle width="23" x="483" y="92" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="113" name="api_pin">
+   <resourceStyle width="18" x="0" y="115" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="114" name="atm">
+   <resourceStyle width="23" x="18" y="115" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="115" name="athletics">
+   <resourceStyle width="23" x="41" y="115" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="116" name="equestrian-borderless">
+   <resourceStyle width="23" x="64" y="115" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="117" name="athletics-borderless">
+   <resourceStyle width="23" x="87" y="115" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="118" name="arrow">
+   <resourceStyle width="23" x="110" y="115" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="119" name="archery">
+   <resourceStyle width="23" x="133" y="115" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="120" name="equestrian">
+   <resourceStyle width="23" x="156" y="115" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="121" name="fastfood">
+   <resourceStyle width="23" x="179" y="115" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="122" name="archery-borderless">
+   <resourceStyle width="23" x="202" y="115" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="123" name="firebrigade">
+   <resourceStyle width="23" x="225" y="115" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="124" name="football-borderless">
+   <resourceStyle width="23" x="248" y="115" height="23"/>
+  </symbolStyle>
+  <symbolStyle id="125" name="basketball-borderless">
+   <resourceStyle width="23" x="271" y="115" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="126" name="khanda">
+   <resourceStyle width="21" x="294" y="115" height="21"/>
+  </symbolStyle>
+  <symbolStyle id="127" name="parking-permissive">
+   <resourceStyle width="20" x="315" y="115" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="128" name="parking-private">
+   <resourceStyle width="20" x="335" y="115" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="129" name="speed_trap">
+   <resourceStyle width="18" x="355" y="115" height="18"/>
+  </symbolStyle>
+  <symbolStyle id="130" name="bank">
+   <resourceStyle width="18" x="373" y="115" height="18"/>
+  </symbolStyle>
+  <symbolStyle id="131" name="traffic_signal">
+   <resourceStyle width="18" x="391" y="115" height="18"/>
+  </symbolStyle>
+  <symbolStyle id="132" name="windmill">
+   <resourceStyle width="18" x="409" y="115" height="18"/>
+  </symbolStyle>
+  <symbolStyle id="133" name="embassy">
+   <resourceStyle width="18" x="427" y="115" height="18"/>
+  </symbolStyle>
+  <symbolStyle id="134" name="drinking_water">
+   <resourceStyle width="18" x="445" y="115" height="18"/>
+  </symbolStyle>
+  <symbolStyle id="135" name="parking_roof-permissive">
+   <resourceStyle width="18" x="463" y="115" height="18"/>
+  </symbolStyle>
+  <symbolStyle id="136" name="mosque">
+   <resourceStyle width="18" x="481" y="115" height="18"/>
+  </symbolStyle>
+  <symbolStyle id="137" name="doctor">
+   <resourceStyle width="18" x="0" y="138" height="18"/>
+  </symbolStyle>
+  <symbolStyle id="138" name="church">
+   <resourceStyle width="18" x="18" y="138" height="18"/>
+  </symbolStyle>
+  <symbolStyle id="139" name="housenumber">
+   <resourceStyle width="18" x="36" y="138" height="18"/>
+  </symbolStyle>
+  <symbolStyle id="140" name="roundabout_left">
+   <resourceStyle width="18" x="54" y="138" height="18"/>
+  </symbolStyle>
+  <symbolStyle id="141" name="roundabout_right">
+   <resourceStyle width="18" x="72" y="138" height="18"/>
+  </symbolStyle>
+  <symbolStyle id="142" name="power_photovoltaic">
+   <resourceStyle width="17" x="90" y="138" height="17"/>
+  </symbolStyle>
+  <symbolStyle id="143" name="power_hydro">
+   <resourceStyle width="17" x="107" y="138" height="17"/>
+  </symbolStyle>
+  <symbolStyle id="144" name="wastewater">
+   <resourceStyle width="17" x="124" y="138" height="17"/>
+  </symbolStyle>
+  <symbolStyle id="145" name="power_generic">
+   <resourceStyle width="17" x="141" y="138" height="17"/>
+  </symbolStyle>
+  <symbolStyle id="146" name="viewpoint">
+   <resourceStyle width="17" x="158" y="138" height="17"/>
+  </symbolStyle>
+  <symbolStyle id="147" name="power_wind">
+   <resourceStyle width="17" x="175" y="138" height="17"/>
+  </symbolStyle>
+  <symbolStyle id="148" name="cave_entrance">
+   <resourceStyle width="17" x="192" y="138" height="17"/>
+  </symbolStyle>
+  <symbolStyle id="149" name="lighthouse">
+   <resourceStyle width="17" x="209" y="138" height="17"/>
+  </symbolStyle>
+  <symbolStyle id="150" name="bureau_de_change">
+   <resourceStyle width="17" x="226" y="138" height="17"/>
+  </symbolStyle>
+  <symbolStyle id="151" name="car_sharing">
+   <resourceStyle width="17" x="243" y="138" height="16"/>
+  </symbolStyle>
+  <symbolStyle id="152" name="hotel_and_restaurant">
+   <resourceStyle width="14" x="260" y="138" height="14"/>
+  </symbolStyle>
+  <symbolStyle id="153" name="picnic">
+   <resourceStyle width="14" x="274" y="138" height="14"/>
+  </symbolStyle>
+  <symbolStyle id="154" name="bench">
+   <resourceStyle width="14" x="288" y="138" height="14"/>
+  </symbolStyle>
+  <symbolStyle id="155" name="parking_roof_fee">
+   <resourceStyle width="23" x="302" y="138" height="13"/>
+  </symbolStyle>
+  <symbolStyle id="156" name="parking_roof_fee-permissive">
+   <resourceStyle width="23" x="325" y="138" height="13"/>
+  </symbolStyle>
+  <symbolStyle id="157" name="parking_fee">
+   <resourceStyle width="23" x="348" y="138" height="13"/>
+  </symbolStyle>
+  <symbolStyle id="158" name="parking_fee-permissive">
+   <resourceStyle width="23" x="371" y="138" height="13"/>
+  </symbolStyle>
+  <symbolStyle id="159" name="park_and_ride">
+   <resourceStyle width="23" x="394" y="138" height="13"/>
+  </symbolStyle>
+  <symbolStyle id="160" name="park_and_ride-permissive">
+   <resourceStyle width="23" x="417" y="138" height="13"/>
+  </symbolStyle>
+  <symbolStyle id="161" name="disused">
+   <resourceStyle width="11" x="440" y="138" height="11"/>
+  </symbolStyle>
+  <symbolStyle id="162" name="power-tower">
+   <resourceStyle width="11" x="451" y="138" height="11"/>
+  </symbolStyle>
+  <symbolStyle id="163" name="vulcan">
+   <resourceStyle width="11" x="462" y="138" height="11"/>
+  </symbolStyle>
+  <symbolStyle id="164" name="building">
+   <resourceStyle width="11" x="473" y="138" height="11"/>
+  </symbolStyle>
+  <symbolStyle id="165" name="survey_point">
+   <resourceStyle width="10" x="484" y="138" height="10"/>
+  </symbolStyle>
+  <symbolStyle id="166" name="power-pole">
+   <resourceStyle width="8" x="494" y="138" height="8"/>
+  </symbolStyle>
+  <symbolStyle id="167" name="tree">
+   <resourceStyle width="7" x="502" y="138" height="7"/>
+  </symbolStyle>
  </page>
-    </skin>
+</skin>
diff --git a/data/resources-yota/symbols.png b/data/resources-yota/symbols.png
index 065c80ed76..f40643a846 100644
--- a/data/resources-yota/symbols.png
+++ b/data/resources-yota/symbols.png
diff --git a/data/styles/include/base_landuse.mapcss b/data/styles/include/base_landuse.mapcss
deleted file mode 100644
index 7ca7299e93..0000000000
--- a/data/styles/include/base_landuse.mapcss
+++ /dev/null
@@ -1,265 +0,0 @@
-area[natural=coastline]
-{
-  fill-color: #f1eee8;
-}
-area|z6-11[natural=land]
-{
-  fill-color: #f1eee8;
-}
-area|z12-[natural=land]
-{
-  fill-color: #f8f8f8;
-}
-
-area[landuse],
-area[natural],
-area[leisure]
-{
-  fill-position: background;
-}
-
-area|z12-[landuse=farm],
-area|z12-[landuse=farmland]
-{
-  fill-color: #DFDF97;
-}
-area|z13-[amenity=grave_yard],
-area|z12-[landuse=allotments],
-area|z13-[landuse=cemetery],
-area|z12-[landuse=field],
-area|z12-[landuse=grass],
-area|z12-[landuse=meadow],
-area|z12-[landuse=recreation_ground],
-area|z12-[landuse=village_green],
-area|z12-[natural=scrub]
-{
-  fill-color: #d0e8c4;
-}
-area|z10-[natural=wood],
-area|z10-[landuse=forest]
-{
-  fill-color: #B2D6A5;
-}
-area|z11-[aeroway=apron],
-area|z12-[landuse=brownfield],
-area|z12-[landuse=cemetery],
-area|z12-[landuse=construction],
-area|z12-[landuse=farmyard],
-area|z12-[landuse=greenfield],
-area|z12-[landuse=industrial],
-area|z12-[landuse=quarry],
-area|z12-[landuse=railway],
-{
-  fill-color: #DDDDCC;
-}
-area|z12-[landuse=commercial],
-area|z12-[natural=heath]
-{
-  fill-color: #f8f8d8;
-  fill-position: background;
-}
-area|z12-[landuse=military]
-{
-  fill-color: #d0d050;
-}
-area|z12-[landuse=conservation]
-{
-  fill-color: #cfeca8;
-}
-area|z12-[landuse=residential]
-{
-  fill-color: #ede8d2;
-}
-area|z12-[landuse=residential][residential=urban]
-{
-  fill-color: #eeeeee;
-}
-area|z12-[landuse=residential][residential=rural]
-{
-  fill-color: #FFFFCC;
-}
-area|z12-[landuse=retail]
-{
-  fill-color: #f8ecec;
-}
-area|z13-[landuse=farmyard]
-{
-  fill-color: #e4e4e4;
-}
-area|z13-[landuse=landfill],
-area|z13-[landuse=quarry]
-{
-  fill-color: #e9dd72;
-}
-area|z13-[landuse=vineyard]
-{
-  fill-color: #d1ead1;
-}
-area|z15-[landuse=garages]
-{
-  fill-color: #e1e1e5;
-}
-area|z15-16[landuse=construction],
-node|z15-16[landuse=construction]
-{
-  text: name;
-  font-size: 12;
-  text-color: #808070;
-}
-area|z17-[landuse=construction],
-node|z17-[landuse=construction]
-{
-  text: name;
-  font-size: 14;
-  text-color: #404040;
-}
-area|z17-[aeroway=gate],
-area|z15[landuse=allotments],
-area|z15[landuse=basin],
-area|z15[landuse=brownfield],
-area|z15[landuse=cemetery],
-area|z15[landuse=commercial],
-area|z15[landuse=farm],
-area|z15[landuse=farmland],
-area|z15[landuse=farmyard],
-area|z15[landuse=forest],
-area|z15[landuse=garages],
-area|z15[landuse=grass],
-area|z15[landuse=greenfield],
-area|z15[landuse=greenhouse_horticulture],
-area|z15[landuse=industrial],
-area|z15[landuse=landfill],
-area|z15[landuse=meadow],
-area|z15[landuse=military],
-area|z15[landuse=orchard],
-area|z15[landuse=quarry],
-area|z15[landuse=railway],
-area|z15[landuse=recreation_ground],
-area|z15[landuse=reservoir],
-area|z15[landuse=retail],
-area|z15[landuse=salt_pond],
-area|z15[landuse=village_green],
-area|z15[landuse=vineyard],
-area|z14-15[natural=bay],
-area|z15[natural=grass],
-area|z15[natural=greenfield],
-area|z15[natural=greenhouse_horticulture],
-area|z15[natural=meadow],
-area|z15[natural=orchard],
-area|z15[natural=salt_pond],
-area|z15[natural=vineyard],
-node|z17-[aeroway=gate],
-node|z14-15[natural=bay],
-area|z14-[landuse=field],
-area|z15-[landuse=residential]
-{
-  text: name;
-  font-size: 12;
-  text-color: #202020;
-}
-
-area|z16-[landuse=forest],
-area|z17-[tourism=zoo],
-area|z16-[amenity=townhall],
-area|z17-[tourism=caravan_site],
-area|z17-[leisure=garden],
-area|z17-[leisure=park],
-node|z13-[highway=motorway_junction],
-node|z17-[tourism=caravan_site],
-node|z17-[tourism=zoo],
-node|z16-[amenity=townhall]
-{
-  font-size: 12;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #404040;
-  text-halo-color: white;
-}
-
-area|z16-[landuse=allotments],
-area|z16-[landuse=basin],
-area|z16-[landuse=brownfield],
-area|z16-[landuse=cemetery],
-area|z16-[landuse=commercial],
-area|z16-[landuse=farm],
-area|z16-[landuse=farmland],
-area|z16-[landuse=farmyard],
-area|z16-[landuse=forest],
-area|z16-[landuse=garages],
-area|z16-[landuse=grass],
-area|z16-[landuse=greenfield],
-area|z16-[landuse=greenhouse_horticulture],
-area|z16-[landuse=industrial],
-area|z16-[landuse=landfill],
-area|z16-[landuse=meadow],
-area|z16-[landuse=military],
-area|z16-[landuse=orchard],
-area|z16-[landuse=quarry],
-area|z16-[landuse=railway],
-area|z16-[landuse=recreation_ground],
-area|z16-[landuse=reservoir],
-area|z16-[landuse=retail],
-area|z16-[landuse=salt_pond],
-area|z16-[landuse=village_green],
-area|z16-[landuse=vineyard],
-area|z16-[natural=bay],
-area|z16-[natural=grass],
-area|z16-[natural=greenfield],
-area|z16-[natural=greenhouse_horticulture],
-area|z16-[natural=meadow],
-area|z16-[natural=orchard],
-area|z16-[natural=salt_pond],
-area|z16-[natural=vineyard],
-node|z16-[landuse=allotments],
-node|z16-[landuse=basin],
-node|z16-[landuse=brownfield],
-node|z16-[landuse=cemetery],
-node|z16-[landuse=commercial],
-node|z16-[landuse=farm],
-node|z16-[landuse=farmland],
-node|z16-[landuse=farmyard],
-node|z16-[landuse=forest],
-node|z16-[landuse=garages],
-node|z16-[landuse=grass],
-node|z16-[landuse=greenfield],
-node|z16-[landuse=greenhouse_horticulture],
-node|z16-[landuse=industrial],
-node|z16-[landuse=landfill],
-node|z16-[landuse=meadow],
-node|z16-[landuse=military],
-node|z16-[landuse=orchard],
-node|z16-[landuse=quarry],
-node|z16-[landuse=railway],
-node|z16-[landuse=recreation_ground],
-node|z16-[landuse=reservoir],
-node|z16-[landuse=retail],
-node|z16-[landuse=salt_pond],
-node|z16-[landuse=village_green],
-node|z16-[landuse=vineyard],
-node|z16-[natural=bay],
-node|z16-[natural=grass],
-node|z16-[natural=greenfield],
-node|z16-[natural=greenhouse_horticulture],
-node|z16-[natural=meadow],
-node|z16-[natural=orchard],
-node|z16-[natural=salt_pond],
-node|z16-[natural=vineyard]
-{
-  text: name;
-  font-size: 16;
-  text-color: #202020;
-}
-
-/*
-FIX GENERATOR TO UNCOMMENT
-
-area|z6-13[natural=glacier]
-{
-  fill-color: lightblue;
-}
-*/
-
-area|z14-[natural=beach]
-{
-  fill-color: #eecc55;
-}
diff --git a/data/styles/include/base_place.mapcss b/data/styles/include/base_place.mapcss
deleted file mode 100644
index b7613b8eab..0000000000
--- a/data/styles/include/base_place.mapcss
+++ /dev/null
@@ -1,535 +0,0 @@
-*[place]
-{
-  text-position: center;
-  fill-position: background;
-}
-
-
-area|z15-[place=island],
-node|z15-[place=island]
-{
-  text: name;
-  font-size: 16;
-  text-color: #505050;
-}
-node|z-2[place=continent]
-{
-  text: name;
-  font-size: 18;
-  text-color: #808078;
-}
-node|z3[place=country]
-{
-  text: name;
-  font-size: 12;
-  text-color: #404040;
-}
-area|z3[place=country]::int_name,
-node|z3[place=country]::int_name
-{
-  text: int_name;
-  font-size: 12;
-  text-color: #606060;
-}
-
-node|z4[place=city][capital?]::int_name
-{
-  font-size: 10;
-  text-halo-radius: 2;
-  text: int_name;
-  text-color: grey;
-  text-halo-color: #eeeedd;
-}
-node|z8[place=town]
-{
-  font-size: 12;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #404040;
-  text-halo-color: #eeeedd;
-}
-node|z4[place=country],
-node|z9[place=town]
-{
-  font-size: 14;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #404040;
-  text-halo-color: #eeeedd;
-}
-node|z4[place=state]
-{
-  text: name;
-  font-size: 11;
-  text-color: #c0c0b0;
-  z-index: -10;
-}
-node|z4[place=city][capital?]
-{
-  font-size: 11;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #505050;
-  text-halo-color: #eeeedd;
-}
-node|z4-5[place=country]::int_name,
-node|z13-14[place=village]::int_name
-{
-  font-size: 12;
-  text-halo-radius: 2;
-  text: int_name;
-  text-color: #606060;
-  text-halo-color: #eeeedd;
-}
-
-node|z5[place=city][capital?]
-{
-  font-size: 12;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #505050;
-  text-halo-color: #eeeedd;
-}
-node|z5[place=city][capital?]::int_name
-{
-  font-size: 11;
-  text-halo-radius: 2;
-  text: int_name;
-  text-color: grey;
-  text-halo-color: #eeeedd;
-}
-node|z5[place=country]
-{
-  font-size: 16;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #404040;
-  text-halo-color: #eeeedd;
-}
-node|z5[place=city]
-{
-  font-size: 11;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #606060;
-  text-halo-color: #eeeedd;
-}
-node|z5[place=state]
-{
-  text: name;
-  font-size: 12;
-  text-color: #c0c0b0;
-  z-index: -10;
-}
-node|z5[place=city]::int_name
-{
-  font-size: 10;
-  text-halo-radius: 2;
-  text: int_name;
-  text-color: #909090;
-  text-halo-color: #eeeedd;
-}
-node|z7-8[place=city]::int_name,
-node|z9[place=town]::int_name,
-node|z12-13[place=town]::int_name,
-node|z6-9[place=city][capital?]::int_name
-{
-  font-size: 12;
-  text-halo-radius: 2;
-  text: int_name;
-  text-color: grey;
-  text-halo-color: #eeeedd;
-}
-node|z6[place=city][capital?]
-{
-  font-size: 14;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #606060;
-  text-halo-color: #eeeedd;
-}
-
-node|z6[place=country]
-{
-  text: name;
-  font-size: 18;
-  text-color: grey;
-}
-node|z6[place=city],
-node|z15[place=locality],
-node|z12-13[place=village]
-{
-  font-size: 12;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #606060;
-  text-halo-color: #eeeedd;
-}
-node|z6[place=state]
-{
-  text: name;
-  font-size: 13;
-  text-color: #c0c0b0;
-  z-index: -10;
-}
-node|z6[place=country]::int_name
-{
-  text: int_name;
-  font-size: 12;
-  text-color: #a0a090;
-}
-node|z6[place=city]::int_name
-{
-  font-size: 11;
-  text-halo-radius: 2;
-  text: int_name;
-  text-color: #909090;
-  text-halo-color: #eeeedd;
-}
-node|z7[place=country]
-{
-  text: name;
-  font-size: 26;
-  text-color: #909080;
-}
-node|z7-8[place=city]
-{
-  font-size: 14;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #505050;
-  text-halo-color: #eeeedd;
-}
-node|z7[place=country]::d1p3
-{
-  text: int_name;
-  font-size: 14;
-  text-color: #a0a090;
-}
-node|z7[place=state]
-{
-  text: name;
-  font-size: 14;
-  text-color: #c0c0b0;
-  z-index: -10;
-}
-node|z8[place=state]
-{
-  font-size: 14;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #b0b0a8;
-  text-halo-color: #eeeedd;
-  z-index: -10;
-}
-area|z15-[place=farm],
-node|z15-[place=farm],
-node|z12-15[place=hamlet],
-node|z14[place=locality],
-node|z8-9[place=region]
-{
-  text: name;
-  font-size: 12;
-  text-color: #606060;
-}
-node|z8-9[place=city][capital?],
-node|z16[place=locality]
-{
-  font-size: 16;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #606060;
-  text-halo-color: #eeeedd;
-}
-area|z10-14[place=island],
-node|z10-14[place=island]
-{
-  text: name;
-  font-size: 12;
-  text-color: #505050;
-}
-node|z8-9[place=country]
-{
-  text: name;
-  font-size: 28;
-  text-color: #a0a090;
-}
-area|z8-9[place=country]::int_name,
-node|z8-9[place=country]::int_name
-{
-  text: int_name;
-  font-size: 14;
-  text-color: #b0b0a0;
-}
-node|z9[place=state]
-{
-  font-size: 14;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #c0c0b0;
-  text-halo-color: #eeeedd;
-  z-index: -10;
-}
-node|z9[place=city]
-{
-  font-size: 17;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #505050;
-  text-halo-color: #eeeedd;
-}
-node|z9[place=county]
-{
-  text: name;
-  font-size: 14;
-  text-color: #a0a0a0;
-}
-node|z9-11[place=city]::int_name,
-node|z10-11[place=town]::int_name,
-node|z14[place=town]::int_name,
-node|z10-11[place=city][capital?]::int_name
-{
-  font-size: 14;
-  text-halo-radius: 2;
-  text: int_name;
-  text-color: grey;
-  text-halo-color: #eeeedd;
-}
-node|z10-11[place=town]
-{
-  font-size: 16;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #505050;
-  text-halo-color: #eeeedd;
-}
-node|z10-11[place=city],
-node|z12[place=town]
-{
-  font-size: 18;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #505050;
-  text-halo-color: #eeeedd;
-}
-node|z10-11[place=city][capital?]
-{
-  font-size: 18;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #606060;
-  text-halo-color: #eeeedd;
-}
-area|z10[place=county],
-node|z10[place=county]
-{
-  font-size: 14;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #a0a0a0;
-  text-halo-color: #eeeedd;
-}
-area|z11-12[place=county],
-node|z11-12[place=county]
-{
-  font-size: 16;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #a0a090;
-  text-halo-color: #eeeedd;
-}
-node|z12[place=city]::int_name
-{
-  text: int_name;
-  font-size: 16;
-  text-color: grey;
-}
-node|z13-15[place=city]::int_name,
-node|z12[place=city][capital?]::int_name
-{
-  font-size: 16;
-  text-halo-radius: 2;
-  text: int_name;
-  text-color: grey;
-  text-halo-color: #eeeedd;
-}
-area|z12-16[place=suburb]::int_name,
-node|z12-16[place=suburb]::int_name
-{
-  text: int_name;
-  font-size: 12;
-  text-color: #a0a0a0;
-  z-index: 20;
-}
-node|z12[place=city],
-node|z13[place=town]
-{
-  font-size: 20;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #505050;
-  text-halo-color: #eeeedd;
-}
-node|z12[place=city][capital?]
-{
-  font-size: 22;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #606060;
-  text-halo-color: #eeeedd;
-}
-area|z12[place=suburb],
-node|z12[place=suburb]
-{
-  text: name;
-  font-size: 12;
-  text-color: #909090;
-  z-index: 20;
-}
-node|z13[place=city][capital?]::int_name
-{
-  font-size: 18;
-  text-halo-radius: 2;
-  text: int_name;
-  text-color: grey;
-  text-halo-color: #eeeedd;
-}
-area|z14[place=farm],
-area|z13-15[place=islet],
-area|z17-[place=islet]
-{
-  text: name;
-  font-size: 12;
-  text-color: #202020;
-}
-area|z14-[place=hamlet],
-area|z11-[place=village]
-{
-  fill-color: #dddac9;
-}
-node|z13[place=city][capital?]
-{
-  text: name;
-  font-size: 24;
-  text-color: grey;
-}
-node|z13[place=city]
-{
-  font-size: 20;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #404040;
-  text-halo-color: #eeeedd;
-}
-area|z13[place=suburb],
-node|z13[place=suburb]
-{
-  text: name;
-  font-size: 14;
-  text-color: #909090;
-  z-index: 20;
-}
-area|z14[place=town],
-node|z14[place=town]
-{
-  font-size: 22;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #505050;
-  text-halo-color: #eeeedd;
-}
-area|z14-16[place=suburb],
-node|z14-16[place=suburb]
-{
-  text: name;
-  font-size: 18;
-  text-color: #909090;
-  z-index: 20;
-}
-node|z14-15[place=city]
-{
-  font-size: 22;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #404040;
-  text-halo-color: #eeeedd;
-}
-area|z14[place=village],
-node|z14[place=village]
-{
-  font-size: 12;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #404040;
-  text-halo-color: #eeeedd;
-}
-area|z14-16[place=locality]::int_name,
-node|z14-16[place=locality]::int_name
-{
-  text: int_name;
-  font-size: 12;
-  text-color: #909090;
-}
-node|z15-[place=village]::int_name
-{
-  font-size: 12;
-  text-halo-radius: 2;
-  text: int_name;
-  text-color: #909090;
-  text-halo-color: #eeeedd;
-}
-area|z15-16[place=village],
-node|z15-16[place=village]
-{
-  font-size: 16;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #707070;
-  text-halo-color: #eeeedd;
-}
-area|z16[place=islet],
-node|z16[place=islet]
-{
-  text: name;
-  font-size: 16;
-  text-color: #202020;
-}
-area|z16-[place=hamlet],
-node|z16-[place=hamlet]
-{
-  text: name;
-  font-size: 16;
-  text-color: #606060;
-}
-area|z17-[place=suburb],
-node|z17-[place=suburb]
-{
-  text: name;
-  font-size: 20;
-  text-color: #909090;
-  z-index: 20;
-}
-area|z17-[place=village],
-node|z17-[place=village]
-{
-  font-size: 18;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #707070;
-  text-halo-color: #eeeedd;
-}
-area|z17-[place=locality],
-node|z17-[place=locality]
-{
-  text: name;
-  font-size: 16;
-  text-color: #404040;
-}
-area|z17-[place=suburb]::int_name,
-node|z17-[place=suburb]::int_name
-{
-  text: int_name;
-  font-size: 14;
-  text-color: #a0a0a0;
-  z-index: 20;
-}
\ No newline at end of file
diff --git a/data/styles/include/base_publictransport.mapcss b/data/styles/include/base_publictransport.mapcss
deleted file mode 100644
index 87d9099d66..0000000000
--- a/data/styles/include/base_publictransport.mapcss
+++ /dev/null
@@ -1,333 +0,0 @@
-line[highway=bus_stop]
-{
-    casing-width: 0;
-}
-node[highway=bus_stop],
-node[railway=tram_stop],
-node[railway=station],
-way[highway=bus_stop],
-way[railway=tram_stop],
-way[railway=station]
-{
-  text-position: center;
-}
-area|z16[highway=bus_stop],
-node|z16[highway=bus_stop],
-area|z15[railway=tram_stop],
-node|z15[railway=tram_stop]
-{
-  font-size: 10;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #3050d8;
-  text-offset: 10;
-  text-halo-color: white;
-}
-
-area|z16[highway=bus_stop]::int_name,
-node|z16[highway=bus_stop]::int_name,
-area|z15[railway=tram_stop]::int_name,
-node|z15[railway=tram_stop]::int_name
-{
-  font-size: 9;
-  text-halo-radius: 2;
-  text: int_name;
-  text-color: #3050d8;
-  text-offset: 10;
-  text-halo-color: white;
-  z-index: 20;
-}
-
-*|z17-[highway=bus_stop],
-*|z16[railway=tram_stop]
-{
-  font-size: 11;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #3050d8;
-  text-offset: 10;
-  text-halo-color: white;
-  z-index: 20;
-}
-*|z17-[highway=bus_stop]::int_name,
-*|z16[railway=tram_stop]::int_name
-{
-  font-size: 10;
-  text-halo-radius: 2;
-  text: int_name;
-  text-color: #3050d8;
-  text-offset: 10;
-  text-halo-color: white;
-  z-index: 20;
-}
-
-area|z17-[amenity=bus_station]::int_name,
-node|z17-[amenity=bus_station]::int_name
-{
-  font-size: 10;
-  text-halo-radius: 2;
-  text: int_name;
-  text-color: #404040;
-  text-offset: 10;
-  text-halo-color: white;
-  z-index: 1;
-}
-
-
-area|z16[highway=bus_stop],
-node|z16[highway=bus_stop]
-{
-  icon-image: symbols/bus-mini.svg;
-  z-index: 20;
-}
-area|z16-[amenity=bus_station],
-area|z17-[highway=bus_stop],
-node|z16-[amenity=bus_station],
-node|z17-[highway=bus_stop]
-{
-  icon-image: symbols/bus.svg;
-  z-index: 20;
-}
-area|z17-[railway=tram_stop],
-node|z17-[railway=tram_stop]
-{
-  icon-image: symbols/tramway.svg;
-}
-area|z16[railway=tram_stop],
-node|z16[railway=tram_stop]
-{
-  icon-image: symbols/tramway-mini.svg;
-}
-
-line|z15-[railway=tram]::d1p2
-{
-  color: #e6b7e6;
-  width: 2;
-  z-index: 561;
-}
-
-
-area|z15-[railway=halt],
-area|z17-[railway=tram_stop],
-node|z15-[railway=halt],
-node|z17-[railway=tram_stop]
-{
-  font-size: 12;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #3050d8;
-  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[railway=monorail]::d1p3,
-line|z15[railway=tram]::d1p3
-{
-  color: #4c0f4c;
-  width: 2;
-  z-index: 566;
-  dashes: 7.2,10.8;
-  linecap: butt;
-}
-
-line|z15-[railway=tram]
-{
-  color: #4c0f4c;
-  width: 3.2;
-  z-index: 556;
-}
-
-line|z16-[railway=tram]::d1p3
-{
-  color: #4c0f4c;
-  width: 2;
-  z-index: 566;
-  dashes: 9.6,14.4;
-  linecap: butt;
-}
-
-line|z14[railway=tram]::raildash
-{
-  color: #590959;
-  width: 1.7;
-  z-index: 557;
-  dashes: 3.6,5.4;
-  linecap: butt;
-}
-line|z14[railway=tram]::railfill
-{
-  color: #e6b7e6;
-  width: 1.7;
-  z-index: 556;
-}
-line|z14[railway=tram]::railborder
-{
-  color: #590959;
-  width: 2;
-  z-index: 555;
-}
-
-
-
-line|z12-[railway=subway]
-{
-  color: #0f0f4c;
-  width: 2;
-  z-index: 686;
-  dashes: 9.6,14.4;
-  linecap: butt;
-  opacity: 0.4;
-}
-
-area|z16-[railway=subway_entrance],
-node|z16-[railway=subway_entrance]
-{
-  icon-image: symbols/subway.svg;
-}
-
-line|z12-[railway=subway]                                         {width:3; color: #0f0f4c; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway]                           {text-color:  #3050d8; text-position: center;}
-node[railway=station][transport=subway]::int_name                 {text-color:  #3050d8; text-position: center;}
-node[railway=subway_entrance]                                     {text-color:  #3050d8; text-position: center;}
-
-line|z12-[railway=subway][colour]                                 {width:3; color: eval(tag("colour")); z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour]                   {text-color:  eval(tag("colour"));}
-node[railway=station][transport=subway][colour]::int_name         {text-color:  eval(tag("colour"));}
-node[railway=subway_entrance][colour]                             {text-color:  eval(tag("colour"));}
-
-line|z12-[railway=subway][colour=red]                             {width:3; color: #DD0000; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour=red]               {text-color:  #DD0000;}
-node[railway=station][transport=subway][colour=red]::int_name     {text-color:  #DD0000;}
-node[railway=station][transport=subway][colour=red]               {text-color:  #DD0000;}
-
-line|z12-[railway=subway][colour=blue]                            {width:3; color: #072889; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour=blue]              {text-color:  #072889;}
-node[railway=station][transport=subway][colour=blue]::int_name    {text-color:  #072889;}
-node[railway==subway_entrance][colour=blue]                       {text-color:  #072889;}
-
-line|z12-[railway=subway][colour=purple]                          {width:3; color: #8B509C; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour=purple]            {text-color:  #8B509C;}
-node[railway=station][transport=subway][colour=purple]::int_name  {text-color:  #8B509C;}
-node[railway=subway_entrance][colour=purple]                      {text-color:  #8B509C;}
-
-line|z12-[railway=subway][colour=orange]                          {width:3; color: #FF7700; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour=orange]            {text-color:  #FF7700;}
-node[railway=station][transport=subway][colour=orange]::int_name  {text-color:  #FF7700;}
-node[railway=subway_entrance][colour=orange]                      {text-color:  #FF7700;}
-
-line|z12-[railway=subway][colour=green]                           {width:3; color: #006600; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour=green]             {text-color:  #006600;}
-node[railway=station][transport=subway][colour=green]::int_name   {text-color:  #006600;}
-node[railway=subway_entrance][colour=green]                       {text-color:  #006600;}
-
-line|z12-[railway=subway][colour=brown]                           {width:3; color: #BB7700; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour=brown]             {text-color:  #BB7700;}
-node[railway=station][transport=subway][colour=brown]::int_name   {text-color:  #BB7700;}
-node[railway=subway_entrance][colour=brown]                       {text-color:  #BB7700;}
-
-line|z12-[railway=subway][colour=yellow]                          {width:3; color: #F7C600; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
-node[railway=station][transport=subway][colour=yellow]            {text-color:  #F7C600;}
-node[railway=station][transport=subway][colour=yellow]::int_name  {text-color:  #F7C600;}
-node[railway=subway_entrance][colour=yellow]                      {text-color:  #F7C600;}
-
-node|z12[railway=station][transport=subway],
-area|z12[railway=station][transport=subway]
-{ 
-  font-size: 10;
-  text-halo-radius: 2;
-  text: name;
-  text-offset: 10;
-  text-halo-color: #f8fcff;
-  z-index: 170;
-  -x-kot-layer: top;
-}
-node|z12[railway=station][transport=subway]::int_name,
-area|z12[railway=station][transport=subway]::int_name
-{
-  font-size: 9;
-  text-halo-radius: 2;
-  text: int_name;
-  text-offset: 10;
-  text-halo-color: #f8fcff;
-  z-index: 170;
-  -x-kot-layer: top;
-}
-node|z13-14[railway=station][transport=subway],
-area|z13-14[railway=station][transport=subway]
-{ 
-  font-size: 11;
-  text-halo-radius: 2;
-  text: name;
-  text-offset: 10;
-  text-halo-color: #f8fcff;
-  z-index: 170;
-  -x-kot-layer: top;
-}
-node|z13-14[railway=station][transport=subway]::int_name,
-area|z13-14[railway=station][transport=subway]::int_name
-{
-  font-size: 10;
-  text-halo-radius: 2;
-  text: int_name;
-  text-offset: 10;
-  text-halo-color: #f8fcff;
-  z-index: 170;
-  -x-kot-layer: top;
-}
-*|z15-[railway=subway_entrance]
-{ 
-  text-position: center;
-  font-size: 10;
-  text-color: #3050d8;
-  text-halo-radius: 2;
-  text: name;
-  text-offset: 10;
-  z-index: 170;
-}
-node|z15-[railway=station][transport=subway],
-area|z15-[railway=station][transport=subway]
-{ 
-  font-size: 12;
-  text-halo-radius: 2;
-  text: name;
-  text-offset: 10;
-  text-halo-color: #f8fcff;
-  z-index: 170;
-  -x-kot-layer: top;
-}
-node|z15-[railway=station][transport=subway]::int_name,
-area|z15-[railway=station][transport=subway]::int_name
-{
-  font-size: 11;
-  text-halo-radius: 2;
-  text: int_name;
-  text-offset: 10;
-  text-halo-color: #f8fcff;
-  z-index: 170;
-  -x-kot-layer: top;
-}
-area|z12-14[railway=station][transport=subway],
-node|z12-14[railway=station][transport=subway]
-{
-  icon-image: symbols/subway-station-s.svg;
-}
-area|z15[railway=station][transport=subway],
-node|z15[railway=station][transport=subway]
-{
-  icon-image: symbols/subway-station-m.svg;
-}
-area|z16-[railway=station][transport=subway],
-node|z16-[railway=station][transport=subway]
-{
-  icon-image: symbols/subway-station-l.svg;
-}
diff --git a/data/styles/include/base_roads.mapcss b/data/styles/include/base_roads.mapcss
index 3d6d57d3d1..53ce6e0768 100644
--- a/data/styles/include/base_roads.mapcss
+++ b/data/styles/include/base_roads.mapcss
@@ -1,7 +1,7 @@
 line[highway]
 {
-  casing-color: #B5944C;
-  casing-width: 0.8;
+    casing-color: #B5944C;
+    casing-width: 0.8;
 }
 line[highway=pedestrian],
 line[highway=footway],
@@ -11,7 +11,7 @@ line[highway=steps],
 line[highway=cycleway],
 line[highway=construction]
 {
-  casing-width: 0;
+    casing-width: 0;
 }
 line[highway=service],
 line[highway=residential],
@@ -22,328 +22,354 @@ line[highway=secondary]
 }
 line|z7[highway=trunk]
 {
-  color: #eed4a6;
-  width: 1;
+  color:    #eed4a6;
+  width:    1;
+  linecap:  butt;
 }
 line|z7[highway=motorway]
 {
-  color: #efbb6e;
-  width: 1;
+  color:    #efbb6e;
+  width:    1;
+  linecap:  butt;
 }
 line|z8[highway=trunk]
 {
-  color: #f7d396;
-  width: 2;
+  color:    #f7d396;
+  width:    2;
+  linecap:  butt;
 }
 line|z8[highway=motorway]
 {
-  color: #ef9721;
-  width: 2;
+  color:    #ef9721;
+  width:    2;
+  linecap:  butt;
 }
 line|z9-10[highway=trunk]
 {
-  color: #ffc444;
-  width: 2;
+  color:    #ffc444;
+  width:    2;
+  linecap:  butt;
 }
 line|z9[highway=motorway]
 {
-  color: #f08800;
-  width: 3;
+  color:    #f08800;
+  width:    3;
+  linecap:  butt;
 }
 line|z9-10[highway=secondary]
 {
-  color: #fffb80;
-  width: 1;
+  color:    #fffb80;
+  width:    1;
 }
 line|z10[highway=motorway]
 {
-  color: #f08800;
-  width: 4;
+  color:    #f08800;
+  width:    4;
+  linecap:  butt;
 }
 line|z10-12[highway=byway]
 {
-  color: #c0a87c;
-  width: 1;
-  dashes: 4.5,3;
+  color:    #c0a87c;
+  width:    1;
+  dashes:   4.5,3;
+  linecap:  butt;
 }
 line|z8-10[highway=primary]
 {
-  color: #FDE066;
-  width: 1;
+  color:    #FDE066;
+  width:    1;
+  linecap:  butt;
 }
 line|z11[highway=primary]
 {
-  color: #FDE066;
-  width: 2;
+  color:    #FDE066;
+  width:    2;
+  linecap:  butt;
 }
 line|z11[highway=trunk]
 {
-  color: #ffc444;
-  width: 3;
+  color:    #ffc444;
+  width:    3;
+  linecap:  butt;
 }
 line|z11[highway=secondary]
 {
-  color: #fffb80;
-  width: 2;
+  color:    #fffb80;
+  width:    2;
 }
 line|z10-11[highway=primary_link]
 {
-  color: #FDE066;
-  width: 1;
+  color:    #FDE066;
+  width:    1;
 }
 line|z11[highway=motorway]
 {
-  color: #f08800;
-  width: 4;
+  color:    #f08800;
+  width:    4;
+  casing-linecap:    butt;
   casing-color: #b87c04;
 }
 line|z12[highway=primary]
 {
-  color: #FDE066;
-  width: 3;
+  color:    #FDE066;
+  width:    3;
+  casing-linecap:    butt;
   casing-color: #d8a050;
 }
 line|z12[highway=trunk]
 {
-  color: #ffc444;
-  width: 3;
+  color:    #ffc444;
+  width:    3;
+  casing-linecap:    butt;
   casing-color: #d8a050;
 }
 line|z12[highway=tertiary]
 {
-  color: #ffff90;
-  width: 1;
+  color:    #ffff90;
+  width:    1;
   casing-color: #c8c860;
 }
 line|z12[highway=secondary]
 {
-  color: #fffb80;
-  width: 3;
+  color:    #fffb80;
+  width:    3;
+  casing-linecap:    butt;
   casing-color: #c8c860;
 }
 line|z10-11[highway=primary],
 line|z10-11[highway=trunk],
 line|z10-11[highway=motorway]
 {
-  font-size: 10;
+  font-size:    10;
   text-halo-radius: 2;
   text: name;
-  text-color: #303030;
+  text-color:   #303030;
 }
 line|z12-13[highway=primary],
 line|z12-13[highway=trunk],
 line|z12-13[highway=motorway]
 {
-  font-size: 12;
+  font-size:    12;
   text-halo-radius: 2;
   text: name;
-  text-color: #303030;
+  text-color:   #303030;
 }
 line|z12[highway=motorway]
 {
-  color: #f08800;
-  width: 6;
+  color:    #f08800;
+  width:    6;
+  casing-linecap:    butt;
   casing-color: #b87c04;
 }
 line|z12[highway=raceway]
 {
-  color: #e8e4d4;
-  width: 0.38;
+  color:    #e8e4d4;
+  width:    0.38;
 }
 line|z12[highway=primary_link]
 {
-  color: #FDE066;
-  width: 3;
+  color:    #FDE066;
+  width:    3;
 }
 line|z12[highway=tertiary_link]
 {
-  color: #ffff90;
-  width: 1;
+  color:    #ffff90;
+  width:    1;
 }
 line|z13-14[highway=byway]
 {
-  color: #c0a87c;
-  width: 1;
+  color:    #c0a87c;
+  width:    1;
 }
 line|z13[highway=secondary]
 {
-  color: #fffb80;
-  width: 4;
+  color:    #fffb80;
+  width:    4;
+  casing-linecap:    butt;
   casing-color: #c8c860;
 }
 line|z13[highway=tertiary]
 {
-  color: #ffff90;
-  width: 2;
+  color:    #ffff90;
+  width:    2;
   casing-color: #c8c860;
 }
 line|z13[highway=tertiary_link]
 {
-  color: #ffff90;
-  width: 2.75;
+  color:    #ffff90;
+  width:    2.75;
 }
 line|z13-15[highway=secondary]
 {
-  font-size: 12;
+  font-size:    12;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
+  text-color:   #404040;
 }
 line|z13[highway=raceway]
 {
-  color: #e8e4d4;
-  width: 0.75;
+  color:    #e8e4d4;
+  width:    0.75;
 }
 line|z13[highway=primary_link]
 {
-  color: #FDE066;
-  width: 3;
+  color:    #FDE066;
+  width:    3;
 }
 line|z13[highway=construction]
 {
-  color: #d0d0d0;
-  width: 2.75;
-  dashes: 4,4;
-  linecap: butt;
+  color:    #d0d0d0;
+  width:    2.75;
+  dashes:   4,4;
+  linecap:  butt;
 }
 line|z13[highway=ford]
 {
-  color: #B9D4D4;
-  width: 2.75;
+  color:    #B9D4D4;
+  width:    2.75;
   casing-color: #202020;
 }
 line|z13[highway=bridleway]
 {
-  color: #a9d355;
-  width: 0.9;
+  color:    #a9d355;
+  width:    0.9;
 }
 line|z13[highway=unclassified]
 {
-  color: white;
-  width: 1;
+  color:    white;
+  width:    1;
+  linecap:  butt;
 }
 line|z13-14[highway=motorway]
 {
-  font-size: 16;
+  font-size:    16;
   text-halo-radius: 2;
   text: name;
-  text-color: #202020;
+  text-color:   #202020;
 }
 line|z13[highway=residential],
 line|z13[highway=living_street]
 {
-  color: white;
-  width: 1;
+  color:    white;
+  width:    1;
+  casing-linecap:    butt;
   casing-color: #c8c8af;
 }
 line|z13[highway=primary]
 {
-  color: #FDE066;
-  width: 5;
+  color:    #FDE066;
+  width:    5;
+  casing-linecap:    butt;
   casing-color: #d8a050;
 }
 line|z13[highway=trunk]
 {
-  color: #ffc444;
-  width: 5;
+  color:    #ffc444;
+  width:    5;
+  casing-linecap:    butt;
   casing-color: #d8a050;
 }
 line|z13[highway=motorway]
 {
-  color: #f08800;
-  width: 8;
+  color:    #f08800;
+  width:    8;
+  casing-linecap:    butt;
   casing-color: #b87c04;
 }
 line|z13[highway=track]
 {
-  color: #d79331;
-  width: 1;
+  color:    #d79331;
+  width:    1;
+  linecap:  butt;
 }
 line|z14[highway=cycleway]
 {
-  color: #4dbf4d;
-  width: 1;
+  color:    #4dbf4d;
+  width:    1;
 }
 line|z14[highway=raceway]
 {
-  color: #e8e4d4;
-  width: 3;
+  color:    #e8e4d4;
+  width:    3;
 }
 line|z14-[highway=tertiary]
 {
-  font-size: 12;
+  font-size:    12;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
+  text-color:   #404040;
 }
 line|z14[highway=ford]
 {
-  color: #B9D4D4;
-  width: 3.5;
+  color:    #B9D4D4;
+  width:    3.5;
   casing-color: #101010;
 }
 line|z14[highway=construction]
 {
-  color: #d0d0d0;
-  width: 3.5;
-  dashes: 4,4;
-  linecap: butt;
+  color:    #d0d0d0;
+  width:    3.5;
+  dashes:   4,4;
+  linecap:  butt;
 }
 line|z14[highway=motorway_link]
 {
-  color: #f08800;
-  width: 5.5;
+  color:    #f08800;
+  width:    5.5;
 }
 line|z14[highway=primary],
 line|z14[highway=trunk]
 {
-  font-size: 14;
+  font-size:    14;
   text-halo-radius: 2;
   text: name;
-  text-color: #303030;
+  text-color:   #303030;
 }
 line|z15[highway=primary],
 line|z15[highway=trunk]
 {
-  font-size: 15;
+  font-size:    15;
   text-halo-radius: 2;
   text: name;
-  text-color: #303030;
+  text-color:   #303030;
 }
 line|z14[highway=motorway]
 {
-  color: #f08800;
-  width: 12;
+  color:    #f08800;
+  width:    12;
+  casing-linecap:    butt;
   casing-color: #b87c04;
 }
 line|z14[highway=residential],
 line|z14[highway=unclassified],
 line|z14[highway=living_street]
 {
-  color: white;
-  width: 3;
+  color:    white;
+  width:    3;
+  casing-linecap:    butt;
   casing-color: #c8c8af;
 }
 line|z14[highway=tertiary]
 {
-  color: #ffff90;
-  width: 3;
+  color:    #ffff90;
+  width:    3;
   casing-color: #c8c860;
 }
 line|z14[highway=track]
 {
-  color: #d79331;
-  width: 1;
+  color:    #d79331;
+  width:    1;
+  linecap:  butt;
 }
 line|z14[highway=bridleway]
 {
-  color: #8fbf4d;
-  width: 1.6;
+  color:    #8fbf4d;
+  width:    1.6;
 }
 line|z14[highway=primary_link]
 {
-  color: #FDE066;
-  width: 4.5;
+  color:    #FDE066;
+  width:    4.5;
 }
 line|z15[highway=living_street],
 line|z14-[highway=motorway_link],
@@ -352,499 +378,511 @@ line|z14-15[highway=road],
 line|z14-[highway=secondary_link],
 line|z15-[highway=tertiary_link]
 {
-  font-size: 12;
+  font-size:    12;
   text-halo-radius: 2;
   text: name;
-  text-color: #202020;
+  text-color:   #202020;
 }
 line|z14[highway=tertiary_link]
 {
-  color: #ffff90;
-  width: 4.5;
+  color:    #ffff90;
+  width:    4.5;
 }
 line|z14[highway=secondary]
 {
-  color: #fffb80;
-  width: 5;
+  color:    #fffb80;
+  width:    5;
+  casing-linecap:    butt;
   casing-color: #c8c860;
 }
 line|z14[highway=pedestrian]
 {
-  color: #d0ccac;
-  width: 1;
+  color:    #d0ccac;
+  width:    1;
 }
 line|z14[highway=primary]
 {
-  color: #FDE066;
-  width: 7;
+  color:    #FDE066;
+  width:    7;
+  casing-linecap:    butt;
   casing-color: #d8a050;
 }
 line|z14[highway=trunk]
 {
-  color: #ffc444;
-  width: 7;
+  color:    #ffc444;
+  width:    7;
+  casing-linecap:    butt;
   casing-color: #d8a050;
 }
 line|z10-12[highway=secondary_link]
 {
-  color: #fffb80;
-  width: 1;
+  color:    #fffb80;
+  width:    1;
 }
 line|z13[highway=secondary_link]
 {
-  color: #fffb80;
-  width: 2;
+  color:    #fffb80;
+  width:    2;
 }
 line|z14[highway=secondary_link]
 {
-  color: #fffb80;
-  width: 4.5;
+  color:    #fffb80;
+  width:    4.5;
 }
 line|z14[highway=road]
 {
-  color: #d0d0d0;
-  width: 3.5;
+  color:    #d0d0d0;
+  width:    3.5;
 }
 line|z15[highway=footway]
 {
-  color: #d0ccbc;
-  width: 1;
+  color:    #d0ccbc;
+  width:    1;
 }
 line|z15[highway=path]
 {
-  color: silver;
-  width: 2;
+  color:    silver;
+  width:    2;
 }
 line|z15[highway=raceway]
 {
-  color: #e8e4d4;
-  width: 3;
+  color:    #e8e4d4;
+  width:    3;
 }
 line|z15-16[highway=motorway]
 {
-  color: #f08800;
-  width: 16;
+  color:    #f08800;
+  width:    16;
+  casing-linecap:    butt;
   casing-color: #b87c04;
 }
 line|z10-12[highway=trunk_link]
 {
-  color: #ffc444;
-  width: 1;
+  color:    #ffc444;
+  width:    1;
 }
 line|z13[highway=trunk_link]
 {
-  color: #ffc444;
-  width: 2;
+  color:    #ffc444;
+  width:    2;
 }
 line|z14[highway=trunk_link]
 {
-  color: #ffc444;
-  width: 4;
+  color:    #ffc444;
+  width:    4;
+  casing-linecap:    butt;
   casing-color: #d8a050;
 }
 line|z15[highway=primary]
 {
-  color: #FDE066;
-  width: 8;
+  color:    #FDE066;
+  width:    8;
+  casing-linecap:    butt;
   casing-color: #d8a050;
 }
 line|z15[highway=trunk],
 line|z15[highway=trunk_link]
 {
-  color: #ffc444;
-  width: 8;
+  color:    #ffc444;
+  width:    8;
+  casing-linecap:    butt;
   casing-color: #d8a050;
 }
 line|z15[highway=track]
 {
-  color: #c0a87c;
-  width: 2;
+  color:    #c0a87c;
+  width:    2;
 }
 line|z15[highway=pedestrian]
 {
-  color: #e8e8e8;
-  width: 3;
+  color:    #e8e8e8;
+  width:    3;
   casing-color: #c0bc9c;
 }
 line|z15[highway=byway]
 {
-  color: #c0a87c;
-  width: 2;
+  color:    #c0a87c;
+  width:    2;
 }
 line|z15[highway=primary_link]
 {
-  color: #FDE066;
-  width: 9;
+  color:    #FDE066;
+  width:    9;
 }
 line|z15[highway=secondary]
 {
-  color: #fffb80;
-  width: 7;
+  color:    #fffb80;
+  width:    7;
+  casing-linecap:    butt;
   casing-color: #c8c860;
 }
 line|z15[highway=road]
 {
-  color: #d0d0d0;
-  width: 7;
+  color:    #d0d0d0;
+  width:    7;
 }
 line|z15[highway=raceway]::d2p2
 {
-  color: red;
-  width: 3.4;
-  z-index: 187;
-  dashes: 0.4,0.4;
-  linecap: butt;
+  color:    red;
+  width:    3.4;
+  z-index:  187;
+  dashes:   0.4,0.4;
+  linecap:  butt;
 }
 line|z14-[highway=residential],
 line|z14-[highway=unclassified],
 line|z14-[highway=pedestrian]
 {
-  font-size: 12;
+  font-size:    12;
   text-halo-radius: 2;
   text: name;
-  text-color: #505050;
+  text-color:   #505050;
 }
 line|z15[highway=tertiary_link]
 {
-  color: #ffff90;
-  width: 9;
+  color:    #ffff90;
+  width:    9;
 }
 line|z15[highway=raceway]::out
 {
-  color: #e8e4d4;
-  width: 6;
-  z-index: 342;
+  color:    #e8e4d4;
+  width:    6;
+  z-index:  342;
 }
 line|z15[highway=bridleway]
 {
-  color: #d3cb98;
-  width: 3.2;
+  color:    #d3cb98;
+  width:    3.2;
 }
 line|z15[highway=secondary_link]
 {
-  color: #fffb80;
-  width: 9;
+  color:    #fffb80;
+  width:    9;
 }
 line|z15[highway=construction]
 {
-  color: #d0d0d0;
-  width: 7;
-  dashes: 4,4;
-  linecap: butt;
-}
-area|z15-[highway=byway][area?]
+  color:    #d0d0d0;
+  width:    7;
+  dashes:   4,4;
+  linecap:  butt;
+}area|z15-[highway=byway][area?]
 {
-  fill-color: #efadaa;
+  fill-color:   #efadaa;
 }
 line|z15[highway=service]
 {
-  color: #fdfdfd;
-  width: 3;
+  color:    #fdfdfd;
+  width:    3;
 }
 line|z15[highway=raceway]
 {
-  color: white;
-  width: 3.4;
-  z-index: 186;
+  color:    white;
+  width:    3.4;
+  z-index:  186;
 }
 line|z15[highway=motorway]
 {
-  font-size: 17;
+  font-size:    17;
   text-halo-radius: 2;
   text: name;
-  text-color: #202020;
+  text-color:   #202020;
 }
 line|z15[highway=tertiary]
 {
-  color: #ffff90;
-  width: 4;
+  color:    #ffff90;
+  width:    4;
   casing-color: #c8c860;
 }
 line|z15[highway=ford]
 {
-  color: #B9D4D4;
-  width: 7;
+  color:    #B9D4D4;
+  width:    7;
   casing-color: #707070;
 }
 area|z15-[highway=footway][area?]
 {
-  fill-color: #f8f0e8;
+  fill-color:   #f8f0e8;
 }
 line|z12[highway=motorway_link]
 {
-  color: #f08800;
-  width: 1;
+  color:    #f08800;
+  width:    1;
 }
 line|z13[highway=motorway_link]
 {
-  color: #f08800;
-  width: 2;
+  color:    #f08800;
+  width:    2;
 }
 line|z14[highway=motorway_link]
 {
-  color: #f08800;
-  width: 4;
+  color:    #f08800;
+  width:    4;
 }
 line|z15[highway=motorway_link]
 {
-  color: #f08800;
-  width: 8;
+  color:    #f08800;
+  width:    8;
 }
 line|z15[highway=residential],
 line|z15[highway=unclassified],
 line|z15[highway=living_street]
 {
-  color: white;
-  width: 4;
+  color:    white;
+  width:    4;
+  casing-linecap:    butt;
   casing-color: #c8c8af;
 }
 line|z15[highway=cycleway]
 {
-  color: #90bc90;
-  width: 1;
+  color:    #90bc90;
+  width:    1;
 }area|z15-[highway=pedestrian][area?]
 {
-  fill-color: #f0f0f0;
+  fill-color:   #f0f0f0;
 }
 line|z16[highway=path][sac_scale=demanding_mountain_hiking]
 {
-  color: red;
-  width: 1.2;
-  dashes: 0.16,2.4;
-  linecap: butt;
+  color:    red;
+  width:    1.2;
+  dashes:   0.16,2.4;
+  linecap:  butt;
 }
 line|z16[highway=bridleway]
 {
-  color: #d3cb98;
-  width: 6.4;
+  color:    #d3cb98;
+  width:    6.4;
 }
 line|z16[highway=primary_link]
 {
-  color: #FDE066;
-  width: 12;
+  color:    #FDE066;
+  width:    12;
 }
 line|z16[highway=construction]
 {
-  color: #d0d0d0;
-  width: 9;
-  dashes: 4,4;
-  linecap: butt;
+  color:    #d0d0d0;
+  width:    9;
+  dashes:   4,4;
+  linecap:  butt;
 }
 line|z16[highway=byway]
 {
-  color: #c0a87c;
-  width: 4;
+  color:    #c0a87c;
+  width:    4;
 }
 line|z16[highway=path][route=hiking]
 {
-  color: red;
-  width: 1.2;
+  color:    red;
+  width:    1.2;
 }
 line|z16[highway=cycleway]
 {
-  color: #90bc90;
-  width: 2;
+  color:    #90bc90;
+  width:    2;
 }
 line|z16[highway=footway][sac_scale=hiking]
 {
-  color: red;
-  width: 1.2;
+  color:    red;
+  width:    1.2;
 }
 line|z16[highway=road]
 {
-  color: #d0d0d0;
-  width: 9;
+  color:    #d0d0d0;
+  width:    9;
 }
 line|z16-[highway=motorway]
 {
-  font-size: 18;
+  font-size:    18;
   text-halo-radius: 2;
   text: name;
-  text-color: #202020;
+  text-color:   #202020;
 }
 line|z16[highway=secondary]
 {
-  color: #fffb80;
-  width: 11;
+  color:    #fffb80;
+  width:    11;
+  casing-linecap:    butt;
   casing-color: #c8c860;
 }
 line|z16[highway=raceway]::d2p3
 {
-  color: #e8e4d4;
-  width: 6;
-  z-index: 603;
+  color:    #e8e4d4;
+  width:    6;
+  z-index:  603;
 }
 line|z16[highway=pedestrian]
 {
-  color: #e8e8e8;
-  width: 4;
+  color:    #e8e8e8;
+  width:    4;
   casing-color: #c0bc9c;
 }
 line|z16[highway=footway][sac_scale=demanding_mountain_hiking]
 {
-  color: red;
-  width: 1.2;
-  dashes: 0.16,2.4;
-  linecap: butt;
+  color:    red;
+  width:    1.2;
+  dashes:   0.16,2.4;
+  linecap:  butt;
 }
 line|z16[highway=secondary]
 {
-  font-size: 14;
+  font-size:    14;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
+  text-color:   #404040;
 }
 line|z16[highway=path][sac_scale=mountain_hiking]
 {
-  color: red;
-  width: 1.2;
-  dashes: 2,2;
-  linecap: butt;
+  color:    red;
+  width:    1.2;
+  dashes:   2,2;
+  linecap:  butt;
 }
 line|z16[highway=path]
 {
-  color: silver;
-  width: 2;
+  color:    silver;
+  width:    2;
 }
 line|z16[highway=path][sac_scale=difficult_alpine_hiking]
 {
-  color: blue;
-  width: 1.2;
-  dashes: 0.16,2.4;
-  linecap: butt;
+  color:    blue;
+  width:    1.2;
+  dashes:   0.16,2.4;
+  linecap:  butt;
 }
 line|z16[highway=footway]
 {
-  color: #d0ccbc;
-  width: 2;
+  color:    #d0ccbc;
+  width:    2;
 }
 line|z16[highway=footway][sac_scale=mountain_hiking]
 {
-  color: red;
-  width: 1.2;
-  dashes: 2,2;
-  linecap: butt;
+  color:    red;
+  width:    1.2;
+  dashes:   2,2;
+  linecap:  butt;
 }
 line|z16[highway=path][sac_scale][sac_scale=alpine_hiking]
 {
-  color: blue;
-  width: 1.2;
+  color:    blue;
+  width:    1.2;
 }
 line|z16[highway=footway][sac_scale=alpine_hiking]
 {
-  color: blue;
-  width: 1.2;
+  color:    blue;
+  width:    1.2;
 }
 line|z16[highway=service]
 {
-  color: white;
-  width: 5;
+  color:    white;
+  width:    5;
 }
 line|z16[highway=footway][sac_scale=demanding_alpine_hiking]
 {
-  color: blue;
-  width: 1.2;
-  dashes: 2,2;
-  linecap: butt;
+  color:    blue;
+  width:    1.2;
+  dashes:   2,2;
+  linecap:  butt;
 }
 line|z16[highway=raceway]
 {
-  color: white;
-  width: 6.8;
+  color:    white;
+  width:    6.8;
 
 }
 line|z16[highway=tertiary]
 {
-  color: #ffff90;
-  width: 6;
+  color:    #ffff90;
+  width:    6;
   casing-color: #c8c860;
 }
 line|z16[highway=tertiary_link]
 {
-  color: #ffff90;
-  width: 12;
+  color:    #ffff90;
+  width:    12;
 }
 line|z16-[highway=motorway_link]
 {
-  color: #f08800;
-  width: 12;
+  color:    #f08800;
+  width:    12;
 }
 line|z16[highway=path][sac_scale=demanding_alpine_hiking]
 {
-  color: blue;
-  width: 1.2;
-  dashes: 2,2;
-  linecap: butt;
+  color:    blue;
+  width:    1.2;
+  dashes:   2,2;
+  linecap:  butt;
 }
 line|z15-16[highway=primary]
 {
-  color: #FDE066;
-  width: 14;
+  color:    #FDE066;
+  width:    14;
+  casing-linecap:    butt;
   casing-color: #d8a050;
 }
 line|z16[highway=trunk],
 line|z16[highway=trunk_link]
 {
-  color: #ffc444;
-  width: 14;
+  color:    #ffc444;
+  width:    14;
+  casing-linecap:    butt;
   casing-color: #d8a050;
 }
 line|z16[highway=steps]
 {
-  width: 4;
-  z-index: 687;
-  color: #d0ccac;
-  linecap: butt;
-  dashes: 2.4,0.8;
+  width:    4;
+  z-index:  687;
+  color:    #d0ccac;
+  linecap:  butt;
+  dashes:   2.4,0.8;
 }
 line|z16[highway=residential],
 line|z16[highway=unclassified],
 line|z16[highway=living_street]
 {
-  color: white;
-  width: 6;
+  color:    white;
+  width:    6;
+  casing-linecap:    butt;
   casing-color: #c8c8af;
 }
 line|z16[highway=footway][sac_scale=difficult_alpine_hiking]
 {
-  color: blue;
-  width: 1.2;
-  dashes: 0.16,2.4;
-  linecap: butt;
+  color:    blue;
+  width:    1.2;
+  dashes:   0.16,2.4;
+  linecap:  butt;
 }
 line|z16[highway=raceway]::d2p2
 {
-  color: red;
-  width: 6.8;
-  z-index: 461;
-  dashes: 0.8,0.8;
-  linecap: butt;
+  color:    red;
+  width:    6.8;
+  z-index:  461;
+  dashes:   0.8,0.8;
+  linecap:  butt;
 }
 line|z16[highway=raceway]
 {
-  color: #e8e4d4;
-  width: 12;
-  z-index: 587;
+  color:    #e8e4d4;
+  width:    12;
+  z-index:  587;
 }
 line|z16-[highway=secondary_link]
 {
-  color: #fffb80;
-  width: 12;
+  color:    #fffb80;
+  width:    12;
 }
 line|z16[highway=ford]
 {
-  color: #B9D4D4;
-  width: 9;
+  color:    #B9D4D4;
+  width:    9;
   casing-color: #707070;
 }
 line|z16-[highway=primary],
 line|z16-[highway=trunk],
 line|z16-[highway=trunk_link]
 {
-  font-size: 17;
+  font-size:    17;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
+  text-color:   #404040;
 }
 line|z16-[highway=bridleway],
 line|z16-[highway=byway],
@@ -853,10 +891,10 @@ line|z16-[highway=path],
 line|z16-[highway=road],
 line|z16-[highway=service]
 {
-  font-size: 12;
+  font-size:    12;
   text-halo-radius: 2;
   text: name;
-  text-color: #606060;
+  text-color:   #606060;
 }
 line|z16-[highway=footway],
 line|z16-[highway=cycleway],
@@ -864,301 +902,306 @@ line|z16-[highway=pedestrian],
 line|z16-[highway=steps],
 line|z16-[highway=track]
 {
-  font-size: 12;
+  font-size:    12;
   text-halo-radius: 2;
   text: name;
-  text-color: #303030;
+  text-color:   #303030;
 }
 line|z16[highway=track]
 {
-  color: #c0a87c;
-  width: 4;
+  color:    #c0a87c;
+  width:    4;
 }
 line|z17-[highway=pedestrian]
 {
-  color: #e8e8e8;
-  width: 7;
+  color:    #e8e8e8;
+  width:    7;
   casing-color: #c0bc9c;
 }
 line|z17[highway=steps]::d1p2
 {
-  width: 4;
-  z-index: 300;
-  color: #d0ccac;
-  linecap: butt;
-  dashes: 2.4,1;
+  width:    4;
+  z-index:  300;
+  color:    #d0ccac;
+  linecap:  butt;
+  dashes:   2.4,1;
 }
 line|z17[highway=steps]
 {
-  color: #a0a090;
-  width: 6;
-  linecap: butt;
+  color:    #a0a090;
+  width:    6;
+  linecap:  butt;
 }
 line|z18[highway=steps]::d1p2
 {
-  width: 8;
-  z-index: 300;
-  color: #d0ccac;
-  linecap: butt;
-  dashes: 3,1;
+  width:    8;
+  z-index:  300;
+  color:    #d0ccac;
+  linecap:  butt;
+  dashes:   3,1;
 }
 line|z18[highway=steps]
 {
-  color: #a0a090;
-  width: 10;
-  linecap: butt;
+  color:    #a0a090;
+  width:    10;
+  linecap:  butt;
 }
 line|z19-[highway=steps]::d1p2
 {
-  width: 16;
-  z-index: 300;
-  color: #d0ccac;
-  linecap: butt;
-  dashes: 4,1;
+  width:    16;
+  z-index:  300;
+  color:    #d0ccac;
+  linecap:  butt;
+  dashes:   4,1;
 }
 line|z19-[highway=steps]
 {
-  color: #a0a090;
-  width: 18;
-  linecap: butt;
+  color:    #a0a090;
+  width:    18;
+  linecap:  butt;
 }
 line|z17-[highway=service]
 {
-  color: white;
-  width: 7;
+  color:    white;
+  width:    7;
 }
 line|z17[highway=footway]::dashes
 {
-  width: 4;
-  z-index: 692;
-  color: #d0ccbc;
-  linecap: butt;
+  width:  4;
+  z-index:  692;
+  color:  #d0ccbc;
+  linecap:  butt;
   dashes: 1,3;
 }
 line|z17-[highway=footway]
 {
-  color: #d0ccbc;
-  width: 5;
+  color:    #d0ccbc;
+  width:    5;
 }
 line|z18[highway=footway]::dashes
 {
-  width: 8;
-  z-index: 692;
-  color: #d0ccbc;
-  linecap: butt;
-  dashes: 1,3;
+  width:    8;
+  z-index:  692;
+  color:    #d0ccbc;
+  linecap:  butt;
+  dashes:   1,3;
 }
 line|z18[highway=footway],
 line|z18[highway=service],
 line|z18[highway=pedestrian]
 {
-  width: 9;
+  width:    9;
 }
 line|z19-[highway=footway]::dashes
 {
-  width: 16;
-  z-index: 692;
-  color: #d0ccbc;
-  linecap: butt;
-  dashes: 1,4;
+  width:    16;
+  z-index:  692;
+  color:    #d0ccbc;
+  linecap:  butt;
+  dashes:   1,4;
 }
 line|z19-[highway=footway],
 line|z19-[highway=service],
 line|z19-[highway=pedestrian]
 {
-  width: 17;
+  width:    17;
 }
 line|z17-[highway=path][sac_scale=demanding_alpine_hiking]
 {
-  color: blue;
-  width: 0.8;
-  dashes: 4,4;
-  linecap: butt;
+  color:    blue;
+  width:    0.8;
+  dashes:   4,4;
+  linecap:  butt;
 }
 line|z17-[highway=path][sac_scale=demanding_mountain_hiking]
 {
-  color: red;
-  width: 0.8;
-  dashes: 0.08,1.2;
-  linecap: butt;
+  color:    red;
+  width:    0.8;
+  dashes:   0.08,1.2;
+  linecap:  butt;
 }
 line|z17-[highway=proposed],
 line|z17-[highway=construction]
 {
-  color: #d0d0d0;
-  width: 10;
-  dashes: 4,4;
-  linecap: butt;
+  color:    #d0d0d0;
+  width:    10;
+  dashes:   4,4;
+  linecap:  butt;
 }
 line|z17-[highway=raceway]
 {
-  color: white;
-  width: 13.6;
-  z-index: 474;
+  color:    white;
+  width:    13.6;
+  z-index:  474;
 }
 line|z17-[highway=residential],
 line|z17-[highway=unclassified],
 line|z17-[highway=living_street]
 {
-  color: white;
-  width: 8;
+  color:    white;
+  width:    8;
+  casing-linecap:    butt;
   casing-color: #c8c8af;
 }
 line|z17-[highway=path][sac_scale=mountain_hiking]
 {
-  color: red;
-  width: 0.8;
-  dashes: 4,4;
-  linecap: butt;
+  color:    red;
+  width:    0.8;
+  dashes:   4,4;
+  linecap:  butt;
 }
 line|z17-[highway=footway][sac_scale=demanding_mountain_hiking]
 {
-  color: red;
-  linecap: butt;
+  color:    red;
+  linecap:  butt;
 }
 line|z17-[highway=raceway]::d2p3
 {
-  color: #e8e4d4;
-  width: 12;
-  z-index: 635;
+  color:    #e8e4d4;
+  width:    12;
+  z-index:  635;
 }
 line|z17-[highway=primary_link]
 {
-  color: #FDE066;
-  width: 12;
+  color:    #FDE066;
+  width:    12;
 }
 line|z17-[highway=raceway]
 {
-  color: #e8e4d4;
-  width: 12;
+  color:    #e8e4d4;
+  width:    12;
 }
 line|z17-[highway=raceway]::d2p2
 {
-  color: red;
-  width: 13.6;
-  z-index: 475;
-  dashes: 1.6,1.6;
-  linecap: butt;
+  color:    red;
+  width:    13.6;
+  z-index:  475;
+  dashes:   1.6,1.6;
+  linecap:  butt;
 }
 line|z17-[highway=secondary]
 {
-  color: #fffb80;
-  width: 14;
+  color:    #fffb80;
+  width:    14;
+  casing-linecap:    butt;
   casing-color: #c8c860;
 }
 line|z17-[highway=bridleway]
 {
-  color: #d3cb98;
-  width: 6.8;
+  color:    #d3cb98;
+  width:    6.8;
 }
 line|z17-[highway=primary]
 {
-  color: #FDE066;
-  width: 16;
+  color:    #FDE066;
+  width:    16;
+  casing-linecap:    butt;
   casing-color: #d8a050;
 }
 line|z17-[highway=trunk],
 line|z17-[highway=trunk_link]
 {
-  color: #ffc444;
-  width: 16;
+  color:    #ffc444;
+  width:    16;
+  casing-linecap:    butt;
   casing-color: #d8a050;
 }
 line|z17-[highway=ford]
 {
-  color: #B9D4D4;
-  width: 10;
+  color:    #B9D4D4;
+  width:    10;
   casing-color: #707070;
 }
 line|z17-[highway=byway]
 {
-  color: #c0a87c;
-  width: 6;
+  color:    #c0a87c;
+  width:    6;
 }
 line|z17-[highway=path]
 {
-  color: silver;
-  width: 3;
+  color:    silver;
+  width:    3;
 }
 line|z17-[highway=path][route=hiking]
 {
-  color: red;
-  width: 0.8;
+  color:    red;
+  width:    0.8;
 }
 line|z17-[highway=footway][sac_scale=hiking]
 {
-  color: red;
-  width: 0.8;
+  color:    red;
+  width:    0.8;
 }
 line|z17-[highway=footway][sac_scale=alpine_hiking]
 {
-  color: blue;
+  color:    blue;
 }
 line|z17-[highway=footway][sac_scale=difficult_alpine_hiking]
 {
-  color: blue;
-  linecap: butt;
+  color:    blue;
+  linecap:  butt;
 }
 line|z17-[highway=tertiary_link]
 {
-  color: #ffff90;
-  width: 12;
+  color:    #ffff90;
+  width:    12;
 }
 line|z17-[highway=footway][sac_scale=demanding_alpine_hiking]
 {
-  color: blue;
-  linecap: butt;
+  color:    blue;
+  linecap:  butt;
 }
 line|z17-[highway=track]
 {
-  color: #c0a87c;
-  width: 6;
+  color:    #c0a87c;
+  width:    6;
 }
 line|z17-[highway=cycleway]
 {
-  color: #90bc90;
-  width: 3;
+  color:    #90bc90;
+  width:    3;
 }
 line|z17-[highway=motorway]
 {
-  color: #f08800;
-  width: 17;
+  color:    #f08800;
+  width:    17;
+  casing-linecap:    butt;
   casing-color: #b87c04;
 }
 line|z17-[highway=road]
 {
-  color: #d0d0d0;
-  width: 10;
+  color:    #d0d0d0;
+  width:    10;
 }
 line|z17-[highway=secondary]
 {
-  font-size: 16;
+  font-size:    16;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
+  text-color:   #404040;
 }
 line|z17-[highway=path][sac_scale=difficult_alpine_hiking]
 {
-  color: blue;
-  width: 0.8;
-  dashes: 0.08,1.2;
-  linecap: butt;
+  color:    blue;
+  width:    0.8;
+  dashes:   0.08,1.2;
+  linecap:  butt;
 }
 line|z17-[highway=path][sac_scale][sac_scale=alpine_hiking]
 {
-  color: blue;
-  width: 0.8;
+  color:    blue;
+  width:    0.8;
 }
 line|z17-[highway=tertiary]
 {
-  color: #ffff90;
-  width: 12;
+  color:    #ffff90;
+  width:    12;
   casing-color: #c8c860;
 }
 line|z17-[highway=footway][sac_scale=mountain_hiking]
 {
-  color: red;
-  linecap: butt;
+  color:    red;
+  linecap:  butt;
 }
 line|z18[highway=motorway],
 line|z18[highway=motorway_link],
@@ -1174,7 +1217,7 @@ line|z18[highway=residential],
 line|z18[highway=unclassified],
 line|z18[highway=living_street]
 {
-  width: 23;
+  width:    23;
 }
 line|z19-[highway=motorway],
 line|z19-[highway=motorway_link],
@@ -1190,14 +1233,14 @@ line|z19-[highway=residential],
 line|z19-[highway=unclassified],
 line|z19-[highway=living_street]
 {
-  width: 41;
+  width:    41;
 }
 area|z15-[area:highway=footway],
 area|z15-[area:highway=pedestrian],
 area|z15-[area:highway=path],
 area|z15-[area:highway=steps]
 {
-  fill-color: #d0ccbc;
+  fill-color:   #d0ccbc;
 }
 line[highway=footway],
 line[highway=pedestrian],
@@ -1249,7 +1292,7 @@ area[area:highway]
 }
 line[highway]
 {
-  text-halo-color: eval(prop("color"));
+  text-halo-color:  eval(prop("color"));
   text-position: line;
 }
 *[highway][area?]
diff --git a/data/styles/include/base_roads_UK.mapcss b/data/styles/include/base_roads_UK.mapcss
deleted file mode 100644
index df5cfc9ed3..0000000000
--- a/data/styles/include/base_roads_UK.mapcss
+++ /dev/null
@@ -1,37 +0,0 @@
-*[highway=motorway],
-*[highway=motorway_link],
-area[area:highway=motorway]
-{
-  fill-color: #8AC;
-  color: #8AC;
-  text-halo-color: #8AC;
-}
-
-*[highway=trunk],
-*[highway=trunk_link],
-area[area:highway=trunk]
-{
-  fill-color: #9D9;
-  color: #9D9;
-  text-halo-color: #9D9;
-}
-
-*[highway=primary],
-*[highway=primary_link],
-area[area:highway=primary]
-{
-  fill-color: #D99;
-  color: #D99;
-  text-halo-color: #D99;
-}
-
-*[highway=secondary],
-*[highway=secondary_link],
-area[area:highway=secondary]
-{
-  fill-color: #FDA;
-  color: #FDA;
-  text-halo-color: #FDA;
-}
-
-
diff --git a/data/styles/include/base_shop.mapcss b/data/styles/include/base_shop.mapcss
index ecb578d1ab..62e251c950 100644
--- a/data/styles/include/base_shop.mapcss
+++ b/data/styles/include/base_shop.mapcss
@@ -6,31 +6,31 @@
 area|z17-[shop][shop!=no],
 node|z17-[shop][shop!=no],
 {
-  font-size: 11;
+  font-size:    11;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
-  text-offset: 10;
-  text-halo-color: white;
+  text-color:   #404040;
+  text-offset:  10;
+  text-halo-color:  white;
   z-index: 1;
 }
 
 area|z16-[shop=car_repair],
 node|z16-[shop=car_repair]
 {
-  icon-image: symbols/car_repair.svg;
+  icon-image:   car_repair.svg;
 }
 
 area|z16-[shop=kiosk],
 node|z16-[shop=kiosk]
 {
-  icon-image: symbols/kiosk.svg;
+  icon-image:   kiosk.svg;
 }
 
 area|z16-[shop=bakery],
 node|z16-[shop=bakery]
 {
-  icon-image: symbols/bakery.svg;
+  icon-image:   bakery.svg;
 }
 
 area|z16-[shop=convenience],
@@ -60,19 +60,17 @@ node|z16-[shop=department_store],
 area|z16-[shop=furniture],
 node|z16-[shop=furniture]
 {
-  icon-image: symbols/supermarket.svg;
+  icon-image:   supermarket.svg;
 }
 
-/*
 area|z16-[shop=hairdresser],
 node|z16-[shop=hairdresser]
 {
-  icon-image: symbols/hairdresser.svg;
+  icon-image:   hairdresser.svg;
 }
-*/
 
 area|z16-[shop=clothes],
 node|z16-[shop=clothes]
 {
-  icon-image: symbols/clothes.svg;
+  icon-image:   clothes.svg;
 }
\ No newline at end of file
diff --git a/data/styles/include/base_sport.mapcss b/data/styles/include/base_sport.mapcss
deleted file mode 100644
index 3ee2689e79..0000000000
--- a/data/styles/include/base_sport.mapcss
+++ /dev/null
@@ -1,154 +0,0 @@
-*[sport]
-{
-  text-position: center;
-}
-
-area|z12-[leisure=sports_centre],
-area|z12-[leisure=stadium],
-area|z12-[leisure=track]
-{
-  fill-color: #d0e8c4;
-}
-
-area|z17-[leisure=sports_centre],
-area|z17-[leisure=stadium],
-node|z17-[leisure=stadium],
-node|z17-[leisure=sports_centre]
-{
-  font-size: 12;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #404040;
-  text-halo-color: white;
-}
-
-area|z13-[leisure=dog_park][sport=tennis],
-area|z13-[leisure=pitch][sport=tennis],
-area|z13-[leisure=playground][sport=tennis],
-area|z13-[leisure=playing_fields][sport=tennis]
-{
-  fill-color: #ddb298;
-}
-/*
-area|z17-[sport=gymnastics],
-area|z17-[sport=multi],
-node|z17-[sport=gymnastics],
-node|z17-[sport=multi]
-{
-  icon-image: symbols/gymnastics-borderless.svg;
-}
-
-area|z17-[leisure=playground],
-node|z17-[leisure=playground]
-{
-  icon-image: symbols/playground.svg;
-}
-
-area|z17-[sport=diving],
-area|z17-[sport=scuba_diving],
-node|z17-[sport=diving],
-node|z17-[sport=scuba_diving]
-{
-  icon-image: symbols/diving-borderless.svg;
-}
-*/
-area|z17-[sport=cricket],
-node|z17-[sport=cricket]
-{
-  icon-image: symbols/cricket-borderless.svg;
-}
-/*
-area|z17-[sport=equestrian],
-node|z17-[sport=equestrian]
-{
-  icon-image: symbols/equestrian-borderless.svg;
-}
-area|z17-[sport=curling],
-node|z17-[sport=curling]
-{
-  icon-image: symbols/curling-borderless.svg;
-}
-*/
-area|z17-[sport=american_football],
-area|z17-[sport=australian_football],
-area|z17-[sport=football],
-node|z17-[sport=american_football],
-node|z17-[sport=australian_football],
-node|z17-[sport=football]
-{
-  icon-image: symbols/football-borderless.svg;
-}
-/*
-area|z17-[sport=swimming],
-node|z17-[sport=swimming]
-{
-  icon-image: symbols/swimming-borderless.svg;
-}
-*/
-area|z17-[sport=tennis],
-node|z17-[sport=tennis]
-{
-  icon-image: symbols/tennis-borderless.svg;
-}
-area|z17-[sport=soccer],
-node|z17-[sport=soccer]
-{
-  icon-image: symbols/soccer-borderless.svg;
-}
-/*
-area|z17-[sport=shooting],
-node|z17-[sport=shooting]
-{
-  icon-image: symbols/shooting-borderless.svg;
-}
-
-area|z17-[sport=handball],
-node|z17-[sport=handball]
-{
-  icon-image: symbols/handball-borderless.svg;
-}
-*/
-area|z17-[sport=golf],
-node|z17-[sport=golf],
-area|z17-[leisure=golf_course],
-node|z17-[leisure=golf_course]
-{
-  icon-image: symbols/golfCourse.svg;
-}
-area|z17-[sport=baseball],
-node|z17-[sport=baseball]
-{
-  icon-image: symbols/baseball-borderless.svg;
-}
-/*
-area|z17-[sport=athletics],
-node|z17-[sport=athletics]
-{
-  icon-image: symbols/athletics-borderless.svg;
-}
-
-area|z17-[sport=bowls],
-node|z17-[sport=bowls]
-{
-  icon-image: symbols/bowls-borderless.svg;
-}
-area|z17-[sport=archery],
-node|z17-[sport=archery]
-{
-  icon-image: symbols/archery-borderless.svg;
-}
-*/
-area|z17-[sport=basketball],
-node|z17-[sport=basketball]
-{
-  icon-image: symbols/basketball-borderless.svg;
-}
-line|z15-[marking=sport]
-{
-    width: 0.5;
-    color: white;
-}
-line|z15-[marking=sport][colour?]
-{
-    color: eval(tag("colour"));
-}
diff --git a/data/styles/include/base_water.mapcss b/data/styles/include/base_water.mapcss
deleted file mode 100644
index 562b33037c..0000000000
--- a/data/styles/include/base_water.mapcss
+++ /dev/null
@@ -1,479 +0,0 @@
-
-node|z1-[place=ocean]
-{
-  text: name;
-  font-size:8;
-  text-color:#4976d1;
-  z-index:-1
-}
-node|z2-[place=ocean]
-{
-  font-size:9;
-}
-node|z5-[place=ocean]
-{
-  font-size:10;
-}
-node|z7-[place=ocean]
-{
-  font-size:11;
-}
-node|z3-[place=sea]
-{
-  text: name;
-  font-size: 8;
-  text-color: #4976d1;
-}
-node|z7-[place=sea]
-{
-  font-size: 10;
-}
-node|z9-[place=sea]
-{
-  font-size: 11;
-}
-area|z16-[amenity=fountain],
-area|z12-[landuse=basin],
-area|z12-[landuse=reservoir],
-area|z13-[leisure=swimming_pool],
-area[natural=ocean],
-area|z10-[natural=lake],
-area|z10-[natural=pond],
-area|z10-[natural=water],
-area|z10-[waterway=dock],
-area|z10-[waterway=riverbank],
-area|z14-[natural=bay],
-{
-  fill-color: #B9D4D4;
-  z-index: 100;
-}
-line|z10[waterway=river]
-{
-  color: #B9D4D4;
-  width: 0.5;
-}
-area|z13-[leisure=water_park],
-line|z11[waterway=river]
-{
-  color: #B9D4D4;
-  width: 1;
-}
-line|z12[waterway=river]
-{
-  color: #B9D4D4;
-  width: 2.5;
-}
-area|z14-[natural=wetland],
-area|z12-[natural=wetland][wetland=bog]
-{
-  fill-color: #a0c3b8;
-}
-line|z12[waterway=drain]
-{
-  color: #B9D4D4;
-  width: 1;
-  z-index: 67;
-}
-line|z12[waterway=ditch]
-{
-  color: #B9D4D4;
-  width: 0.3;
-  z-index: 68;
-}
-line|z12[waterway=stream]
-{
-  color: #B9D4D4;
-  width: 0.75;
-  z-index: 65;
-}
-line|z12[waterway=canal]
-{
-  color: #B9D4D4;
-  width: 2.5;
-}
-line|z13[waterway=drain]
-{
-  color: #B9D4D4;
-  width: 1.5;
-  z-index: 77;
-}
-line|z13[waterway=river]
-{
-  color: #B9D4D4;
-  width: 3;
-}
-area|z13[natural=water]
-{
-  text: name;
-  font-size: 10;
-  text-color: navy;
-}
-area|z14[natural=water]
-{
-  text: name;
-  font-size: 11;
-  text-color: navy;
-}
-area|z15[natural=water]
-{
-  text: name;
-  font-size: 12;
-  text-color: navy;
-}
-area|z16-[natural=water]
-{
-  text: name;
-  font-size: 16;
-  text-color: navy;
-}
-line|z13[waterway=ditch]
-{
-  color: #B9D4D4;
-  width: 0.4;
-  z-index: 78;
-}
-line|z13[waterway=stream]
-{
-  color: #B9D4D4;
-  width: 1;
-  z-index: 75;
-}
-line|z13[waterway=canal]
-{
-  color: #B9D4D4;
-  width: 3;
-}
-line|z14[natural=spring],
-line|z14[waterway=river]
-{
-  color: #B9D4D4;
-  width: 4;
-}
-line|z14[waterway=stream][intermittent=yes]
-{
-  color: #B9D4D4;
-  width: 1;
-  z-index: 100;
-  dashes: 2.4,0.8;
-  linecap: butt;
-}
-line|z14[waterway=dam]
-{
-  color: #202020;
-  width: 0.38;
-  z-index: 124;
-}
-line|z14[waterway=lock]
-{
-  color: #f8f8f8;
-  width: 5;
-  z-index: 88;
-  casing-width: 0.5;
-  casing-color: #202020;
-}
-line|z14-[natural=spring],
-line|z14-[waterway=canal],
-line|z14-[waterway=river]
-{
-  text: name;
-  font-size: 12;
-  text-color: #507cea;
-}
-line|z14[waterway=canal]
-{
-  color: #B9D4D4;
-  width: 4;
-}
-line|z14[waterway=drain]
-{
-  color: #B9D4D4;
-  width: 2.3;
-}
-line|z14[waterway=ditch]
-{
-  color: #B9D4D4;
-  width: 0.3;
-  z-index: 104;
-}
-line|z14[waterway=stream]
-{
-  color: #B9D4D4;
-  width: 1;
-  z-index: 101;
-}
-line|z14[waterway=stream][intermittent=ephemeral]
-{
-  color: #B9D4D4;
-  width: 1;
-  z-index: 99;
-  dashes: 1.6,1.6;
-  linecap: butt;
-}
-line|z14[waterway=weir]
-{
-  color: #000044;
-  width: 0.25;
-  z-index: 123;
-}
-line|z15[waterway=weir]
-{
-  color: #000044;
-  width: 1;
-  z-index: 128;
-}
-line|z15[waterway=canal]
-{
-  color: #B9D4D4;
-  width: 4;
-}
-line|z15[waterway=stream][intermittent=yes]
-{
-  color: #B9D4D4;
-  width: 2;
-  dashes: 2.4,0.8;
-  linecap: butt;
-}
-line|z15[waterway=ditch]
-{
-  color: #B9D4D4;
-  width: 0.6;
-  z-index: 109;
-}
-line|z15[waterway=stream]
-{
-  color: #B9D4D4;
-  width: 2;
-  z-index: 106;
-}
-line|z15[waterway=stream][intermittent=ephemeral]
-{
-  color: #B9D4D4;
-  width: 2;
-  z-index: 104;
-  dashes: 1.6,1.6;
-  linecap: butt;
-}
-line|z15[waterway=lock]
-{
-  color: #f8f8f8;
-  width: 9;
-  z-index: 92;
-  casing-width: 0.5;
-  casing-color: #202020;
-}
-line|z15[natural=spring],
-line|z15[waterway=river]
-{
-  color: #B9D4D4;
-  width: 5;
-}
-line|z15[waterway=drain]
-{
-  color: #B9D4D4;
-  width: 2.8;
-  z-index: 108;
-  casing-width: 0.35;
-  casing-color: #b0b0b0;
-}
-line|z15[waterway=dam]
-{
-  color: #202020;
-  width: 1.5;
-  z-index: 129;
-}
-line|z15[man_made=breakwater]
-{
-  color: #707070;
-  width: 2;
-}
-line|z16[waterway=lock]
-{
-  color: #f8f8f8;
-  width: 10;
-  z-index: 94;
-  casing-width: 1;
-  casing-color: #202020;
-}
-line|z16[waterway=dam]
-{
-  color: #202020;
-  width: 3;
-  z-index: 131;
-}
-line|z16[waterway=drain]
-{
-  width: 4;
-  z-index: 110;
-  color: #B9D4D4;
-  casing-width: 0.6;
-  casing-color: #b0b0b0;
-}
-line|z16-[waterway=ditch],
-line|z16-[waterway=drain],
-line|z16-[waterway=stream]
-{
-  text: name;
-  font-size: 12;
-  text-color: navy;
-}
-line|z16[waterway=stream][intermittent=yes]
-{
-  color: #B9D4D4;
-  width: 2;
-  dashes: 2.4,0.8;
-  linecap: butt;
-}
-area|z17-[amenity=drinking_water],
-node|z17-[amenity=drinking_water]
-{
-  icon-image: symbols/drinking_water.svg;
-}
-line|z16[man_made=breakwater]
-{
-  color: #707070;
-  width: 4;
-  z-index: 854;
-}
-area|z12-[man_made=wastewater_plant]
-{
-  fill-position: background;
-}
-area|z12-[man_made=wastewater_plant]
-{
-  fill-color: #e4e4e4;
-}
-line|z16[waterway=stream]
-{
-  color: #B9D4D4;
-  width: 2;
-  z-index: 108;
-}
-line|z16[natural=spring],
-line|z16[waterway=river]
-{
-  color: #B9D4D4;
-  width: 8;
-}
-line|z16[waterway=canal]
-{
-  color: #B9D4D4;
-  width: 4.8;
-}
-line|z16[waterway=ditch]
-{
-  color: #B9D4D4;
-  width: 0.6;
-  z-index: 111;
-}
-line|z16[waterway=stream][intermittent=ephemeral]
-{
-  color: #B9D4D4;
-  width: 2;
-  z-index: 106;
-  dashes: 1.6,1.6;
-  linecap: butt;
-}
-line|z16[waterway=weir]
-{
-  color: #000044;
-  width: 2;
-  z-index: 130;
-}
-line|z17-[waterway=canal]
-{
-  width: 6.4;
-  color: #B9D4D4;
-  casing-width: 0.8;
-  casing-color: #b0b0b0;
-}
-line|z17-[waterway=lock]
-{
-  color: #f8f8f8;
-  width: 12;
-  z-index: 96;
-  casing-width: 2;
-  casing-color: #202020;
-}
-line|z17-[natural=spring],
-line|z17-[waterway=river]
-{
-  color: #B9D4D4;
-  width: 16;
-}
-line|z17-[waterway=weir]
-{
-  color: #000044;
-  width: 3;
-  z-index: 132;
-}
-line|z17-[waterway=ditch]
-{
-  color: #B9D4D4;
-  width: 0.8;
-  z-index: 113;
-}
-line|z17-[waterway=stream]
-{
-  color: #B9D4D4;
-  width: 2.2;
-  z-index: 110;
-}
-line|z17-[waterway=stream][intermittent=yes]
-{
-  color: #B9D4D4;
-  width: 2.2;
-  z-index: 108;
-  dashes: 2.4,0.8;
-  linecap: butt;
-}
-line|z17-[man_made=breakwater]
-{
-  color: #707070;
-  width: 6.4;
-  z-index: 913;
-}
-line|z17-[waterway=stream][intermittent=ephemeral]
-{
-  color: #B9D4D4;
-  width: 2.2;
-  z-index: 109;
-  dashes: 1.6,1.6;
-  linecap: butt;
-}
-line|z17-[waterway=drain]
-{
-  width: 6.4;
-  z-index: 112;
-  color: #B9D4D4;
-  casing-width: 0.8;
-  casing-color: #b0b0b0;
-}
-line|z17-[waterway=dam]
-{
-  color: #202020;
-  width: 4;
-  z-index: 133;
-}
-area[waterway=riverbank],
-line[waterway=river],
-line[waterway=canal]
-{
-  z-index: 20;
-}
-line[waterway]
-{
-  text-halo-color: eval(prop("color"));
-}
-line[waterway]
-{
-  text-position: line;
-}
-area|z14-[natural=lake],
-area|z12-14[natural=pond],
-node|z14-[natural=lake],
-node|z12-14[natural=pond]
-{
-  text: name;
-  font-size: 12;
-  text-color: #5070d0;
-}
diff --git a/data/styles/include/icon_colors.mapcss b/data/styles/include/icon_colors.mapcss
deleted file mode 100644
index 4c280a70e6..0000000000
--- a/data/styles/include/icon_colors.mapcss
+++ /dev/null
@@ -1,187 +0,0 @@
-*|z16-[shop],
-*|z16-[craft],
-*|z16-[amenity=marketplace]
-{
-    icon-fill-color: #fff;
-    icon-color: #428;
-    symbol-fill-color: #428;
-    symbol-image: symbols/neta/circle-24.svg;
-}
-
-
-*|z14-[earthquake:damage=spontaneous_camp]
-*|z16-[emergency],
-*|z16-[amenity=fire_station]
-{
-    icon-fill-color: #fff;
-    icon-color: red;
-    symbol-fill-color: red;
-    symbol-image: symbols/neta/circle-24.svg;
-}
-
-*|z12-[natural=volcano]
-{
-    icon-fill-color: red;
-}
-
-*|z15-[amenity=fuel],
-*|z16-[amenity=parking][access!=no],
-*|z16-[amenity=parking][location=underground],
-*|z16-[amenity=parking][parking=multi-storey],
-*|z16-[amenity=bicycle_parking]
-{
-    icon-fill-color: #fff;
-    icon-color: blue;
-    symbol-fill-color: blue;
-    symbol-image: symbols/neta/square-24.svg;
-}
-*|z16-[amenity=parking][fee?]
-{
-    icon-color: silver;
-}
-
-
-*|z16-[sport=swimming]
-{
-    icon-fill-color: blue;
-}
-
-*|z16-[amenity=drinking_water],
-*|z16-[man_made=water_well],
-{
-    icon-fill-color: blue;
-}
-
-*|z16-[natural=tree],
-*|z16-[wood=deciduous],
-*|z16-[wood=coniferous]
-{
-    icon-fill-color: green;
-}
-
-*|z16-[amenity=bank],
-*|z16-[amenity=atm],
-*|z16-[amenity=bureau_de_change],
-*|z16-[amenity=money_transfer]
-{
-    icon-fill-color: #fff;
-    icon-color: #040;
-    symbol-fill-color: #040;
-    symbol-image: symbols/neta/circle-24.svg;
-}
-
-*|z16-[amenity=school],
-*|z16-[amenity=kindergarten],
-*|z16-[amenity=prison],
-*|z16-[amenity=post_office],
-*|z16-[amenity=library],
-*|z16-[amenity=college],
-*|z16-[amenity=university],
-*|z16-[amenity=bicycle_rental]
-{
-    icon-fill-color: #fff;
-    icon-color: #A84;
-    symbol-fill-color: #A84;
-    symbol-image: symbols/neta/circle-24.svg;
-}
-
-*|z12-[railway=station][colour],
-*|z16-[railway=subway_entrance],
-*|z12-[aeroway=aerodrome],
-*|z12-[aeroway=airport],
-*|z14-15[railway=halt],
-*|z16-[railway=halt],
-*|z16-[railway=tram_stop],
-*|z16-[highway=bus_stop],
-*|z12-[railway=station],
-*|z16-[amenity=taxi]
-{
-    icon-fill-color: #fff;
-    icon-color: #04D;
-    symbol-fill-color: #04D;
-    symbol-image: symbols/neta/square-24.svg;
-}
-
-*|z16-[railway=subway_entrance],
-*|z12-15[railway=station][transport=subway],
-*|z14[railway=station],
-*|z14-15[railway=halt]
-{
-    icon-fill-color: #fff;
-    icon-color: #04D;
-    symbol-fill-color: #04D;
-    symbol-image: symbols/neta/square-18.svg;
-}
-
-*|z16-[amenity=bus_station]
-{
-    icon-fill-color: #fff;
-    icon-color: navy;
-    symbol-fill-color: #04D;
-    symbol-image: symbols/neta/square-24.svg;
-}
-
-*|z16-[amenity=hospital],
-*|z16-[amenity=doctors],
-*|z16-[healthcare=hospital],
-*|z16-[amenity=pharmacy],
-*|z16-[amenity=dentist],
-*|z16-[healthcare=dentist]
-{
-    icon-fill-color: #fff;
-    icon-color: #c0c;
-    symbol-fill-color: #c0c;
-    symbol-image: symbols/neta/circle-24.svg;
-}
-
-*|z16-[barrier=block]
-{
-    icon-fill-color: red;
-}
-
-*|z16-[amenity=bar],
-*|z16-[amenity=nightclub],
-*|z16-[amenity=pub],
-*|z16-[amenity=restaurant],
-*|z16-[amenity=fast_food],
-*|z16-[amenity=cafe]
-{
-    icon-fill-color: #fff;
-    icon-color: #D70;
-    symbol-fill-color: #D70;
-    symbol-image: symbols/neta/circle-24.svg;
-}
-
-*|z16-[amenity=police],
-*|z16-[amenity=museum],
-*|z16-[amenity=toilets],
-*|z16-[amenity=theatre],
-*|z16-[historic=museum],
-*|z16-[tourism=museum],
-*|z16-[amenity=hotel],
-*|z16-[amenity=hostel],
-*|z16-[hotel],
-*|z16-[tourism=guest_house],
-*|z16-[tourism=hostel],
-*|z16-[tourism=hotel],
-*|z16-[tourism=motel],
-*|z16-[amenity=gambling],
-*|z16-[amenity=casino],
-*|z16-[amenity=cinema],
-*|z16-[shop=dry_cleaning],
-*|z16-[amenity=landury],
-*|z16-[amenity=funeral_directors],
-*|z16-[office],
-*|z16-[amenity=social_facility],
-*|z16-[amenity=courthouse],
-*|z16-[amenity=community_centre],
-*|z16-[amenity=car_rental],
-*|z16-[amenity=embassy],
-*|z16-[amenity=place_of_worship],
-*|z16-[religion]
-{
-    icon-fill-color: #fff;
-    icon-color: #333;
-    symbol-fill-color: #333;
-    symbol-image: symbols/neta/circle-24.svg;
-}
\ No newline at end of file
diff --git a/data/styles/include/icons_maki.mapcss b/data/styles/include/icons_maki.mapcss
deleted file mode 100644
index 73eab8004c..0000000000
--- a/data/styles/include/icons_maki.mapcss
+++ /dev/null
@@ -1,418 +0,0 @@
-*|z16-[sport=american_football],
-*|z16-[sport=australian_football],
-{
-    icon-image: symbols/maki/america-football-18.svg;
-}
-*|z16-[sport=baseball]
-{
-    icon-image: symbols/maki/baseball-18.svg;
-}
-*|z16-[sport=basketball]
-{
-    icon-image: symbols/maki/basketball-18.svg;
-}
-
-*|z16-[tourism=gallery]
-{
-    icon-image: symbols/maki/art-gallery-18.svg;
-}
-*|z16-[amenity=bar],
-*|z16-[amenity=nightclub]
-{
-    icon-image: symbols/maki/bar-18.svg;
-}
-*|z16-[amenity=pub]
-{
-    icon-image: symbols/maki/beer-18.svg;
-}
-*|z16-[amenity=restaurant]
-{
-    icon-image: symbols/maki/restaurant-18.svg;
-}
-*|z16-[amenity=fast_food]
-{
-    icon-image: symbols/maki/fast-food-18.svg;
-}
-*|z16-[amenity=cafe]
-{
-    icon-image: symbols/maki/cafe-18.svg;
-}
-*|z15-[tourism=camp_site],
-*|z15-[tourism=caravan_site],
-*|z15-[tourism=picnic_site],
-*|z15-[earthquake:damage=spontaneous_camp]
-{
-    icon-image: symbols/maki/campsite-18.svg;
-}
-
-*|z16-[landuse=cemetery],
-*|z16-[amenity=grave_yard]
-{
-    icon-image: symbols/maki/cemetery-18.svg;
-}
-*|z16-[amenity=cinema]
-{
-    icon-image: symbols/maki/cinema-18.svg;
-}
-*|z16-[sport=cricket]
-{
-    icon-image: symbols/maki/cricket-18.svg;
-}
-*|z16-[waterway=dam]
-{
-    icon-image: symbols/maki/dam-18.svg;
-}
-*|z16-[amenity=theatre]
-{
-    icon-image: symbols/maki/theatre-18.svg;
-}
-*|z16-[amenity=embassy]
-{
-    icon-image: symbols/maki/embassy-18.svg;
-}
-*|z16-[amenity=emergency_phone],
-*|z16-[emergency=phone]
-{
-    icon-image: symbols/maki/emergency-telephone-18.svg;
-}
-
-
-*|z16-[amenity=ferry_terminal],
-*|z16-[leisure=slipway],
-{
-    icon-image: symbols/maki/ferry-18.svg;
-}
-*|z16-[amenity=police]
-{
-    icon-image: symbols/maki/police-18.svg;
-}
-*|z16-[amenity=fire_station]
-{
-    icon-image: symbols/maki/fire-station-18.svg;
-}
-*|z15-[amenity=fuel]
-{
-    icon-image: symbols/maki/fuel-18.svg;
-}
-*|z16-[sport=golf],
-*|z16-[leisure=golf_course]
-{
-    icon-image: symbols/maki/golf-18.svg;
-}
-
-*|z16-[harbour][harbour!=no],
-*|z16-[seamark:type=harbour]
-{
-    icon-image: symbols/maki/harbor-18.svg;
-}
-*|z15-[aeroway=helipad]
-{
-    icon-image: symbols/maki/heliport-18.svg;
-}
-
-*|z16-[amenity=hotel],
-*|z16-[amenity=hostel],
-*|z16-[hotel],
-*|z16-[tourism=guest_house],
-*|z16-[tourism=hostel],
-*|z16-[tourism=hotel],
-*|z16-[tourism=motel]
-{
-    icon-image: symbols/maki/lodging-18.svg;
-}
-*|z16-[historic=monument],
-*|z16-[historic=memorial],
-{
-    icon-image: symbols/maki/monument-18.svg;
-}
-*|z16-[historic=museum],
-*|z16-[tourism=museum]
-{
-    icon-image: symbols/maki/museum-18.svg;
-}
-
-*|z16-[natural=tree],
-*|z16-[wood=deciduous]
-{
-    icon-image: symbols/maki/park2-18.svg;
-    text-offset: 10;
-}
-*|z16-[wood=coniferous]
-{
-    icon-image: symbols/maki/park-18.svg;
-}
-*|z16-[amenity=parking][access!=no],
-{
-    icon-image: symbols/maki/parking-18.svg;
-}
-*|z16-[amenity=parking][location=underground],
-*|z16-[amenity=parking][parking=multi-storey]
-{
-    icon-image: symbols/maki/parking-garage-18.svg;
-}
-
-
-*|z16-[leisure=pitch],
-*|z16-[leisure=playground]
-{
-    icon-image: symbols/maki/pitch-18.svg;
-}
-
-*|z16-[amenity=pharmacy]
-{
-    icon-image: symbols/maki/pharmacy-18.svg;
-}
-
-*|z16-[barrier=bollard],
-*|z16-[barrier=block]
-{
-    icon-image: symbols/maki/roadblock-12.svg;
-}
-*|z16-[sport=skiing]
-{
-    icon-image: symbols/maki/skiing-18.svg;
-}
-*|z16-[sport=soccer],
-*|z16-[sport=football]
-{
-    icon-image: symbols/maki/soccer-18.svg;
-}
-*|z16-[sport=swimming]
-{
-    icon-image: symbols/maki/swimming-18.svg;
-}
-
-*|z16-[amenity=telephone]
-{
-    icon-image: symbols/maki/telephone-18.svg;
-}
-*|z16-[sport=tennis]
-{
-    icon-image: symbols/maki/tennis-18.svg;
-}
-*|z16-[amenity=toilets]
-{
-    icon-image: symbols/maki/toilets-18.svg;
-}
-*|z16-[amenity=drinking_water]
-{
-    icon-image: symbols/maki/water-18.svg;
-}
-*|z16-[amenity=recycling],
-*|z16-[amenity=waste_basket]
-{
-    icon-image: symbols/maki/waste-basket-18.svg;
-}
-*|z16-[amenity=zoo],
-*|z16-[shop=zoo]
-{
-    icon-image: symbols/maki/zoo-18.svg;
-}
-*|z15-[tourism=viewpoint],
-{
-    icon-image: symbols/maki/star-stroked-18.svg;
-}
-*|z15-[tourism=artwork],
-{
-    icon-image: symbols/maki/star-18.svg;
-}
-
-*|z12-[natural=peak]
-{
-  icon-image: symbols/maki/triangle-12.svg;
-}
-
-*|z12-[natural=volcano]
-{
-  icon-image: symbols/maki/triangle-12.svg;
-}
-*|z12-[natural=cave_entrance]
-{
-  icon-image: symbols/maki/triangle-stroked-12.svg;
-}
-*|z16-[barrier=gate]
-{
-  icon-image: symbols/maki/square-stroked-12.svg;
-}
-
-/* shops */
-
-*|z16-[amenity=marketplace],
-*|z16-[shop=convenience],
-*|z16-[shop=mall],
-*|z16-[shop=doityourself],
-*|z16-[shop=supermarket],
-*|z16-[shop=electronics],
-*|z16-[shop=shoes],
-*|z16-[shop=department_store],
-*|z16-[shop=kiosk],
-*|z16-[shop=furniture]
-{
-  icon-image: symbols/maki/shop-18.svg;
-}
-
-*|z16-[shop=bicycle]
-{
-    icon-image: symbols/maki/bicycle-18.svg;
-}
-*|z16-[shop=mall],
-*|z16-[shop=doityourself],
-*|z16-[shop=supermarket],
-*|z16-[shop=department_store]
-{
-  icon-image: symbols/maki/grocery-18.svg;
-}
-
-*|z16-[shop=bakery],
-*|z16-[shop=confectionery]
-{
-    icon-image: symbols/maki/bakery-18.svg;
-}
-
-*|z16-[shop=alcohol],
-*|z16-[shop=beverages]
-{
-    icon-image: symbols/maki/alcohol-shop-18.svg;
-}
-*|z16-[amenity=bank],
-*|z16-[amenity=atm],
-*|z16-[amenity=bureau_de_change]
-{
-    icon-image: symbols/maki/bank-18.svg;
-}
-
-*|z16-[shop=music],
-*|z16-[shop=musical_instrument]
-{
-    icon-image: symbols/maki/music-18.svg;
-}
-
-*|z16-[shop=florist],
-*|z16-[shop=garden_centre]
-{
-    icon-image: symbols/maki/garden-18.svg;
-}
-
-*|z16-[shop=butcher]
-{
-    icon-image: symbols/maki/slaughterhouse-18.svg;
-}
-*|z16-[shop=books]
-{
-    icon-image: symbols/maki/library-18.svg;
-}
-
-/* social facilities */
-*|z16-[religion=christian]
-{
-    icon-image: symbols/maki/religious-christian-18.svg;
-}
-*|z16-[religion=jewish]
-{
-    icon-image: symbols/maki/religious-jewish-18.svg;
-}
-*|z16-[religion=muslim]
-{
-    icon-image: symbols/maki/religious-muslim-18.svg;
-}
-*|z16-[amenity=place_of_worship]
-{
-    icon-image: symbols/maki/place-of-worship-18.svg;
-}
-*|z16-[amenity=school],
-*|z16-[amenity=kindergarten]
-{
-    icon-image: symbols/maki/school-18.svg;
-}
-
-*|z16-[amenity=prison]
-{
-    icon-image: symbols/maki/prison-18.svg;
-}
-*|z16-[amenity=hospital],
-*|z16-[amenity=doctors],
-*|z16-[healthcare=hospital]
-{
-    icon-image: symbols/maki/hospital-18.svg;
-}
-*|z16-[amenity=post_office]
-{
-    icon-image: symbols/maki/post-18.svg;
-}
-*|z16-[amenity=post_box]
-{
-    icon-image: symbols/maki/post-12.svg;
- }
-*|z16-[amenity=library]
-{
-    icon-image: symbols/maki/library-18.svg;
-}
-*|z16-[amenity=college],
-*|z16-[amenity=university]
-{
-    icon-image: symbols/maki/college-18.svg;
-}
-
-*|z16-[amenity=bicycle_rental],
-*|z16-[amenity=bicycle_parking]
-{
-    icon-image: symbols/maki/bicycle-18.svg;
-}
-
-/* transport  */
-
-*|z12-[aeroway=aerodrome]
-{
-    icon-image: symbols/maki/airfield-18.svg;
-}
-*|z12-[aeroway=airport]
-{
-    icon-image: symbols/maki/airport-18.svg;
-}
-
-*|z14-15[railway=halt]
-{
-    icon-image: symbols/maki/rail-above-12.svg;
-}
-*|z16-[railway=halt]
-{
-    icon-image: symbols/maki/rail-above-18.svg;
-}
-*|z14[railway=station]
-{
-    icon-image: symbols/maki/rail-12.svg;
-}
-*|z15-[railway=station]
-{
-    icon-image: symbols/maki/rail-18.svg;
-}
-
-*|z16-[railway=tram_stop]
-{
-    icon-image: symbols/maki/rail-above-18.svg;
-}
-
-*|z16-[highway=bus_stop],
-*|z16-[amenity=bus_station]
-{
-    icon-image: symbols/maki/bus-18.svg;
-}
-
-*|z12-14[railway=station][transport=subway]
-{
-    icon-image: symbols/maki/rail-underground-12.svg;
-}
-*|z15-[railway=station][transport=subway]
-{
-    icon-image: symbols/maki/rail-underground-18.svg;
-}
-
-*|z16-[railway=subway_entrance]
-{
-    icon-image: symbols/maki/rail-underground-18.svg;
-}
-
-*|z16-[power=pole]
-{
-    icon-image: symbols/maki/cross-12.svg;
-}
\ No newline at end of file
diff --git a/data/styles/include/icons_neta.mapcss b/data/styles/include/icons_neta.mapcss
deleted file mode 100644
index ba62f09cb7..0000000000
--- a/data/styles/include/icons_neta.mapcss
+++ /dev/null
@@ -1,25 +0,0 @@
-*|z16-[barrier=gate]
-{
-    icon-image: symbols/neta/entrance-18.svg;
-}
-*|z16-[barrier=bollard]
-{
-    icon-image: symbols/neta/bollard-18.svg;
-}
-*|z16-[shop=shoes]
-{
-    icon-image: symbols/neta/shoes-18.svg;
-}
-*|z16-[barrier=lift_gate]
-{
-    icon-image: symbols/neta/lift_gate-18.svg;
-}
-*|z12-[railway=station][transport=subway]
-{
-    icon-image: symbols/neta/subway-18.svg;
-}
-*|z16-[railway=subway_entrance],
-*|z12-15[railway=station][transport=subway]
-{
-    icon-image: symbols/neta/subway-12.svg;
-}
diff --git a/data/styles/include/icons_nori.mapcss b/data/styles/include/icons_nori.mapcss
deleted file mode 100644
index a726fb9210..0000000000
--- a/data/styles/include/icons_nori.mapcss
+++ /dev/null
@@ -1,302 +0,0 @@
-
-/* money */
-*|z16-[amenity=atm]
-{
-    icon-image: symbols/nori/atm-18.svg;
-}
-*|z16-[amenity=bureau_de_change]
-{
-    icon-image: symbols/nori/bureau_de_change-18.svg;
-}
-*|z16-[amenity=money_transfer]
-{
-    icon-image: symbols/nori/money_transfer-18.svg;
-}
-
-/* shops */
-
-*|z16-[shop=bakery]
-{
-    icon-image: symbols/nori/bakery-18.svg;
-}
-/*
-*|z16-[shop=butcher]
-{
-    icon-image: symbols/nori/butcher-18.svg;
-}
-*/
-*|z16-[shop=beverages]
-{
-    icon-image: symbols/nori/beverages-18.svg;
-}
-*|z16-[shop=hairdresser]
-{
-    icon-image: symbols/nori/hairdresser-18.svg;
-}
-*|z16-[shop=hardware]
-{
-    icon-image: symbols/nori/hardware-18.svg;
-}
-*|z16-[shop=mobile_phone]
-{
-    icon-image: symbols/nori/mobile_phone-18.svg;
-}
-*|z16-[shop=clothes],
-*|z16-[shop=outdoor]
-{
-    icon-image: symbols/nori/clothes-18.svg;
-}
-*|z16-[shop=computer]
-{
-    icon-image: symbols/nori/computer-18.svg;
-}
-*|z16-[shop=convenience]
-{
-    icon-image: symbols/nori/shop-18.svg;
-}
-*|z16-[shop=car_parts]
-{
-    icon-image: symbols/nori/car_parts-18.svg;
-}
-*|z16-[craft]
-{
-    icon-image: symbols/nori/craft-18.svg;
-}
-*|z16-[craft=carpenter]
-{
-    icon-image: symbols/nori/carpenter-18.svg;
-}
-*|z16-[amenity=car_rental]
-{
-    icon-image: symbols/nori/car_rental-18.svg;
-}
-*|z16-[shop=car_repair]
-{
-    icon-image: symbols/nori/car_repair-18.svg;
-}
-*|z16-[amenity=pharmacy]
-{
-    icon-image: symbols/nori/pharmacy-18.svg;
-}
-*|z16-[shop=motorcycle]
-{
-    icon-image: symbols/nori/motorcycle-18.svg;
-}
-*|z16-[shop=tyres]
-{
-    icon-image: symbols/nori/tyres-18.svg;
-}
-*|z16-[shop=photo],
-*|z16-[shop=photo_studio],
-{
-    icon-image: symbols/nori/photo-18.svg;
-}
-*|z16-[shop=seafood]
-{
-    icon-image: symbols/nori/seafood-18.svg;
-}
-*|z16-[shop=shoe_repair],
-*|z16-[craft=shoemaker]
-{
-    icon-image: symbols/nori/shoemaker-18.svg;
-}
-*|z16-[amenity=studio]
-{
-    icon-image: symbols/nori/studio-18.svg;
-}
-*|z16-[craft=tailor]
-{
-    icon-image: symbols/nori/tailor-18.svg;
-}
-
-/* transport */
-
-*|z16-[amenity=taxi]
-{
-    icon-image: symbols/nori/taxi-18.svg;
-}
-
-/* physical world objects */
-
-*|z17-[amenity=bench]
-{
-    icon-image: symbols/nori/bench-18.svg;
-}
-*|z16-[man_made=water_well]
-{
-    icon-image: symbols/nori/bucket-18.svg;
-}
-*|z16-[leisure=beach_resort]
-{
-    icon-image: symbols/nori/beach_resort-18.svg;
-}
-*|z16-[amenity=waste_basket]
-{
-    icon-image: symbols/nori/waste_basket-18.svg;
-}
-*|z16-[man_made=watermill]
-{
-    icon-image: symbols/nori/watermill-18.svg;
-}
-*|z16-[man_made=water_tower]
-{
-    icon-image: symbols/nori/water_tower-18.svg;
-}
-*|z16-[man_made=communication_tower],
-*|z16-[man_made=mast]
-{
-    icon-image: symbols/nori/communication-tower-18.svg;
-}
-*|z16-[amenity=fire_hydrant],
-*|z16-[emergency=fire_hydrant]
-{
-    icon-image: symbols/nori/fire_hydrant-18.svg;
-}
-*|z16-[highway=street_lamp]
-{
-    icon-image: symbols/nori/street_lamp-18.svg;
-}
-*|z16-[amenity=drinking_water]
-{
-    icon-image: symbols/nori/drinking_water-18.svg;
-}
-*|z16-[man_made=water_well][drinking_water]
-{
-    icon-image: symbols/nori/drinking_water_well-18.svg;
-}
-*|z16-[amenity=recycling]
-{
-    icon-image: symbols/nori/recycling-18.svg;
-}
-
-/* energy */
-
-*|z14-[power=generator]
-{
-    icon-image: symbols/nori/generator-18.svg;
-}
-*|z14-[power=generator][power_source=nuclear]
-{
-    icon-image: symbols/nori/generator_nuclear-18.svg;
-}
-*|z14-[power=generator][power_source=solar]
-{
-    icon-image: symbols/nori/generator_solar-18.svg;
-}
-*|z14-[power=generator][power_source=wind]
-{
-    icon-image: symbols/nori/generator_wind-18.svg;
-}
-*|z16-[power=tower]
-{
-    icon-image: symbols/nori/power_tower-12.svg;
-}
-*|z16-[man_made=storage_tank]
-{
-    icon-image: symbols/nori/storage_tank-18.svg;
-}
-*|z16-[man_made=water_well][pump=manual]
-{
-    icon-image: symbols/nori/pump-manual-18.svg;
-}
-*|z16-[man_made=water_well][pump=powered]
-{
-    icon-image: symbols/nori/pump-powered-18.svg;
-}
-
-/* social and government */
-
-*|z16-[barrier=border_control]
-{
-    icon-image: symbols/nori/border_control-18.svg;
-}
-*|z16-[amenity=courthouse]
-{
-    icon-image: symbols/nori/courthouse-18.svg;
-}
-*|z16-[amenity=social_facility]
-{
-    icon-image: symbols/nori/social_facility-18.svg;
-}
-*|z16-[amenity=grave_yard]
-{
-    icon-image: symbols/nori/grave_yard-18.svg;
-}
-*|z16-[office=government]
-{
-    icon-image: symbols/nori/government-18.svg;
-}
-*|z16-[leisure=playground]
-{
-    icon-image: symbols/nori/playground-18.svg;
-}
-*|z16-[tourism=information]
-{
-    icon-image: symbols/nori/information-18.svg;
-}
-*|z16-[amenity=kindergarten]
-{
-    icon-image: symbols/nori/kindergarten-18.svg;
-}
-*|z16-[religion=hindu]
-{
-    icon-image: symbols/nori/hindu-18.svg;
-}
-*|z16-[office=ngo]
-{
-    icon-image: symbols/nori/ngo-18.svg;
-}
-
-/* recreation */
-
-*|z14-[tourism=picnic_site]
-{
-    icon-image: symbols/nori/camp_site-18.svg;
-}
-*|z16-[amenity=community_centre]
-{
-    icon-image: symbols/nori/community_centre-18.svg;
-}
-*|z15-[tourism=viewpoint]
-{
-    icon-image: symbols/nori/viewpoint-18.svg;
-}
-
-/* health */
-
-*|z16-[healthcare=hospital]
-{
-    icon-image: symbols/nori/hospital-18.svg;
-}
-*|z16-[amenity=dentist],
-*|z16-[healthcare=dentist]
-{
-    icon-image: symbols/nori/dentist-18.svg;
-}
-
-/* food */
-*|z16-[amenity=pub]
-{
-    icon-image: symbols/nori/pub-18.svg;
-}
-
-/* services */
-
-*|z16-[shop=dry_cleaning],
-*|z16-[amenity=laundry]
-{
-    icon-image: symbols/nori/dry_cleaning-18.svg;
-}
-*|z16-[amenity=funeral_directors]
-{
-    icon-image: symbols/nori/funeral_directors-18.svg;
-}
-*|z16-[amenity=gambling],
-*|z16-[amenity=casino]
-{
-    icon-image: symbols/nori/gambling-18.svg;
-}
-*|z16-[amenity=shower]
-{
-    icon-image: symbols/nori/shower-18.svg;
-}
\ No newline at end of file
diff --git a/data/styles/ink.mapcss b/data/styles/ink.mapcss
index e1cc979a9e..597f32961f 100644
--- a/data/styles/ink.mapcss
+++ b/data/styles/ink.mapcss
@@ -1,14 +1,8 @@
-/*
-TODO:
-  - separate water features from this file
-*/
-
 canvas {
     background-color: #f1eee8;
     fill-color: #B9D4D4;
     default-lines: false;
     default-points: false;
-    -x-mapsithme-dpi: yota;
 }
 
 way::* {
@@ -23,6 +17,14 @@ way::* {
     text-halo-radius: 2;
     text-anchor-horizontal: center;
     text-anchor-vertical: center;
+    icon-width: 16;
+    icon-height: 16;
+}
+
+*
+{
+    icon-width: 16;
+    icon-height: 16;
 }
 
 node::* {
@@ -46,8 +48,10 @@ area[natural=coastline]
 *[leisure],
 *[man_made],
 *[natural],
+*[place],
 *[power],
-*[landuse]
+*[landuse],
+*[sport]
 {
   text-position: center
 }
@@ -55,22 +59,61 @@ area[natural=coastline]
 area[landuse],
 area[natural],
 area[leisure],
+area[place],
 area[aeroway],
-area[tourism]
+area[tourism],
 {
   fill-position: background;
 }
 
 @import("include/base_roads.mapcss");
 @import("include/base_shop.mapcss");
-@import("include/base_sport.mapcss");
-@import("include/base_place.mapcss");
-@import("include/base_water.mapcss");
 
+line[highway=bus_stop],
 line[highway=motorway_junction]
 {
     casing-width: 0;
 }
+
+area|z15-[place=island],
+node|z15-[place=island]
+{
+  text: name;
+  font-size:    16;
+}
+
+node|z1-[place=ocean]
+{
+  text: name;
+  font-size:8;
+  z-index:-1
+}
+node|z2-[place=ocean]
+{
+  font-size:9;
+}
+node|z5-[place=ocean]
+{
+  font-size:10;
+}
+node|z7-[place=ocean]
+{
+  font-size:11;
+}
+node|z3-[place=sea]
+{
+  text: name;
+  font-size: 8;
+  text-color: #4976d1;
+}
+node|z7-[place=sea]
+{
+  font-size: 10;
+}
+node|z9-[place=sea]
+{
+  font-size: 11;
+}
 area|z16-[amenity=fountain],
 area|z12-[landuse=basin],
 area|z12-[landuse=reservoir],
@@ -83,238 +126,433 @@ area|z10-[waterway=dock],
 area|z10-[waterway=riverbank],
 area|z14-[natural=bay],
 {
-  fill-color: #0;
+  fill-color:   #0;
   z-index: 100;
 }
+
+node|z-2[place=continent]
+{
+  text: name;
+  font-size:    18;
+  text-color:   #808078;
+}
+node|z3[place=country]
+{
+  text: name;
+  font-size:    12;
+  text-color:   #404040;
+}
 line|z4[boundary=administrative][admin_level=2]
 {
-  color: #ffa090;
-  width: 1;
-  dashes: 3.12,3.12;
-  linecap: butt;
+  color:    #ffa090;
+  width:    1;
+  dashes:   3.12,3.12;
+  linecap:  butt;
   -x-kot-layer: top;
 }
+node|z8[place=town]
+{
+  font-size:    12;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #404040;
+}
+node|z4[place=country],
+node|z9[place=town]
+{
+  font-size:    14;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #404040;
+}
+node|z4[place=state]
+{
+  text: name;
+  font-size:    11;
+  text-color:   #c0c0b0;
+  z-index: -10;
+}
+node|z4[place=city][capital?]
+{
+  font-size:    11;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #505050;
+}
 line|z5[boundary=administrative][admin_level=2]
 {
-  color: #ff775b;
-  width: 1;
-  dashes: 3.12,3.12;
-  linecap: butt;
+  color:    #ff775b;
+  width:    1;
+  dashes:   3.12,3.12;
+  linecap:  butt;
   -x-kot-layer: top;
 }
+node|z5[place=city][capital?]
+{
+  font-size:    12;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #505050;
+}
+node|z5[place=country]
+{
+  font-size:    16;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #404040;
+}
+node|z5[place=city]
+{
+  font-size:    11;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #606060;
+}
+node|z5[place=state]
+{
+  text: name;
+  font-size:    12;
+  text-color:   #c0c0b0;
+  z-index: -10;
+}
+node|z6[place=city][capital?]
+{
+  font-size:    14;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #606060;
+}
 line|z5-8[boundary=administrative][admin_level=4]::d2p2,
 line|z4-8[boundary=administrative][admin_level=4][border_type=state]::d3p2
 {
-  color: #eeeedd;
-  width: 1;
-  z-index: 120;
+  color:    #eeeedd;
+  width:    1;
+  z-index:  120;
   -x-kot-layer: top;
 }
+node|z6[place=country]
+{
+  text: name;
+  font-size:    18;
+  text-color:   grey;
+}
+node|z6[place=city],
+node|z15[place=locality],
+node|z12-13[place=village]
+{
+  font-size:    12;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #606060;
+}
 area|z6-11[natural=land]
 {
-  fill-color: #a;
+  fill-color:   #a;
 }
 line|z4-[boundary=administrative][admin_level=3]
 {
-  color: #a0a0a0;
-  width: 1;
-  z-index: 123;
-  dashes: 1,1;
-  linecap: butt;
+  color:    #a0a0a0;
+  width:    1;
+  z-index:  123;
+  dashes:   1,1;
+  linecap:  butt;
   -x-kot-layer: top;
 }
+node|z6[place=state]
+{
+  text: name;
+  font-size:    13;
+  text-color:   #c0c0b0;
+  z-index: -10;
+}
 line|z6[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #eeeedd;
-  width: 1;
+  color:    #eeeedd;
+  width:    1;
   -x-kot-layer: top;
 }
 line|z6[boundary=administrative][border_type=state]
 {
-  color: yellow;
-  width: 1;
-  z-index: 55;
+  color:    yellow;
+  width:    1;
+  z-index:  55;
 }
 line|z6-[boundary=administrative][admin_level=3]::d2p2
 {
-  color: #eeeedd;
-  width: 1;
-  z-index: 122;
+  color:    #eeeedd;
+  width:    1;
+  z-index:  122;
   -x-kot-layer: top;
 }
 line|z6[boundary=administrative][admin_level=2]
 {
-  color: #d9775b;
-  width: 1;
-  dashes: 3.12,3.12;
-  linecap: butt;
+  color:    #d9775b;
+  width:    1;
+  dashes:   3.12,3.12;
+  linecap:  butt;
   -x-kot-layer: top;
 }
 line|z4-6[boundary=administrative][admin_level=4]
 {
-  color: #a0a0a0;
-  width: 0.2;
-  z-index: 121;
-  dashes: 0.3,0.6;
-  linecap: butt;
+  color:    #a0a0a0;
+  width:    0.2;
+  z-index:  121;
+  dashes:   0.3,0.6;
+  linecap:  butt;
   -x-kot-layer: top;
 }
 line|z7[boundary=administrative][admin_level=2]
 {
-  color: #eeeedd;
-  width: 2.73;
+  color:    #eeeedd;
+  width:    2.73;
   -x-kot-layer: top;
 }
 line|z7-8[boundary=administrative][admin_level=4]
 {
-  color: #909090;
-  width: 0.7;
-  z-index: 121;
-  dashes: 0.3,0.6;
-  linecap: butt;
+  color:    #909090;
+  width:    0.7;
+  z-index:  121;
+  dashes:   0.3,0.6;
+  linecap:  butt;
   -x-kot-layer: top;
 }
+node|z7[place=country]
+{
+  text: name;
+  font-size:    26;
+  text-color:   #909080;
+}
 line|z7[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
-  width: 2;
-  dashes: 5,5;
-  linecap: butt;
+  color:    #f9574b;
+  width:    2;
+  dashes:   5,5;
+  linecap:  butt;
   -x-kot-layer: top;
 }
 line|z7[boundary=administrative][border_type=state]
 {
-  color: yellow;
-  width: 0.62;
-  z-index: 56;
+  color:    yellow;
+  width:    0.62;
+  z-index:  56;
+}
+node|z7-8[place=city]
+{
+  font-size:    14;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #505050;
 }
 line|z7[boundary=administrative][border_type=state]::d2p2
 {
-  color: #f9574b;
-  width: 0.12;
-  z-index: 57;
-  dashes: 0.62,0.12,0.12,0.12;
-  linecap: butt;
+  color:    #f9574b;
+  width:    0.12;
+  z-index:  57;
+  dashes:   0.62,0.12,0.12,0.12;
+  linecap:  butt;
+}
+node|z7[place=state]
+{
+  text: name;
+  font-size:    14;
+  text-color:   #c0c0b0;
+  z-index: -10;
 }
 line|z8[boundary=administrative][border_type=state]
 {
-  color: yellow;
-  width: 1.25;
-  z-index: 63;
+  color:    yellow;
+  width:    1.25;
+  z-index:  63;
 }
 line|z8-11[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
-  width: 2.34;
-  dashes: 3.12,3.12;
-  linecap: butt;
+  color:    #f9574b;
+  width:    2.34;
+  dashes:   3.12,3.12;
+  linecap:  butt;
   -x-kot-layer: top;
 }
 line|z8[boundary=administrative][border_type=state]::d2p2
 {
-  color: #f9574b;
-  width: 0.25;
-  z-index: 64;
-  dashes: 1.25,0.25,0.25,0.25;
-  linecap: butt;
+  color:    #f9574b;
+  width:    0.25;
+  z-index:  64;
+  dashes:   1.25,0.25,0.25,0.25;
+  linecap:  butt;
   -x-kot-layer: top;
 }
 line|z8-11[boundary=administrative][admin_level=2]
 {
-  color: #eeeedd;
-  width: 3.12;
+  color:    #eeeedd;
+  width:    3.12;
   -x-kot-layer: top;
 }
+node|z8[place=state]
+{
+  font-size:    14;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #b0b0a8;
+  z-index: -10;
+}
+area|z15-[place=farm],
+node|z15-[place=farm],
+node|z12-15[place=hamlet],
+node|z14[place=locality],
+node|z8-9[place=region]
+{
+  text: name;
+  font-size:    12;
+  text-color:   #606060;
+}
+node|z8-9[place=city][capital?],
+node|z16[place=locality]
+{
+  font-size:    16;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #606060;
+}
+area|z10-14[place=island],
+node|z10-14[place=island]
+{
+  text: name;
+  font-size:    12;
+  text-color:   #505050;
+}
+node|z8-9[place=country]
+{
+  text: name;
+  font-size:    28;
+  text-color:   #a0a090;
+}
 line|z9[boundary=administrative][admin_level=4]::d2p2
 {
-  color: #eeeedd;
-  width: 1.2;
+  color:    #eeeedd;
+  width:    1.2;
   -x-kot-layer: top;
 }
+area|z12-[aeroway=aerodrome],
+area|z12-[aeroway=airport],
+area|z12-[aeroway=aerodrome],
+node|z12-[aeroway=aerodrome],
+node|z12-[aeroway=airport],
+node|z12-[aeroway=aerodrome]
+{
+  icon-image:   airport.svg;
+}
+node|z9[place=state]
+{
+  font-size:    14;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #c0c0b0;
+  z-index: -10;
+}
 line|z9[boundary=administrative][admin_level=4]
 {
-  color: #909090;
-  width: 1;
-  z-index: 12;
-  dashes: 0.3,0.6;
-  linecap: butt;
+  color:    #909090;
+  width:    1;
+  z-index:  12;
+  dashes:   0.3,0.6;
+  linecap:  butt;
   -x-kot-layer: top;
 }
+node|z9[place=city]
+{
+  font-size:    17;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #505050;
+}
+node|z9[place=county]
+{
+  text: name;
+  font-size:    14;
+  text-color:   #a0a0a0;
+}
 area|z11-[aeroway=aerodrome]
 {
-  fill-color: #d8dcce;
+  fill-color:   #d8dcce;
 }
 line|z9[boundary=administrative][border_type=state]
 {
-  color: yellow;
-  width: 1;
-  z-index: 63;
+  color:    yellow;
+  width:    1;
+  z-index:  63;
 }
 line|z9[boundary=administrative][border_type=state]::d2p2
 {
-  color: #f9574b;
-  width: 0.5;
-  z-index: 64;
-  dashes: 2.5,0.5,0.5,0.5;
-  linecap: butt;
+  color:    #f9574b;
+  width:    0.5;
+  z-index:  64;
+  dashes:   2.5,0.5,0.5,0.5;
+  linecap:  butt;
 }
 line|z10[boundary=administrative][admin_level=4]::d2p2,
 {
-  color: #eeeedd;
-  width: 2;
-  z-index: 401;
+  color:    #eeeedd;
+  width:    2;
+  z-index:  401;
   -x-kot-layer: top;
 }
+node|z10-11[place=town]
+{
+  font-size:    16;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #505050;
+}
 line|z10-11[railway=rail]
 {
-  color: silver;
-  width: 1;
-  z-index: 136;
+  color:    silver;
+  width:    1;
+  z-index:  136;
 }
 line|z10-13[railway=rail]::raildash
 {
-  color: #590959;
-  width: 1;
-  z-index: 557;
-  dashes: 4,5;
-  linecap: butt;
+  color:    #590959;
+  width:    1;
+  z-index:  557;
+  dashes:   4,5;
+  linecap:  butt;
 }
 
 line|z10[waterway=river]
 {
-  color: #0;
-  width: 0.5;
+  color:    #0;
+  width:    0.5;
 }
 line|z10[boundary=administrative][border_type=state]
 {
-  color: yellow;
-  width: 5;
-  z-index: 152;
+  color:    yellow;
+  width:    5;
+  z-index:  152;
 }
 line|z10[boundary=administrative][admin_level=4]
 {
-  color: #909090;
-  linecap: butt;
+  color:    #909090;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1.5;
-  z-index: 402;
-  dashes: 0.3,0.6;
+  width:    1.5;
+  z-index:  402;
+  dashes:   0.3,0.6;
 }
 line|z10-11[route=ferry]
 {
-  color: #98b8e8;
-  width: 1;
-  z-index: 147;
-  dashes: 3,2;
-  linecap: butt;
+  color:    #98b8e8;
+  width:    1;
+  z-index:  147;
+  dashes:   3,2;
+  linecap:  butt;
 }
 line|z10[boundary=administrative][border_type=state]::d2p2
 {
-  color: #f9574b;
-  width: 1;
-  z-index: 153;
-  dashes: 5,1,1,1;
-  linecap: butt;
+  color:    #f9574b;
+  width:    1;
+  z-index:  153;
+  dashes:   5,1,1,1;
+  linecap:  butt;
 }
 area|z12-[landuse=farm],
 area|z12-[landuse=farmland]
@@ -331,18 +569,26 @@ area|z12-[leisure=stadium],
 area|z12-[leisure=track],
 area|z12-[natural=scrub]
 {
-  fill-color: #6;
+  fill-color:   #6;
 }
 area|z10-[natural=wood],
 area|z10-[landuse=forest]
 {
-  fill-color: #5;
+  fill-color:   #5;
 }
 area|z10-[landuse=residential],
 area|z10-[landuse=commercial]
 {
     fill-color: #8;
 }
+node|z10-11[place=city],
+node|z12[place=town]
+{
+  font-size:    18;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #505050;
+}
 area|z11-[aeroway=apron],
 area|z12-[landuse=brownfield],
 area|z12-[landuse=cemetery],
@@ -353,16 +599,23 @@ area|z12-[landuse=industrial],
 area|z12-[landuse=quarry],
 area|z12-[landuse=railway],
 {
-  fill-color: #6;
+  fill-color:   #6;
+}
+node|z10-11[place=city][capital?]
+{
+  font-size:    18;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #606060;
 }
 line|z10[boundary=national_park]
 {
-  color: #4ef94b;
-  linecap: butt;
+  color:    #4ef94b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 154;
-  dashes: 5,1,1,1;
+  width:    1;
+  z-index:  154;
+  dashes:   5,1,1,1;
 }
 area|z15-[amenity=college],
 area|z15-[amenity=kindergarten],
@@ -370,165 +623,181 @@ area|z15-[amenity=school],
 area|z15-[amenity=university],
 area|z15-[tourism=attraction]
 {
-  fill-color: #6;
+  fill-color:   #6;
   fill-position: background;
 }
+area|z10[place=county],
+node|z10[place=county]
+{
+  font-size:    14;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #a0a0a0;
+}
 line|z11[boundary=administrative][border_type=state]::d2p2
 {
-  color: #f9574b;
-  width: 2;
-  z-index: 153;
-  dashes: 10,2,2,2;
-  linecap: butt;
+  color:    #f9574b;
+  width:    2;
+  z-index:  153;
+  dashes:   10,2,2,2;
+  linecap:  butt;
 }
 line|z11[boundary=national_park]
 {
-  color: #4ef94b;
-  linecap: butt;
+  color:    #4ef94b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 154;
-  dashes: 10,2,2,2;
+  width:    2;
+  z-index:  154;
+  dashes:   10,2,2,2;
+}
+area|z11-12[place=county],
+node|z11-12[place=county]
+{
+  font-size:    16;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #a0a090;
 }
 area|z13-[leisure=water_park],
 line|z11[waterway=river]
 {
-  color: #0;
-  width: 1;
+  color:    #0;
+  width:    1;
 }
 line|z12[railway=construction]
 {
-  color: #404040;
-  width: 0.75;
-  z-index: 215;
-  dashes: 1,1;
-  linecap: butt;
+  color:    #404040;
+  width:    0.75;
+  z-index:  215;
+  dashes:   1,1;
+  linecap:  butt;
 }
 line|z12[boundary=administrative][type=nation]
 {
-  color: yellow;
-  width: 6;
-  z-index: 414;
+  color:    yellow;
+  width:    6;
+  z-index:  414;
   -x-kot-layer: top;
 }
 line|z12[railway=yard]
 {
-  color: #404040;
-  width: 0.5;
-  z-index: 228;
+  color:    #404040;
+  width:    0.5;
+  z-index:  228;
 }
 line|z12[boundary=administrative][border_type=country]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 417;
-  dashes: 12,12;
+  width:    2;
+  z-index:  417;
+  dashes:   12,12;
 }
 line|z12[waterway=river]
 {
-  color: #0;
-  width: 2.5;
+  color:    #0;
+  width:    2.5;
 }
 area|z14-[natural=wetland],
 area|z12-[natural=wetland][wetland=bog]
 {
-  fill-color: #a0c3b8;
+  fill-color:   #a0c3b8;
 }
 line|z12[railway=narrow_gauge]
 {
-  color: silver;
-  width: 1;
-  z-index: 222;
+  color:    silver;
+  width:    1;
+  z-index:  222;
 }
 line|z12[railway=light_rail]
 {
-  color: #90d090;
-  width: 1;
-  z-index: 668;
+  color:    #90d090;
+  width:    1;
+  z-index:  668;
 }
 area|z12-[natural=heath]
 {
-  fill-color: #6;
+  fill-color:   #6;
 }
 line|z12[boundary=administrative][border_type=region]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 412;
-  dashes: 12,4,4,4;
+  width:    1;
+  z-index:  412;
+  dashes:   12,4,4,4;
 }
 line|z12[aeroway=runway]
 {
-  casing-linecap: butt;
-  color: #d4dcbd;
-  linecap: butt;
-  width: 2;
-  z-index: 230;
+  casing-linecap:    butt;
+  color:    #d4dcbd;
+  linecap:  butt;
+  width:    2;
+  z-index:  230;
   linejoin: bevel;
-  casing-linejoin: bevel;
+  casing-linejoin:  bevel;
   casing-width: 1;
   casing-color: #202020;
 }
 line|z12-[man_made=cutline]
 {
-  casing-color: #e;
-  casing-width: 1;
+  casing-color:    #e;
+  casing-width:    1;
 }
 line|z13-[man_made=cutline]
 {
-  casing-width: 2;
+  casing-width:    2;
 }
 area|z12-[landuse=military]
 {
-  fill-color: #d0d050;
+  fill-color:   #d0d050;
 }
 line|z12[railway=preserved]
 {
-  color: silver;
-  width: 1;
-  z-index: 223;
+  color:    silver;
+  width:    1;
+  z-index:  223;
 }
 area|z12-[landuse=conservation]
 {
-  fill-color: #cfeca8;
+  fill-color:   #cfeca8;
 }
 line|z12[railway=abandoned]
 {
-  color: #b2b2b2;
-  width: 0.25;
-  z-index: 219;
-  opacity: 0.3;
+  color:    #b2b2b2;
+  width:    0.25;
+  z-index:  219;
+  opacity:  0.3;
 }
 line|z12[aeroway=taxiway]
 {
-  casing-linecap: butt;
-  color: #d4dcbd;
-  linecap: butt;
-  width: 0.5;
-  z-index: 231;
+  casing-linecap:    butt;
+  color:    #d4dcbd;
+  linecap:  butt;
+  width:    0.5;
+  z-index:  231;
   linejoin: bevel;
-  casing-linejoin: bevel;
+  casing-linejoin:  bevel;
   casing-width: 1;
   casing-color: #202020;
 }
 line|z12[boundary=administrative][border_type=state]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 413;
-  dashes: 12,4,4,4;
+  width:    2;
+  z-index:  413;
+  dashes:   12,4,4,4;
 }
 line|z12[railway=monorail]
 {
-  color: #d08080;
-  width: 1;
-  z-index: 226;
+  color:    #d08080;
+  width:    1;
+  z-index:  226;
 }
 area|z13-[amenity=college],
 area|z13-[amenity=kindergarten],
@@ -536,179 +805,213 @@ area|z13-[amenity=school],
 area|z13-[amenity=university],
 area|z12-[man_made=wastewater_plant]
 {
-  fill-position: background;
+  fill-position:    background;
 }
 line|z12[railway=rail]
 {
-  color: silver;
-  width: 1;
-  z-index: 221;
+  color:    silver;
+  width:    1;
+  z-index:  221;
 }
 line|z12[railway=funicular]
 {
-  color: #a0a0a0;
-  width: 1;
-  z-index: 225;
+  color:    #a0a0a0;
+  width:    1;
+  z-index:  225;
 }
 line|z12[waterway=drain]
 {
-  color: #B9D4D4;
-  width: 1;
-  z-index: 67;
+  color:    #B9D4D4;
+  width:    1;
+  z-index:  67;
+}
+node|z12[place=city],
+node|z13[place=town]
+{
+  font-size:    20;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #505050;
 }
 line|z12[waterway=ditch]
 {
-  color: #B9D4D4;
-  width: 0.3;
-  z-index: 68;
+  color:    #B9D4D4;
+  width:    0.3;
+  z-index:  68;
 }
 line|z12[waterway=stream]
 {
-  color: #B9D4D4;
-  width: 0.75;
-  z-index: 65;
+  color:    #B9D4D4;
+  width:    0.75;
+  z-index:  65;
 }
 line|z12[route=ferry]
 {
-  color: #98b8e8;
-  width: 1;
-  z-index: 389;
-  dashes: 3,2;
-  linecap: butt;
+  color:    #98b8e8;
+  width:    1;
+  z-index:  389;
+  dashes:   3,2;
+  linecap:  butt;
 }
 line|z12[boundary=administrative][border_type=country]
 {
-  color: yellow;
-  width: 6;
-  z-index: 415;
+  color:    yellow;
+  width:    6;
+  z-index:  415;
   -x-kot-layer: top;
 }
+area|z12-[natural=volcano],
+node|z12-[natural=volcano]
+{
+  icon-image:   vulcan.svg;
+}
 area|z13-[landuse=farmyard],
 area|z12-[man_made=wastewater_plant]
 {
-  fill-color: #e4e4e4;
+  fill-color:   #e4e4e4;
 }
 line|z12[boundary=administrative][admin_level=2]
 {
-  color: #eeeedd;
-  width: 6;
-  z-index: 409;
+  color:    #eeeedd;
+  width:    6;
+  z-index:  409;
   -x-kot-layer: top;
 }
+node|z12[place=city][capital?]
+{
+  font-size:    22;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #606060;
+}
+area|z12[place=suburb],
+node|z12[place=suburb]
+{
+  text: name;
+  font-size:    12;
+  text-color:   #909090;
+  text-halo-radius: 2;
+  z-index: 20;
+}
 area|z12-[aeroway=terminal]
 {
-  fill-color: #d4c894;
+  fill-color:   #d4c894;
 }
 line|z12[boundary=national_park]
 {
-  color: #4ef94b;
-  linecap: butt;
+  color:    #4ef94b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 418;
-  dashes: 12,4,4,4;
+  width:    2;
+  z-index:  418;
+  dashes:   12,4,4,4;
 }
 line|z12[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 410;
-  dashes: 12,12;
+  width:    2;
+  z-index:  410;
+  dashes:   12,12;
 }
 line|z12[waterway=canal]
 {
-  color: #2;
-  width: 2.5;
+  color:    #2;
+  width:    2.5;
 }
 line|z12[railway=disused]
 {
-  color: grey;
-  width: 0.5;
-  z-index: 218;
-  opacity: 0.5;
+  color:    grey;
+  width:    0.5;
+  z-index:  218;
+  opacity:  0.5;
 }
 area|z12-[natural=land]
 {
-  fill-color: #f8f8f8;
+  fill-color:   #f8f8f8;
+}
+area|z12-13[natural=peak],
+node|z12-13[natural=peak]
+{
+  icon-image:   peak-mini.svg;
 }
-area|z12-[natural=lake],
+area|z14-[natural=lake],
 area|z12-14[natural=pond],
 node|z14-[natural=lake],
 node|z12-14[natural=pond]
 {
   text: name;
-  font-size: 12;
-  text-color: #5070d0;
+  font-size:    12;
+  text-color:   #5070d0;
 }
 line|z12[boundary=administrative][type=nation]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 416;
-  dashes: 12,12;
+  width:    2;
+  z-index:  416;
+  dashes:   12,12;
 }
 line|z13[waterway=drain]
 {
-  color: #B9D4D4;
-  width: 1.5;
-  z-index: 77;
+  color:    #B9D4D4;
+  width:    1.5;
+  z-index:  77;
 }
 area|z13-[landuse=landfill],
 area|z13-[landuse=quarry]
 {
-  fill-color: #e9dd72;
+  fill-color:   #e9dd72;
 }
 line|z13[piste:type=sled]
 {
-  color: #f0e0dc;
-  width: 1.25;
+  color:    #f0e0dc;
+  width:    1.25;
 }
 area|z13-[landuse=vineyard]
 {
-  fill-color: #d1ead1;
+  fill-color:   #d1ead1;
 }
 line|z13[boundary=administrative][border_type=country]
 {
-  color: yellow;
-  width: 6;
-  z-index: 440;
+  color:    yellow;
+  width:    6;
+  z-index:  440;
   -x-kot-layer: top;
 }
 line|z13[waterway=river]
 {
-  color: #0;
-  width: 3;
+  color:    #0;
+  width:    3;
 }
 area|z13[natural=water]
 {
   text: name;
-  font-size: 10;
-  text-color: navy;
+  font-size:    10;
+  text-color:   navy;
 }
 
 area|z14[natural=water]
 {
   text: name;
-  font-size: 11;
-  text-color: navy;
+  font-size:    11;
+  text-color:   navy;
 }
 
 area|z15[natural=water]
 {
   text: name;
-  font-size: 12;
-  text-color: navy;
+  font-size:    12;
+  text-color:   navy;
 }
 
 area|z16-[natural=water]
 {
   text: name;
-  font-size: 16;
-  text-color: navy;
+  font-size:    16;
+  text-color:   navy;
 }
 
 area|z17-[aeroway=gate],
@@ -746,171 +1049,174 @@ area|z15[natural=meadow],
 area|z15[natural=orchard],
 area|z15[natural=salt_pond],
 area|z15[natural=vineyard],
+area|z14[place=farm],
+area|z13-15[place=islet],
+area|z17-[place=islet],
 node|z17-[aeroway=gate],
 node|z14-15[natural=bay]
 {
   text: name;
-  font-size: 12;
-  text-color: #202020;
+  font-size:    12;
+  text-color:   #202020;
 }
 area|z13[aeroway=aerodrome],
 node|z13[aeroway=aerodrome]
 {
-  text-offset: 10;
+  text-offset:  10;
   text: name;
-  font-size: 12;
-  text-color: grey;
+  font-size:    12;
+  text-color:   grey;
 }
 line|z13[railway=siding]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 239;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  239;
 }
 line|z13[piste:type=nordic]
 {
-  color: #c00000;
-  width: 0.5;
-  dashes: 1.5,0.25;
-  linecap: butt;
+  color:    #c00000;
+  width:    0.5;
+  dashes:   1.5,0.25;
+  linecap:  butt;
 }
 line|z13[piste:type=downhill]
 {
-  color: #505050;
-  width: 2.5;
+  color:    #505050;
+  width:    2.5;
 }
 line|z13[piste:type=downhill][piste:difficulty=freeride]
 {
-  color: #f6dd0a;
-  width: 2.5;
+  color:    #f6dd0a;
+  width:    2.5;
 }
 line|z13[boundary=administrative][border_type=region]
 {
-  color: #f9574b;
-  linecap: butt;
-  width: 1;
-  z-index: 437;
-  dashes: 12,4,4,4;
+  color:    #f9574b;
+  linecap:  butt;
+  width:    1;
+  z-index:  437;
+  dashes:   12,4,4,4;
 }
 line|z13[route=ferry]
 {
-  color: #98b8e8;
-  width: 1;
-  z-index: 411;
-  dashes: 3,2;
-  linecap: butt;
+  color:    #98b8e8;
+  width:    1;
+  z-index:  411;
+  dashes:   3,2;
+  linecap:  butt;
 }
 line|z13[waterway=ditch]
 {
-  color: #B9D4D4;
-  width: 0.4;
-  z-index: 78;
+  color:    #B9D4D4;
+  width:    0.4;
+  z-index:  78;
 }
 line|z13[waterway=stream]
 {
-  color: #B9D4D4;
-  width: 1;
-  z-index: 75;
+  color:    #B9D4D4;
+  width:    1;
+  z-index:  75;
 }
 line|z13[railway=funicular]
 {
-  color: #a0a0a0;
-  width: 1;
-  z-index: 235;
+  color:    #a0a0a0;
+  width:    1;
+  z-index:  235;
 }
 line|z13[railway=preserved]
 {
-  color: #b0b0b0;
-  width: 1.35;
-  z-index: 231;
+  color:    #b0b0b0;
+  width:    1.35;
+  z-index:  231;
 }
 line|z13[boundary=administrative][border_type=country]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
-  width: 2;
-  z-index: 442;
-  dashes: 12,12;
+  color:    #f9574b;
+  linecap:  butt;
+  width:    2;
+  z-index:  442;
+  dashes:   12,12;
 }
 line|z13[railway=abandoned]
 {
-  color: #b2b2b2;
-  width: 0.55;
-  z-index: 227;
-  opacity: 0.3;
+  color:    #b2b2b2;
+  width:    0.55;
+  z-index:  227;
+  opacity:  0.3;
 }
 line|z13[railway=disused]
 {
-  color: grey;
-  width: 0.85;
-  z-index: 226;
-  opacity: 0.5;
+  color:    grey;
+  width:    0.85;
+  z-index:  226;
+  opacity:  0.5;
 }
 line|z13[aeroway=runway]
 {
-  casing-linecap: butt;
-  color: #d4dcbd;
-  linecap: butt;
-  width: 2.5;
-  z-index: 240;
+  casing-linecap:    butt;
+  color:    #d4dcbd;
+  linecap:  butt;
+  width:    2.5;
+  z-index:  240;
   linejoin: bevel;
-  casing-linejoin: bevel;
+  casing-linejoin:  bevel;
   casing-width: 1;
   casing-color: #202020;
 }
 line|z13[boundary=administrative][admin_level=2]
 {
-  color: #eeeedd;
-  width: 6;
-  z-index: 433;
+  color:    #eeeedd;
+  width:    6;
+  z-index:  433;
 }
 line|z13[railway=construction]
 {
-  color: #404040;
-  width: 1.35;
-  z-index: 224;
-  dashes: 1.5,1.5;
-  linecap: butt;
+  color:    #404040;
+  width:    1.35;
+  z-index:  224;
+  dashes:   1.5,1.5;
+  linecap:  butt;
 }
 line|z13[boundary=administrative][border_type=state]
 {
-  color: #f9574b;
-  linecap: butt;
-  width: 2;
-  z-index: 438;
-  dashes: 12,4,4,4;
+  color:    #f9574b;
+  linecap:  butt;
+  width:    2;
+  z-index:  438;
+  dashes:   12,4,4,4;
 }
 node|z13[aerialway=station]
 {
   symbol-shape: circle;
-  symbol-fill-color: #202020;
-  symbol-size: 2;
+  symbol-fill-color:    #202020;
+  symbol-size:  2;
 }
 area|z13-15[natural=peak],
 node|z13-15[natural=peak]
 {
-  text-offset: 10;
+  text-offset:  10;
   text: name;
-  font-size: 12;
-  text-color: #404040;
+  font-size:    12;
+  text-color:   #404040;
 }
 line|z13[boundary=administrative][type=nation]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
-  width: 2;
-  z-index: 441;
-  dashes: 12,12;
+  color:    #f9574b;
+  linecap:  butt;
+  width:    2;
+  z-index:  441;
+  dashes:   12,12;
 }
 line|z13[aeroway=taxiway]
 {
-  casing-linecap: butt;
-  color: #d4dcbd;
-  linecap: butt;
-  width: 1;
-  z-index: 241;
+  casing-linecap:    butt;
+  color:    #d4dcbd;
+  linecap:  butt;
+  width:    1;
+  z-index:  241;
   linejoin: bevel;
-  casing-linejoin: bevel;
+  casing-linejoin:  bevel;
   casing-width: 1;
   casing-color: #202020;
 }
@@ -920,10 +1226,10 @@ node|z17-[amenity=shelter],
 node|z17-[amenity=school]
 {
   text-offset: 10;
-  font-size: 12;
+  font-size:    12;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
+  text-color:   #404040;
 }
 
 area|z16-[landuse=forest],
@@ -932,15 +1238,19 @@ area|z16-[amenity=townhall],
 area|z17-[tourism=caravan_site],
 area|z17-[leisure=garden],
 area|z17-[leisure=park],
+area|z17-[leisure=sports_centre],
+area|z17-[leisure=stadium],
 node|z13-[highway=motorway_junction],
+node|z17-[leisure=stadium],
 node|z17-[tourism=caravan_site],
 node|z17-[tourism=zoo],
-node|z16-[amenity=townhall]
+node|z16-[amenity=townhall],
+node|z17-[leisure=sports_centre]
 {
-  font-size: 12;
+  font-size:    12;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
+  text-color:   #404040;
 }
 
 node|z13-[highway=motorway_junction]
@@ -950,364 +1260,444 @@ node|z13-[highway=motorway_junction]
 
 line|z13[piste:type=downhill][piste:difficulty=intermediate]
 {
-  color: #ff4040;
-  width: 2.5;
+  color:    #ff4040;
+  width:    2.5;
 }
 line|z13[piste:type=downhill][piste:difficulty=advanced]
 {
-  color: #202020;
-  width: 2.5;
+  color:    #202020;
+  width:    2.5;
 }
 line|z13[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
-  width: 2;
-  z-index: 434;
-  dashes: 12,12;
+  color:    #f9574b;
+  linecap:  butt;
+  width:    2;
+  z-index:  434;
+  dashes:   12,12;
 }
 line|z13[natural=glacier]
 {
-  color: lightblue;
-  width: 0.75;
-  z-index: 6;
+  color:    lightblue;
+  width:    0.75;
+  z-index:  6;
 }
 line|z13[railway=monorail]
 {
-  color: #d08080;
-  width: 1;
+  color:    #d08080;
+  width:    1;
 }
 area|z13-14[leisure=park],
 node|z13-14[leisure=park]
 {
   text: name;
-  font-size: 12;
-  text-color: #5ca800;
+  font-size:    12;
+  text-color:   #5ca800;
+}
+node|z13[place=city][capital?]
+{
+  text: name;
+  font-size:    24;
+  text-color:   grey;
+}
+area|z13-[leisure=dog_park][sport=tennis],
+area|z13-[leisure=pitch][sport=tennis],
+area|z13-[leisure=playground][sport=tennis],
+area|z13-[leisure=playing_fields][sport=tennis]
+{
+  fill-color:   #ddb298;
 }
 line|z13[railway=narrow_gauge]
 {
-  color: #a0a0a0;
-  width: 1;
-  z-index: 230;
+  color:    #a0a0a0;
+  width:    1;
+  z-index:  230;
 }
 line|z13[railway=light_rail]
 {
-  color: #90d090;
-  width: 1;
-  z-index: 687;
+  color:    #90d090;
+  width:    1;
+  z-index:  687;
 }
 line|z13[waterway=canal]
 {
-  color: #2;
-  width: 3;
+  color:    #2;
+  width:    3;
 }
 line|z13[railway=rail]
 {
-  color: #b0b0b0;
-  width: 1.85;
-  z-index: 229;
+  color:    #b0b0b0;
+  width:    1.85;
+  z-index:  229;
 }
 line|z13[railway=yard]
 {
-  color: #404040;
-  width: 0.85;
-  z-index: 238;
+  color:    #404040;
+  width:    0.85;
+  z-index:  238;
 }
 line|z13[piste:type=downhill][piste:difficulty=easy]
 {
-  color: blue;
-  width: 2.5;
+  color:    blue;
+  width:    2.5;
+}
+node|z13[place=city]
+{
+  font-size:    20;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #404040;
 }
 line|z13[piste:type=downhill][piste:difficulty=novice]
 {
-  color: #40ff40;
-  width: 2.5;
+  color:    #40ff40;
+  width:    2.5;
 }
 line|z13[piste:type=downhill][piste:difficulty=expert]
 {
-  color: #f6800a;
-  width: 2.5;
+  color:    #f6800a;
+  width:    2.5;
+}
+area|z13[place=suburb],
+node|z13[place=suburb]
+{
+  text: name;
+  font-size:    14;
+  text-color:   #909090;
+  text-halo-radius: 2;
+  z-index: 20;
 }
 line|z14[railway=spur]::d1p2
 {
-  color: #909090;
-  width: 1;
-  z-index: 293;
+  color:    #909090;
+  width:    1;
+  z-index:  293;
 }
 line|z14[railway=yard]
 {
-  color: #404040;
-  width: 1.6;
-  z-index: 208;
+  color:    #404040;
+  width:    1.6;
+  z-index:  208;
 }
 area|z14-15[natural=cave_entrance],
 area|z14-15[natural=volcano],
 node|z14-15[natural=cave_entrance],
 node|z14-15[natural=volcano]
 {
-  text-offset: 10;
+  text-offset:  10;
   text: name;
-  font-size: 12;
-  text-color: #202020;
+  font-size:    12;
+  text-color:   #202020;
 }
 line|z14[railway=abandoned]::d1p3
 {
-  opacity: 0.4;
-  color: #b2b2b2;
-  linecap: butt;
-  width: 1;
-  z-index: 300;
-  dashes: 4.5,4.5;
+  opacity:  0.4;
+  color:    #b2b2b2;
+  linecap:  butt;
+  width:    1;
+  z-index:  300;
+  dashes:   4.5,4.5;
+}
+area|z14-[natural=peak],
+node|z14-[natural=peak]
+{
+  icon-image:   peak.svg;
 }
 area|z14-[man_made=pier]
 {
     fill-color: #f1eee8;
     z-index: 488;
 }
+area|z16-[amenity=ferry_terminal],
+node|z16-[amenity=ferry_terminal]
+{
+    icon-image: slipway.svg;
+}
+
 line|z14[man_made=pier]::d1p3
 {
-  color: #e4e4e4;
-  width: 0.6;
-  z-index: 488;
+  color:    #e4e4e4;
+  width:    0.6;
+  z-index:  488;
 }
 line|z14[railway=narrow_gauge]::d1p3
 {
-  color: #404040;
-  width: 1.7;
-  z-index: 303;
-  dashes: 5.5,5.5;
-  linecap: butt;
+  color:    #404040;
+  width:    1.7;
+  z-index:  303;
+  dashes:   5.5,5.5;
+  linecap:  butt;
+}
+area|z14-[natural=cave_entrance],
+node|z14-[natural=cave_entrance]
+{
+  icon-image:   cave_entrance.svg;
 }
 line|z14[railway=monorail]::d1p2
 {
-  color: #d08080;
-  width: 1.7;
-  z-index: 556;
+  color:    #d08080;
+  width:    1.7;
+  z-index:  556;
 }
 line|z14[railway=light_rail]
 {
-  color: #095909;
-  width: 2.4;
-  z-index: 668;
+  color:    #095909;
+  width:    2.4;
+  z-index:  668;
 }
 line|z14[boundary=administrative][admin_level=6]
 {
-  color: #f9574b;
-  linecap: butt;
-  width: 1;
-  z-index: 521;
-  dashes: 4,20;
+  color:    #f9574b;
+  linecap:  butt;
+  width:    1;
+  z-index:  521;
+  dashes:   4,20;
 }
 line|z14[piste:lift=j-bar],
 line|z14[piste:lift=platter],
 line|z14[piste:lift=t-bar]
 {
   text: name;
-  font-size: 12;
-  text-color: #202020;
+  font-size:    12;
+  text-color:   #202020;
 }
 line|z14[railway=construction]::d1p3
 {
-  color: #606060;
-  width: 1.7;
-  z-index: 296;
-  dashes: 1.5,1.5,1.5,4.5;
-  linecap: butt;
+  color:    #606060;
+  width:    1.7;
+  z-index:  296;
+  dashes:   1.5,1.5,1.5,4.5;
+  linecap:  butt;
+}
+area|z14-[power=generator][generator:type=photovoltaic],
+node|z14-[power=generator][generator:type=photovoltaic]
+{
+  icon-image:   power_photovoltaic.svg;
 }
 line|z14-[railway=rail],
 node|z16-[aerialway=station]
 {
-  font-size: 12;
+  font-size:    12;
   text-halo-radius: 2;
   text: name;
-  text-color: #3050d8;
+  text-color:   #3050d8;
 }
 line|z14[piste:lift=platter]::d1p2
 {
-  color: #202020;
-  width: 0.4;
+  color:    #202020;
+  width:    0.4;
 }
 line|z14[piste:lift=j-bar]::d2p2
 {
-  color: #202020;
-  width: 0.4;
+  color:    #202020;
+  width:    0.4;
+}
+area|z14-[earthquake:damage=spontaneous_camp],
+node|z14-[earthquake:damage=spontaneous_camp]
+{
+  icon-image:   earthquakecamp.svg;
 }
 line|z14[railway=construction]
 {
-  color: #606060;
-  width: 2.4;
-  z-index: 193;
-  dashes: 1.5,1.5;
-  linecap: butt;
+  color:    #606060;
+  width:    2.4;
+  z-index:  193;
+  dashes:   1.5,1.5;
+  linecap:  butt;
 }
 line|z14[railway=spur]
 {
-  color: #b0b0b0;
-  width: 1.6;
-  z-index: 207;
+  color:    #b0b0b0;
+  width:    1.6;
+  z-index:  207;
 }
 line|z14[railway=narrow_gauge]::d1p2
 {
-  color: #e6e6e6;
-  width: 1.7;
-  z-index: 286;
+  color:    #e6e6e6;
+  width:    1.7;
+  z-index:  286;
 }
 line|z14-[piste:type=downhill]
 {
-  color: #505050;
-  width: 5;
+  color:    #505050;
+  width:    5;
 }
 line|z14-[piste:type=downhill][piste:difficulty=easy]
 {
-  color: blue;
-  width: 5;
+  color:    blue;
+  width:    5;
 }
 line|z14[aeroway=runway]
 {
-  casing-linecap: butt;
-  color: #d4dcbd;
-  linecap: butt;
-  width: 10;
-  z-index: 314;
+  casing-linecap:    butt;
+  color:    #d4dcbd;
+  linecap:  butt;
+  width:    10;
+  z-index:  314;
   linejoin: bevel;
-  casing-linejoin: bevel;
+  casing-linejoin:  bevel;
   casing-width: 2;
   casing-color: #202020;
 }
 line|z14[route=ferry]
 {
-  color: #98b8e8;
-  width: 1;
-  z-index: 499;
-  dashes: 3,2;
-  linecap: butt;
+  color:    #98b8e8;
+  width:    1;
+  z-index:  499;
+  dashes:   3,2;
+  linecap:  butt;
 }
 line|z14[railway=rail],
 {
-  color: #888888;
-  z-index: 198;
-  width: 3;
+  color:    #888888;
+  z-index:  198;
+  width:    3;
 }
 line|z14-[piste:type=downhill][piste:difficulty=advanced]
 {
-  color: #202020;
-  width: 5;
+  color:    #202020;
+  width:    5;
 }
 
 line|z14[piste:type=sled]
 {
-  color: #f0e0dc;
-  width: 2.5;
+  color:    #f0e0dc;
+  width:    2.5;
 }
 line|z14[natural=spring],
 line|z14[waterway=river]
 {
-  color: #0;
-  width: 4;
+  color:    #0;
+  width:    4;
 }
 
 line|z14[boundary=administrative][border_type=country]
 {
-  color: yellow;
-  width: 6;
-  z-index: 533;
+  color:    yellow;
+  width:    6;
+  z-index:  533;
+}
+area|z15-[tourism=alpine_hut],
+node|z15-[tourism=alpine_hut]
+{
+  icon-image:   alpine_hut.svg;
 }
 line|z14[railway=preserved]::d1p3
 {
-  color: #505050;
-  width: 1.7;
-  z-index: 304;
-  dashes: 4.5,4.5;
-  linecap: butt;
+  color:    #505050;
+  width:    1.7;
+  z-index:  304;
+  dashes:   4.5,4.5;
+  linecap:  butt;
 }
 line|z14[man_made=cutline]
 {
-  casing-width: 2;
+  casing-width:    2;
+}
+area|z14-[amenity=shelter],
+node|z14-[amenity=shelter]
+{
+  icon-image:   shelter.svg;
 }
 line|z14[railway=siding]
 {
-  color: #909090;
-  width: 1.6;
-  z-index: 209;
+  color:    #909090;
+  width:    1.6;
+  z-index:  209;
 }
 line|z14[boundary=administrative][admin_level=5]
 {
-  color: #f9574b;
-  linecap: butt;
-  width: 1;
-  z-index: 522;
-  dashes: 12,12;
+  color:    #f9574b;
+  linecap:  butt;
+  width:    1;
+  z-index:  522;
+  dashes:   12,12;
+}
+area|z14[place=town],
+node|z14[place=town]
+{
+  font-size:    22;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #505050;
 }
 line|z14-[piste:type=downhill][piste:difficulty=expert]
 {
-  color: #f6800a;
-  width: 5;
+  color:    #f6800a;
+  width:    5;
 }
+line|z14-[railway=tram]
+{
+    color: black;
+    width: 1;
+    -x-kot-layer: top;
+}
+
 line|z14[railway=monorail]::raildash,
 {
-  color: #590959;
-  width: 1.7;
-  z-index: 557;
-  dashes: 3.6,5.4;
-  linecap: butt;
+  color:    #590959;
+  width:    1.7;
+  z-index:  557;
+  dashes:   3.6,5.4;
+  linecap:  butt;
 }
 line|z14[railway=monorail]::railborder,
 {
-  color: #590959;
-  width: 2;
-  z-index: 555;
+  color:    #590959;
+  width:    2;
+  z-index:  555;
 }
 line|z14[piste:lift=platter]::d1p3
 {
-  color: #202020;
-  width: 4;
-  dashes: 0.4,20;
-  linecap: butt;
+  color:    #202020;
+  width:    4;
+  dashes:   0.4,20;
+  linecap:  butt;
 }
 line|z14[boundary=administrative][type=nation]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
-  width: 2;
-  z-index: 534;
-  dashes: 12,12;
+  color:    #f9574b;
+  linecap:  butt;
+  width:    2;
+  z-index:  534;
+  dashes:   12,12;
 }
 line|z14[waterway=dam]
 {
-  color: #202020;
-  width: 0.38;
-  z-index: 124;
+  color:    #202020;
+  width:    0.38;
+  z-index:  124;
 }
 line|z14[piste:lift=j-bar]::d2p3
 {
-  color: #202020;
-  width: 4;
-  dashes: 0.4,20;
-  linecap: butt;
+  color:    #202020;
+  width:    4;
+  dashes:   0.4,20;
+  linecap:  butt;
 }
 line|z14[railway=disused]
 {
-  color: grey;
-  width: 1.6;
-  z-index: 196;
-  opacity: 0.7;
+  color:    grey;
+  width:    1.6;
+  z-index:  196;
+  opacity:  0.7;
 }
 line|z14[railway=construction]::d1p2
 {
-  color: #f2f2f2;
-  width: 1.7;
-  z-index: 279;
+  color:    #f2f2f2;
+  width:    1.7;
+  z-index:  279;
 }
 line|z14[railway=funicular]::d1p3
 {
-  color: #590909;
-  width: 0.4;
-  z-index: 309;
+  color:    #590909;
+  width:    0.4;
+  z-index:  309;
 }
 line|z14[waterway=lock]
 {
-  color: #f8f8f8;
-  width: 5;
+  color:    #f8f8f8;
+  width:    5;
   casing-width: 1;
   casing-color: #202020;
 }
@@ -1316,142 +1706,156 @@ line|z14-[waterway=canal],
 line|z14-[waterway=river]
 {
   text: name;
-  font-size: 12;
-  text-color: #f;
+  font-size:    12;
+  text-color:   #f;
   text-halo-color: #0;
 }
 line|z14[railway=yard]::d1p2
 {
-  color: #e6e6e6;
-  width: 1;
-  z-index: 294;
+  color:    #e6e6e6;
+  width:    1;
+  z-index:  294;
 }
 line|z14-[piste:type=downhill][piste:difficulty=freeride]
 {
-  color: #f6dd0a;
-  width: 5;
+  color:    #f6dd0a;
+  width:    5;
 }
 line|z14[boundary=administrative][admin_level=2]
 {
-  color: #eeeedd;
-  width: 6;
-  z-index: 525;
+  color:    #eeeedd;
+  width:    6;
+  z-index:  525;
 }
 line|z14[railway=rail]::d1p5
 {
-  color: #888888;
-  width: 1.8;
-  z-index: 302;
-  dashes: 4.5,4.5;
-  linecap: butt;
+  color:    #888888;
+  width:    1.8;
+  z-index:  302;
+  dashes:   4.5,4.5;
+  linecap:  butt;
 }
 line|z14[railway=rail]::d1p4
 {
-  color: #e6e6e6;
-  width: 1.8;
-  z-index: 285;
+  color:    #e6e6e6;
+  width:    1.8;
+  z-index:  285;
 }
 line|z14[railway=abandoned]::d1p2
 {
-  color: white;
-  width: 1;
-  z-index: 283;
-  opacity: 0.4;
+  color:    white;
+  width:    1;
+  z-index:  283;
+  opacity:  0.4;
 }
 line|z14[railway=siding]::d1p3
 {
-  color: #404040;
-  width: 1;
-  z-index: 313;
-  dashes: 3,6;
-  linecap: butt;
+  color:    #404040;
+  width:    1;
+  z-index:  313;
+  dashes:   3,6;
+  linecap:  butt;
 }
 line|z14[boundary=administrative][border_type=country]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
-  width: 2;
-  z-index: 535;
-  dashes: 12,12;
+  color:    #f9574b;
+  linecap:  butt;
+  width:    2;
+  z-index:  535;
+  dashes:   12,12;
 }
 line|z14[boundary=administrative][border_type=region]
 {
-  color: #f9574b;
-  linecap: butt;
-  width: 1;
-  z-index: 530;
-  dashes: 12,4,4,4;
+  color:    #f9574b;
+  linecap:  butt;
+  width:    1;
+  z-index:  530;
+  dashes:   12,4,4,4;
 }
 line|z14[waterway=canal]
 {
-  color: #2;
-  width: 4;
+  color:    #2;
+  width:    4;
 }
 line|z14[railway=preserved]::d1p2
 {
-  color: #e6e6e6;
-  width: 1.7;
+  color:    #e6e6e6;
+  width:    1.7;
 }
 line|z14[railway=siding]::d1p2
 {
-  color: #e6e6e6;
-  width: 1;
-  z-index: 295;
+  color:    #e6e6e6;
+  width:    1;
+  z-index:  295;
 }
 line|z14[boundary=administrative][border_type=county]
 {
-  color: #f9574b;
-  linecap: butt;
-  width: 1;
-  z-index: 529;
-  dashes: 4,20;
+  color:    #f9574b;
+  linecap:  butt;
+  width:    1;
+  z-index:  529;
+  dashes:   4,20;
+}
+area|z14-[power=generator],
+node|z14-[power=generator]
+{
+  icon-image:   power_generic.svg;
 }
 line|z12-[mapswithme=grid]
 {
-  color: #202020;
-  width: 4;
-  dashes: 1,1;
-  linecap: butt;
+  color:    #202020;
+  width:    4;
+  dashes:   1,1;
+  linecap:  butt;
+}
+area|z14-16[place=suburb],
+node|z14-16[place=suburb]
+{
+  text: name;
+  font-size:    18;
+  text-color:   #909090;
+  text-halo-radius: 2;
+  z-index: 20;
 }
 line|z14[piste:lift=t-bar]::d2p2
 {
-  color: #202020;
-  width: 0.4;
+  color:    #202020;
+  width:    0.4;
 }
 line|z14[railway=disused]::d1p2
 {
-  color: #f2f2f2;
-  width: 1;
-  z-index: 282;
-  opacity: 0.7;
+  color:    #f2f2f2;
+  width:    1;
+  z-index:  282;
+  opacity:  0.7;
 }
 area|z14-[power=generator],
 area|z14-[power=station],
 area|z14-[power=sub_station],
 node|z14-[power=generator]
 {
-  fill-color: #bebebe;
+  fill-color:   #bebebe;
 }
 line|z14[man_made=pier]
 {
-  color: #d0d0d0;
-  width: 0.8;
+  color:    #d0d0d0;
+  width:    0.8;
 }
 line|z14[waterway=drain]
 {
-  color: #B9D4D4;
-  width: 2.3;
+  color:    #B9D4D4;
+  width:    2.3;
 }
 area|z12-[aeroway=airport],
 area|z12-[aeroway=aerodrome],
 node|z12-[aeroway=airport],
 node|z12-[aeroway=aerodrome]
 {
-  font-size: 10;
+  font-size:    10;
   text-halo-radius: 2;
   text: name;
-  text-color: #005BE2;
-  text-offset: 10;
+  text-color:   #005BE2;
+  text-offset:  10;
   text-position: center;
 }
 area|z13-14[aeroway=airport],
@@ -1459,216 +1863,246 @@ area|z13-14[aeroway=aerodrome],
 node|z13-14[aeroway=airport],
 node|z13-14[aeroway=aerodrome]
 {
-  font-size: 11;
+  font-size:    11;
 }
 area|z15-[aeroway=airport],
 area|z15-[aeroway=aerodrome],
 node|z15-[aeroway=airport],
 node|z15-[aeroway=aerodrome]
 {
-  font-size: 12;
+  font-size:    12;
 }
 
 line|z14[railway=preserved]
 {
-  color: #909090;
-  width: 2.4;
-  z-index: 200;
+  color:    #909090;
+  width:    2.4;
+  z-index:  200;
+}
+area|z14-[power=generator][power_source=hydro],
+node|z14-[power=generator][power_source=hydro]
+{
+  icon-image:   power_hydro.svg;
 }
 line|z14[railway=light_rail]::d1p3
 {
-  color: #095909;
-  width: 1.7;
-  z-index: 687;
-  dashes: 3.8,5.4;
-  linecap: butt;
+  color:    #095909;
+  width:    1.7;
+  z-index:  687;
+  dashes:   3.8,5.4;
+  linecap:  butt;
 }
 line|z14[railway=yard]::d1p3
 {
-  color: #404040;
-  width: 1;
-  z-index: 312;
-  dashes: 3,6;
-  linecap: butt;
+  color:    #404040;
+  width:    1;
+  z-index:  312;
+  dashes:   3,6;
+  linecap:  butt;
 }
 line|z14[boundary=administrative][border_type=state]
 {
-  color: #f9574b;
-  linecap: butt;
-  width: 2;
-  z-index: 531;
-  dashes: 12,4,4,4;
+  color:    #f9574b;
+  linecap:  butt;
+  width:    2;
+  z-index:  531;
+  dashes:   12,4,4,4;
 }
 line|z14[railway=narrow_gauge]
 {
-  color: #606060;
-  width: 2.4;
-  z-index: 199;
+  color:    #606060;
+  width:    2.4;
+  z-index:  199;
+}
+area|z16-[power=tower],
+node|z16-[power=tower]
+{
+  icon-image:   power-tower.svg;
 }
 area|z14-[natural=beach]
 {
-  fill-color: #eecc55;
+  fill-color:   #eecc55;
 }
 line|z14-[piste:type=downhill][piste:difficulty=novice]
 {
-  color: #40ff40;
-  width: 5;
+  color:    #40ff40;
+  width:    5;
 }
 line|z14[railway=disused]::d1p3
 {
-  opacity: 0.7;
-  color: grey;
-  linecap: butt;
-  width: 1;
-  z-index: 299;
-  dashes: 4.5,4.5;
+  opacity:  0.7;
+  color:    grey;
+  linecap:  butt;
+  width:    1;
+  z-index:  299;
+  dashes:   4.5,4.5;
 }
 line|z14[waterway=ditch]
 {
-  color: #B9D4D4;
-  width: 0.3;
-  z-index: 104;
+  color:    #B9D4D4;
+  width:    0.3;
+  z-index:  104;
+}
+area|z14-[power=generator][power_source=wind],
+node|z14-[power=generator][power_source=wind]
+{
+  icon-image:   power_wind.svg;
 }
 line|z14[piste:lift=t-bar]::d2p3
 {
-  color: #202020;
-  width: 4;
-  dashes: 0.4,20;
-  linecap: butt;
+  color:    #202020;
+  width:    4;
+  dashes:   0.4,20;
+  linecap:  butt;
+}
+node|z14-15[place=city]
+{
+  font-size:    22;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #404040;
 }
 line|z14[railway=abandoned]
 {
-  color: #b2b2b2;
-  width: 1.6;
-  z-index: 197;
-  opacity: 0.4;
+  color:    #b2b2b2;
+  width:    1.6;
+  z-index:  197;
+  opacity:  0.4;
 }
 line|z14[aeroway=taxiway]
 {
-  casing-linecap: butt;
-  color: #d4dcbd;
-  linecap: butt;
-  width: 4;
-  z-index: 315;
+  casing-linecap:    butt;
+  color:    #d4dcbd;
+  linecap:  butt;
+  width:    4;
+  z-index:  315;
   linejoin: bevel;
-  casing-linejoin: bevel;
+  casing-linejoin:  bevel;
   casing-width: 1;
   casing-color: #202020;
 }
+area|z14[place=village],
+node|z14[place=village]
+{
+  font-size:    12;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #404040;
+}
 line|z14[railway=light_rail]::d1p2
 {
-  color: #b7e6e6;
-  width: 1.7;
-  z-index: 677;
+  color:    #b7e6e6;
+  width:    1.7;
+  z-index:  677;
 }
 line|z14[waterway=stream]
 {
-  color: #B9D4D4;
-  width: 1;
-  z-index: 101;
+  color:    #B9D4D4;
+  width:    1;
+  z-index:  101;
 }
 node|z14[aerialway=station]
 {
   symbol-shape: circle;
-  symbol-fill-color: #3050d8;
-  symbol-size: 2;
+  symbol-fill-color:    #3050d8;
+  symbol-size:  2;
 }
 line|z14[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
-  width: 2;
-  z-index: 526;
-  dashes: 12,12;
+  color:    #f9574b;
+  linecap:  butt;
+  width:    2;
+  z-index:  526;
+  dashes:   12,12;
 }
 line|z14[man_made=pier]
 {
-  color: #d0d0d0;
-  width: 0.1;
-  z-index: 486;
+  color:    #d0d0d0;
+  width:    0.1;
+  z-index:  486;
 }
 line|z14[piste:type=nordic]
 {
-  color: #c00000;
-  width: 1;
-  dashes: 3,0.5;
-  linecap: butt;
+  color:    #c00000;
+  width:    1;
+  dashes:   3,0.5;
+  linecap:  butt;
 }
 line|z14[railway=funicular]
 {
-  color: #590909;
-  width: 2.4;
-  z-index: 205;
+  color:    #590909;
+  width:    2.4;
+  z-index:  205;
 }
 node|z16-[highway=motorway_junction]::d1p1
 {
-  font-size: 12;
+  font-size:    12;
   text-halo-radius: 2;
   text: name;
-  text-color: #202020;
+  text-color:   #202020;
   text-position: center;
 }
 line|z14[railway=spur]::d1p3
 {
-  color: #ececec;
-  width: 1;
-  z-index: 311;
-  dashes: 3,6;
-  linecap: butt;
+  color:    #ececec;
+  width:    1;
+  z-index:  311;
+  dashes:   3,6;
+  linecap:  butt;
 }
 line|z14[waterway=weir]
 {
-  color: #000044;
-  width: 0.25;
-  z-index: 123;
+  color:    #000044;
+  width:    0.25;
+  z-index:  123;
 }
 line|z14[natural=glacier]
 {
-  color: lightblue;
-  width: 0.8;
-  z-index: 8;
+  color:    lightblue;
+  width:    0.8;
+  z-index:  8;
 }
 node|z15[aerialway=station]
 {
   symbol-shape: circle;
-  symbol-fill-color: #3050d8;
-  symbol-size: 3;
+  symbol-fill-color:    #3050d8;
+  symbol-size:  3;
 }
 line|z14[railway=funicular]::d1p2
 {
-  color: #e6b7b7;
-  width: 1.7;
-  z-index: 291;
-  dashes: 3.6,5.4;
-  linecap: butt;
+  color:    #e6b7b7;
+  width:    1.7;
+  z-index:  291;
+  dashes:   3.6,5.4;
+  linecap:  butt;
 }
 line|z15[railway=spur]::d1p3
 {
-  color: #606060;
-  width: 1.4;
-  z-index: 411;
-  dashes: 6,12;
-  linecap: butt;
+  color:    #606060;
+  width:    1.4;
+  z-index:  411;
+  dashes:   6,12;
+  linecap:  butt;
 }
 line|z15[boundary=administrative][border_type=county]
 {
-  color: #f9574b;
-  linecap: butt;
-  width: 1;
-  z-index: 686;
-  dashes: 4,20;
+  color:    #f9574b;
+  linecap:  butt;
+  width:    1;
+  z-index:  686;
+  dashes:   4,20;
 }
 line|z15-16[man_made=cutline]
 {
-  casing-width: 3;
+  casing-width:    3;
 }
 line|z15[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
-  width: 2;
-  z-index: 680;
-  dashes: 12,12;
+  color:    #f9574b;
+  linecap:  butt;
+  width:    2;
+  z-index:  680;
+  dashes:   12,12;
 }
 area|z16[building],
 node|z16[building],
@@ -1676,698 +2110,777 @@ area|z16[addr:housenumber][addr:street],
 node|z16[addr:housenumber][addr:street]
 {
   text: "addr:housenumber";
-  font-size: 10;
-  text-color: #f;
+  font-size:    10;
+  text-color:   #f;
   text-halo-color: #0;
   text-position: center;
 }
 line|z15[railway=disused]
 {
-  color: grey;
-  width: 3.2;
-  z-index: 284;
-  opacity: 0.7;
+  color:    grey;
+  width:    3.2;
+  z-index:  284;
+  opacity:  0.7;
 }
 line|z15[railway=preserved]::d1p2
 {
-  color: #e6e6e6;
-  width: 2;
-  z-index: 388;
+  color:    #e6e6e6;
+  width:    2;
+  z-index:  388;
 }
 line|z15[piste:lift=magic_carpet]
 {
-  color: #101010;
-  width: 1.6;
+  color:    #101010;
+  width:    1.6;
 }
 line|z15[railway=abandoned]
 {
-  color: #b2b2b2;
-  width: 3.2;
-  z-index: 285;
-  opacity: 0.4;
+  color:    #b2b2b2;
+  width:    3.2;
+  z-index:  285;
+  opacity:  0.4;
 }
 line|z15[route=ferry]
 {
-  color: #98b8e8;
-  width: 1;
-  z-index: 643;
-  dashes: 7,5;
-  linecap: butt;
+  color:    #98b8e8;
+  width:    1;
+  z-index:  643;
+  dashes:   7,5;
+  linecap:  butt;
 }
 line|z15[railway=siding]::d1p3
 {
-  color: #333333;
-  width: 1.4;
-  z-index: 413;
-  dashes: 6,12;
-  linecap: butt;
+  color:    #333333;
+  width:    1.4;
+  z-index:  413;
+  dashes:   6,12;
+  linecap:  butt;
 }
 line|z15-[piste:lift=j-bar]
 {
-  color: #202020;
-  width: 0.8;
+  color:    #202020;
+  width:    0.8;
 }
 line|z15[waterway=weir]
 {
-  color: #000044;
-  width: 1;
-  z-index: 128;
+  color:    #000044;
+  width:    1;
+  z-index:  128;
 }
 line|z15[waterway=canal]
 {
-  color: #2;
-  width: 4;
+  color:    #2;
+  width:    4;
+}
+area|z15-[tourism=viewpoint],
+node|z15-[tourism=viewpoint],
+area|z15-[tourism=artwork],
+node|z15-[tourism=artwork]
+{
+  icon-image:   viewpoint.svg;
 }
 line|z15[railway=siding]::d1p2
 {
-  color: #e6e6e6;
-  width: 1.4;
-  z-index: 396;
+  color:    #e6e6e6;
+  width:    1.4;
+  z-index:  396;
+}
+area|z15-16[railway=tram_stop],
+node|z15-16[railway=tram_stop]
+{
+  icon-image:   tramway-mini.svg;
 }
 line|z15[railway=preserved]
 {
-  color: #909090;
-  width: 3.2;
-  z-index: 289;
+  color:    #909090;
+  width:    3.2;
+  z-index:  289;
 }
 line|z15-[aeroway=runway]
 {
-  casing-linecap: butt;
-  color: #d4dcbd;
-  linecap: butt;
-  width: 20;
+  casing-linecap:    butt;
+  color:    #d4dcbd;
+  linecap:  butt;
+  width:    20;
   linejoin: bevel;
-  casing-linejoin: bevel;
+  casing-linejoin:  bevel;
   casing-width: 4;
   casing-color: #202020;
 }
 line|z15-[piste:lift=t-bar]
 {
-  color: #202020;
-  width: 0.8;
+  color:    #202020;
+  width:    0.8;
 }
 line|z15[boundary=administrative][admin_level=5]
 {
-  color: #f9574b;
-  linecap: butt;
-  width: 1;
-  z-index: 676;
-  dashes: 12,12;
+  color:    #f9574b;
+  linecap:  butt;
+  width:    1;
+  z-index:  676;
+  dashes:   12,12;
 }
 line|z15-[piste:lift=t-bar]::d2p2
 {
-  color: #202020;
-  width: 8;
-  dashes: 0.8,40;
-  linecap: butt;
+  color:    #202020;
+  width:    8;
+  dashes:   0.8,40;
+  linecap:  butt;
 }
 area|z15-[tourism=attraction],
 node|z15-[tourism=attraction]
 {
-  font-size: 12;
+  font-size:    12;
   text-halo-radius: 2;
   text: name;
-  text-color: #303030;
+  text-color:   #303030;
 }
 line|z15[railway=yard]
 {
-  color: #333333;
-  width: 2.4;
+  color:    #333333;
+  width:    2.4;
 }
 line|z15[railway=spur]
 {
-  color: #606060;
-  width: 2.4;
-  z-index: 295;
+  color:    #606060;
+  width:    2.4;
+  z-index:  295;
 }
 line|z15[boundary=administrative][border_type=region]
 {
-  color: #f9574b;
-  linecap: butt;
-  width: 1;
-  z-index: 688;
-  dashes: 12,4,4,4;
+  color:    #f9574b;
+  linecap:  butt;
+  width:    1;
+  z-index:  688;
+  dashes:   12,4,4,4;
 }
 line|z15[railway=rail]
 {
-  color: #666666;
-  z-index: 287;
-  width: 4;
+  color:    #666666;
+  z-index:  287;
+  width:    4;
 }
 line|z15[railway=rail]::d1p5
 {
-  color: #666666;
-  width: 2.4;
-  dashes: 9,9;
-  linecap: butt;
-  z-index: 387;
+  color:    #666666;
+  width:    2.4;
+  dashes:   9,9;
+  linecap:  butt;
+  z-index:  387;
 }
 line|z15[railway=rail]::d1p4
 {
-  color: #e6e6e6;
-  width: 2.4;
-  z-index: 386;
+  color:    #e6e6e6;
+  width:    2.4;
+  z-index:  386;
+}
+area|z15-[aeroway=helipad],
+node|z15-[aeroway=helipad]
+{
+  icon-image:   helipad.svg;
 }
 line|z15[boundary=administrative][admin_level=8]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
 
-  width: 1;
-  dashes: 12,4,4,4;
+  width:    1;
+  dashes:   12,4,4,4;
 }
 line|z15[railway=narrow_gauge]::d1p2
 {
-  color: #e6e6e6;
-  width: 2;
-  z-index: 387;
+  color:    #e6e6e6;
+  width:    2;
+  z-index:  387;
+}
+area|z15-16[place=village],
+node|z15-16[place=village]
+{
+  font-size:    16;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #707070;
+}
+area|z15-[railway=halt],
+area|z17-[railway=tram_stop],
+node|z15-[railway=halt],
+node|z17-[railway=tram_stop]
+{
+  font-size:    12;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #3050d8;
+  text-offset:  10;
 }
 line|z15[boundary=administrative][admin_level=7]
 {
-  color: #f9574b;
-  width: 1;
-  z-index: 674;
+  color:    #f9574b;
+  width:    1;
+  z-index:  674;
   -x-kot-layer: top;
 }
 line|z15[boundary=administrative][border_type=city]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 0.8;
-  z-index: 685;
-  dashes: 12,4,4,4;
+  width:    0.8;
+  z-index:  685;
+  dashes:   12,4,4,4;
 }
 line|z15-[piste:lift=platter]
 {
-  color: #202020;
-  width: 0.8;
+  color:    #202020;
+  width:    0.8;
 }
 area|z15-[landuse=garages]
 {
-  fill-color: #5;
+  fill-color:   #5;
 }
 line|z15[railway=yard]::d1p2
 {
-  color: #e6e6e6;
-  width: 1.4;
-  z-index: 395;
+  color:    #e6e6e6;
+  width:    1.4;
+  z-index:  395;
 }
 line|z15-16[railway=light_rail]::d1p2
 {
-  color: #b7e6e6;
-  width: 2;
-  z-index: 677;
+  color:    #b7e6e6;
+  width:    2;
+  z-index:  677;
 }
 line|z15-16[railway=light_rail]
 {
-  color: #0f4c0f;
-  width: 3.2;
-  z-index: 668;
+  color:    #0f4c0f;
+  width:    3.2;
+  z-index:  668;
 }
 line|z15[boundary=national_park]
 {
-  color: #4ef94b;
-  linecap: butt;
+  color:    #4ef94b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 694;
-  dashes: 12,4,4,4;
+  width:    2;
+  z-index:  694;
+  dashes:   12,4,4,4;
 }
 line|z15[railway=preserved]::d1p3
 {
-  color: #333333;
-  width: 2;
-  z-index: 405;
-  dashes: 9,9;
-  linecap: butt;
+  color:    #333333;
+  width:    2;
+  z-index:  405;
+  dashes:   9,9;
+  linecap:  butt;
 }
 line|z15-[piste:type=nordic]
 {
-  color: #c00000;
-  width: 2;
-  dashes: 6,1;
-  linecap: butt;
+  color:    #c00000;
+  width:    2;
+  dashes:   6,1;
+  linecap:  butt;
 }
 line|z15[railway=light_rail]::d1p3
 {
-  color: #0f4c0f;
-  width: 2;
-  z-index: 687;
-  dashes: 7.6,10.8;
-  linecap: butt;
+  color:    #0f4c0f;
+  width:    2;
+  z-index:  687;
+  dashes:   7.6,10.8;
+  linecap:  butt;
 }
 area|z15-[leisure=park],
 node|z15-[leisure=park]
 {
-  font-size: 12;
+  font-size:    12;
   text-halo-radius: 2;
   text: name;
-  text-color: #5ca800;
+  text-color:   #5ca800;
 }
 line|z15[railway=funicular]::d1p2
 {
-  color: #e6b7b7;
-  width: 2;
-  z-index: 392;
-  dashes: 7.2,10.8;
-  linecap: butt;
+  color:    #e6b7b7;
+  width:    2;
+  z-index:  392;
+  dashes:   7.2,10.8;
+  linecap:  butt;
 }
 line|z15[waterway=ditch]
 {
-  color: #B9D4D4;
-  width: 0.6;
-  z-index: 109;
+  color:    #B9D4D4;
+  width:    0.6;
+  z-index:  109;
 }
 line|z15[waterway=stream]
 {
-  color: #B9D4D4;
-  width: 2;
-  z-index: 106;
+  color:    #B9D4D4;
+  width:    2;
+  z-index:  106;
 }
 line|z15-[aeroway=taxiway]
 {
-  casing-linecap: butt;
-  color: #d4dcbd;
-  linecap: butt;
-  width: 8;
-  z-index: 415;
+  casing-linecap:    butt;
+  color:    #d4dcbd;
+  linecap:  butt;
+  width:    8;
+  z-index:  415;
   linejoin: bevel;
-  casing-linejoin: bevel;
+  casing-linejoin:  bevel;
   casing-width: 2;
   casing-color: #202020;
 }
 line|z15[boundary=administrative][border_type=state]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 689;
-  dashes: 12,4,4,4;
+  width:    2;
+  z-index:  689;
+  dashes:   12,4,4,4;
 }
 line|z15[boundary=administrative][admin_level=2]
 {
-  color: #eeeedd;
-  width: 6;
-  z-index: 679;
+  color:    #eeeedd;
+  width:    6;
+  z-index:  679;
   -x-kot-layer: top;
 }
 line|z15[boundary=administrative][admin_level=10]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 0.8;
-  z-index: 671;
-  dashes: 4,20;
+  width:    0.8;
+  z-index:  671;
+  dashes:   4,20;
 }
 line|z15-[piste:lift=j-bar]::d2p2
 {
-  color: #202020;
-  width: 8;
-  z-index: 605;
-  dashes: 0.8,40;
-  linecap: butt;
+  color:    #202020;
+  width:    8;
+  z-index:  605;
+  dashes:   0.8,40;
+  linecap:  butt;
 }
 line|z15[railway=spur]::d1p2
 {
-  color: #e6e6e6;
-  width: 1.4;
-  z-index: 394;
+  color:    #e6e6e6;
+  width:    1.4;
+  z-index:  394;
 }
 line|z15[boundary=administrative][type=nation]
 {
-  color: yellow;
-  width: 6;
-  z-index: 690;
+  color:    yellow;
+  width:    6;
+  z-index:  690;
   -x-kot-layer: top;
 }
 line|z15[piste:lift=rope_tow]
 {
-  color: #d8d8c4;
-  width: 1;
-  z-index: 607;
-  dashes: 2,2;
-  linecap: butt;
+  color:    #d8d8c4;
+  width:    1;
+  z-index:  607;
+  dashes:   2,2;
+  linecap:  butt;
 }
 line|z15[aerialway=chair_lift]
 {
-  color: #202020;
-  width: 0.8;
-  z-index: 612;
+  color:    #202020;
+  width:    0.8;
+  z-index:  612;
 }
 line|z15[man_made=pier]
 {
-  color: #d0d0d0;
-  width: 0.2;
-  z-index: 630;
+  color:    #d0d0d0;
+  width:    0.2;
+  z-index:  630;
 }
 line|z15[boundary=administrative][admin_level=6]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 675;
-  dashes: 4,20;
+  width:    1;
+  z-index:  675;
+  dashes:   4,20;
 }
 line|z15[railway=monorail]::d1p3
 {
-  color: #4c0f4c;
-  width: 2;
-  z-index: 566;
-  dashes: 7.2,10.8;
-  linecap: butt;
+  color:    #4c0f4c;
+  width:    2;
+  z-index:  566;
+  dashes:   7.2,10.8;
+  linecap:  butt;
 }
 line|z15[railway=abandoned]::d1p2
 {
-  color: white;
-  width: 2;
-  z-index: 384;
-  opacity: 0.4;
+  color:    white;
+  width:    2;
+  z-index:  384;
+  opacity:  0.4;
 }
 line|z15-[railway=monorail]
 {
-  color: #4c0f4c;
-  width: 3.2;
-  z-index: 556;
+  color:    #4c0f4c;
+  width:    3.2;
+  z-index:  556;
 }
 line|z15[aerialway=gondola]
 {
-  color: #202020;
-  width: 0.8;
-  z-index: 610;
+  color:    #202020;
+  width:    0.8;
+  z-index:  610;
 }
 line|z15[railway=narrow_gauge]::d1p3
 {
-  color: #333333;
-  width: 2;
-  z-index: 404;
-  dashes: 11,11;
-  linecap: butt;
+  color:    #333333;
+  width:    2;
+  z-index:  404;
+  dashes:   11,11;
+  linecap:  butt;
 }
 line|z15[railway=funicular]
 {
-  color: #4c0f0f;
-  width: 3.2;
-  z-index: 293;
+  color:    #4c0f0f;
+  width:    3.2;
+  z-index:  293;
 }
 line|z15[railway=yard]::d1p3
 {
-  color: #333333;
-  width: 1.4;
-  z-index: 412;
-  dashes: 6,12;
-  linecap: butt;
+  color:    #333333;
+  width:    1.4;
+  z-index:  412;
+  dashes:   6,12;
+  linecap:  butt;
 }
 line|z15[boundary=administrative][border_type=country]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 693;
-  dashes: 12,12;
+  width:    2;
+  z-index:  693;
+  dashes:   12,12;
 }
 line|z15[railway=construction]
 {
-  color: #606060;
-  width: 3.2;
-  z-index: 281;
-  dashes: 3,3;
-  linecap: butt;
+  color:    #606060;
+  width:    3.2;
+  z-index:  281;
+  dashes:   3,3;
+  linecap:  butt;
 }
 line|z15[waterway=lock]
 {
-  color: #f8f8f8;
-  width: 9;
-  z-index: 92;
+  color:    #f8f8f8;
+  width:    9;
+  z-index:  92;
   casing-width: 0.5;
   casing-color: #202020;
 }
 line|z15[boundary=administrative][admin_level=9]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 672; 
-  dashes: 12,12; 
+  width:    1;
+  z-index:  672; 
+  dashes:   12,12; 
 }
 line|z15[man_made=pier]
 {
-  color: #d0d0d0;
-  width: 1.6;
-  z-index: 631;
+  color:    #d0d0d0;
+  width:    1.6;
+  z-index:  631;
 }
 line|z15[natural=glacier]
 {
-  color: lightblue;
-  width: 1.6;
-  z-index: 8;
+  color:    lightblue;
+  width:    1.6;
+  z-index:  8;
 }
 line|z15[natural=spring],
 line|z15[waterway=river]
 {
-  color: #0;
-  width: 5;
+  color:    #0;
+  width:    5;
 }
 line|z15[aerialway=mixed_lift]
 {
-  color: #202020;
-  width: 0.8;
-  z-index: 613;
+  color:    #202020;
+  width:    0.8;
+  z-index:  613;
 }
 line|z15[railway=disused]::d1p2
 {
-  color: #f2f2f2;
-  width: 2;
-  z-index: 383;
-  opacity: 0.7;
+  color:    #f2f2f2;
+  width:    2;
+  z-index:  383;
+  opacity:  0.7;
 }
 line|z15[aerialway=cable_car]
 {
-  color: #202020;
-  width: 0.8;
-  z-index: 609;
+  color:    #202020;
+  width:    0.8;
+  z-index:  609;
 }
 line|z15[man_made=pier]::d1p3
 {
-  color: #e4e4e4;
-  width: 1.2;
-  z-index: 632;
+  color:    #e4e4e4;
+  width:    1.2;
+  z-index:  632;
 }
 line|z15[boundary=administrative][border_type=suburb]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 0.8;
-  z-index: 683;
-  dashes: 4,20;
+  width:    0.8;
+  z-index:  683;
+  dashes:   4,20;
 }
 line|z15[railway=disused]::d1p3
 {
-  opacity: 0.7;
-  color: grey;
-  linecap: butt;
-  width: 2;
-  z-index: 400;
-  dashes: 9,9;
+  opacity:  0.7;
+  color:    grey;
+  linecap:  butt;
+  width:    2;
+  z-index:  400;
+  dashes:   9,9;
 }
 line|z15[waterway=drain]
 {
-  color: #B9D4D4;
-  width: 2.8;
-  z-index: 108;
+  color:    #B9D4D4;
+  width:    2.8;
+  z-index:  108;
   casing-width: 0.35;
   casing-color: #b0b0b0;
 }
 line|z15[waterway=dam]
 {
-  color: #202020;
-  width: 1.5;
-  z-index: 129;
+  color:    #202020;
+  width:    1.5;
+  z-index:  129;
 }
 area|z15-16[landuse=construction],
 node|z15-16[landuse=construction]
 {
   text: name;
-  font-size: 12;
-  text-color: #808070;
+  font-size:    12;
+  text-color:   #808070;
 }
 line|z15[railway=abandoned]::d1p3
 {
-  opacity: 0.4;
-  color: #b2b2b2;
-  linecap: butt;
-  width: 2;
-  z-index: 401;
-  dashes: 9,9;
+  opacity:  0.4;
+  color:    #b2b2b2;
+  linecap:  butt;
+  width:    2;
+  z-index:  401;
+  dashes:   9,9;
 }
 line|z15[man_made=breakwater]
 {
-  color: #707070;
-  width: 2;
+  color:    #707070;
+  width:    2;
 }
 line|z15-[railway=monorail]::d1p2
 {
-  color: #d08080;
-  width: 2;
-  z-index: 561;
+  color:    #d08080;
+  width:    2;
+  z-index:  561;
 }
 line|z15-[piste:lift=platter]::d1p2
 {
-  color: #202020;
-  width: 8;
-  dashes: 1,40;
-  linecap: butt;
+  color:    #202020;
+  width:    8;
+  dashes:   1,40;
+  linecap:  butt;
 }
 line|z15[railway=construction]::d1p2
 {
-  color: #f2f2f2;
-  width: 2;
-  z-index: 381;
+  color:    #f2f2f2;
+  width:    2;
+  z-index:  381;
 }
 line|z15[boundary=administrative][type=nation]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 692;
-  dashes: 12,12;
+  width:    2;
+  z-index:  692;
+  dashes:   12,12;
 }
 line|z15[piste:type=sled]
 {
-  color: #f0e0dc;
-  width: 5;
+  color:    #f0e0dc;
+  width:    5;
 }
 line|z15[boundary=administrative][border_type=country]
 {
-  color: yellow;
-  width: 6;
-  z-index: 691;
+  color:    yellow;
+  width:    6;
+  z-index:  691;
   -x-kot-layer: top;
 }
+area|z16[highway=bus_stop],
+area|z15[railway=tram_stop],
+node|z16[highway=bus_stop],
+node|z15[railway=tram_stop]
+{
+  font-size:    10;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #3050d8;
+  text-offset:  10;
+}
+
+area|z15-[amenity=fuel],
+node|z15-[amenity=fuel]
+{
+  icon-image:   petrolstation.svg;
+}
+area|z15-[leisure=nature_reserve],
+node|z15-[leisure=nature_reserve]
+{
+  icon-image:   bird.svg;
+}
+
 area|z15-[building]
 {
-  fill-color: #3;
+  fill-color:   #3;
 }
 
 line|z15[railway=narrow_gauge]
 {
-  color: #333333;
-  width: 3.2;
-  z-index: 288;
+  color:    #333333;
+  width:    3.2;
+  z-index:  288;
 }
 line|z15[boundary=administrative][border_type=municipality]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 684;
-  dashes: 12,4,4,4;
+  width:    1;
+  z-index:  684;
+  dashes:   12,4,4,4;
 }
 line|z15[railway=construction]::d1p3
 {
-  color: #606060;
-  width: 2;
-  z-index: 397;
-  dashes: 3,3,3,9;
-  linecap: butt;
+  color:    #606060;
+  width:    2;
+  z-index:  397;
+  dashes:   3,3,3,9;
+  linecap:  butt;
 }
 line|z15[railway=siding]
 {
-  color: #333333;
-  width: 2.4;
-  z-index: 297;
+  color:    #333333;
+  width:    2.4;
+  z-index:  297;
 }
 line|z15[railway=funicular]::d1p3
 {
-  color: #4c0f0f;
-  width: 0.5;
-  z-index: 410;
+  color:    #4c0f0f;
+  width:    0.5;
+  z-index:  410;
+}
+*|z17-[highway=bus_stop],
+*|z16[railway=tram_stop]
+{
+  font-size:    11;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #3050d8;
+  text-offset:  10;
+  z-index: 20;
 }
 line|z16[communication=line]
 {
-  color: #f080f0;
-  width: 0.4;
-  z-index: 873;
-  dashes: 8,4;
-  linecap: butt;
+  color:    #f080f0;
+  width:    0.4;
+  z-index:  873;
+  dashes:   8,4;
+  linecap:  butt;
+}
+area|z16-[amenity=bureau_de_change],
+node|z16-[amenity=bureau_de_change]
+{
+  icon-image:   bureau_de_change.svg;
 }
 line|z16[boundary=administrative][admin_level=5]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 932;
-  dashes: 12,12;
+  width:    1;
+  z-index:  932;
+  dashes:   12,12;
 }
 line|z16[railway=narrow_gauge]::d1p3
 {
-  color: #333333;
-  width: 2;
-  z-index: 647;
-  dashes: 14,14;
-  linecap: butt;
+  color:    #333333;
+  width:    2;
+  z-index:  647;
+  dashes:   14,14;
+  linecap:  butt;
 }
 line|z16[waterway=lock]
 {
-  color: #f8f8f8;
-  width: 10;
-  z-index: 94;
+  color:    #f8f8f8;
+  width:    10;
+  z-index:  94;
   casing-width: 1;
   casing-color: #202020;
 }
 line|z16[aerialway=chair_lift]
 {
-  color: #202020;
-  width: 1.6;
-  z-index: 852;
+  color:    #202020;
+  width:    1.6;
+  z-index:  852;
 }
 line|z16[piste:type=sled]
 {
-  color: #f0e0dc;
-  width: 10;
-  z-index: 840;
+  color:    #f0e0dc;
+  width:    10;
+  z-index:  840;
 }
 line|z16[man_made=pipeline][location=overground]
 {
-  color: #a0a0a0;
-  width: 0.8;
-  z-index: 875;
-  dashes: 8,4;
-  linecap: butt;
+  color:    #a0a0a0;
+  width:    0.8;
+  z-index:  875;
+  dashes:   8,4;
+  linecap:  butt;
 }
 line|z16[railway=spur]
 {
-  color: #606060;
-  width: 2.4;
-  z-index: 547;
+  color:    #606060;
+  width:    2.4;
+  z-index:  547;
+}
+area|z16-[amenity=restaurant],
+node|z16-[amenity=restaurant]
+{
+  icon-image:   restaurant.svg;
 }
 line|z16[railway=funicular]
 {
-  color: #4c0f0f;
-  width: 3.2;
-  z-index: 546;
+  color:    #4c0f0f;
+  width:    3.2;
+  z-index:  546;
 }
 line|z16[man_made=pier]::d1p3
 {
-  color: #e4e4e4;
-  width: 2.4;
-  z-index: 857;
+  color:    #e4e4e4;
+  width:    2.4;
+  z-index:  857;
 }
 line|z16[boundary=administrative][admin_level=2],
 line|z16[boundary=administrative][border_type=country]
 {
-  color: #eeeedd;
-  width: 6;
-  z-index: 933;
+  color:    #eeeedd;
+  width:    6;
+  z-index:  933;
   -x-kot-layer: top;
 }
 area|z17-[amenity],
@@ -2379,95 +2892,122 @@ node|z17-[historic],
 node|z17-[office][office!=no],
 node|z17-[tourism]
 {
-  font-size: 11;
+  font-size:    11;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
-  text-offset: 10;
+  text-color:   #404040;
+  text-offset:  10;
   z-index: 1;
 }
 
 line|z16[railway=disused]
 {
-  color: grey;
-  width: 3.2;
-  z-index: 540;
-  opacity: 0.7;
+  color:    grey;
+  width:    3.2;
+  z-index:  540;
+  opacity:  0.7;
 }
 line|z16[boundary=administrative][admin_level=10]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 0.8;
-  z-index: 927;
-  dashes: 4,20;
+  width:    0.8;
+  z-index:  927;
+  dashes:   4,20;
+}
+area|z17-[amenity=atm],
+node|z17-[amenity=atm]
+{
+  icon-image:   atm.svg;
 }
 line|z16[railway=light_rail]::d1p3
 {
-  color: #0f4c0f;
-  width: 2;
-  z-index: 687;
-  dashes: 9.6,14.4;
-  linecap: butt;
+  color:    #0f4c0f;
+  width:    2;
+  z-index:  687;
+  dashes:   9.6,14.4;
+  linecap:  butt;
+}
+area|z17-[military=bunker],
+area|z16-[historic=battlefield],
+node|z17-[military=bunker],
+node|z16-[historic=battlefield]
+{
+  icon-image:   cannon.svg;
+}
+area|z16-[amenity=hunting_stand],
+node|z16-[amenity=hunting_stand]
+{
+  icon-image:   hunting_closed_high.svg;
 }
 line|z16[waterway=dam]
 {
-  color: #202020;
-  width: 3;
-  z-index: 131;
+  color:    #202020;
+  width:    3;
+  z-index:  131;
 }
 line|z16[railway=spur]::d1p2
 {
-  color: #e6e6e6;
-  width: 1.2;
-  z-index: 638;
+  color:    #e6e6e6;
+  width:    1.2;
+  z-index:  638;
 }
 line|z16[railway=spur]::d1p3
 {
-  color: #333333;
-  width: 1.2;
-  z-index: 652;
-  dashes: 8,16;
-  linecap: butt;
+  color:    #333333;
+  width:    1.2;
+  z-index:  652;
+  dashes:   8,16;
+  linecap:  butt;
 }
 line|z16[waterway=drain]
 {
-  width: 4;
-  z-index: 110;
-  color: #B9D4D4;
+  width:    4;
+  z-index:  110;
+  color:    #B9D4D4;
   casing-width: 0.6;
   casing-color: #b0b0b0;
 }
+area|z16-[amenity=fast_food],
+node|z16-[amenity=fast_food]
+{
+  icon-image:   fastfood.svg;
+}
 line|z16[boundary=administrative][border_type=country]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 945;
-  dashes: 12,12;
+  width:    2;
+  z-index:  945;
+  dashes:   12,12;
+}
+area|z16-[amenity=bench],
+node|z16-[amenity=bench]
+{
+  icon-image:   bench.svg;
 }
 area|z16-[power=pole],
 node|z16-[power=pole]
 {
-  icon-image: symbols/power-pole.svg;
+  icon-image:   power-pole.svg;
 }
 area|z16-[natural=peak],
 node|z16-[natural=peak]
 {
-  text-offset: 10;
+  text-offset:  10;
   text: name;
-  font-size: 16;
-  text-color: #404040;
+  font-size:    16;
+  text-color:   #404040;
 }
 line|z16[route=ferry]
 {
-  color: #a8c8d8;
-  width: 2;
-  z-index: 877;
-  dashes: 12,8;
-  linecap: butt;
+  color:    #a8c8d8;
+  width:    2;
+  z-index:  877;
+  dashes:   12,8;
+  linecap:  butt;
 }
 area|z16-[landuse=allotments],
 area|z16-[landuse=basin],
@@ -2503,6 +3043,7 @@ area|z16-[natural=meadow],
 area|z16-[natural=orchard],
 area|z16-[natural=salt_pond],
 area|z16-[natural=vineyard],
+area|z16[place=islet],
 node|z16-[landuse=allotments],
 node|z16-[landuse=basin],
 node|z16-[landuse=brownfield],
@@ -2536,151 +3077,208 @@ node|z16-[natural=greenhouse_horticulture],
 node|z16-[natural=meadow],
 node|z16-[natural=orchard],
 node|z16-[natural=salt_pond],
-node|z16-[natural=vineyard]
+node|z16-[natural=vineyard],
+node|z16[place=islet]
 {
   text: name;
-  font-size: 16;
-  text-color: #202020;
+  font-size:    16;
+  text-color:   #202020;
 }
 line|z16[railway=razed]
 {
-  opacity: 0.3;
-  color: #c2c2c2;
-  linecap: butt;
-  width: 3.2;
-  z-index: 541;
-  dashes: 2.4,2.4;
+  opacity:  0.3;
+  color:    #c2c2c2;
+  linecap:  butt;
+  width:    3.2;
+  z-index:  541;
+  dashes:   2.4,2.4;
 }
 line|z16[railway=abandoned]
 {
-  color: #b2b2b2;
-  width: 3.2;
-  z-index: 542;
-  opacity: 0.4;
+  color:    #b2b2b2;
+  width:    3.2;
+  z-index:  542;
+  opacity:  0.4;
 }
 area|z16[aerialway=station],
 node|z16[aerialway=station]
 {
   symbol-shape: circle;
-  symbol-fill-color: #3050d8;
-  symbol-size: 4;
+  symbol-fill-color:    #3050d8;
+  symbol-size:  4;
+}
+area|z16-[amenity=bicycle_rental],
+node|z16-[amenity=bicycle_rental]
+{
+  icon-image:   bicycle_rental.svg;
 }
 line|z16[power=minor_line]
 {
-  color: white;
-  width: 1.6;
-  z-index: 862;
-  opacity: 0.5;
+  color:    white;
+  width:    1.6;
+  z-index:  862;
+  opacity:  0.5;
+}
+area|z16-[amenity=theatre],
+node|z16-[amenity=theatre]
+{
+  icon-image:   theatre.svg;
+}
+area|z16-[amenity=embassy],
+node|z16-[amenity=embassy]
+{
+  icon-image:   embassy.svg;
 }
 line|z16[railway=rail]::d1p3
 {
-  color: #666666;
-  z-index: 543;
-  width: 4;
+  color:    #666666;
+  z-index:  543;
+  width:    4;
+}
+area|z16-[tourism=guest_house],
+area|z16-[tourism=hostel],
+node|z16-[tourism=guest_house],
+node|z16-[tourism=hostel]
+{
+  icon-image:   hostel.svg;
+}
+area|z16-[tourism=hotel],
+area|z16-[tourism=motel],
+node|z16-[tourism=hotel],
+node|z16-[tourism=motel]
+{
+  icon-image:   hotel.svg;
 }
 line|z16[boundary=administrative][border_type=region]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 940;
-  dashes: 12,4,4,4;
+  width:    1;
+  z-index:  940;
+  dashes:   12,4,4,4;
 }
 line|z16-[railway=monorail]::d1p3
 {
-  color: #4c0f4c;
-  width: 2;
-  z-index: 566;
-  dashes: 9.6,14.4;
-  linecap: butt;
+  color:    #4c0f4c;
+  width:    2;
+  z-index:  566;
+  dashes:   9.6,14.4;
+  linecap:  butt;
 }
 line|z16[railway=rail]
 {
-  color: #e6e6e6;
-  width: 2.4;
-  z-index: 631;
+  color:    #e6e6e6;
+  width:    2.4;
+  z-index:  631;
+}
+area|z16-[railway=subway_entrance],
+node|z16-[railway=subway_entrance]
+{
+  icon-image:   subway.svg;
 }
 line|z16[piste:lift=rope_tow]
 {
-  color: #d8d8c4;
-  width: 2;
-  dashes: 4,4;
-  linecap: butt;
+  color:    #d8d8c4;
+  width:    2;
+  dashes:   4,4;
+  linecap:  butt;
 }
 line|z16-[waterway=ditch],
 line|z16-[waterway=drain],
 line|z16-[waterway=stream]
 {
   text: name;
-  font-size: 12;
+  font-size:    12;
 }
 line|z16[barrier=hedge]
 {
-  color: #b0b0b0;
-  width: 0.4;
-  z-index: 879;
+  color:    #b0b0b0;
+  width:    0.4;
+  z-index:  879;
+}
+area|z16-[amenity=restaurant][hotel],
+node|z16-[amenity=restaurant][hotel]
+{
+  icon-image:   hotel_and_restaurant.svg;
 }
 line|z16[boundary=administrative][border_type=county]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 939;
-  dashes: 4,20;
+  width:    1;
+  z-index:  939;
+  dashes:   4,20;
 }
 line|z16[boundary=administrative][admin_level=8]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 929;
-  dashes: 12,4,4,4;
+  width:    1;
+  z-index:  929;
+  dashes:   12,4,4,4;
 }
 line|z16[boundary=administrative][admin_level=6]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 931;
-  dashes: 4,20;
+  width:    1;
+  z-index:  931;
+  dashes:   4,20;
+}
+area|z16-[place=hamlet],
+node|z16-[place=hamlet]
+{
+  text: name;
+  font-size:    16;
+  text-color:   #606060;
 }
 line|z16[boundary=national_park]
 {
-  color: #4ef94b;
-  linecap: butt;
+  color:    #4ef94b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 946;
-  dashes: 12,4,4,4;
+  width:    2;
+  z-index:  946;
+  dashes:   12,4,4,4;
 }
 line|z16[railway=narrow_gauge]::d1p2
 {
-  color: #e6e6e6;
-  width: 2;
-  z-index: 632;
+  color:    #e6e6e6;
+  width:    2;
+  z-index:  632;
+}
+area|z17-[amenity=toilets],
+node|z17-[amenity=toilets],
+{
+  icon-image:   toilets.svg;
 }
 line|z16[boundary=administrative][border_type=suburb]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 0.8;
-  z-index: 936;
-  dashes: 4,20;
+  width:    0.8;
+  z-index:  936;
+  dashes:   4,20;
 }
 area|z16-[natural=cave_entrance],
 area|z16-[natural=volcano],
 node|z16-[natural=cave_entrance],
 node|z16-[natural=volcano]
 {
-  text-offset: 10;
+  text-offset:  10;
   text: name;
-  font-size: 16;
-  text-color: #202020;
+  font-size:    16;
+  text-color:   #202020;
+}
+area|z16-[railway=level_crossing],
+node|z16-[railway=level_crossing]
+{
+  icon-image:   railway-crossing.svg;
 }
 line|z16[barrier=bollard],
 node|z16[barrier=block],
@@ -2689,482 +3287,637 @@ node|z16[barrier=stile],
 node|z16[barrier=toll_booth]
 {
   symbol-shape: circle;
-  symbol-fill-color: #707070;
-  symbol-size: 1.2;
+  symbol-fill-color:    #707070;
+  symbol-size:  1.2;
 }
 line|z16[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 935;
-  dashes: 12,12;
+  width:    2;
+  z-index:  935;
+  dashes:   12,12;
 }
 line|z16[man_made=pipeline]::d1p2
 {
-  color: #a0a0a0;
-  width: 0.8;
-  z-index: 876;
-  dashes: 1.2,2,1.2,2,1.2,4.4;
-  linecap: butt;
+  color:    #a0a0a0;
+  width:    0.8;
+  z-index:  876;
+  dashes:   1.2,2,1.2,2,1.2,4.4;
+  linecap:  butt;
 }
 line|z16[railway=funicular]::d1p2
 {
-  color: #e6b7b7;
-  width: 2;
-  z-index: 636;
-  dashes: 9.6,14.4;
-  linecap: butt;
+  color:    #e6b7b7;
+  width:    2;
+  z-index:  636;
+  dashes:   9.6,14.4;
+  linecap:  butt;
 }
 line|z16[power=minor_line]::d1p2
 {
-  color: grey;
-  width: 0.8;
-  z-index: 863;
-  dashes: 1.2,2,1.2,2,1.2,4.4;
-  linecap: butt;
+  color:    grey;
+  width:    0.8;
+  z-index:  863;
+  dashes:   1.2,2,1.2,2,1.2,4.4;
+  linecap:  butt;
 }
 line|z16[boundary=administrative][type=nation]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 944;
-  dashes: 12,12;
+  width:    2;
+  z-index:  944;
+  dashes:   12,12;
+}
+area|z16-[amenity=fire_station],
+node|z16-[amenity=fire_station]
+{
+  icon-image:   firebrigade.svg;
 }
 line|z16[railway=construction]::d1p3
 {
-  color: #606060;
-  width: 2.4;
-  z-index: 641;
-  dashes: 4,4,4,12;
-  linecap: butt;
+  color:    #606060;
+  width:    2.4;
+  z-index:  641;
+  dashes:   4,4,4,12;
+  linecap:  butt;
+}
+area|z16[amenity=taxi],
+area|z17-[amenity=taxi],
+node|z16[amenity=taxi],
+node|z17-[amenity=taxi]
+{
+  icon-image:   taxi.svg;
 }
 line|z16[railway=preserved]::d1p3
 {
-  color: #333333;
-  width: 2;
-  z-index: 648;
-  dashes: 12,12;
-  linecap: butt;
+  color:    #333333;
+  width:    2;
+  z-index:  648;
+  dashes:   12,12;
+  linecap:  butt;
 }
 line|z16[railway=narrow_gauge]
 {
-  color: #333333;
-  width: 3.2;
-  z-index: 544;
+  color:    #333333;
+  width:    3.2;
+  z-index:  544;
 }
 line|z16[power=minor_line]::d1p3
 {
-  color: grey;
-  width: 0.8;
-  z-index: 864;
-  dashes: 8,4;
-  linecap: butt;
+  color:    grey;
+  width:    0.8;
+  z-index:  864;
+  dashes:   8,4;
+  linecap:  butt;
+}
+area|z16-[amenity=fountain],
+node|z16-[amenity=fountain]
+{
+  icon-image:   fountain.svg;
 }
 line|z16[barrier=wall]
 {
-  color: #2;
-  width: 0.5;
+  color:    #2;
+  width:    0.5;
 }
 line|z16[barrier=city_wall]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 898;
-  dashes: 0.0,2.0;
-  linecap: butt;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  898;
+  dashes:   0.0,2.0;
+  linecap:  butt;
 }
 line|z16[railway=siding]
 {
-  color: #333333;
-  width: 2.4;
-  z-index: 549;
+  color:    #333333;
+  width:    2.4;
+  z-index:  549;
+}
+area|z16-[amenity=car_rental],
+node|z16-[amenity=car_rental]
+{
+  icon-image:   car_rental.svg;
 }
 line|z16[railway=siding]::d1p2
 {
-  color: #e6e6e6;
-  width: 1.2;
-  z-index: 640;
+  color:    #e6e6e6;
+  width:    1.2;
+  z-index:  640;
+}
+area|z17-[amenity=drinking_water],
+node|z17-[amenity=drinking_water]
+{
+  icon-image:   drinking_water.svg;
 }
 line|z16[man_made=breakwater]
 {
-  color: #707070;
-  width: 4;
-  z-index: 854;
+  color:    #707070;
+  width:    4;
+  z-index:  854;
 }
 line|z16[railway=funicular]::d1p3
 {
-  color: #4c0f0f;
-  width: 0.6;
-  z-index: 651;
+  color:    #4c0f0f;
+  width:    0.6;
+  z-index:  651;
+}
+area|z16-[amenity=marketplace],
+node|z16-[amenity=marketplace]
+{
+  icon-image:   supermarket.svg;
+}
+area|z16[amenity=pharmacy],
+area|z16-[amenity=doctors],
+area|z17-[amenity=pharmacy],
+node|z16[amenity=pharmacy],
+node|z16-[amenity=doctors],
+node|z17-[amenity=pharmacy]
+{
+  icon-image:   pharmacy.svg;
 }
 line|z16[aerialway=cable_car]
 {
-  color: #202020;
-  width: 1.6;
-  z-index: 850;
+  color:    #202020;
+  width:    1.6;
+  z-index:  850;
 }
 area|z16[railway=platform],
 line|z16[railway=platform]
 {
-  color: #bbbbbb;
-  width: 4;
-  z-index: 580;
+  color:    #bbbbbb;
+  width:    4;
+  z-index:  580;
 }
 line|z16[railway=disused]::d1p2
 {
-  color: #f2f2f2;
-  width: 2.4;
-  z-index: 627;
-  opacity: 0.7;
+  color:    #f2f2f2;
+  width:    2.4;
+  z-index:  627;
+  opacity:  0.7;
 }
 line|z16[waterway=stream]
 {
-  color: #B9D4D4;
-  width: 2;
+  color:    #B9D4D4;
+  width:    2;
+}
+area|z16-[amenity=place_of_worship],
+node|z16-[amenity=place_of_worship]
+{
+  icon-image:   religion.svg;
 }
 line|z16[barrier=retaining_wall]
 {
-  color: #b0b0b0;
-  width: 1;
+  color:    #b0b0b0;
+  width:    1;
 }
 line|z16[natural=spring],
 line|z16[waterway=river]
 {
-  color: #0;
-  width: 8;
+  color:    #0;
+  width:    8;
+}
+area|z16-[railway=crossing],
+node|z16-[railway=crossing]
+{
+  icon-image:   railway-crossing-small.svg;
+}
+area|z16-[barrier=lift_gate],
+node|z16-[barrier=lift_gate]
+{
+  icon-image:   barrier.svg;
+}
+area|z16-[amenity=bar],
+area|z16-[amenity=nightclub],
+node|z16-[amenity=bar],
+node|z16-[amenity=nightclub]
+{
+  icon-image:   bar.svg;
+}
+area|z16-[historic=ruins],
+node|z16-[historic=ruins]
+{
+  icon-image:   ruins.svg;
 }
 line|z16[man_made=pier]
 {
-  color: #d0d0d0;
-  width: 0.4;
-  z-index: 855;
+  color:    #d0d0d0;
+  width:    0.4;
+  z-index:  855;
 }
 line|z16[boundary=administrative][border_type=state]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 941;
-  dashes: 12,4,4,4;
+  width:    2;
+  z-index:  941;
+  dashes:   12,4,4,4;
+}
+area|z16-[amenity=speed_trap],
+node|z16-[amenity=speed_trap]
+{
+  icon-image:   speed_trap.svg;
+}
+area|z16-[historic=memorial],
+area|z16-[historic=monument],
+node|z16-[historic=memorial],
+node|z16-[historic=monument]
+{
+  icon-image:   memorial.svg;
 }
 line|z16[boundary=administrative][admin_level=7]
 {
-  color: #f9574b;
-  width: 1;
-  z-index: 930;
+  color:    #f9574b;
+  width:    1;
+  z-index:  930;
   -x-kot-layer: top;
 }
 line|z16[railway=rail]::d1p5
 {
-  color: #666666;
-  width: 2.4;
-  z-index: 646;
-  dashes: 12,12;
-  linecap: butt;
+  color:    #666666;
+  width:    2.4;
+  z-index:  646;
+  dashes:   12,12;
+  linecap:  butt;
 }
 line|z16[man_made=pier]::d1p2
 {
-  color: #d0d0d0;
-  width: 3.2;
+  color:    #d0d0d0;
+  width:    3.2;
 }
 line|z16[barrier=city_wall]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 897;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  897;
 }
 area|z16-[railway=platform],
 line|z16-[railway=platform]
 {
-  fill-color: #bbbbbb;
+  fill-color:   #bbbbbb;
 }
 line|z16[boundary=administrative][border_type=municipality]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 937;
-  dashes: 12,4,4,4;
+  width:    1;
+  z-index:  937;
+  dashes:   12,4,4,4;
 }
 line|z16[railway=razed]::d1p2
 {
-  color: white;
-  width: 2.4;
-  z-index: 628;
-  opacity: 0.3;
+  color:    white;
+  width:    2.4;
+  z-index:  628;
+  opacity:  0.3;
 }
 line|z16[railway=razed]::d1p3
 {
-  opacity: 0.3;
-  color: #c2c2c2;
-  linecap: butt;
-  width: 2.4;
-  z-index: 644;
-  dashes: 2.4,2.4,2.4,2.4,2.4,12;
+  opacity:  0.3;
+  color:    #c2c2c2;
+  linecap:  butt;
+  width:    2.4;
+  z-index:  644;
+  dashes:   2.4,2.4,2.4,2.4,2.4,12;
 }
 line|z16[railway=abandoned]::d1p2
 {
-  color: white;
-  width: 2.4;
-  z-index: 629;
-  opacity: 0.4;
+  color:    white;
+  width:    2.4;
+  z-index:  629;
+  opacity:  0.4;
+}
+area|z16-[historic=castle],
+node|z16-[historic=castle]
+{
+  icon-image:   castle.svg;
 }
 line|z16[waterway=canal]
 {
-  color: #B9D4D4;
-  width: 4.8;
+  color:    #B9D4D4;
+  width:    4.8;
 }
 line|z16[barrier=hedge]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 881;
-  dashes: 0.0,2.0;
-  linecap: butt;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  881;
+  dashes:   0.0,2.0;
+  linecap:  butt;
+}
+area|z17-[amenity=police],
+node|z17-[amenity=police]
+{
+  icon-image:   police.svg;
 }
 line|z16[railway=construction]
 {
-  color: #606060;
-  width: 3.2;
-  z-index: 538;
-  dashes: 4,4;
-  linecap: butt;
+  color:    #606060;
+  width:    3.2;
+  z-index:  538;
+  dashes:   4,4;
+  linecap:  butt;
 }
 line|z16[boundary=administrative][border_type=city]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 0.8;
-  z-index: 938;
-  dashes: 12,4,4,4;
+  width:    0.8;
+  z-index:  938;
+  dashes:   12,4,4,4;
+}
+area|z17-[amenity=hospital],
+node|z17-[amenity=hospital]
+{
+  icon-image:   hospital.svg;
 }
 line|z16[waterway=ditch]
 {
-  color: #B9D4D4;
-  width: 0.6;
-  z-index: 111;
+  color:    #B9D4D4;
+  width:    0.6;
+  z-index:  111;
 }
 line|z16[railway=construction]::d1p2
 {
-  color: #f2f2f2;
-  width: 2.4;
-  z-index: 625;
+  color:    #f2f2f2;
+  width:    2.4;
+  z-index:  625;
+}
+node|z16-[natural=tree]
+{
+  icon-image:   tree.svg;
 }
 line|z16[boundary=administrative][type=nation]
 {
-  color: yellow; 
-  width: 6;
-  z-index: 942;
+  color:    yellow; 
+  width:    6;
+  z-index:  942;
   -x-kot-layer: top;
 }
+area|z16-[amenity=cafe],
+node|z16-[amenity=cafe]
+{
+  icon-image:   cafe.svg;
+  z-index: 1;
+}
 line|z16[man_made=pipeline]
 {
-  color: white;
-  width: 1.6;
-  z-index: 874;
-  opacity: 0.5;
+  color:    white;
+  width:    1.6;
+  z-index:  874;
+  opacity:  0.5;
+}
+area|z16-[amenity=car_sharing],
+node|z16-[amenity=car_sharing]
+{
+  icon-image:   car_sharing.svg;
 }
 line|z16[waterway=weir]
 {
-  color: #000044;
-  width: 2;
-  z-index: 130;
+  color:    #000044;
+  width:    2;
+  z-index:  130;
 }
 line|z16[piste:lift=magic_carpet]
 {
-  color: #101010;
-  width: 3.2;
+  color:    #101010;
+  width:    3.2;
 }
 line|z16[railway=preserved]
 {
-  color: #909090;
-  width: 3.2;
+  color:    #909090;
+  width:    3.2;
+}
+area|z16-[amenity=cinema],
+node|z16-[amenity=cinema]
+{
+  icon-image:   cinema.svg;
+}
+area|z16-[historic=archaeological_site],
+area|z16-[historic=museum],
+area|z16-[tourism=museum],
+node|z16-[historic=archaeological_site],
+node|z16-[historic=museum],
+node|z16-[tourism=museum]
+{
+  icon-image:   museum.svg;
 }
 line|z16[barrier=retaining_wall]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 891;
-  dashes: 0.0,2.0;
-  linecap: butt;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  891;
+  dashes:   0.0,2.0;
+  linecap:  butt;
 }
 line|z16[railway=siding]::d1p3
 {
-  color: #333333;
-  width: 1.2;
-  z-index: 654;
-  dashes: 8,16;
-  linecap: butt;
+  color:    #333333;
+  width:    1.2;
+  z-index:  654;
+  dashes:   8,16;
+  linecap:  butt;
 }
 line|z16[natural=glacier]
 {
-  color: lightblue;
-  width: 3.2;
-  z-index: 8;
+  color:    lightblue;
+  width:    3.2;
+  z-index:  8;
 }
 line|z16[boundary=administrative][admin_level=9]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 928;
-  dashes: 12,12;
+  width:    1;
+  z-index:  928;
+  dashes:   12,12;
+}
+area|z16-[amenity=post_office],
+node|z16-[amenity=post_office]
+{
+  icon-image:   postoffice.svg;
 }
 line|z16[aerialway=mixed_lift]
 {
-  color: #202020;
-  width: 1.6;
-  z-index: 853;
+  color:    #202020;
+  width:    1.6;
+  z-index:  853;
 }
 line|z16[railway=yard]::railfill
 {
-  color: #e6e6e6;
-  width: 1.2;
-  z-index: 639;
+  color:    #e6e6e6;
+  width:    1.2;
+  z-index:  639;
 }
 line|z16[railway=yard]::railborder
 {
-  color: #333333;
-  width: 2.4;
-  z-index: 548;
+  color:    #333333;
+  width:    2.4;
+  z-index:  548;
 }
 line|z16[railway=yard]::raildash
 {
-  color: #333333;
-  width: 1.2;
-  z-index: 653;
-  dashes: 8,16;
-  linecap: butt;
+  color:    #333333;
+  width:    1.2;
+  z-index:  653;
+  dashes:   8,16;
+  linecap:  butt;
+}
+area|z16-[amenity=library],
+node|z16-[amenity=library],
+{
+  icon-image:   library.svg;
 }
 line|z16[aerialway=gondola]
 {
-  color: #202020;
-  width: 1.6;
-  z-index: 851;
+  color:    #202020;
+  width:    1.6;
+  z-index:  851;
 }
 line|z16-[power=line]
 {
-  color: white;
-  width: 1.6;
-  z-index: 858;
-  opacity: 0.5;
+  color:    white;
+  width:    1.6;
+  z-index:  858;
+  opacity:  0.5;
 }
 line|z16-[power=line]::d1p2
 {
-  color: grey;
-  width: 0.8;
-  z-index: 861;
-  dashes: 16,8;
-  linecap: butt;
+  color:    grey;
+  width:    0.8;
+  z-index:  861;
+  dashes:   16,8;
+  linecap:  butt;
 }
 line|z16-[power=line][location=underground]
 {
-  color: grey;
-  width: 0.8;
-  z-index: 859;
-  dashes: 2.4,4,2.4,4,2.4,8.8;
-  linecap: butt;
+  color:    grey;
+  width:    0.8;
+  z-index:  859;
+  dashes:   2.4,4,2.4,4,2.4,8.8;
+  linecap:  butt;
 }
 line|z17-[piste:lift=magic_carpet]
 {
-  color: #101010;
-  width: 6.4;
+  color:    #101010;
+  width:    6.4;
 }
 line|z17-[railway=rail]
 {
-  color: #666666;
-  z-index: 568;
-  width: 4.4;
+  color:    #666666;
+  z-index:  568;
+  width:    4.4;
 }
 line|z17-[man_made=pipeline]
 {
-  color: white;
-  width: 1.6;
-  z-index: 947;
-  opacity: 0.5;
+  color:    white;
+  width:    1.6;
+  z-index:  947;
+  opacity:  0.5;
 }
 line|z17-[aerialway=cable_car]
 {
-  color: #202020;
-  width: 3.2;
-  z-index: 909;
+  color:    #202020;
+  width:    3.2;
+  z-index:  909;
 }
 line|z17-[boundary=administrative][admin_level=7]
 {
-  color: #f9574b;
-  width: 0.8;
-  z-index: 965;
+  color:    #f9574b;
+  width:    0.8;
+  z-index:  965;
   -x-kot-layer: top;
 }
 line|z17-[boundary=administrative][border_type=county]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 973;
-  dashes: 4,20;
+  width:    1;
+  z-index:  973;
+  dashes:   4,20;
+}
+area|z17-[sport=gymnastics],
+area|z17-[sport=multi],
+area|z17-[sport=skiing],
+node|z17-[sport=gymnastics],
+node|z17-[sport=multi],
+node|z17-[sport=skiing]
+{
+  icon-image:   gymnastics-borderless.svg;
 }
 line|z17-[communication=line]::d1p2
 {
-  color: #f080f0;
-  width: 0.8;
-  z-index: 933;
-  dashes: 8,4;
-  linecap: butt;
+  color:    #f080f0;
+  width:    0.8;
+  z-index:  933;
+  dashes:   8,4;
+  linecap:  butt;
+}
+area|z17-[leisure=playground],
+node|z17-[leisure=playground]
+{
+  icon-image:   playground.svg;
 }
 line|z17-[railway=razed]::d1p3
 {
-  opacity: 0.3;
-  color: #c2c2c2;
-  linecap: butt;
-  width: 2;
-  z-index: 678;
-  dashes: 2.4,2.4,2.4,2.4,2.4,12;
+  opacity:  0.3;
+  color:    #c2c2c2;
+  linecap:  butt;
+  width:    2;
+  z-index:  678;
+  dashes:   2.4,2.4,2.4,2.4,2.4,12;
 }
 line|z17-[railway=construction]::d1p2
 {
-  color: #f2f2f2;
-  width: 2;
-  z-index: 659;
+  color:    #f2f2f2;
+  width:    2;
+  z-index:  659;
 }
 line|z17-[railway=narrow_gauge]
 {
-  color: #333333;
-  width: 3.2;
-  z-index: 569;
+  color:    #333333;
+  width:    3.2;
+  z-index:  569;
+}
+area|z17-[sport=diving],
+area|z17-[sport=scuba_diving],
+node|z17-[sport=diving],
+node|z17-[sport=scuba_diving]
+{
+  icon-image:   diving-borderless.svg;
 }
 line|z17-[waterway=canal]
 {
-  width: 6.4;
-  color: #B9D4D4;
+  width:    6.4;
+  color:    #B9D4D4;
   casing-width: 0.8;
   casing-color: #b0b0b0;
 }
 line|z17-[barrier=retaining_wall]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 958;
-  dashes: 0.0,4.0;
-  linecap: butt;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  958;
+  dashes:   0.0,4.0;
+  linecap:  butt;
 }
 line|z17-[boundary=administrative][type=nation]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 978;
-  dashes: 12,12;
+  width:    2;
+  z-index:  978;
+  dashes:   12,12;
 }
 area|z17-[building],
 node|z17-[building],
@@ -3172,396 +3925,486 @@ area|z17-[addr:housenumber][addr:street],
 node|z17-[addr:housenumber][addr:street]
 {
   text: "addr:housenumber";
-  font-size: 11;
-  text-color: #404040;
+  font-size:    11;
+  text-color:   #404040;
   text-position: center;
 }
 line|z17-[waterway=lock]
 {
-  color: #f8f8f8;
-  width: 12;
-  z-index: 96;
+  color:    #f8f8f8;
+  width:    12;
+  z-index:  96;
   casing-width: 2;
   casing-color: #202020;
 }
+area|z17-[sport=cricket],
+node|z17-[sport=cricket]
+{
+  icon-image:   cricket-borderless.svg;
+}
 line|z17-[man_made=pipeline]::d1p2
 {
-  color: #a0a0a0;
-  width: 0.8;
-  z-index: 949;
-  dashes: 1.2,2,1.2,2,1.2,4.4;
-  linecap: butt;
+  color:    #a0a0a0;
+  width:    0.8;
+  z-index:  949;
+  dashes:   1.2,2,1.2,2,1.2,4.4;
+  linecap:  butt;
 }
 line|z17-[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 969;
-  dashes: 12,12;
+  width:    2;
+  z-index:  969;
+  dashes:   12,12;
 }
 line|z17-[railway=narrow_gauge]::d1p2
 {
-  color: #e6e6e6;
-  width: 2;
-  z-index: 665;
+  color:    #e6e6e6;
+  width:    2;
+  z-index:  665;
 }
 line|z17-[railway=light_rail]
 {
-  color: #0f4c0f;
-  width: 3.2;
-  z-index: 571;
+  color:    #0f4c0f;
+  width:    3.2;
+  z-index:  571;
 }
 line|z17-[power=minor_line]::d1p3
 {
-  color: grey;
-  width: 0.8;
-  z-index: 923;
-  dashes: 8,4;
-  linecap: butt;
+  color:    grey;
+  width:    0.8;
+  z-index:  923;
+  dashes:   8,4;
+  linecap:  butt;
 }
 line|z17-[railway=yard]::d1p2
 {
-  color: #e6e6e6;
-  width: 1.36;
-  z-index: 672;
+  color:    #e6e6e6;
+  width:    1.36;
+  z-index:  672;
 }
 line|z17-[aerialway=mixed_lift]
 {
-  color: #202020;
-  width: 3.2;
-  z-index: 912;
+  color:    #202020;
+  width:    3.2;
+  z-index:  912;
 }
 line|z17-[natural=spring],
 line|z17-[waterway=river]
 {
-  color: #0;
-  width: 16;
+  color:    #0;
+  width:    16;
+}
+area|z14-[tourism=camp_site],
+node|z14-[tourism=camp_site]
+{
+  icon-image:   campsite.svg;
+}
+area|z17-[leisure=slipway],
+node|z17-[leisure=slipway]
+{
+  icon-image:   slipway.svg;
 }
 line|z17-[boundary=administrative][border_type=country]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 979;
-  dashes: 12,12;
+  width:    2;
+  z-index:  979;
+  dashes:   12,12;
 }
 line|z17-[railway=yard]
 {
-  color: #333333;
-  width: 2.4;
-  z-index: 577;
+  color:    #333333;
+  width:    2.4;
+  z-index:  577;
 }
 line|z17-[boundary=administrative][type=nation]
 {
-  color: yellow;
-  width: 6;
-  z-index: 976;
+  color:    yellow;
+  width:    6;
+  z-index:  976;
   -x-kot-layer: top;
 }
 line|z17-[barrier=hedge]
 {
-  color: #202020;
-  width: 0.8;
-  z-index: 953;
-  dashes: 0.0,4.0;
-  linecap: butt;
+  color:    #202020;
+  width:    0.8;
+  z-index:  953;
+  dashes:   0.0,4.0;
+  linecap:  butt;
 }
 line|z17-[waterway=weir]
 {
-  color: #000044;
-  width: 3;
-  z-index: 132;
+  color:    #000044;
+  width:    3;
+  z-index:  132;
 }
 area|z17-[power=generator]::d1p3,
 node|z17-[power=generator]::d1p3
 {
-  z-index: 927;
+  z-index:  927;
 }
 line|z17-[railway=rail]::d1p5
 {
-  color: #666666;
-  width: 3.2;
-  z-index: 681;
-  dashes: 12,12;
-  linecap: butt;
+  color:    #666666;
+  width:    3.2;
+  z-index:  681;
+  dashes:   12,12;
+  linecap:  butt;
 }
 line|z17-[communication=line]
 {
-  color: white;
-  width: 1.6;
-  z-index: 930;
-  opacity: 0.5;
+  color:    white;
+  width:    1.6;
+  z-index:  930;
+  opacity:  0.5;
+}
+area|z17-[sport=equestrian],
+node|z17-[sport=equestrian]
+{
+  icon-image:   equestrian-borderless.svg;
 }
 line|z17-[boundary=administrative][border_type=suburb]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 0.8;
-  z-index: 970;
-  dashes: 4,20;
+  width:    0.8;
+  z-index:  970;
+  dashes:   4,20;
 }
 line|z17-[boundary=administrative][admin_level=9]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 963;
-  dashes: 12,12;
+  width:    1;
+  z-index:  963;
+  dashes:   12,12;
 }
 line|z17-[boundary=administrative][admin_level=5]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 967;
-  dashes: 12,12;
+  width:    1;
+  z-index:  967;
+  dashes:   12,12;
 }
 line|z17-[man_made=pier]
 {
-  color: #d0d0d0;
-  width: 0.4;
-  z-index: 914;
+  color:    #d0d0d0;
+  width:    0.4;
+  z-index:  914;
 }
 line|z17-[boundary=administrative][admin_level=6]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 966;
-  dashes: 4,20;
+  width:    1;
+  z-index:  966;
+  dashes:   4,20;
 }
 line|z17-[railway=spur]::d1p2
 {
-  color: #e6e6e6;
-  width: 1.36;
-  z-index: 671;
+  color:    #e6e6e6;
+  width:    1.36;
+  z-index:  671;
+}
+area|z17-[sport=curling],
+node|z17-[sport=curling]
+{
+  icon-image:   curling-borderless.svg;
 }
 line|z17-[railway=preserved]::d1p2
 {
-  color: #e6e6e6;
-  width: 2;
-  z-index: 666;
+  color:    #e6e6e6;
+  width:    2;
+  z-index:  666;
+}
+area|z17-[amenity=college],
+area|z17-[amenity=university],
+node|z17-[amenity=college],
+node|z17-[amenity=university]
+{
+  icon-image:   university.svg;
+}
+area|z17-[place=suburb],
+node|z17-[place=suburb]
+{
+  text: name;
+  font-size:    20;
+  text-color:   #909090;
+  text-halo-radius: 2;
+  z-index: 20;
+}
+area|z17-[place=village],
+node|z17-[place=village]
+{
+  font-size:    18;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #707070;
 }
 line|z17-[boundary=administrative][border_type=city]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 0.8;
-  z-index: 972;
-  dashes: 12,4,4,4;
+  width:    0.8;
+  z-index:  972;
+  dashes:   12,4,4,4;
 }
 line|z17-[railway=disused]::d1p3
 {
-  opacity: 0.7;
-  color: grey;
-  linecap: butt;
-  width: 2;
-  z-index: 677;
-  dashes: 12,12;
+  opacity:  0.7;
+  color:    grey;
+  linecap:  butt;
+  width:    2;
+  z-index:  677;
+  dashes:   12,12;
 }
 node|z17-[man_made=cairn]
 {
   symbol-shape: circle;
-  symbol-fill-color: white;
-  symbol-size: 3.2;
+  symbol-fill-color:    white;
+  symbol-size:  3.2;
 }
 line|z17-[aerialway=chair_lift]
 {
-  color: #202020;
-  width: 3.2;
+  color:    #202020;
+  width:    3.2;
+}
+area|z17-[tourism=picnic_site],
+node|z17-[tourism=picnic_site]
+{
+  icon-image:   picnic.svg;
+}
+area|z17-[sport=american_football],
+area|z17-[sport=australian_football],
+area|z17-[sport=football],
+node|z17-[sport=american_football],
+node|z17-[sport=australian_football],
+node|z17-[sport=football]
+{
+  icon-image:   football-borderless.svg;
 }
 area|z17-[railway=platform],
 line|z17-[railway=platform]
 {
-  color: #bbbbbb;
-  width: 8;
+  color:    #bbbbbb;
+  width:    8;
 }
 line|z17-[barrier=wall]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 956;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  956;
 }
 line|z17-[communication=line][location=underground]
 {
-  color: #f080f0;
-  width: 0.8;
-  z-index: 931;
-  dashes: 1.2,2,1.2,2,1.2,4.4;
-  linecap: butt;
+  color:    #f080f0;
+  width:    0.8;
+  z-index:  931;
+  dashes:   1.2,2,1.2,2,1.2,4.4;
+  linecap:  butt;
+}
+area|z17-[man_made=windmill],
+node|z17-[man_made=windmill]
+{
+  icon-image:   windmill.svg;
 }
 line|z17-[boundary=administrative][admin_level=11]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 0.8;
-  z-index: 961;
-  dashes: 0.8,5.2;
+  width:    0.8;
+  z-index:  961;
+  dashes:   0.8,5.2;
 }
 line|z17-[railway=siding]::d1p3
 {
-  color: #333333;
-  width: 1.36;
-  z-index: 692;
-  dashes: 7.2,16.8;
-  linecap: butt;
+  color:    #333333;
+  width:    1.36;
+  z-index:  692;
+  dashes:   7.2,16.8;
+  linecap:  butt;
+}
+area|z17-[sport=swimming],
+node|z17-[sport=swimming]
+{
+  icon-image:   swimming-borderless.svg;
+}
+area|z17-[amenity=kindergarten],
+node|z17-[amenity=kindergarten]
+{
+  icon-image:   kindergarten2.svg;
+}
+area|z17-[place=locality],
+node|z17-[place=locality]
+{
+  text: name;
+  font-size:    16;
+  text-color:   #404040;
 }
 line|z17-[route=ferry]
 {
-  color: #a8c8d8;
-  width: 2;
-  z-index: 950;
-  dashes: 12,8;
-  linecap: butt;
+  color:    #a8c8d8;
+  width:    2;
+  z-index:  950;
+  dashes:   12,8;
+  linecap:  butt;
 }
 line|z17-[waterway=ditch]
 {
-  color: #B9D4D4;
-  width: 0.8;
-  z-index: 113;
+  color:    #B9D4D4;
+  width:    0.8;
+  z-index:  113;
 }
 line|z17-[piste:lift=rope_tow]
 {
-  color: #d8d8c4;
-  width: 4;
-  dashes: 8,8;
-  linecap: butt;
+  color:    #d8d8c4;
+  width:    4;
+  dashes:   8,8;
+  linecap:  butt;
 }
 line|z17-[waterway=stream]
 {
-  color: #B9D4D4;
-  width: 2.2;
-  z-index: 110;
+  color:    #B9D4D4;
+  width:    2.2;
+  z-index:  110;
 }
 line|z17-[railway=siding]::d1p2
 {
-  color: #e6e6e6;
-  width: 1.36;
-  z-index: 673;
+  color:    #e6e6e6;
+  width:    1.36;
+  z-index:  673;
 }
 line|z17-[man_made=cutline]
 {
-  casing-width: 3;
+  casing-width:   3;
 }
 line|z17-[railway=razed]::d1p2
 {
-  color: white;
-  width: 2;
-  z-index: 662;
-  opacity: 0.3;
+  color:    white;
+  width:    2;
+  z-index:  662;
+  opacity:  0.3;
 }
 line|z17-[man_made=pier]::d1p3
 {
-  color: #e4e4e4;
-  width: 2.4;
-  z-index: 916;
+  color:    #e4e4e4;
+  width:    2.4;
+  z-index:  916;
+}
+area|z17-[tourism=information][information=guidepost],
+node|z17-[tourism=information][information=guidepost]
+{
+  icon-image:   information-guidepost.svg;
 }
 line|z16-[barrier=fence]
 {
-  color: #3;
-  width: .5;
+  color:    #3;
+  width:    .5;
 }
 line|z17-[railway=abandoned]
 {
-  color: #b2b2b2;
-  width: 3.2;
-  z-index: 565;
-  opacity: 0.4;
+  color:    #b2b2b2;
+  width:    3.2;
+  z-index:  565;
+  opacity:  0.4;
 }
 line|z17-[barrier=retaining_wall]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 957;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  957;
 }
 line|z17-[railway=construction]
 {
-  color: #606060;
-  width: 3.2;
-  z-index: 561;
-  dashes: 4,4;
-  linecap: butt;
+  color:    #606060;
+  width:    3.2;
+  z-index:  561;
+  dashes:   4,4;
+  linecap:  butt;
 }
 line|z17-[railway=disused]
 {
-  color: grey;
-  width: 3.2;
-  z-index: 564;
-  opacity: 0.7;
+  color:    grey;
+  width:    3.2;
+  z-index:  564;
+  opacity:  0.7;
 }
 line|z17-[railway=light_rail]::d1p3
 {
-  color: #0f4c0f;
-  width: 2;
-  z-index: 684;
-  dashes: 9.6,14.4;
-  linecap: butt;
+  color:    #0f4c0f;
+  width:    2;
+  z-index:  684;
+  dashes:   9.6,14.4;
+  linecap:  butt;
 }
 line|z17-[railway=rail]::d1p4
 {
-  color: #e6e6e6;
-  width: 3.2;
-  z-index: 664;
+  color:    #e6e6e6;
+  width:    3.2;
+  z-index:  664;
 }
 line|z17-[railway=spur]
 {
-  color: #333333;
-  width: 2.4;
-  z-index: 576;
+  color:    #333333;
+  width:    2.4;
+  z-index:  576;
 }
 line|z17-[barrier=city_wall]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 959;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  959;
 }
 line|z17-[railway=construction]::d1p3
 {
-  color: #606060;
-  width: 2;
-  z-index: 674;
-  dashes: 4,4,4,12;
-  linecap: butt;
+  color:    #606060;
+  width:    2;
+  z-index:  674;
+  dashes:   4,4,4,12;
+  linecap:  butt;
 }
 line|z17-[boundary=administrative][admin_level=10]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 0.8;
-  z-index: 962;
-  dashes: 4,20;
+  width:    0.8;
+  z-index:  962;
+  dashes:   4,20;
 }
 line|z17-[railway=siding]
 {
-  color: #333333;
-  width: 2.4;
-  z-index: 578;
+  color:    #333333;
+  width:    2.4;
+  z-index:  578;
 }
 line|z17-[railway=disused]::d1p2
 {
-  color: #f2f2f2;
-  width: 2;
-  z-index: 661;
-  opacity: 0.7;
+  color:    #f2f2f2;
+  width:    2;
+  z-index:  661;
+  opacity:  0.7;
 }
 line|z17-[boundary=administrative][border_type=region]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 974;
-  dashes: 12,4,4,4;
+  width:    2;
+  z-index:  974;
+  dashes:   12,4,4,4;
 }
 
 node|z17-[barrier=bollard],
@@ -3571,235 +4414,237 @@ node|z17-[barrier=stile],
 node|z17-[barrier=toll_booth]
 {
   symbol-shape: circle;
-  symbol-fill-color: #707070;
-  symbol-size: 1.6;
+  symbol-fill-color:    #707070;
+  symbol-size:  1.6;
 }
 line|z17-[boundary=administrative][border_type=state]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  dashes: 12,4,4,4;
+  width:    2;
+  dashes:   12,4,4,4;
 }
 area|z15-[historic=ship]
 {
-  fill-color: #cdcdb4;
+  fill-color:   #cdcdb4;
   text: name;
   font-size: 11;
 }
 line|z17-[boundary=national_park]
 {
-  color: #4ef94b;
-  linecap: butt;
+  color:    #4ef94b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 980;
-  dashes: 12,4,4,4;
+  width:    2;
+  z-index:  980;
+  dashes:   12,4,4,4;
 }
 line|z17-[railway=funicular]
 {
-  color: #4c0f0f;
-  width: 3.2;
-  z-index: 574;
+  color:    #4c0f0f;
+  width:    3.2;
+  z-index:  574;
 }
 line|z17-[man_made=pier]::d1p2
 {
-  color: #d0d0d0;
-  width: 3.2;
-  z-index: 915;
+  color:    #d0d0d0;
+  width:    3.2;
+  z-index:  915;
 }
 
 line|z17-[railway=abandoned]::d1p3
 {
-  opacity: 0.4;
-  color: #b2b2b2;
-  linecap: butt;
-  width: 2;
-  z-index: 679;
-  dashes: 12,12;
+  opacity:  0.4;
+  color:    #b2b2b2;
+  linecap:  butt;
+  width:    2;
+  z-index:  679;
+  dashes:   12,12;
 }
 
 line|z17-[barrier=city_wall]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 960;
-  dashes: 0.0,4.0;
-  linecap: butt;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  960;
+  dashes:   0.0,4.0;
+  linecap:  butt;
 }
 
 line|z17-[railway=light_rail]::d1p2
 {
-  color: #b7e6e6;
-  width: 2;
-  z-index: 667;
+  color:    #b7e6e6;
+  width:    2;
+  z-index:  667;
 }
 line|z17-[power=minor_line]::d1p2
 {
-  color: grey;
-  width: 0.8;
-  dashes: 1.2,2,1.2,2,1.2,4.4;
-  linecap: butt;
+  color:    grey;
+  width:    0.8;
+  dashes:   1.2,2,1.2,2,1.2,4.4;
+  linecap:  butt;
 }
 
 area|z17-[aerialway=station],
 node|z17-[aerialway=station]
 {
   symbol-shape: circle;
-  symbol-fill-color: #3050d8;
-  symbol-size: 3.2;
+  symbol-fill-color:    #3050d8;
+  symbol-size:  3.2;
 }
 line|z17-[railway=funicular]::d1p2
 {
-  color: #e6b7b7;
-  width: 2;
-  z-index: 670;
-  dashes: 9.6,14.4;
-  linecap: butt;
+  color:    #e6b7b7;
+  width:    2;
+  z-index:  670;
+  dashes:   9.6,14.4;
+  linecap:  butt;
 }
 line|z17-[aerialway=gondola]
 {
-  color: #202020;
-  width: 3.2;
-  z-index: 910;
+  color:    #202020;
+  width:    3.2;
+  z-index:  910;
 }
 line|z17-[railway=preserved]
 {
-  color: #909090;
-  width: 3.2;
-  z-index: 570;
+  color:    #909090;
+  width:    3.2;
+  z-index:  570;
 }
 line|z17-[boundary=administrative][border_type=municipality]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 971;
-  dashes: 12,4,4,4;
+  width:    1;
+  z-index:  971;
+  dashes:   12,4,4,4;
 }
 line|z17-[railway=preserved]::d1p3
 {
-  color: #333333;
-  width: 2;
-  z-index: 683;
-  dashes: 12,12;
-  linecap: butt;
+  color:    #333333;
+  width:    2;
+  z-index:  683;
+  dashes:   12,12;
+  linecap:  butt;
 }
 line|z17-[man_made=breakwater]
 {
-  color: #707070;
-  width: 6.4;
-  z-index: 913;
+  color:    #707070;
+  width:    6.4;
+  z-index:  913;
 }
 line|z17-[boundary=administrative][admin_level=8]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 964;
-  dashes: 12,4,4,4;
+  width:    1;
+  z-index:  964;
+  dashes:   12,4,4,4;
 }
 area|z17-[landuse=construction],
 node|z17-[landuse=construction]
 {
   text: name;
-  font-size: 14;
-  text-color: #404040;
+  font-size:    14;
+  text-color:   #404040;
 }
 
 line|z17-[railway=funicular]::d1p3
 {
-  color: #4c0f0f;
-  width: 0.64;
-  z-index: 688;
+  color:    #4c0f0f;
+  width:    0.64;
+  z-index:  688;
 }
 line|z17-[waterway=drain]
 {
-  width: 6.4;
-  z-index: 112;
-  color: #B9D4D4;
+  width:    6.4;
+  z-index:  112;
+  color:    #B9D4D4;
   casing-width: 0.8;
   casing-color: #b0b0b0;
 }
 line|z17-[boundary=administrative][border_type=country]
 {
-  color: yellow;
-  width: 6;
-  z-index: 977;
+  color:    yellow;
+  width:    6;
+  z-index:  977;
   -x-kot-layer: top;
 }
 line|z17-[boundary=administrative][admin_level=2]
 {
-  color: #eeeedd;
-  width: 6;
+  color:    #eeeedd;
+  width:    6;
   -x-kot-layer: top;
 }
 line|z17-[railway=abandoned]::d1p2
 {
-  color: white;
-  width: 2;
-  z-index: 663;
-  opacity: 0.4;
+  color:    white;
+  width:    2;
+  z-index:  663;
+  opacity:  0.4;
 }
 line|z17-[natural=glacier]
 {
-  color: lightblue;
-  width: 6.4;
-  z-index: 8;
+  color:    lightblue;
+  width:    6.4;
+  z-index:  8;
 }
 line|z17-[railway=yard]::d1p3
 {
-  color: #333333;
-  width: 1.36;
-  z-index: 691;
-  dashes: 7.2,16.8;
-  linecap: butt;
+  color:    #333333;
+  width:    1.36;
+  z-index:  691;
+  dashes:   7.2,16.8;
+  linecap:  butt;
 }
 line|z17-[railway=spur]::d1p3
 {
-  color: #333333;
-  width: 1.36;
-  z-index: 690;
-  dashes: 7.2,16.8;
-  linecap: butt;
+  color:    #333333;
+  width:    1.36;
+  z-index:  690;
+  dashes:   7.2,16.8;
+  linecap:  butt;
 }
 line|z17-[waterway=dam]
 {
-  color: #202020;
-  width: 4;
-  z-index: 133;
+  color:    #202020;
+  width:    4;
+  z-index:  133;
 }
 line|z17-[barrier=hedge]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 952;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  952;
 }
 line|z17-[piste:type=sled]
 {
-  color: #f0e0dc;
-  width: 20;
+  color:    #f0e0dc;
+  width:    20;
 }
 line|z17-[railway=narrow_gauge]::d1p3
 {
-  color: #333333;
-  width: 2;
-  z-index: 682;
-  dashes: 14.4,14.4;
-  linecap: butt;
+  color:    #333333;
+  width:    2;
+  z-index:  682;
+  dashes:   14.4,14.4;
+  linecap:  butt;
 }
 
 line|z17-[power=minor_line]
 {
-  color: white;
-  width: 1.6;
-  z-index: 921;
-  opacity: 0.5;
+  color:    white;
+  width:    1.6;
+  z-index:  921;
+  opacity:  0.5;
 }
 
+node[railway=station][transport=subway]                           {text-color:  #3050d8; text-position: center;}
+
 area[waterway=riverbank],
 line[waterway=river],
 line[waterway=canal]
@@ -3810,8 +4655,8 @@ line[waterway=canal]
 node|z17-[entrance]
 {
   symbol-shape: circle;
-  symbol-fill-color: #202020;
-  symbol-size: 2;
+  symbol-fill-color:  #202020;
+  symbol-size:  2;
   font-size: 9;
   text: ref;
   text-offset-x: 6;
@@ -3826,14 +4671,186 @@ node|z19-[entrance]::flats
 node|z15-[railway=station][!transport],
 area|z15-[railway=station][!transport]
 { 
-  font-size: 12;
+  font-size:    12;
   text-halo-radius: 2;
   text: name;
-  text-color: #3050d8;
-  text-offset: 10;
+  text-color:   #3050d8;
+  text-offset:  10;
   z-index: 170;
 }
 
+/* POI icons */
+
+area|z17-[tourism=information][office],
+node|z17-[tourism=information][office]
+{
+  icon-image:   information-office.svg;
+}
+area|z17-[barrier=gate],
+node|z17-[barrier=gate]
+{
+  icon-image:   gate.svg;
+}
+area|z16[highway=bus_stop],
+node|z16[highway=bus_stop]
+{
+  icon-image:   bus-mini.svg;
+  z-index: 20;
+}
+area|z16-[amenity=bus_station],
+area|z17-[highway=bus_stop],
+node|z16-[amenity=bus_station],
+node|z17-[highway=bus_stop]
+{
+  icon-image:   bus.svg;
+  z-index: 20;
+}
+area|z17-[railway=tram_stop],
+node|z17-[railway=tram_stop]
+{
+  icon-image:   tramway.svg;
+}
+area|z17-[man_made=lighthouse],
+node|z17-[man_made=lighthouse]
+{
+  icon-image:   lighthouse.svg;
+}
+area|z17-[tourism=information],
+node|z17-[tourism=information]
+{
+  icon-image:   information.svg;
+}
+
+area|z17-[amenity=post_box],
+node|z17-[amenity=post_box]
+{
+  icon-image:   postbox.svg;
+}
+area|z16-[amenity=bank],
+node|z16-[amenity=bank]
+{
+  icon-image:   bank.svg;
+  z-index:  5;
+}
+area|z16-[amenity=pub],
+node|z16-[amenity=pub]
+{
+  icon-image:   pub.svg;
+}
+
+node|z17-[amenity=recycling]
+{
+  icon-image:   recycling.svg;
+}
+node|z16-[amenity=telephone]
+{
+  icon-image:   telephone.svg;
+}
+
+area|z17-[sport=handball],
+node|z17-[sport=handball]
+{
+  icon-image:   handball-borderless.svg;
+}
+area|z17-[sport=golf],
+node|z17-[sport=golf],
+area|z17-[leisure=golf_course],
+node|z17-[leisure=golf_course]
+{
+  icon-image:   golfCourse.svg;
+}
+
+area|z17-[sport=baseball],
+node|z17-[sport=baseball]
+{
+  icon-image:   baseball-borderless.svg;
+}
+area|z17-[sport=athletics],
+node|z17-[sport=athletics]
+{
+  icon-image:   athletics-borderless.svg;
+}
+area|z17-[sport=bowls],
+node|z17-[sport=bowls]
+{
+  icon-image:   bowls-borderless.svg;
+}
+area|z17-[sport=archery],
+node|z17-[sport=archery]
+{
+  icon-image:   archery-borderless.svg;
+}
+area|z17-[amenity=school],
+node|z17-[amenity=school]
+{
+  icon-image:   school.svg;
+}
+
+area|z14-16[railway=halt],
+area|z14-15[railway=station],
+node|z14-16[railway=halt],
+node|z14-15[railway=station],
+{
+  icon-image:   railway-station-mini.svg;
+  z-index: 150;
+}
+
+area|z17-[railway=halt],
+area|z16-[railway=station],
+node|z17-[railway=halt],
+node|z16-[railway=station]
+{
+  icon-image:   railway-station.svg;
+}
+
+node|z12[railway=station][transport=subway],
+area|z12[railway=station][transport=subway]
+{ 
+  font-size:    10;
+  text-halo-radius: 2;
+  text: name;
+  text-offset:  10;
+  z-index: 170;
+  -x-kot-layer: top;
+}
+node|z13-14[railway=station][transport=subway],
+area|z13-14[railway=station][transport=subway]
+{ 
+  font-size:    11;
+  text-halo-radius: 2;
+  text: name;
+  text-offset:  10;
+  z-index: 170;
+  -x-kot-layer: top;
+}
+node|z15-[railway=station][transport=subway],
+area|z15-[railway=station][transport=subway]
+{ 
+  font-size:    12;
+  text-halo-radius: 2;
+  text: name;
+  text-offset:  10;
+  z-index: 170;
+  -x-kot-layer: top;
+}
+area|z12-14[railway=station][transport=subway],
+node|z12-14[railway=station][transport=subway]
+{
+  icon-image:   subway-station-s.svg;
+}
+
+area|z15[railway=station][transport=subway],
+node|z15[railway=station][transport=subway]
+{
+  icon-image:   subway-station-m.svg;
+}
+
+area|z16-[railway=station][transport=subway],
+node|z16-[railway=station][transport=subway]
+{
+  icon-image:   subway-station-l.svg;
+}
+
 /* Eval magic */
 
 line[waterway]
@@ -3847,53 +4864,69 @@ line[railway]
   text-position: line;
 }
 
+node[highway=bus_stop],
+node[railway=tram_stop],
+node[railway=station],
+way[highway=bus_stop],
+way[railway=tram_stop],
+way[railway=station]
+{
+  text-position: center;
+}
+
 line|z15-[bridge?]::bridgewhite,
 line|z15-[tunnel?]::tunnelwhite,
 {
-  z-index: 3;
+  z-index:  3;
   casing-width: eval(prop("width")/2+2);
-  casing-linecap: butt;
+  casing-linecap:    butt;
   casing-color: #7;
 }
 
 line|z9-[highway]::wipebackground
 {
-  z-index: 3;
+  z-index:    3;
   casing-width: eval(prop("width")/2+3);
-  casing-linecap: butt;
+  casing-linecap:    butt;
   casing-color: #7;
   -x-kot-layer: bottom;
 }
 
 line|z15-[bridge?]::bridgeblack
 {
-  z-index: 2;
+  z-index:  2;
   casing-width: eval(prop("width")/2+3);
-  casing-linecap: butt;
+  casing-linecap:    butt;
   casing-color: #707070;
 }
 
 line|z15-[tunnel?]::tunnelblack
 {
-  z-index: 2;
+  z-index:  2;
   casing-width: eval(prop("width")/2+3);
-  casing-linecap: butt;
+  casing-linecap:    butt;
   casing-color: #707070;
-  casing-dashes: 5,5;
+  casing-dashes:    5,5;
 }
 
 line|z16-[oneway?]::arrows
 {
-  pattern-offset: 200;
+  pattern-offset:   200;
   z-index: 1000;
-  pattern-image: symbols/arrow.svg;
-  pattern-spacing: 234;
+  pattern-image:    arrow.svg;
+  pattern-spacing:  234;
 }
 
 line[access][access!=yes]::*
 {
-  opacity: 0;
-  casing-opacity: 0;
+  opacity:  0;
+  casing-opacity:  0;
+}
+
+line|z15-[marking=sport]
+{
+    width: 0.5;
+    color: white;
 }
 line|z18-[lit]::lit
 {
@@ -4019,8 +5052,6 @@ line[highway=steps]
     text-color: white;
 }
 
-@import("include/base_publictransport.mapcss");
-
 *[building]
 {
     text-halo-color: #1;
@@ -4041,7 +5072,12 @@ line[highway=steps]
 }
 
 
-
+*[amenity!=bench][natural!=tree][!barrier][railway!=subway_entrance][!power][natural!=peak]
+{
+    symbol-shape: eval(cond(prop("icon-image"), "circle", ""));
+    symbol-size: 13;
+    symbol-fill-color: #f; 
+}
 node|z14[railway=station][transport=subway]
 {
     symbol-size: 11;
@@ -4086,33 +5122,10 @@ area[area:highway]{fill-color: white}
     width: 0;
 }
 
-node[railway=station][transport=subway]                           {text-color: #3050d8; text-position: center;}
-
 area|z15-[area:highway=footway],
 area|z15-[area:highway=pedestrian],
 area|z15-[area:highway=path],
 area|z15-[area:highway=steps]
 {
     fill-color: #d;
-}
-
-*::int_name
-{
-  text: "";
-}
-
-@import("include/icons_maki.mapcss");
-@import("include/icons_nori.mapcss");
-@import("include/icons_neta.mapcss");
-@import("include/icon_colors.mapcss");
-
-*
-{
-    icon-fill-color: #0;
-    icon-color: #f;
-    symbol-fill-color: #f;
-}
-*[natural!=tree][!barrier][power!=pole][power!=tower][natural!=peak]
-{
-    symbol-image: eval(any(prop("symbol-image"), "symbols/neta/circle-24.svg"));
 }
\ No newline at end of file
diff --git a/data/styles/normal.mapcss b/data/styles/normal.mapcss
index 5f4aa81435..62c75e6da8 100644
--- a/data/styles/normal.mapcss
+++ b/data/styles/normal.mapcss
@@ -1,46 +1,42 @@
-canvas
-{
-  background-color: #f1eee8;
-  fill-color: #B9D4D4;
-  default-lines: false;
-  default-points: false;
-  -x-mapsithme-dpi: ldpi,mdpi,hdpi,xhdpi,xxhdpi;
-}
-
-way::*
-{
-  linejoin: round;
-  linecap: round;
-  text-position: line;
-}
-
-*::*
-{
-  text-halo-color: white;
-  text-anchor-horizontal: center;
-  text-anchor-vertical: center;
+canvas {
+    background-color: #f1eee8;
+    fill-color: #B9D4D4;
+    default-lines: false;
+    default-points: false;
+}
+way::* {
+    linejoin: round;
+    linecap: round;
+    casing-linecap: none;
+    text-position: line;
+}
+*::* {
+    text-halo-color: white;
+    text-anchor-horizontal: center;
+    text-anchor-vertical: center;
+    icon-width: 16;
+    icon-height: 16;
 }
-
 *
 {
-  icon-fill-color: #444;
+    icon-width: 16;
+    icon-height: 16;
 }
-
 *::int_name
 {
   text-offset: 20;
 }
-
 node::* {
-  text-anchor-vertical: top;
+    text-anchor-vertical: top;
 }
-
 area::* {
-  text-position: center;
-  text-anchor-vertical: center;
+    text-position: center;
+    text-anchor-vertical: center;
+}
+area[natural=coastline]
+{
+  fill-color: #f1eee8;
 }
-
-
 *[amenity],
 *[office],
 *[historic],
@@ -48,240 +44,603 @@ area::* {
 *[leisure],
 *[man_made],
 *[natural],
+*[place],
 *[power],
-*[landuse]
+*[landuse],
+*[sport]
 {
   text-position: center
 }
+area[landuse],
+area[natural],
+area[leisure],
+area[place],
 area[aeroway],
-area[tourism]
+area[tourism],
 {
   fill-position: background;
 }
 
 @import("include/base_roads.mapcss");
-/* @import("include/base_roads_UK.mapcss"); */
 @import("include/base_shop.mapcss");
-@import("include/base_sport.mapcss");
-@import("include/base_place.mapcss");
-@import("include/base_landuse.mapcss");
-@import("include/base_water.mapcss");
 
+line[highway=bus_stop],
 line[highway=motorway_junction]
 {
-  casing-width: 0;
+    casing-width: 0;
+}
+area|z15-[place=island],
+node|z15-[place=island]
+{
+  text: name;
+  font-size:    16;
+  text-color:   #505050;
+}
+node|z1-[place=ocean]
+{
+  text: name;
+  font-size:8;
+  text-color:#4976d1;
+  z-index:-1
+}
+node|z2-[place=ocean]
+{
+  font-size:9;
+}
+node|z5-[place=ocean]
+{
+  font-size:10;
+}
+node|z7-[place=ocean]
+{
+  font-size:11;
+}
+node|z3-[place=sea]
+{
+  text: name;
+  font-size: 8;
+  text-color: #4976d1;
+}
+node|z7-[place=sea]
+{
+  font-size: 10;
+}
+node|z9-[place=sea]
+{
+  font-size: 11;
+}
+area|z16-[amenity=fountain],
+area|z12-[landuse=basin],
+area|z12-[landuse=reservoir],
+area|z13-[leisure=swimming_pool],
+area[natural=ocean],
+area|z10-[natural=lake],
+area|z10-[natural=pond],
+area|z10-[natural=water],
+area|z10-[waterway=dock],
+area|z10-[waterway=riverbank],
+area|z14-[natural=bay],
+{
+  fill-color:   #B9D4D4;
+  z-index: 100;
+}
+node|z-2[place=continent]
+{
+  text: name;
+  font-size:    18;
+  text-color:   #808078;
+}
+node|z3[place=country]
+{
+  text: name;
+  font-size:    12;
+  text-color:   #404040;
+}
+area|z3[place=country]::int_name,
+node|z3[place=country]::int_name
+{
+  text: int_name;
+  font-size:    12;
+  text-color:   #606060;
 }
 line|z4[boundary=administrative][admin_level=2]
 {
-  color: #ffa090;
-  width: 1;
-  z-index: 400;
-  dashes: 3.12,3.12;
-  linecap: butt;
+  color:    #ffa090;
+  width:    1;
+  z-index:  400;
+  dashes:   3.12,3.12;
+  linecap:  butt;
   -x-kot-layer: top;
 }
+node|z4[place=city][capital?]::int_name
+{
+  font-size:    10;
+  text-halo-radius: 2;
+  text: int_name;
+  text-color:   grey;
+  text-halo-color:  #eeeedd;
+}
+node|z8[place=town]
+{
+  font-size:    12;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #404040;
+  text-halo-color:  #eeeedd;
+}
+node|z4[place=country],
+node|z9[place=town]
+{
+  font-size:    14;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #404040;
+  text-halo-color:  #eeeedd;
+}
+node|z4[place=state]
+{
+  text: name;
+  font-size:    11;
+  text-color:   #c0c0b0;
+  z-index: -10;
+}
+node|z4[place=city][capital?]
+{
+  font-size:    11;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #505050;
+  text-halo-color:  #eeeedd;
+}
+node|z4-5[place=country]::int_name,
+node|z13-14[place=village]::int_name
+{
+  font-size:    12;
+  text-halo-radius: 2;
+  text: int_name;
+  text-color:   #606060;
+  text-halo-color:  #eeeedd;
+}
 line|z5[boundary=administrative][admin_level=2]
 {
-  color: #ff775b;
-  width: 1;
-  z-index: 400;
-  dashes: 3.12,3.12;
-  linecap: butt;
+  color:    #ff775b;
+  width:    1;
+  z-index:  400;
+  dashes:   3.12,3.12;
+  linecap:  butt;
   -x-kot-layer: top;
 }
+node|z5[place=city][capital?]
+{
+  font-size:    12;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #505050;
+  text-halo-color:  #eeeedd;
+}
+node|z5[place=city][capital?]::int_name
+{
+  font-size:    11;
+  text-halo-radius: 2;
+  text: int_name;
+  text-color:   grey;
+  text-halo-color:  #eeeedd;
+}
+node|z5[place=country]
+{
+  font-size:    16;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #404040;
+  text-halo-color:  #eeeedd;
+}
+node|z5[place=city]
+{
+  font-size:    11;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #606060;
+  text-halo-color:  #eeeedd;
+}
+node|z5[place=state]
+{
+  text: name;
+  font-size:    12;
+  text-color:   #c0c0b0;
+  z-index: -10;
+}
+node|z5[place=city]::int_name
+{
+  font-size:    10;
+  text-halo-radius: 2;
+  text: int_name;
+  text-color:   #909090;
+  text-halo-color:  #eeeedd;
+}
+node|z7-8[place=city]::int_name,
+node|z9[place=town]::int_name,
+node|z12-13[place=town]::int_name,
+node|z6-9[place=city][capital?]::int_name
+{
+  font-size:    12;
+  text-halo-radius: 2;
+  text: int_name;
+  text-color:   grey;
+  text-halo-color:  #eeeedd;
+}
+node|z6[place=city][capital?]
+{
+  font-size:    14;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #606060;
+  text-halo-color:  #eeeedd;
+}
 line|z5-8[boundary=administrative][admin_level=4]::d2p2,
 line|z4-8[boundary=administrative][admin_level=4][border_type=state]::d3p2
 {
-  color: #eeeedd;
-  width: 1;
-  z-index: 120;
+  color:    #eeeedd;
+  width:    1;
+  z-index:  120;
   -x-kot-layer: top;
 }
+node|z6[place=country]
+{
+  text: name;
+  font-size:    18;
+  text-color:   grey;
+}
+node|z6[place=city],
+node|z15[place=locality],
+node|z12-13[place=village]
+{
+  font-size:    12;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #606060;
+  text-halo-color:  #eeeedd;
+}
+area|z6-11[natural=land]
+{
+  fill-color:   white;
+}
 line|z4-[boundary=administrative][admin_level=3]
 {
-  color: #a0a0a0;
-  width: 1;
-  z-index: 123;
-  dashes: 1,1;
-  linecap: butt;
+  color:    #a0a0a0;
+  width:    1;
+  z-index:  123;
+  dashes:   1,1;
+  linecap:  butt;
   -x-kot-layer: top;
 }
+node|z6[place=state]
+{
+  text: name;
+  font-size:    13;
+  text-color:   #c0c0b0;
+  z-index: -10;
+}
 line|z6[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #eeeedd;
-  width: 1;
-  z-index: 123;
+  color:    #eeeedd;
+  width:    1;
+  z-index:  123;
   -x-kot-layer: top;
 }
+node|z6[place=country]::int_name
+{
+  text: int_name;
+  font-size:    12;
+  text-color:   #a0a090;
+}
 line|z6[boundary=administrative][border_type=state]
 {
-  color: yellow;
-  width: 1;
-  z-index: 55;
+  color:    yellow;
+  width:    1;
+  z-index:  55;
+}
+node|z6[place=city]::int_name
+{
+  font-size:    11;
+  text-halo-radius: 2;
+  text: int_name;
+  text-color:   #909090;
+  text-halo-color:  #eeeedd;
 }
 line|z6-[boundary=administrative][admin_level=3]::d2p2
 {
-  color: #eeeedd;
-  width: 1;
-  z-index: 122;
+  color:    #eeeedd;
+  width:    1;
+  z-index:  122;
   -x-kot-layer: top;
 }
 line|z6[boundary=administrative][admin_level=2]
 {
-  color: #d9775b;
-  width: 1;
-  z-index: 124;
-  dashes: 3.12,3.12;
-  linecap: butt;
+  color:    #d9775b;
+  width:    1;
+  z-index:  124;
+  dashes:   3.12,3.12;
+  linecap:  butt;
   -x-kot-layer: top;
 }
 line|z4-6[boundary=administrative][admin_level=4]
 {
-  color: #a0a0a0;
-  width: 0.2;
-  z-index: 121;
-  dashes: 0.3,0.6;
-  linecap: butt;
+  color:    #a0a0a0;
+  width:    0.2;
+  z-index:  121;
+  dashes:   0.3,0.6;
+  linecap:  butt;
   -x-kot-layer: top;
 }
 line|z7[boundary=administrative][admin_level=2]
 {
-  color: #eeeedd;
-  width: 2.73;
-  z-index: 124;
+  color:    #eeeedd;
+  width:    2.73;
+  z-index:  124;
   -x-kot-layer: top;
 }
 line|z7-8[boundary=administrative][admin_level=4]
 {
-  color: #909090;
-  width: 0.7;
-  z-index: 121;
-  dashes: 0.3,0.6;
-  linecap: butt;
+  color:    #909090;
+  width:    0.7;
+  z-index:  121;
+  dashes:   0.3,0.6;
+  linecap:  butt;
   -x-kot-layer: top;
 }
+node|z7[place=country]
+{
+  text: name;
+  font-size:    26;
+  text-color:   #909080;
+}
 line|z7[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
-  width: 2;
-  z-index: 125;
-  dashes: 5,5;
-  linecap: butt;
+  color:    #f9574b;
+  width:    2;
+  z-index:  125;
+  dashes:   5,5;
+  linecap:  butt;
   -x-kot-layer: top;
 }
 line|z7[boundary=administrative][border_type=state]
 {
-  color: yellow;
-  width: 0.62;
-  z-index: 56;
+  color:    yellow;
+  width:    0.62;
+  z-index:  56;
+}
+node|z7-8[place=city]
+{
+  font-size:    14;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #505050;
+  text-halo-color:  #eeeedd;
+}
+node|z7[place=country]::d1p3
+{
+  text: int_name;
+  font-size:    14;
+  text-color:   #a0a090;
 }
 line|z7[boundary=administrative][border_type=state]::d2p2
 {
-  color: #f9574b;
-  width: 0.12;
-  z-index: 57;
-  dashes: 0.62,0.12,0.12,0.12;
-  linecap: butt;
+  color:    #f9574b;
+  width:    0.12;
+  z-index:  57;
+  dashes:   0.62,0.12,0.12,0.12;
+  linecap:  butt;
+}
+node|z7[place=state]
+{
+  text: name;
+  font-size:    14;
+  text-color:   #c0c0b0;
+  z-index: -10;
 }
 line|z8[boundary=administrative][border_type=state]
 {
-  color: yellow;
-  width: 1.25;
-  z-index: 63;
+  color:    yellow;
+  width:    1.25;
+  z-index:  63;
 }
 line|z8-11[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
-  width: 2.34;
-  z-index: 125;
-  dashes: 3.12,3.12;
-  linecap: butt;
+  color:    #f9574b;
+  width:    2.34;
+  z-index:  125;
+  dashes:   3.12,3.12;
+  linecap:  butt;
   -x-kot-layer: top;
 }
 line|z8[boundary=administrative][border_type=state]::d2p2
 {
-  color: #f9574b;
-  width: 0.25;
-  z-index: 64;
-  dashes: 1.25,0.25,0.25,0.25;
-  linecap: butt;
+  color:    #f9574b;
+  width:    0.25;
+  z-index:  64;
+  dashes:   1.25,0.25,0.25,0.25;
+  linecap:  butt;
   -x-kot-layer: top;
 }
 line|z8-11[boundary=administrative][admin_level=2]
 {
-  color: #eeeedd;
-  width: 3.12;
-  z-index: 124;
+  color:    #eeeedd;
+  width:    3.12;
+  z-index:  124;
   -x-kot-layer: top;
 }
+node|z8[place=state]
+{
+  font-size:    14;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #b0b0a8;
+  text-halo-color:  #eeeedd;
+  z-index: -10;
+}
+area|z15-[place=farm],
+node|z15-[place=farm],
+node|z12-15[place=hamlet],
+node|z14[place=locality],
+node|z8-9[place=region]
+{
+  text: name;
+  font-size:    12;
+  text-color:   #606060;
+}
+node|z8-9[place=city][capital?],
+node|z16[place=locality]
+{
+  font-size:    16;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #606060;
+  text-halo-color:  #eeeedd;
+}
+area|z10-14[place=island],
+node|z10-14[place=island]
+{
+  text: name;
+  font-size:    12;
+  text-color:   #505050;
+}
+node|z8-9[place=country]
+{
+  text: name;
+  font-size:    28;
+  text-color:   #a0a090;
+}
+area|z8-9[place=country]::d1p3,
+node|z8-9[place=country]::d1p3
+{
+  text: int_name;
+  font-size:    14;
+  text-color:   #b0b0a0;
+}
 line|z9[boundary=administrative][admin_level=4]::d2p2
 {
-  color: #eeeedd;
-  width: 1.2;
+  color:    #eeeedd;
+  width:    1.2;
   -x-kot-layer: top;
 }
+area|z12-[aeroway=aerodrome],
+area|z12-[aeroway=airport],
+area|z12-[aeroway=aerodrome],
+node|z12-[aeroway=aerodrome],
+node|z12-[aeroway=airport],
+node|z12-[aeroway=aerodrome]
+{
+  icon-image:   airport.svg;
+}
+node|z9[place=state]
+{
+  font-size:    14;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #c0c0b0;
+  text-halo-color:  #eeeedd;
+  z-index: -10;
+}
 line|z9[boundary=administrative][admin_level=4]
 {
-  color: #909090;
-  width: 1;
-  z-index: 12;
-  dashes: 0.3,0.6;
-  linecap: butt;
+  color:    #909090;
+  width:    1;
+  z-index:  12;
+  dashes:   0.3,0.6;
+  linecap:  butt;
   -x-kot-layer: top;
 }
+node|z9[place=city]
+{
+  font-size:    17;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #505050;
+  text-halo-color:  #eeeedd;
+}
+node|z9[place=county]
+{
+  text: name;
+  font-size:    14;
+  text-color:   #a0a0a0;
+}
+node|z9-11[place=city]::int_name,
+node|z10-11[place=town]::int_name,
+node|z14[place=town]::int_name,
+node|z10-11[place=city][capital?]::int_name
+{
+  font-size:    14;
+  text-halo-radius: 2;
+  text: int_name;
+  text-color:   grey;
+  text-halo-color:  #eeeedd;
+}
 area|z11-[aeroway=aerodrome]
 {
-  fill-color: #d8dcce;
+  fill-color:   #d8dcce;
 }
 line|z9[boundary=administrative][border_type=state]
 {
-  color: yellow;
-  width: 1;
-  z-index: 63;
+  color:    yellow;
+  width:    1;
+  z-index:  63;
 }
 line|z9[boundary=administrative][border_type=state]::d2p2
 {
-  color: #f9574b;
-  width: 0.5;
-  z-index: 64;
-  dashes: 2.5,0.5,0.5,0.5;
-  linecap: butt;
+  color:    #f9574b;
+  width:    0.5;
+  z-index:  64;
+  dashes:   2.5,0.5,0.5,0.5;
+  linecap:  butt;
 }
 line|z10[boundary=administrative][admin_level=4]::d2p2,
 {
-  color: #eeeedd;
-  width: 2;
-  z-index: 401;
+  color:    #eeeedd;
+  width:    2;
+  z-index:  401;
   -x-kot-layer: top;
 }
+node|z10-11[place=town]
+{
+  font-size:    16;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #505050;
+  text-halo-color:  #eeeedd;
+}
 line|z10-11[railway=rail]
 {
-  color: silver;
-  width: 1;
-  z-index: 136;
+  color:    silver;
+  width:    1;
+  z-index:  136;
+}
+line|z10[waterway=river]
+{
+  color:    #B9D4D4;
+  width:    0.5;
 }
 line|z10[boundary=administrative][border_type=state]
 {
-  color: yellow;
-  width: 5;
-  z-index: 152;
+  color:    yellow;
+  width:    5;
+  z-index:  152;
 }
 line|z10[boundary=administrative][admin_level=4]
 {
-  color: #909090;
-  linecap: butt;
+  color:    #909090;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1.5;
-  z-index: 402;
-  dashes: 0.3,0.6;
+  width:    1.5;
+  z-index:  402;
+  dashes:   0.3,0.6;
 }
 line|z10-11[route=ferry]
 {
-  color: #98b8e8;
-  width: 1;
-  z-index: 147;
-  dashes: 3,2;
-  linecap: butt;
+  color:    #98b8e8;
+  width:    1;
+  z-index:  147;
+  dashes:   3,2;
+  linecap:  butt;
 }
 area|z12-[leisure=common],
 area|z12-[leisure=dog_park],
@@ -295,24 +654,78 @@ area|z12-[tourism=caravan_site],
 area|z12-[tourism=picnic_site],
 area|z12-[tourism=zoo]
 {
-  fill-color: #cfecb7;
+  fill-color:   #cfecb7;
 }
 line|z10[boundary=administrative][border_type=state]::d2p2
 {
-  color: #f9574b;
-  width: 1;
-  z-index: 153;
-  dashes: 5,1,1,1;
-  linecap: butt;
+  color:    #f9574b;
+  width:    1;
+  z-index:  153;
+  dashes:   5,1,1,1;
+  linecap:  butt;
+}
+area|z12-[landuse=farm],
+area|z12-[landuse=farmland]
+{
+  fill-color: #DFDF97;
+}
+area|z13-[amenity=grave_yard],
+area|z12-[landuse=allotments],
+area|z13-[landuse=cemetery],
+area|z12-[landuse=field],
+area|z12-[landuse=grass],
+area|z12-[landuse=meadow],
+area|z12-[landuse=recreation_ground],
+area|z12-[landuse=village_green],
+area|z12-[leisure=sports_centre],
+area|z12-[leisure=stadium],
+area|z12-[leisure=track],
+area|z12-[natural=scrub]
+{
+  fill-color:   #d0e8c4;
+}
+area|z10-[natural=wood],
+area|z10-[landuse=forest]
+{
+  fill-color:   #B2D6A5;
+}
+node|z10-11[place=city],
+node|z12[place=town]
+{
+  font-size:    18;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #505050;
+  text-halo-color:  #eeeedd;
+}
+area|z11-[aeroway=apron],
+area|z12-[landuse=brownfield],
+area|z12-[landuse=cemetery],
+area|z12-[landuse=construction],
+area|z12-[landuse=farmyard],
+area|z12-[landuse=greenfield],
+area|z12-[landuse=industrial],
+area|z12-[landuse=quarry],
+area|z12-[landuse=railway],
+{
+  fill-color:   #DDDDCC;
+}
+node|z10-11[place=city][capital?]
+{
+  font-size:    18;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #606060;
+  text-halo-color:  #eeeedd;
 }
 line|z10[boundary=national_park]
 {
-  color: #4ef94b;
-  linecap: butt;
+  color:    #4ef94b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 154;
-  dashes: 5,1,1,1;
+  width:    1;
+  z-index:  154;
+  dashes:   5,1,1,1;
 }
 area|z13-[amenity=college],
 area|z13-[amenity=kindergarten],
@@ -320,401 +733,669 @@ area|z13-[amenity=school],
 area|z13-[amenity=university],
 area|z15-[tourism=attraction]
 {
-  fill-color: #f0e0dc;
+  fill-color:   #f0e0dc;
+}
+area|z10[place=county],
+node|z10[place=county]
+{
+  font-size:    14;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #a0a0a0;
+  text-halo-color:  #eeeedd;
 }
 line|z11[boundary=administrative][border_type=state]::d2p2
 {
-  color: #f9574b;
-  width: 2;
-  z-index: 153;
-  dashes: 10,2,2,2;
-  linecap: butt;
+  color:    #f9574b;
+  width:    2;
+  z-index:  153;
+  dashes:   10,2,2,2;
+  linecap:  butt;
 }
 line|z11[boundary=national_park]
 {
-  color: #4ef94b;
-  linecap: butt;
+  color:    #4ef94b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 154;
-  dashes: 10,2,2,2;
+  width:    2;
+  z-index:  154;
+  dashes:   10,2,2,2;
+}
+area|z11-12[place=county],
+node|z11-12[place=county]
+{
+  font-size:    16;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #a0a090;
+  text-halo-color:  #eeeedd;
+}
+area|z13-[leisure=water_park],
+line|z11[waterway=river]
+{
+  color:    #B9D4D4;
+  width:    1;
 }
 line|z12[railway=construction]
 {
-  color: #404040;
-  width: 0.75;
-  z-index: 215;
-  dashes: 1,1;
-  linecap: butt;
+  color:    #404040;
+  width:    0.75;
+  z-index:  215;
+  dashes:   1,1;
+  linecap:  butt;
 }
 line|z12[boundary=administrative][type=nation]
 {
-  color: yellow;
-  width: 6;
-  z-index: 414;
+  color:    yellow;
+  width:    6;
+  z-index:  414;
   -x-kot-layer: top;
 }
 line|z12[railway=yard]
 {
-  color: #404040;
-  width: 0.5;
-  z-index: 228;
+  color:    #404040;
+  width:    0.5;
+  z-index:  228;
+}
+node|z12[place=city]::int_name
+{
+  text: int_name;
+  font-size:    16;
+  text-color:   grey;
+}
+node|z13-15[place=city]::int_name,
+node|z12[place=city][capital?]::int_name
+{
+  font-size:    16;
+  text-halo-radius: 2;
+  text: int_name;
+  text-color:   grey;
+  text-halo-color:  #eeeedd;
 }
 line|z12[boundary=administrative][border_type=country]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 417;
-  dashes: 12,12;
+  width:    2;
+  z-index:  417;
+  dashes:   12,12;
+}
+line|z12[waterway=river]
+{
+  color:    #B9D4D4;
+  width:    2.5;
+}
+area|z14-[natural=wetland],
+area|z12-[natural=wetland][wetland=bog]
+{
+  fill-color:   #a0c3b8;
+}
+area|z12-16[place=suburb]::d1p3,
+node|z12-16[place=suburb]::d1p3
+{
+  text: int_name;
+  font-size:    12;
+  text-color:   #a0a0a0;
+  z-index: 20;
 }
 line|z12[railway=narrow_gauge]
 {
-  color: silver;
-  width: 1;
-  z-index: 222;
+  color:    silver;
+  width:    1;
+  z-index:  222;
 }
 line|z12[railway=light_rail]
 {
-  color: #90d090;
-  width: 1;
-  z-index: 668;
+  color:    #90d090;
+  width:    1;
+  z-index:  668;
 }
 area|z15-[amenity=parking][!access],
-area|z15-[amenity=parking][access?]
+area|z15-[amenity=parking][access?],
+area|z12-[landuse=commercial],
+area|z12-[natural=heath]
 {
-  fill-color: #f8f8d8;
-  fill-position: background;
+  fill-color:   #f8f8d8;
 }
 line|z12[boundary=administrative][border_type=region]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 412;
-  dashes: 12,4,4,4;
+  width:    1;
+  z-index:  412;
+  dashes:   12,4,4,4;
 }
 line|z12[aeroway=runway]
 {
-  casing-linecap: butt;
-  color: #d4dcbd;
-  linecap: butt;
-  width: 2;
-  z-index: 230;
+  casing-linecap:    butt;
+  color:    #d4dcbd;
+  linecap:  butt;
+  width:    2;
+  z-index:  230;
   linejoin: bevel;
-  casing-linejoin: bevel;
+  casing-linejoin:  bevel;
   casing-width: 0.5;
   casing-color: #202020;
 }
 line|z12[man_made=cutline]
 {
-  color: #f1eee8;
-  width: 1;
-  z-index: 184;
-  linecap: butt;
+  color:    #f1eee8;
+  width:    1;
+  z-index:  184;
+  linecap:  butt;
 }
 line|z13[man_made=cutline]
 {
-  color: #f1eee8;
-  width: 2;
-  z-index: 184;
-  linecap: butt;
+  color:    #f1eee8;
+  width:    2;
+  z-index:  184;
+  linecap:  butt;
+}
+area|z12-[landuse=military]
+{
+  fill-color:   #d0d050;
 }
-
 line|z12[railway=preserved]
 {
-  color: silver;
-  width: 1;
-  z-index: 223;
+  color:    silver;
+  width:    1;
+  z-index:  223;
+}
+area|z12-[landuse=conservation]
+{
+  fill-color:   #cfeca8;
 }
-
 line|z12[railway=abandoned]
 {
-  color: #b2b2b2;
-  width: 0.25;
-  z-index: 219;
-  opacity: 0.3;
+  color:    #b2b2b2;
+  width:    0.25;
+  z-index:  219;
+  opacity:  0.3;
 }
 line|z12[aeroway=taxiway]
 {
-  casing-linecap: butt;
-  color: #d4dcbd;
-  linecap: butt;
-  width: 0.5;
-  z-index: 231;
+  casing-linecap:    butt;
+  color:    #d4dcbd;
+  linecap:  butt;
+  width:    0.5;
+  z-index:  231;
   linejoin: bevel;
-  casing-linejoin: bevel;
+  casing-linejoin:  bevel;
   casing-width: 0.12;
   casing-color: #202020;
 }
 line|z12[boundary=administrative][border_type=state]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 413;
-  dashes: 12,4,4,4;
+  width:    2;
+  z-index:  413;
+  dashes:   12,4,4,4;
 }
 line|z12[railway=monorail]
 {
-  color: #d08080;
-  width: 1;
-  z-index: 226;
+  color:    #d08080;
+  width:    1;
+  z-index:  226;
 }
 area|z13-[amenity=college],
 area|z13-[amenity=kindergarten],
 area|z13-[amenity=school],
-area|z13-[amenity=university]
+area|z13-[amenity=university],
+area|z12-[man_made=wastewater_plant]
 {
-  fill-position: background;
+  fill-position:    background;
 }
 line|z12[railway=rail]
 {
-  color: silver;
-  width: 1;
-  z-index: 221;
+  color:    silver;
+  width:    1;
+  z-index:  221;
 }
 line|z12[railway=funicular]
 {
-  color: #a0a0a0;
-  width: 1;
-  z-index: 225;
+  color:    #a0a0a0;
+  width:    1;
+  z-index:  225;
+}
+line|z12[waterway=drain]
+{
+  color:    #B9D4D4;
+  width:    1;
+  z-index:  67;
+}
+node|z12[place=city],
+node|z13[place=town]
+{
+  font-size:    20;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #505050;
+  text-halo-color:  #eeeedd;
+}
+area|z12-[landuse=residential]
+{
+  fill-color:   #ede8d2;
+}
+area|z12-[landuse=residential][residential=urban]
+{
+  fill-color:   #eeeeee;
+}
+area|z12-[landuse=residential][residential=rural]
+{
+  fill-color:   #FFFFCC;
+}
+area|z12-[landuse=retail]
+{
+  fill-color:   #f8ecec;
+}
+line|z12[waterway=ditch]
+{
+  color:    #B9D4D4;
+  width:    0.3;
+  z-index:  68;
+}
+line|z12[waterway=stream]
+{
+  color:    #B9D4D4;
+  width:    0.75;
+  z-index:  65;
 }
 line|z12[route=ferry]
 {
-  color: #98b8e8;
-  width: 1;
-  z-index: 389;
-  dashes: 3,2;
-  linecap: butt;
+  color:    #98b8e8;
+  width:    1;
+  z-index:  389;
+  dashes:   3,2;
+  linecap:  butt;
 }
 line|z12[boundary=administrative][border_type=country]
 {
-  color: yellow;
-  width: 6;
-  z-index: 415;
+  color:    yellow;
+  width:    6;
+  z-index:  415;
   -x-kot-layer: top;
 }
+area|z12-[natural=volcano],
+node|z12-[natural=volcano]
+{
+  icon-image:   vulcan.svg;
+}
+area|z13-[landuse=farmyard],
+area|z12-[man_made=wastewater_plant]
+{
+  fill-color:   #e4e4e4;
+}
 line|z12[boundary=administrative][admin_level=2]
 {
-  color: #eeeedd;
-  width: 6;
-  z-index: 409;
+  color:    #eeeedd;
+  width:    6;
+  z-index:  409;
   -x-kot-layer: top;
 }
+node|z12[place=city][capital?]
+{
+  font-size:    22;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #606060;
+  text-halo-color:  #eeeedd;
+}
+area|z12[place=suburb],
+node|z12[place=suburb]
+{
+  text: name;
+  font-size:    12;
+  text-color:   #909090;
+  z-index: 20;
+}
 area|z12-[aeroway=terminal]
 {
-  fill-color: #d4c894;
+  fill-color:   #d4c894;
 }
 line|z12[boundary=national_park]
 {
-  color: #4ef94b;
-  linecap: butt;
+  color:    #4ef94b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 418;
-  dashes: 12,4,4,4;
+  width:    2;
+  z-index:  418;
+  dashes:   12,4,4,4;
+}
+area|z12-[natural=land]
+{
+  fill-color:   #f8f8f8;
 }
 line|z12[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 410;
-  dashes: 12,12;
+  width:    2;
+  z-index:  410;
+  dashes:   12,12;
+}
+line|z12[waterway=canal]
+{
+  color:    #B9D4D4;
+  width:    2.5;
 }
 line|z12[railway=disused]
 {
-  color: grey;
-  width: 0.5;
-  z-index: 218;
-  opacity: 0.5;
+  color:    grey;
+  width:    0.5;
+  z-index:  218;
+  opacity:  0.5;
+}
+area|z12-13[natural=peak],
+node|z12-13[natural=peak]
+{
+  icon-image:   peak-mini.svg;
+}
+area|z14-[natural=lake],
+area|z12-14[natural=pond],
+node|z14-[natural=lake],
+node|z12-14[natural=pond]
+{
+  text: name;
+  font-size:    12;
+  text-color:   #5070d0;
 }
 line|z12[boundary=administrative][type=nation]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 416;
-  dashes: 12,12;
+  width:    2;
+  z-index:  416;
+  dashes:   12,12;
+}
+line|z13[waterway=drain]
+{
+  color:    #B9D4D4;
+  width:    1.5;
+  z-index:  77;
+}
+area|z13-[landuse=landfill],
+area|z13-[landuse=quarry]
+{
+  fill-color:   #e9dd72;
 }
 line|z13[piste:type=sled]
 {
-  color: #f0e0dc;
-  width: 1.25;
+  color:    #f0e0dc;
+  width:    1.25;
+}
+area|z13-[landuse=vineyard]
+{
+  fill-color:   #d1ead1;
 }
 line|z13[boundary=national_park]
 {
-  color: #4ef94b;
-  linecap: butt;
+  color:    #4ef94b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 443;
-  dashes: 12,4,4,4;
+  width:    2;
+  z-index:  443;
+  dashes:   12,4,4,4;
 }
 line|z13[boundary=administrative][border_type=country]
 {
-  color: yellow;
-  width: 6;
-  z-index: 440;
+  color:    yellow;
+  width:    6;
+  z-index:  440;
   -x-kot-layer: top;
 }
+line|z13[waterway=river]
+{
+  color:    #B9D4D4;
+  width:    3;
+}
+node|z13[place=city][capital?]::int_name
+{
+  font-size:    18;
+  text-halo-radius: 2;
+  text: int_name;
+  text-color:   grey;
+  text-halo-color:  #eeeedd;
+}
+area|z13[natural=water]
+{
+  text: name;
+  font-size:    10;
+  text-color:   navy;
+}
+area|z14[natural=water]
+{
+  text: name;
+  font-size:    11;
+  text-color:   navy;
+}
+area|z15[natural=water]
+{
+  text: name;
+  font-size:    12;
+  text-color:   navy;
+}
+area|z16-[natural=water]
+{
+  text: name;
+  font-size:    16;
+  text-color:   navy;
+}
+area|z17-[aeroway=gate],
+area|z15[landuse=allotments],
+area|z15[landuse=basin],
+area|z15[landuse=brownfield],
+area|z15[landuse=cemetery],
+area|z15[landuse=commercial],
+area|z15[landuse=farm],
+area|z15[landuse=farmland],
+area|z15[landuse=farmyard],
+area|z15[landuse=forest],
+area|z15[landuse=garages],
+area|z15[landuse=grass],
+area|z15[landuse=greenfield],
+area|z15[landuse=greenhouse_horticulture],
+area|z15[landuse=industrial],
+area|z15[landuse=landfill],
+area|z15[landuse=meadow],
+area|z15[landuse=military],
+area|z15[landuse=orchard],
+area|z15[landuse=quarry],
+area|z15[landuse=railway],
+area|z15[landuse=recreation_ground],
+area|z15[landuse=reservoir],
+area|z15[landuse=retail],
+area|z15[landuse=salt_pond],
+area|z15[landuse=village_green],
+area|z15[landuse=vineyard],
+area|z14-15[natural=bay],
+area|z15[natural=grass],
+area|z15[natural=greenfield],
+area|z15[natural=greenhouse_horticulture],
+area|z15[natural=meadow],
+area|z15[natural=orchard],
+area|z15[natural=salt_pond],
+area|z15[natural=vineyard],
+area|z14[place=farm],
+area|z13-15[place=islet],
+area|z17-[place=islet],
+node|z17-[aeroway=gate],
+node|z14-15[natural=bay],
+area|z14-[landuse=field],
+area|z15-[landuse=residential]
+{
+  text: name;
+  font-size:    12;
+  text-color:   #202020;
+}
 area|z13[aeroway=aerodrome],
 node|z13[aeroway=aerodrome]
 {
-  text-offset: 10;
+  text-offset:  10;
   text: name;
-  font-size: 12;
-  text-color: grey;
+  font-size:    12;
+  text-color:   grey;
 }
 line|z13[railway=siding]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 239;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  239;
 }
 line|z13[piste:type=nordic]
 {
-  color: #c00000;
-  width: 0.5;
-  dashes: 1.5,0.25;
-  linecap: butt;
+  color:    #c00000;
+  width:    0.5;
+  dashes:   1.5,0.25;
+  linecap:  butt;
 }
 line|z13[piste:type=downhill]
 {
-  color: #505050;
-  width: 2.5;
+  color:    #505050;
+  width:    2.5;
 }
 line|z13[piste:type=downhill][piste:difficulty=freeride]
 {
-  color: #f6dd0a;
-  width: 2.5;
+  color:    #f6dd0a;
+  width:    2.5;
 }
 line|z13[boundary=administrative][border_type=region]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 437;
-  dashes: 12,4,4,4;
+  width:    1;
+  z-index:  437;
+  dashes:   12,4,4,4;
 }
 line|z13[route=ferry]
 {
-  color: #98b8e8;
-  width: 1;
-  z-index: 411;
-  dashes: 3,2;
-  linecap: butt;
+  color:    #98b8e8;
+  width:    1;
+  z-index:  411;
+  dashes:   3,2;
+  linecap:  butt;
+}
+line|z13[waterway=ditch]
+{
+  color:    #B9D4D4;
+  width:    0.4;
+  z-index:  78;
+}
+line|z13[waterway=stream]
+{
+  color:    #B9D4D4;
+  width:    1;
+  z-index:  75;
 }
 line|z13[railway=funicular]
 {
-  color: #a0a0a0;
-  width: 1;
-  z-index: 235;
+  color:    #a0a0a0;
+  width:    1;
+  z-index:  235;
 }
 line|z13[railway=preserved]
 {
-  color: #b0b0b0;
-  width: 1.35;
-  z-index: 231;
+  color:    #b0b0b0;
+  width:    1.35;
+  z-index:  231;
 }
 line|z13[boundary=administrative][border_type=country]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 442;
-  dashes: 12,12;
+  width:    2;
+  z-index:  442;
+  dashes:   12,12;
 }
 line|z13[railway=abandoned]
 {
-  color: #b2b2b2;
-  width: 0.55;
-  z-index: 227;
-  opacity: 0.3;
+  color:    #b2b2b2;
+  width:    0.55;
+  z-index:  227;
+  opacity:  0.3;
 }
 line|z13[railway=disused]
 {
-  color: grey;
-  width: 0.85;
-  z-index: 226;
-  opacity: 0.5;
+  color:    grey;
+  width:    0.85;
+  z-index:  226;
+  opacity:  0.5;
 }
 line|z13[aeroway=runway]
 {
-  casing-linecap: butt;
-  color: #d4dcbd;
-  linecap: butt;
-  width: 2.5;
-  z-index: 240;
+  casing-linecap:    butt;
+  color:    #d4dcbd;
+  linecap:  butt;
+  width:    2.5;
+  z-index:  240;
   linejoin: bevel;
-  casing-linejoin: bevel;
+  casing-linejoin:  bevel;
   casing-width: 0.5;
   casing-color: #202020;
 }
 line|z13[boundary=administrative][admin_level=2]
 {
-  color: #eeeedd;
-  width: 6;
-  z-index: 433;
+  color:    #eeeedd;
+  width:    6;
+  z-index:  433;
   -x-kot-layer: top;
 }
 line|z13[railway=construction]
 {
-  color: #404040;
-  width: 1.35;
-  z-index: 224;
-  dashes: 1.5,1.5;
-  linecap: butt;
+  color:    #404040;
+  width:    1.35;
+  z-index:  224;
+  dashes:   1.5,1.5;
+  linecap:  butt;
 }
 line|z13[boundary=administrative][border_type=state]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 438;
-  dashes: 12,4,4,4;
+  width:    2;
+  z-index:  438;
+  dashes:   12,4,4,4;
 }
 node|z13[aerialway=station]
 {
   symbol-shape: circle;
-  symbol-fill-color: #202020;
-  symbol-size: 2;
+  symbol-fill-color:    #202020;
+  symbol-size:  2;
 }
 area|z13-15[natural=peak],
 node|z13-15[natural=peak]
 {
-  text-offset: 10;
+  text-offset:  10;
   text: name;
-  font-size: 12;
-  text-color: #404040;
+  font-size:    12;
+  text-color:   #404040;
 }
 line|z13[boundary=administrative][type=nation]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 441;
-  dashes: 12,12;
+  width:    2;
+  z-index:  441;
+  dashes:   12,12;
 }
 line|z13[aeroway=taxiway]
 {
-  casing-linecap: butt;
-  color: #d4dcbd;
-  linecap: butt;
-  width: 1;
-  z-index: 241;
+  casing-linecap:    butt;
+  color:    #d4dcbd;
+  linecap:  butt;
+  width:    1;
+  z-index:  241;
   linejoin: bevel;
-  casing-linejoin: bevel;
+  casing-linejoin:  bevel;
   casing-width: 0.25;
   casing-color: #202020;
 }
@@ -724,11 +1405,32 @@ node|z17-[amenity=shelter],
 node|z17-[amenity=school]
 {
   text-offset: 10;
-  font-size: 12;
+  font-size:    12;
   text-halo-radius: 2;
   text: name;
-  text-color: #404040;
-  text-halo-color: white;
+  text-color:   #404040;
+  text-halo-color:  white;
+}
+area|z16-[landuse=forest],
+area|z17-[tourism=zoo],
+area|z16-[amenity=townhall],
+area|z17-[tourism=caravan_site],
+area|z17-[leisure=garden],
+area|z17-[leisure=park],
+area|z17-[leisure=sports_centre],
+area|z17-[leisure=stadium],
+node|z13-[highway=motorway_junction],
+node|z17-[leisure=stadium],
+node|z17-[tourism=caravan_site],
+node|z17-[tourism=zoo],
+node|z16-[amenity=townhall],
+node|z17-[leisure=sports_centre]
+{
+  font-size:    12;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #404040;
+  text-halo-color:  white;
 }
 node|z13-[highway=motorway_junction]
 {
@@ -737,522 +1439,670 @@ node|z13-[highway=motorway_junction]
 area|z17-[leisure=garden]::int_name,
 area|z17-[leisure=park]::int_name
 {
-  font-size: 11;
+  font-size:  11;
   text-halo-radius: 2;
   text: int_name;
   text-color: #404040;
-  text-halo-color: white;
+  text-halo-color:  white;
 }
 line|z13[piste:type=downhill][piste:difficulty=intermediate]
 {
-  color: #ff4040;
-  width: 2.5;
+  color:    #ff4040;
+  width:    2.5;
 }
 line|z13[piste:type=downhill][piste:difficulty=advanced]
 {
-  color: #202020;
-  width: 2.5;
+  color:    #202020;
+  width:    2.5;
 }
 line|z13[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 434;
-  dashes: 12,12;
+  width:    2;
+  z-index:  434;
+  dashes:   12,12;
+}
+area|z14-[place=hamlet],
+area|z11-[place=village]
+{
+  fill-color:   #dddac9;
+}
+line|z13[natural=glacier]
+{
+  color:    lightblue;
+  width:    0.75;
+  z-index:  6;
 }
 line|z13[railway=monorail]
 {
-  color: #d08080;
-  width: 1;
+  color:    #d08080;
+  width:    1;
 }
 area|z13-14[leisure=park],
 node|z13-14[leisure=park]
 {
   text: name;
-  font-size: 12;
-  text-color: #5ca800;
+  font-size:    12;
+  text-color:   #5ca800;
 }
 area|z13-14[leisure=park]::int_name,
 node|z13-14[leisure=park]::int_name
 {
   text: int_name;
-  font-size: 11;
+  font-size:  11;
   text-color: #5ca800;
 }
+node|z13[place=city][capital?]
+{
+  text: name;
+  font-size:    24;
+  text-color:   grey;
+}
+area|z13-[leisure=dog_park][sport=tennis],
+area|z13-[leisure=pitch][sport=tennis],
+area|z13-[leisure=playground][sport=tennis],
+area|z13-[leisure=playing_fields][sport=tennis]
+{
+  fill-color:   #ddb298;
+}
 line|z13[railway=narrow_gauge]
 {
-  color: #a0a0a0;
-  width: 1;
-  z-index: 230;
+  color:    #a0a0a0;
+  width:    1;
+  z-index:  230;
 }
 line|z13[railway=light_rail]
 {
-  color: #90d090;
-  width: 1;
-  z-index: 687;
+  color:    #90d090;
+  width:    1;
+  z-index:  687;
 }
 line|z13[boundary=administrative][type=nation]
 {
-  color: yellow;
-  width: 6;
-  z-index: 439;
+  color:    yellow;
+  width:    6;
+  z-index:  439;
   -x-kot-layer: top;
 }
+line|z13[waterway=canal]
+{
+  color:    #B9D4D4;
+  width:    3;
+}
 line|z13[railway=rail]
 {
-  color: #b0b0b0;
-  width: 1.85;
-  z-index: 229;
+  color:    #b0b0b0;
+  width:    1.85;
+  z-index:  229;
 }
 line|z13[railway=yard]
 {
-  color: #404040;
-  width: 0.85;
-  z-index: 238;
+  color:    #404040;
+  width:    0.85;
+  z-index:  238;
 }
 line|z13[piste:type=downhill][piste:difficulty=easy]
 {
-  color: blue;
-  width: 2.5;
+  color:    blue;
+  width:    2.5;
+}
+node|z13[place=city]
+{
+  font-size:    20;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #404040;
+  text-halo-color:  #eeeedd;
 }
 line|z13[piste:type=downhill][piste:difficulty=novice]
 {
-  color: #40ff40;
-  width: 2.5;
+  color:    #40ff40;
+  width:    2.5;
 }
 line|z13[piste:type=downhill][piste:difficulty=expert]
 {
-  color: #f6800a;
-  width: 2.5;
+  color:    #f6800a;
+  width:    2.5;
+}
+area|z13[place=suburb],
+node|z13[place=suburb]
+{
+  text: name;
+  font-size:    14;
+  text-color:   #909090;
+  z-index: 20;
 }
 line|z14[railway=spur]::d1p2
 {
-  color: #909090;
-  width: 1;
-  z-index: 293;
+  color:    #909090;
+  width:    1;
+  z-index:  293;
 }
 line|z14[railway=yard]
 {
-  color: #404040;
-  width: 1.6;
-  z-index: 208;
+  color:    #404040;
+  width:    1.6;
+  z-index:  208;
 }
 area|z14-15[natural=cave_entrance],
 area|z14-15[natural=volcano],
 node|z14-15[natural=cave_entrance],
 node|z14-15[natural=volcano]
 {
-  text-offset: 10;
+  text-offset:  10;
   text: name;
-  font-size: 12;
-  text-color: #202020;
+  font-size:    12;
+  text-color:   #202020;
 }
 line|z14[railway=abandoned]::d1p3
 {
-  opacity: 0.4;
-  color: #b2b2b2;
-  linecap: butt;
-  width: 1;
-  z-index: 300;
-  dashes: 4.5,4.5;
+  opacity:  0.4;
+  color:    #b2b2b2;
+  linecap:  butt;
+  width:    1;
+  z-index:  300;
+  dashes:   4.5,4.5;
+}
+area|z14-[natural=peak],
+node|z14-[natural=peak]
+{
+  icon-image:   peak.svg;
 }
 area|z14-[man_made=pier]
 {
-  fill-color: #f1eee8;
+    fill-color: #f1eee8;
+    z-index: 488;
+}
+area|z16-[amenity=ferry_terminal],
+node|z16-[amenity=ferry_terminal]
+{
+    icon-image: slipway.svg;
 }
 line|z14[man_made=pier]::d1p3
 {
-  color: #e4e4e4;
-  width: 0.6;
+  color:    #e4e4e4;
+  width:    0.6;
+  z-index:  488;
 }
 line|z14[railway=narrow_gauge]::d1p3
 {
-  color: #404040;
-  width: 1.7;
-  z-index: 303;
-  dashes: 5.5,5.5;
-  linecap: butt;
+  color:    #404040;
+  width:    1.7;
+  z-index:  303;
+  dashes:   5.5,5.5;
+  linecap:  butt;
+}
+area|z14-[natural=cave_entrance],
+node|z14-[natural=cave_entrance]
+{
+  icon-image:   cave_entrance.svg;
 }
 line|z14[railway=monorail]::d1p2
 {
-  color: #d08080;
-  width: 1.7;
-  z-index: 556;
+  color:    #d08080;
+  width:    1.7;
+  z-index:  556;
 }
 line|z14[railway=light_rail]
 {
-  color: #095909;
-  width: 2.4;
-  z-index: 668;
+  color:    #095909;
+  width:    2.4;
+  z-index:  668;
 }
 line|z14[boundary=administrative][admin_level=6]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 521;
-  dashes: 4,20;
+  width:    1;
+  z-index:  521;
+  dashes:   4,20;
 }
 line|z14[piste:lift=j-bar],
 line|z14[piste:lift=platter],
 line|z14[piste:lift=t-bar]
 {
   text: name;
-  font-size: 12;
-  text-color: #202020;
+  font-size:    12;
+  text-color:   #202020;
 }
 line|z14[railway=construction]::d1p3
 {
-  color: #606060;
-  width: 1.7;
-  z-index: 296;
-  dashes: 1.5,1.5,1.5,4.5;
-  linecap: butt;
+  color:    #606060;
+  width:    1.7;
+  z-index:  296;
+  dashes:   1.5,1.5,1.5,4.5;
+  linecap:  butt;
+}
+area|z14-[power=generator][generator:type=photovoltaic]::d2p2,
+node|z14-[power=generator][generator:type=photovoltaic]::d2p2
+{
+  icon-image:   power_photovoltaic.svg;
 }
 line|z14-[railway=rail],
 node|z16-[aerialway=station]
 {
-  font-size: 12;
+  font-size:    12;
   text-halo-radius: 2;
   text: name;
-  text-color: #3050d8;
-  text-halo-color: white;
+  text-color:   #3050d8;
+  text-halo-color:  white;
 }
 line|z14[piste:lift=platter]::d1p2
 {
-  color: #202020;
-  width: 0.4;
+  color:    #202020;
+  width:    0.4;
 }
 line|z14[piste:lift=j-bar]::d2p2
 {
-  color: #202020;
-  width: 0.4;
+  color:    #202020;
+  width:    0.4;
+}
+area|z14-[earthquake:damage=spontaneous_camp],
+node|z14-[earthquake:damage=spontaneous_camp]
+{
+  icon-image:   earthquakecamp.svg;
 }
 line|z14[railway=construction]
 {
-  color: #606060;
-  width: 2.4;
-  z-index: 193;
-  dashes: 1.5,1.5;
-  linecap: butt;
+  color:    #606060;
+  width:    2.4;
+  z-index:  193;
+  dashes:   1.5,1.5;
+  linecap:  butt;
 }
 line|z14[railway=spur]
 {
-  color: #b0b0b0;
-  width: 1.6;
-  z-index: 207;
+  color:    #b0b0b0;
+  width:    1.6;
+  z-index:  207;
 }
 line|z14[railway=narrow_gauge]::d1p2
 {
-  color: #e6e6e6;
-  width: 1.7;
-  z-index: 286;
+  color:    #e6e6e6;
+  width:    1.7;
+  z-index:  286;
 }
 line|z14-[piste:type=downhill]
 {
-  color: #505050;
-  width: 5;
+  color:    #505050;
+  width:    5;
 }
 line|z14-[piste:type=downhill][piste:difficulty=easy]
 {
-  color: blue;
-  width: 5;
+  color:    blue;
+  width:    5;
 }
 line|z14[boundary=administrative][type=nation]
 {
-  color: yellow;
-  width: 6;
-  z-index: 532;
+  color:    yellow;
+  width:    6;
+  z-index:  532;
   -x-kot-layer: top;
 }
 line|z14[aeroway=runway]
 {
-  casing-linecap: butt;
-  color: #d4dcbd;
-  linecap: butt;
-  width: 10;
-  z-index: 314;
+  casing-linecap:    butt;
+  color:    #d4dcbd;
+  linecap:  butt;
+  width:    10;
+  z-index:  314;
   linejoin: bevel;
-  casing-linejoin: bevel;
+  casing-linejoin:  bevel;
   casing-width: 2;
   casing-color: #202020;
 }
 line|z14[route=ferry]
 {
-  color: #98b8e8;
-  width: 1;
-  z-index: 499;
-  dashes: 3,2;
-  linecap: butt;
+  color:    #98b8e8;
+  width:    1;
+  z-index:  499;
+  dashes:   3,2;
+  linecap:  butt;
 }
 line|z14[railway=rail],
 {
-  color: #888888;
-  z-index: 198;
-  width: 3;
+  color:    #888888;
+  z-index:  198;
+  width:    3;
 }
 line|z14-[piste:type=downhill][piste:difficulty=advanced]
 {
-  color: #202020;
-  width: 5;
+  color:    #202020;
+  width:    5;
 }
 line|z14[piste:type=sled]
 {
-  color: #f0e0dc;
-  width: 2.5;
+  color:    #f0e0dc;
+  width:    2.5;
+}
+line|z14[natural=spring],
+line|z14[waterway=river]
+{
+  color:    #B9D4D4;
+  width:    4;
 }
 line|z14-[piste:type=downhill][piste:difficulty=intermediate]
 {
-  color: #ff4040;
-  width: 5;
+  color:    #ff4040;
+  width:    5;
 }
 line|z14[boundary=administrative][border_type=country]
 {
-  color: yellow;
-  width: 6;
-  z-index: 533;
+  color:    yellow;
+  width:    6;
+  z-index:  533;
   -x-kot-layer: top;
 }
+area|z15-[tourism=alpine_hut],
+node|z15-[tourism=alpine_hut]
+{
+  icon-image:   alpine_hut.svg;
+}
 line|z14[boundary=national_park]
 {
-  color: #4ef94b;
-  linecap: butt;
+  color:    #4ef94b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 536;
-  dashes: 12,4,4,4;
+  width:    2;
+  z-index:  536;
+  dashes:   12,4,4,4;
 }
 line|z14[railway=preserved]::d1p3
 {
-  color: #505050;
-  width: 1.7;
-  z-index: 304;
-  dashes: 4.5,4.5;
-  linecap: butt;
+  color:    #505050;
+  width:    1.7;
+  z-index:  304;
+  dashes:   4.5,4.5;
+  linecap:  butt;
 }
 line|z14[man_made=cutline]
 {
-  color: #f1eee8;
-  width: 4;
-  z-index: 247;
-  linecap: butt;
+  color:    #f1eee8;
+  width:    4;
+  z-index:  247;
+  linecap:  butt;
+}
+area|z14-[amenity=shelter],
+node|z14-[amenity=shelter]
+{
+  icon-image:   shelter.svg;
 }
 line|z14[railway=siding]
 {
-  color: #909090;
-  width: 1.6;
-  z-index: 209;
+  color:    #909090;
+  width:    1.6;
+  z-index:  209;
 }
 line|z14[boundary=administrative][admin_level=5]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 522;
-  dashes: 12,12;
+  width:    1;
+  z-index:  522;
+  dashes:   12,12;
+}
+area|z14[place=town],
+node|z14[place=town]
+{
+  font-size:    22;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #505050;
+  text-halo-color:  #eeeedd;
 }
 line|z14-[piste:type=downhill][piste:difficulty=expert]
 {
-  color: #f6800a;
-  width: 5;
+  color:    #f6800a;
+  width:    5;
 }
-line|z14[railway=monorail]::raildash
+line|z14[waterway=stream][intermittent=yes]
 {
-  color: #590959;
-  width: 1.7;
-  z-index: 557;
-  dashes: 3.6,5.4;
-  linecap: butt;
+  color:    #B9D4D4;
+  width:    1;
+  z-index:  100;
+  dashes:   2.4,0.8;
+  linecap:  butt;
 }
-line|z14[railway=monorail]::railborder
+line|z14[railway=monorail]::raildash,
+line|z14[railway=tram]::raildash
 {
-  color: #590959;
-  width: 2;
-  z-index: 555;
+  color:    #590959;
+  width:    1.7;
+  z-index:  557;
+  dashes:   3.6,5.4;
+  linecap:  butt;
 }
-area|z15-[railway=halt],
-node|z15-[railway=halt]
+line|z14[railway=tram]::railfill
 {
-  font-size: 12;
-  text-halo-radius: 2;
-  text: name;
-  text-color: #3050d8;
-  text-offset: 10;
-  text-halo-color: white;
+  color:    #e6b7e6;
+  width:    1.7;
+  z-index:  556;
+}
+line|z14[railway=monorail]::railborder,
+line|z14[railway=tram]::railborder
+{
+  color:    #590959;
+  width:    2;
+  z-index:  555;
 }
 line|z14[piste:lift=platter]::d1p3
 {
-  color: #202020;
-  width: 4;
-  dashes: 0.4,20;
-  linecap: butt;
+  color:    #202020;
+  width:    4;
+  dashes:   0.4,20;
+  linecap:  butt;
 }
 line|z14[boundary=administrative][type=nation]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 534;
-  dashes: 12,12;
+  width:    2;
+  z-index:  534;
+  dashes:   12,12;
+}
+line|z14[waterway=dam]
+{
+  color:    #202020;
+  width:    0.38;
+  z-index:  124;
 }
 line|z14[piste:lift=j-bar]::d2p3
 {
-  color: #202020;
-  width: 4;
-  dashes: 0.4,20;
-  linecap: butt;
+  color:    #202020;
+  width:    4;
+  dashes:   0.4,20;
+  linecap:  butt;
 }
 line|z14[railway=disused]
 {
-  color: grey;
-  width: 1.6;
-  z-index: 196;
-  opacity: 0.7;
+  color:    grey;
+  width:    1.6;
+  z-index:  196;
+  opacity:  0.7;
 }
 line|z14[railway=construction]::d1p2
 {
-  color: #f2f2f2;
-  width: 1.7;
-  z-index: 279;
+  color:    #f2f2f2;
+  width:    1.7;
+  z-index:  279;
 }
 line|z14[railway=funicular]::d1p3
 {
-  color: #590909;
-  width: 0.4;
-  z-index: 309;
+  color:    #590909;
+  width:    0.4;
+  z-index:  309;
+}
+line|z14[waterway=lock]
+{
+  color:    #f8f8f8;
+  width:    5;
+  z-index:  88;
+  casing-width: 0.5;
+  casing-color: #202020;
+}
+line|z14-[natural=spring],
+line|z14-[waterway=canal],
+line|z14-[waterway=river]
+{
+  text: name;
+  font-size:    12;
+  text-color:   #507cea;
 }
 line|z14[railway=yard]::d1p2
 {
-  color: #e6e6e6;
-  width: 1;
-  z-index: 294;
+  color:    #e6e6e6;
+  width:    1;
+  z-index:  294;
 }
 line|z14-[piste:type=downhill][piste:difficulty=freeride]
 {
-  color: #f6dd0a;
-  width: 5;
+  color:    #f6dd0a;
+  width:    5;
 }
 line|z14[boundary=administrative][admin_level=2]
 {
-  color: #eeeedd;
-  width: 6;
-  z-index: 525;
+  color:    #eeeedd;
+  width:    6;
+  z-index:  525;
   -x-kot-layer: top;
 }
 line|z14[railway=rail]::d1p5
 {
-  color: #888888;
-  width: 1.8;
-  z-index: 302;
-  dashes: 4.5,4.5;
-  linecap: butt;
+  color:    #888888;
+  width:    1.8;
+  z-index:  302;
+  dashes:   4.5,4.5;
+  linecap:  butt;
 }
 line|z14[railway=rail]::d1p4
 {
-  color: #e6e6e6;
-  width: 1.8;
-  z-index: 285;
+  color:    #e6e6e6;
+  width:    1.8;
+  z-index:  285;
 }
 line|z14[railway=abandoned]::d1p2
 {
-  color: white;
-  width: 1;
-  z-index: 283;
-  opacity: 0.4;
+  color:    white;
+  width:    1;
+  z-index:  283;
+  opacity:  0.4;
 }
 line|z14[railway=siding]::d1p3
 {
-  color: #404040;
-  width: 1;
-  z-index: 313;
-  dashes: 3,6;
-  linecap: butt;
+  color:    #404040;
+  width:    1;
+  z-index:  313;
+  dashes:   3,6;
+  linecap:  butt;
 }
 line|z14[boundary=administrative][border_type=country]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 535;
-  dashes: 12,12;
+  width:    2;
+  z-index:  535;
+  dashes:   12,12;
 }
 line|z14[boundary=administrative][border_type=region]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 530;
-  dashes: 12,4,4,4;
+  width:    1;
+  z-index:  530;
+  dashes:   12,4,4,4;
+}
+line|z14[waterway=canal]
+{
+  color:    #B9D4D4;
+  width:    4;
 }
 line|z14[railway=preserved]::d1p2
 {
-  color: #e6e6e6;
-  width: 1.7;
+  color:    #e6e6e6;
+  width:    1.7;
 }
 line|z14[railway=siding]::d1p2
 {
-  color: #e6e6e6;
-  width: 1;
-  z-index: 295;
+  color:    #e6e6e6;
+  width:    1;
+  z-index:  295;
 }
 line|z14[boundary=administrative][border_type=county]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 529;
-  dashes: 4,20;
+  width:    1;
+  z-index:  529;
+  dashes:   4,20;
+}
+area|z14-[power=generator],
+node|z14-[power=generator]
+{
+  icon-image:   power_generic.svg;
 }
 line|z12-[mapswithme=grid]
 {
-  color: #202020;
-  width: 4;
-  dashes: 1,1;
-  linecap: butt;
+  color:    #202020;
+  width:    4;
+  dashes:   1,1;
+  linecap:  butt;
+}
+area|z14-16[place=suburb],
+node|z14-16[place=suburb]
+{
+  text: name;
+  font-size:    18;
+  text-color:   #909090;
+  z-index: 20;
 }
 line|z14[piste:lift=t-bar]::d2p2
 {
-  color: #202020;
-  width: 0.4;
+  color:    #202020;
+  width:    0.4;
 }
 line|z14[railway=disused]::d1p2
 {
-  color: #f2f2f2;
-  width: 1;
-  z-index: 282;
-  opacity: 0.7;
+  color:    #f2f2f2;
+  width:    1;
+  z-index:  282;
+  opacity:  0.7;
 }
 area|z14-[power=generator],
 area|z14-[power=station],
 area|z14-[power=sub_station],
 node|z14-[power=generator]
 {
-  fill-color: #bebebe;
+  fill-color:   #bebebe;
 }
 line|z14[man_made=pier]
 {
-  color: #d0d0d0;
-  width: 0.8;
+  color:    #d0d0d0;
+  width:    0.8;
+}
+line|z14[waterway=drain]
+{
+  color:    #B9D4D4;
+  width:    2.3;
 }
 area|z12-[aeroway=airport],
 area|z12-[aeroway=aerodrome],
 node|z12-[aeroway=airport],
 node|z12-[aeroway=aerodrome]
 {
-  font-size: 10;
+  font-size:    10;
   text-halo-radius: 2;
   text: name;
-  text-color: #005BE2;
-  text-halo-color: white;
-  text-offset: 10;
+  text-color:   #005BE2;
+  text-halo-color:  white;
+  text-offset:  10;
   text-position: point;
 }
 area|z12-[aeroway=airport]::int_name,
@@ -1260,850 +2110,1172 @@ area|z12-[aeroway=aerodrome]::int_name,
 node|z12-[aeroway=airport]::int_name
 node|z12-[aeroway=aerodrome]::int_name,
 {
-  font-size: 9;
+  font-size:    9;
   text-halo-radius: 2;
   text: int_name;
-  text-color: #005BE2;
-  text-halo-color: white;
-  text-offset: 10;
+  text-color:   #005BE2;
+  text-halo-color:  white;
+  text-offset:  10;
 }
 area|z13-14[aeroway=airport],
 area|z13-14[aeroway=aerodrome],
 node|z13-14[aeroway=airport],
 node|z13-14[aeroway=aerodrome]
 {
-  font-size: 11;
+  font-size:    11;
 }
 area|z13-14[aeroway=airport]::int_name,
 area|z13-14[aeroway=aerodrome]::int_name,
 area|z13-14[aeroway=airport]::int_name,
 node|z13-14[aeroway=aerodrome]::int_name
 {
-  font-size: 10;
+  font-size:    10;
 }
 area|z15-[aeroway=airport],
 area|z15-[aeroway=aerodrome],
 node|z15-[aeroway=airport],
 node|z15-[aeroway=aerodrome]
 {
-  font-size: 12;
+  font-size:    12;
 }
 area|z15-[aeroway=airport]::int_name,
 area|z15-[aeroway=aerodrome]::int_name,
 area|z15-[aeroway=airport]::int_name,
 node|z15-[aeroway=aerodrome]::int_name
 {
-  font-size: 11;
+  font-size:    11;
 }
 line|z14[railway=preserved]
 {
-  color: #909090;
-  width: 2.4;
-  z-index: 200;
+  color:    #909090;
+  width:    2.4;
+  z-index:  200;
+}
+area|z14-[power=generator][power_source=hydro]::d2p2,
+node|z14-[power=generator][power_source=hydro]::d2p2
+{
+  icon-image:   power_hydro.svg;
 }
 line|z14[railway=light_rail]::d1p3
 {
-  color: #095909;
-  width: 1.7;
-  z-index: 687;
-  dashes: 3.8,5.4;
-  linecap: butt;
+  color:    #095909;
+  width:    1.7;
+  z-index:  687;
+  dashes:   3.8,5.4;
+  linecap:  butt;
 }
 line|z14[railway=yard]::d1p3
 {
-  color: #404040;
-  width: 1;
-  z-index: 312;
-  dashes: 3,6;
-  linecap: butt;
+  color:    #404040;
+  width:    1;
+  z-index:  312;
+  dashes:   3,6;
+  linecap:  butt;
 }
 line|z14[boundary=administrative][border_type=state]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 531;
-  dashes: 12,4,4,4;
+  width:    2;
+  z-index:  531;
+  dashes:   12,4,4,4;
 }
 line|z14[railway=narrow_gauge]
 {
-  color: #606060;
-  width: 2.4;
-  z-index: 199;
+  color:    #606060;
+  width:    2.4;
+  z-index:  199;
+}
+area|z16-[power=tower],
+node|z16-[power=tower]
+{
+  icon-image:   power-tower.svg;
+}
+area|z14-[natural=beach]
+{
+  fill-color:   #eecc55;
 }
 line|z14-[piste:type=downhill][piste:difficulty=novice]
 {
-  color: #40ff40;
-  width: 5;
+  color:    #40ff40;
+  width:    5;
 }
 line|z14[railway=disused]::d1p3
 {
-  opacity: 0.7;
-  color: grey;
-  linecap: butt;
-  width: 1;
-  z-index: 299;
-  dashes: 4.5,4.5;
+  opacity:  0.7;
+  color:    grey;
+  linecap:  butt;
+  width:    1;
+  z-index:  299;
+  dashes:   4.5,4.5;
+}
+line|z14[waterway=ditch]
+{
+  color:    #B9D4D4;
+  width:    0.3;
+  z-index:  104;
+}
+area|z14-[power=generator][power_source=wind]::d2p2,
+node|z14-[power=generator][power_source=wind]::d2p2
+{
+  icon-image:   power_wind.svg;
 }
 line|z14[piste:lift=t-bar]::d2p3
 {
-  color: #202020;
-  width: 4;
-  dashes: 0.4,20;
-  linecap: butt;
+  color:    #202020;
+  width:    4;
+  dashes:   0.4,20;
+  linecap:  butt;
+}
+node|z14-15[place=city]
+{
+  font-size:    22;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #404040;
+  text-halo-color:  #eeeedd;
 }
 line|z14[railway=abandoned]
 {
-  color: #b2b2b2;
-  width: 1.6;
-  z-index: 197;
-  opacity: 0.4;
+  color:    #b2b2b2;
+  width:    1.6;
+  z-index:  197;
+  opacity:  0.4;
 }
 line|z14[aeroway=taxiway]
 {
-  casing-linecap: butt;
-  color: #d4dcbd;
-  linecap: butt;
-  width: 4;
-  z-index: 315;
+  casing-linecap:    butt;
+  color:    #d4dcbd;
+  linecap:  butt;
+  width:    4;
+  z-index:  315;
   linejoin: bevel;
-  casing-linejoin: bevel;
+  casing-linejoin:  bevel;
   casing-width: 1;
   casing-color: #202020;
 }
+area|z14[place=village],
+node|z14[place=village]
+{
+  font-size:    12;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #404040;
+  text-halo-color:  #eeeedd;
+}
 line|z14[railway=light_rail]::d1p2
 {
-  color: #b7e6e6;
-  width: 1.7;
-  z-index: 677;
+  color:    #b7e6e6;
+  width:    1.7;
+  z-index:  677;
+}
+line|z14[waterway=stream]
+{
+  color:    #B9D4D4;
+  width:    1;
+  z-index:  101;
+}
+area|z14-16[place=locality]::d1p3,
+node|z14-16[place=locality]::d1p3
+{
+  text: int_name;
+  font-size:    12;
+  text-color:   #909090;
 }
 node|z14[aerialway=station]
 {
   symbol-shape: circle;
-  symbol-fill-color: #3050d8;
-  symbol-size: 2;
+  symbol-fill-color:    #3050d8;
+  symbol-size:  2;
 }
 line|z14[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 526;
-  dashes: 12,12;
+  width:    2;
+  z-index:  526;
+  dashes:   12,12;
+}
+line|z14[waterway=stream][intermittent=ephemeral]
+{
+  color:    #B9D4D4;
+  width:    1;
+  z-index:  99;
+  dashes:   1.6,1.6;
+  linecap:  butt;
 }
 line|z14[man_made=pier]
 {
-  color: #d0d0d0;
-  width: 0.1;
-  z-index: 486;
+  color:    #d0d0d0;
+  width:    0.1;
+  z-index:  486;
 }
 line|z14[piste:type=nordic]
 {
-  color: #c00000;
-  width: 1;
-  dashes: 3,0.5;
-  linecap: butt;
+  color:    #c00000;
+  width:    1;
+  dashes:   3,0.5;
+  linecap:  butt;
 }
 line|z14[railway=funicular]
 {
-  color: #590909;
-  width: 2.4;
-  z-index: 205;
+  color:    #590909;
+  width:    2.4;
+  z-index:  205;
 }
 node|z16-[highway=motorway_junction]::d1p1
 {
-  font-size: 12;
+  font-size:    12;
   text-halo-radius: 2;
   text: name;
-  text-color: #202020;
-  text-halo-color: white;
+  text-color:   #202020;
+  text-halo-color:  white;
   text-position: center;
 }
 line|z14[railway=spur]::d1p3
 {
-  color: #ececec;
-  width: 1;
-  z-index: 311;
-  dashes: 3,6;
-  linecap: butt;
+  color:    #ececec;
+  width:    1;
+  z-index:  311;
+  dashes:   3,6;
+  linecap:  butt;
+}
+line|z14[waterway=weir]
+{
+  color:    #000044;
+  width:    0.25;
+  z-index:  123;
+}
+line|z14[natural=glacier]
+{
+  color:    lightblue;
+  width:    0.8;
+  z-index:  8;
 }
 node|z15[aerialway=station]
 {
   symbol-shape: circle;
-  symbol-fill-color: #3050d8;
-  symbol-size: 3;
+  symbol-fill-color:    #3050d8;
+  symbol-size:  3;
 }
 line|z14[railway=funicular]::d1p2
 {
-  color: #e6b7b7;
-  width: 1.7;
-  z-index: 291;
-  dashes: 3.6,5.4;
-  linecap: butt;
+  color:    #e6b7b7;
+  width:    1.7;
+  z-index:  291;
+  dashes:   3.6,5.4;
+  linecap:  butt;
 }
 line|z15[railway=spur]::d1p3
 {
-  color: #606060;
-  width: 1.4;
-  z-index: 411;
-  dashes: 6,12;
-  linecap: butt;
+  color:    #606060;
+  width:    1.4;
+  z-index:  411;
+  dashes:   6,12;
+  linecap:  butt;
 }
 line|z15[boundary=administrative][border_type=county]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 686;
-  dashes: 4,20;
+  width:    1;
+  z-index:  686;
+  dashes:   4,20;
+}
+line|z12-[railway=subway]
+{
+  color:    #0f0f4c;
+  width:    2;
+  z-index:  686;
+  dashes:   9.6,14.4;
+  linecap:  butt;
+  opacity: 0.4;
 }
 line|z15-16[man_made=cutline]
 {
-  color: #f1eee8;
-  width: 5;
+  color:    #f1eee8;
+  width:    5;
 }
 line|z15[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 680;
-  dashes: 12,12;
+  width:    2;
+  z-index:  680;
+  dashes:   12,12;
 }
-area|z15-16[building],
-node|z15-16[building],
-area|z15-16[addr:housenumber][addr:street],
-node|z15-16[addr:housenumber][addr:street]
+area|z16[building],
+node|z16[building],
+area|z16[addr:housenumber][addr:street],
+node|z16[addr:housenumber][addr:street]
 {
   text: "addr:housenumber";
-  font-size: 10;
-  text-color: #808070;
+  font-size:    10;
+  text-color:   #808070;
   text-position: center;
 }
 line|z15[railway=disused]
 {
-  color: grey;
-  width: 3.2;
-  z-index: 284;
-  opacity: 0.7;
+  color:    grey;
+  width:    3.2;
+  z-index:  284;
+  opacity:  0.7;
 }
 line|z15[railway=preserved]::d1p2
 {
-  color: #e6e6e6;
-  width: 2;
-  z-index: 388;
+  color:    #e6e6e6;
+  width:    2;
+  z-index:  388;
 }
 line|z15[piste:lift=magic_carpet]
 {
-  color: #101010;
-  width: 1.6;
+  color:    #101010;
+  width:    1.6;
 }
 line|z15[railway=abandoned]
 {
-  color: #b2b2b2;
-  width: 3.2;
-  z-index: 285;
-  opacity: 0.4;
+  color:    #b2b2b2;
+  width:    3.2;
+  z-index:  285;
+  opacity:  0.4;
 }
 line|z15[route=ferry]
 {
-  color: #98b8e8;
-  width: 1;
-  z-index: 643;
-  dashes: 7,5;
-  linecap: butt;
+  color:    #98b8e8;
+  width:    1;
+  z-index:  643;
+  dashes:   7,5;
+  linecap:  butt;
 }
 line|z15[railway=siding]::d1p3
 {
-  color: #333333;
-  width: 1.4;
-  z-index: 413;
-  dashes: 6,12;
-  linecap: butt;
+  color:    #333333;
+  width:    1.4;
+  z-index:  413;
+  dashes:   6,12;
+  linecap:  butt;
 }
 line|z15-[piste:lift=j-bar]
 {
-  color: #202020;
-  width: 0.8;
+  color:    #202020;
+  width:    0.8;
+}
+line|z15[waterway=weir]
+{
+  color:    #000044;
+  width:    1;
+  z-index:  128;
+}
+line|z15[waterway=canal]
+{
+  color:    #B9D4D4;
+  width:    4;
+}
+node|z15-[place=village]::int_name
+{
+  font-size:    12;
+  text-halo-radius: 2;
+  text: int_name;
+  text-color:   #909090;
+  text-halo-color:  #eeeedd;
+}
+area|z16[amenity=parking][!access],
+area|z16[amenity=parking][access?],
+node|z16[amenity=parking][!access],
+node|z16[amenity=parking][access?]
+{
+  icon-image:   parking-mini.svg;
+}
+area|z16-[amenity=parking][access=permissive],
+node|z16-[amenity=parking][access=permissive],
+{
+  icon-image:   parking-permissive.svg;
+}
+area|z15-[tourism=viewpoint],
+node|z15-[tourism=viewpoint],
+area|z15-[tourism=artwork],
+node|z15-[tourism=artwork]
+{
+  icon-image:   viewpoint.svg;
 }
 line|z15[railway=siding]::d1p2
 {
-  color: #e6e6e6;
-  width: 1.4;
-  z-index: 396;
+  color:    #e6e6e6;
+  width:    1.4;
+  z-index:  396;
+}
+area|z15-16[railway=tram_stop],
+node|z15-16[railway=tram_stop]
+{
+  icon-image:   tramway-mini.svg;
 }
-
 line|z15[railway=preserved]
 {
-  color: #909090;
-  width: 3.2;
-  z-index: 289;
+  color:    #909090;
+  width:    3.2;
+  z-index:  289;
 }
 line|z15-[aeroway=runway]
 {
-  casing-linecap: butt;
-  color: #d4dcbd;
-  linecap: butt;
-  width: 20;
+  casing-linecap:    butt;
+  color:    #d4dcbd;
+  linecap:  butt;
+  width:    20;
   linejoin: bevel;
-  casing-linejoin: bevel;
+  casing-linejoin:  bevel;
   casing-width: 4;
   casing-color: #202020;
 }
 line|z15-[piste:lift=t-bar]
 {
-  color: #202020;
-  width: 0.8;
+  color:    #202020;
+  width:    0.8;
 }
 line|z15[boundary=administrative][admin_level=5]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 676;
-  dashes: 12,12;
+  width:    1;
+  z-index:  676;
+  dashes:   12,12;
 }
 line|z15-[piste:lift=t-bar]::d2p2
 {
-  color: #202020;
-  width: 8;
-  dashes: 0.8,40;
-  linecap: butt;
+  color:    #202020;
+  width:    8;
+  dashes:   0.8,40;
+  linecap:  butt;
 }
 area|z15-[tourism=attraction],
 node|z15-[tourism=attraction]
 {
-  font-size: 12;
+  font-size:    12;
   text-halo-radius: 2;
   text: name;
-  text-color: #303030;
-  text-halo-color: white;
+  text-color:   #303030;
+  text-halo-color:  white;
 }
 line|z15[railway=yard]
 {
-  color: #333333;
-  width: 2.4;
+  color:    #333333;
+  width:    2.4;
 }
 line|z15[railway=spur]
 {
-  color: #606060;
-  width: 2.4;
-  z-index: 295;
+  color:    #606060;
+  width:    2.4;
+  z-index:  295;
 }
 line|z15[boundary=administrative][border_type=region]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 688;
-  dashes: 12,4,4,4;
+  width:    1;
+  z-index:  688;
+  dashes:   12,4,4,4;
+}
+line|z15[waterway=stream][intermittent=yes]
+{
+  color:    #B9D4D4;
+  width:    2;
+  dashes:   2.4,0.8;
+  linecap:  butt;
 }
 line|z15[railway=rail]
 {
-  color: #666666;
-  z-index: 287;
-  width: 4;
+  color:    #666666;
+  z-index:  287;
+  width:    4;
 }
 line|z15[railway=rail]::d1p5
 {
-  color: #666666;
-  width: 2.4;
-  dashes: 9,9;
-  linecap: butt;
-  z-index: 387;
+  color:    #666666;
+  width:    2.4;
+  dashes:   9,9;
+  linecap:  butt;
+  z-index:  387;
 }
 line|z15[railway=rail]::d1p4
 {
-  color: #e6e6e6;
-  width: 2.4;
-  z-index: 386;
+  color:    #e6e6e6;
+  width:    2.4;
+  z-index:  386;
+}
+area|z15-[aeroway=helipad],
+node|z15-[aeroway=helipad]
+{
+  icon-image:   helipad.svg;
 }
 line|z15[boundary=administrative][admin_level=8]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  dashes: 12,4,4,4;
+  width:    1;
+  dashes:   12,4,4,4;
 }
 line|z15[railway=narrow_gauge]::d1p2
 {
-  color: #e6e6e6;
-  width: 2;
-  z-index: 387;
+  color:    #e6e6e6;
+  width:    2;
+  z-index:  387;
+}
+area|z15-16[place=village],
+node|z15-16[place=village]
+{
+  font-size:    16;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #707070;
+  text-halo-color:  #eeeedd;
+}
+line|z15-[railway=tram]::d1p2
+{
+  color:    #e6b7e6;
+  width:    2;
+  z-index:  561;
+}
+area|z15-[railway=halt],
+area|z17-[railway=tram_stop],
+node|z15-[railway=halt],
+node|z17-[railway=tram_stop]
+{
+  font-size:    12;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #3050d8;
+  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;
-  width: 1;
-  z-index: 674;
+  color:    #f9574b;
+  width:    1;
+  z-index:  674;
   -x-kot-layer: top;
 }
 line|z15[boundary=administrative][border_type=city]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 0.8;
-  z-index: 685;
-  dashes: 12,4,4,4;
+  width:    0.8;
+  z-index:  685;
+  dashes:   12,4,4,4;
 }
 line|z15-[piste:lift=platter]
 {
-  color: #202020;
-  width: 0.8;
+  color:    #202020;
+  width:    0.8;
+}
+area|z15-[landuse=garages]
+{
+  fill-color:   #e1e1e5;
 }
 line|z15[railway=yard]::d1p2
 {
-  color: #e6e6e6;
-  width: 1.4;
-  z-index: 395;
+  color:    #e6e6e6;
+  width:    1.4;
+  z-index:  395;
 }
 line|z15-16[railway=light_rail]::d1p2
 {
-  color: #b7e6e6;
-  width: 2;
-  z-index: 677;
+  color:    #b7e6e6;
+  width:    2;
+  z-index:  677;
 }
 line|z15-16[railway=light_rail]
 {
-  color: #0f4c0f;
-  width: 3.2;
-  z-index: 668;
+  color:    #0f4c0f;
+  width:    3.2;
+  z-index:  668;
 }
 line|z15[boundary=national_park]
 {
-  color: #4ef94b;
-  linecap: butt;
+  color:    #4ef94b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 694;
-  dashes: 12,4,4,4;
+  width:    2;
+  z-index:  694;
+  dashes:   12,4,4,4;
 }
 line|z15[railway=preserved]::d1p3
 {
-  color: #333333;
-  width: 2;
-  z-index: 405;
-  dashes: 9,9;
-  linecap: butt;
+  color:    #333333;
+  width:    2;
+  z-index:  405;
+  dashes:   9,9;
+  linecap:  butt;
 }
 line|z15-[piste:type=nordic]
 {
-  color: #c00000;
-  width: 2;
-  dashes: 6,1;
-  linecap: butt;
+  color:    #c00000;
+  width:    2;
+  dashes:   6,1;
+  linecap:  butt;
 }
 line|z15[railway=light_rail]::d1p3
 {
-  color: #0f4c0f;
-  width: 2;
-  z-index: 687;
-  dashes: 7.6,10.8;
-  linecap: butt;
+  color:    #0f4c0f;
+  width:    2;
+  z-index:  687;
+  dashes:   7.6,10.8;
+  linecap:  butt;
 }
 area|z15-[leisure=park],
 node|z15-[leisure=park]
 {
-  font-size: 12;
+  font-size:    12;
   text-halo-radius: 2;
   text: name;
-  text-color: #5ca800;
-  text-halo-color: white;
+  text-color:   #5ca800;
+  text-halo-color:  white;
 }
 area|z15-[leisure=park]::int_name,
 node|z15-[leisure=park]::int_name
 {
-  font-size: 11;
+  font-size:  11;
   text-halo-radius: 2;
   text: int_name;
   text-color: #5ca800;
-  text-halo-color: white;
+  text-halo-color:  white;
 }
 line|z15[railway=funicular]::d1p2
 {
-  color: #e6b7b7;
-  width: 2;
-  z-index: 392;
-  dashes: 7.2,10.8;
-  linecap: butt;
+  color:    #e6b7b7;
+  width:    2;
+  z-index:  392;
+  dashes:   7.2,10.8;
+  linecap:  butt;
+}
+line|z15[waterway=ditch]
+{
+  color:    #B9D4D4;
+  width:    0.6;
+  z-index:  109;
+}
+line|z15[waterway=stream]
+{
+  color:    #B9D4D4;
+  width:    2;
+  z-index:  106;
 }
 line|z15-[aeroway=taxiway]
 {
-  casing-linecap: butt;
-  color: #d4dcbd;
-  linecap: butt;
-  width: 8;
-  z-index: 415;
+  casing-linecap:    butt;
+  color:    #d4dcbd;
+  linecap:  butt;
+  width:    8;
+  z-index:  415;
   linejoin: bevel;
-  casing-linejoin: bevel;
+  casing-linejoin:  bevel;
   casing-width: 2;
   casing-color: #202020;
 }
 line|z15[boundary=administrative][border_type=state]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 689;
-  dashes: 12,4,4,4;
+  width:    2;
+  z-index:  689;
+  dashes:   12,4,4,4;
 }
 line|z15[boundary=administrative][admin_level=2]
 {
-  color: #eeeedd;
-  width: 6;
-  z-index: 679;
+  color:    #eeeedd;
+  width:    6;
+  z-index:  679;
   -x-kot-layer: top;
 }
 line|z15[boundary=administrative][admin_level=10]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 0.8;
-  z-index: 671;
-  dashes: 4,20;
+  width:    0.8;
+  z-index:  671;
+  dashes:   4,20;
 }
 line|z15-[piste:lift=j-bar]::d2p2
 {
-  color: #202020;
-  width: 8;
-  z-index: 605;
-  dashes: 0.8,40;
-  linecap: butt;
+  color:    #202020;
+  width:    8;
+  z-index:  605;
+  dashes:   0.8,40;
+  linecap:  butt;
 }
 line|z15[railway=spur]::d1p2
 {
-  color: #e6e6e6;
-  width: 1.4;
-  z-index: 394;
+  color:    #e6e6e6;
+  width:    1.4;
+  z-index:  394;
 }
 line|z15[boundary=administrative][type=nation]
 {
-  color: yellow;
-  width: 6;
-  z-index: 690;
+  color:    yellow;
+  width:    6;
+  z-index:  690;
   -x-kot-layer: top;
 }
 line|z15[piste:lift=rope_tow]
 {
-  color: #d8d8c4;
-  width: 1;
-  z-index: 607;
-  dashes: 2,2;
-  linecap: butt;
+  color:    #d8d8c4;
+  width:    1;
+  z-index:  607;
+  dashes:   2,2;
+  linecap:  butt;
 }
 line|z15[aerialway=chair_lift]
 {
-  color: #202020;
-  width: 0.8;
-  z-index: 612;
+  color:    #202020;
+  width:    0.8;
+  z-index:  612;
 }
 line|z15[man_made=pier]
 {
-  color: #d0d0d0;
-  width: 0.2;
-  z-index: 630;
+  color:    #d0d0d0;
+  width:    0.2;
+  z-index:  630;
 }
 line|z15[boundary=administrative][admin_level=6]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 675;
-  dashes: 4,20;
+  width:    1;
+  z-index:  675;
+  dashes:   4,20;
 }
-line|z15[railway=monorail]::d1p3
+line|z15[railway=monorail]::d1p3,
+line|z15[railway=tram]::d1p3
 {
-  color: #4c0f4c;
-  width: 2;
-  z-index: 566;
-  dashes: 7.2,10.8;
-  linecap: butt;
+  color:    #4c0f4c;
+  width:    2;
+  z-index:  566;
+  dashes:   7.2,10.8;
+  linecap:  butt;
 }
 line|z15[railway=abandoned]::d1p2
 {
-  color: white;
-  width: 2;
-  z-index: 384;
-  opacity: 0.4;
+  color:    white;
+  width:    2;
+  z-index:  384;
+  opacity:  0.4;
 }
-line|z15-[railway=monorail]
+line|z15-[railway=monorail],
+line|z15-[railway=tram]
 {
-  color: #4c0f4c;
-  width: 3.2;
-  z-index: 556;
+  color:    #4c0f4c;
+  width:    3.2;
+  z-index:  556;
 }
 line|z15[aerialway=gondola]
 {
-  color: #202020;
-  width: 0.8;
-  z-index: 610;
+  color:    #202020;
+  width:    0.8;
+  z-index:  610;
 }
 line|z15[railway=narrow_gauge]::d1p3
 {
-  color: #333333;
-  width: 2;
-  z-index: 404;
-  dashes: 11,11;
-  linecap: butt;
+  color:    #333333;
+  width:    2;
+  z-index:  404;
+  dashes:   11,11;
+  linecap:  butt;
 }
 line|z15[railway=funicular]
 {
-  color: #4c0f0f;
-  width: 3.2;
-  z-index: 293;
+  color:    #4c0f0f;
+  width:    3.2;
+  z-index:  293;
 }
 line|z15[railway=yard]::d1p3
 {
-  color: #333333;
-  width: 1.4;
-  z-index: 412;
-  dashes: 6,12;
-  linecap: butt;
+  color:    #333333;
+  width:    1.4;
+  z-index:  412;
+  dashes:   6,12;
+  linecap:  butt;
 }
 line|z15[boundary=administrative][border_type=country]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 693;
-  dashes: 12,12;
+  width:    2;
+  z-index:  693;
+  dashes:   12,12;
+}
+line|z15[waterway=stream][intermittent=ephemeral]
+{
+  color:    #B9D4D4;
+  width:    2;
+  z-index:  104;
+  dashes:   1.6,1.6;
+  linecap:  butt;
 }
 line|z15[railway=construction]
 {
-  color: #606060;
-  width: 3.2;
-  z-index: 281;
-  dashes: 3,3;
-  linecap: butt;
+  color:    #606060;
+  width:    3.2;
+  z-index:  281;
+  dashes:   3,3;
+  linecap:  butt;
+}
+line|z15[waterway=lock]
+{
+  color:    #f8f8f8;
+  width:    9;
+  z-index:  92;
+  casing-width: 0.5;
+  casing-color: #202020;
 }
 line|z15[boundary=administrative][admin_level=9]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 672;
-  dashes: 12,12;
+  width:    1;
+  z-index:  672;
+  dashes:   12,12;
 }
 line|z15[man_made=pier]
 {
-  color: #d0d0d0;
-  width: 1.6;
-  z-index: 631;
+  color:    #d0d0d0;
+  width:    1.6;
+  z-index:  631;
+}
+line|z15[natural=glacier]
+{
+  color:    lightblue;
+  width:    1.6;
+  z-index:  8;
+}
+line|z15[natural=spring],
+line|z15[waterway=river]
+{
+  color:    #B9D4D4;
+  width:    5;
 }
 line|z15[aerialway=mixed_lift]
 {
-  color: #202020;
-  width: 0.8;
-  z-index: 613;
+  color:    #202020;
+  width:    0.8;
+  z-index:  613;
 }
 line|z15[railway=disused]::d1p2
 {
-  color: #f2f2f2;
-  width: 2;
-  z-index: 383;
-  opacity: 0.7;
+  color:    #f2f2f2;
+  width:    2;
+  z-index:  383;
+  opacity:  0.7;
 }
 line|z15[aerialway=cable_car]
 {
-  color: #202020;
-  width: 0.8;
-  z-index: 609;
+  color:    #202020;
+  width:    0.8;
+  z-index:  609;
 }
 line|z15[man_made=pier]::d1p3
 {
-  color: #e4e4e4;
-  width: 1.2;
-  z-index: 632;
+  color:    #e4e4e4;
+  width:    1.2;
+  z-index:  632;
 }
 line|z15[boundary=administrative][border_type=suburb]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 0.8;
-  z-index: 683;
-  dashes: 4,20;
+  width:    0.8;
+  z-index:  683;
+  dashes:   4,20;
 }
 line|z15[railway=disused]::d1p3
 {
-  opacity: 0.7;
-  color: grey;
-  linecap: butt;
-  width: 2;
-  z-index: 400;
-  dashes: 9,9;
+  opacity:  0.7;
+  color:    grey;
+  linecap:  butt;
+  width:    2;
+  z-index:  400;
+  dashes:   9,9;
+}
+line|z15[waterway=drain]
+{
+  color:    #B9D4D4;
+  width:    2.8;
+  z-index:  108;
+  casing-width: 0.35;
+  casing-color: #b0b0b0;
+}
+line|z15[waterway=dam]
+{
+  color:    #202020;
+  width:    1.5;
+  z-index:  129;
+}
+area|z15-16[landuse=construction],
+node|z15-16[landuse=construction]
+{
+  text: name;
+  font-size:    12;
+  text-color:   #808070;
 }
 line|z15[railway=abandoned]::d1p3
 {
-  opacity: 0.4;
-  color: #b2b2b2;
-  linecap: butt;
-  width: 2;
-  z-index: 401;
-  dashes: 9,9;
+  opacity:  0.4;
+  color:    #b2b2b2;
+  linecap:  butt;
+  width:    2;
+  z-index:  401;
+  dashes:   9,9;
+}
+line|z15[man_made=breakwater]
+{
+  color:    #707070;
+  width:    2;
 }
 line|z15-[railway=monorail]::d1p2
 {
-  color: #d08080;
-  width: 2;
-  z-index: 561;
+  color:    #d08080;
+  width:    2;
+  z-index:  561;
 }
 line|z15-[piste:lift=platter]::d1p2
 {
-  color: #202020;
-  width: 8;
-  dashes: 1,40;
-  linecap: butt;
+  color:    #202020;
+  width:    8;
+  dashes:   1,40;
+  linecap:  butt;
 }
 line|z15[railway=construction]::d1p2
 {
-  color: #f2f2f2;
-  width: 2;
-  z-index: 381;
+  color:    #f2f2f2;
+  width:    2;
+  z-index:  381;
 }
 line|z15[boundary=administrative][type=nation]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 692;
-  dashes: 12,12;
+  width:    2;
+  z-index:  692;
+  dashes:   12,12;
 }
 line|z15[piste:type=sled]
 {
-  color: #f0e0dc;
-  width: 5;
+  color:    #f0e0dc;
+  width:    5;
 }
 line|z15[boundary=administrative][border_type=country]
 {
-  color: yellow;
-  width: 6;
-  z-index: 691;
+  color:    yellow;
+  width:    6;
+  z-index:  691;
   -x-kot-layer: top;
 }
-area|z14-[building],
-node|z14-[building]
+area|z16[highway=bus_stop],
+area|z15[railway=tram_stop],
+node|z16[highway=bus_stop],
+node|z15[railway=tram_stop]
 {
-  fill-color: #cdcdb4;
+  font-size:    10;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #3050d8;
+  text-offset:  10;
+  text-halo-color:  white;
+}
+area|z16[highway=bus_stop]::int_name,
+area|z15[railway=tram_stop]::int_name,
+node|z16[highway=bus_stop]::int_name,
+node|z15[railway=tram_stop]::int_name
+{
+  font-size:  9;
+  text-halo-radius: 2;
+  text: int_name;
+  text-color: #3050d8;
+  text-offset:  10;
+  text-halo-color:  white;
+  z-index: 20;
+}
+area|z15-[amenity=fuel],
+node|z15-[amenity=fuel]
+{
+  icon-image:   petrolstation.svg;
+}
+area|z15-[leisure=nature_reserve],
+node|z15-[leisure=nature_reserve]
+{
+  icon-image:   bird.svg;
+}
+area|z15-[building],
+node|z15-[building]
+{
+  fill-color:   #cdcdb4;
 }
 line|z15[railway=narrow_gauge]
 {
-  color: #333333;
-  width: 3.2;
-  z-index: 288;
+  color:    #333333;
+  width:    3.2;
+  z-index:  288;
 }
 line|z15[boundary=administrative][border_type=municipality]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 684;
-  dashes: 12,4,4,4;
+  width:    1;
+  z-index:  684;
+  dashes:   12,4,4,4;
 }
 line|z15[railway=construction]::d1p3
 {
-  color: #606060;
-  width: 2;
-  z-index: 397;
-  dashes: 3,3,3,9;
-  linecap: butt;
+  color:    #606060;
+  width:    2;
+  z-index:  397;
+  dashes:   3,3,3,9;
+  linecap:  butt;
 }
 line|z15[railway=siding]
 {
-  color: #333333;
-  width: 2.4;
-  z-index: 297;
+  color:    #333333;
+  width:    2.4;
+  z-index:  297;
 }
 line|z15[railway=funicular]::d1p3
 {
-  color: #4c0f0f;
-  width: 0.5;
-  z-index: 410;
+  color:    #4c0f0f;
+  width:    0.5;
+  z-index:  410;
+}
+*|z17-[highway=bus_stop],
+*|z16[railway=tram_stop]
+{
+  font-size:    11;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #3050d8;
+  text-offset:  10;
+  text-halo-color:  white;
+  z-index: 20;
+}
+*|z17-[highway=bus_stop]::int_name,
+*|z16[railway=tram_stop]::int_name
+{
+  font-size:  10;
+  text-halo-radius: 2;
+  text: int_name;
+  text-color: #3050d8;
+  text-offset:  10;
+  text-halo-color:  white;
+  z-index: 20;
 }
 line|z16[communication=line]
 {
-  color: #f080f0;
-  width: 0.4;
-  z-index: 873;
-  dashes: 8,4;
-  linecap: butt;
+  color:    #f080f0;
+  width:    0.4;
+  z-index:  873;
+  dashes:   8,4;
+  linecap:  butt;
+}
+area|z16-[amenity=bureau_de_change],
+node|z16-[amenity=bureau_de_change]
+{
+  icon-image:   bureau_de_change.svg;
 }
 line|z16[boundary=administrative][admin_level=5]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 932;
-  dashes: 12,12;
+  width:    1;
+  z-index:  932;
+  dashes:   12,12;
 }
 line|z16[railway=narrow_gauge]::d1p3
 {
-  color: #333333;
-  width: 2;
-  z-index: 647;
-  dashes: 14,14;
-  linecap: butt;
+  color:    #333333;
+  width:    2;
+  z-index:  647;
+  dashes:   14,14;
+  linecap:  butt;
+}
+line|z16[waterway=lock]
+{
+  color:    #f8f8f8;
+  width:    10;
+  z-index:  94;
+  casing-width: 1;
+  casing-color: #202020;
 }
 line|z16[aerialway=chair_lift]
 {
-  color: #202020;
-  width: 1.6;
-  z-index: 852;
+  color:    #202020;
+  width:    1.6;
+  z-index:  852;
 }
 line|z16[piste:type=sled]
 {
-  color: #f0e0dc;
-  width: 10;
-  z-index: 840;
+  color:    #f0e0dc;
+  width:    10;
+  z-index:  840;
 }
 line|z16[man_made=pipeline][location=overground]
 {
-  color: #a0a0a0;
-  width: 0.8;
-  z-index: 875;
-  dashes: 8,4;
-  linecap: butt;
+  color:    #a0a0a0;
+  width:    0.8;
+  z-index:  875;
+  dashes:   8,4;
+  linecap:  butt;
 }
 line|z16[railway=spur]
 {
-  color: #606060;
-  width: 2.4;
-  z-index: 547;
+  color:    #606060;
+  width:    2.4;
+  z-index:  547;
+}
+area|z16-[amenity=restaurant],
+node|z16-[amenity=restaurant]
+{
+  icon-image:   restaurant.svg;
 }
 line|z16[railway=funicular]
 {
-  color: #4c0f0f;
-  width: 3.2;
-  z-index: 546;
+  color:    #4c0f0f;
+  width:    3.2;
+  z-index:  546;
 }
 line|z16[man_made=pier]::d1p3
 {
-  color: #e4e4e4;
-  width: 2.4;
-  z-index: 857;
+  color:    #e4e4e4;
+  width:    2.4;
+  z-index:  857;
 }
 line|z16[boundary=administrative][admin_level=2],
 line|z16[boundary=administrative][border_type=country]
 {
-  color: #eeeedd;
-  width: 6;
-  z-index: 933;
+  color:    #eeeedd;
+  width:    6;
+  z-index:  933;
   -x-kot-layer: top;
 }
 area|z17-[amenity],
@@ -2115,694 +3287,1112 @@ node|z17-[historic],
 node|z17-[office][office!=no],
 node|z17-[tourism]
 {
-  font-size: 11;
+  font-size:    11;
   text-halo-radius: 2;
   text: name;
+  text-color:   #404040;
+  text-offset:  10;
+  text-halo-color:  white;
+  z-index: 1;
+}
+area|z17-[amenity=bus_station]::int_name,
+node|z17-[amenity=bus_station]::int_name
+{
+  font-size:  10;
+  text-halo-radius: 2;
+  text: int_name;
   text-color: #404040;
-  text-offset: 10;
-  text-halo-color: white;
+  text-offset:  10;
+  text-halo-color:  white;
   z-index: 1;
 }
-
 line|z16[railway=disused]
 {
-  color: grey;
-  width: 3.2;
-  z-index: 540;
-  opacity: 0.7;
+  color:    grey;
+  width:    3.2;
+  z-index:  540;
+  opacity:  0.7;
 }
 line|z16[boundary=administrative][admin_level=10]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 0.8;
-  z-index: 927;
-  dashes: 4,20;
+  width:    0.8;
+  z-index:  927;
+  dashes:   4,20;
+}
+area|z17-[amenity=atm],
+node|z17-[amenity=atm]
+{
+  icon-image:   atm.svg;
 }
 line|z16[railway=light_rail]::d1p3
 {
-  color: #0f4c0f;
-  width: 2;
-  z-index: 687;
-  dashes: 9.6,14.4;
-  linecap: butt;
+  color:    #0f4c0f;
+  width:    2;
+  z-index:  687;
+  dashes:   9.6,14.4;
+  linecap:  butt;
+}
+area|z17-[military=bunker],
+area|z16-[historic=battlefield],
+node|z17-[military=bunker],
+node|z16-[historic=battlefield]
+{
+  icon-image:   cannon.svg;
+}
+area|z16-[amenity=hunting_stand],
+node|z16-[amenity=hunting_stand]
+{
+  icon-image:   hunting_closed_high.svg;
+}
+line|z16[waterway=dam]
+{
+  color:    #202020;
+  width:    3;
+  z-index:  131;
 }
 line|z16[railway=spur]::d1p2
 {
-  color: #e6e6e6;
-  width: 1.2;
-  z-index: 638;
+  color:    #e6e6e6;
+  width:    1.2;
+  z-index:  638;
 }
 line|z16[railway=spur]::d1p3
 {
-  color: #333333;
-  width: 1.2;
-  z-index: 652;
-  dashes: 8,16;
-  linecap: butt;
+  color:    #333333;
+  width:    1.2;
+  z-index:  652;
+  dashes:   8,16;
+  linecap:  butt;
 }
 area|z16[building]::int_name,
 node|z16[building]::int_name
 {
   text: int_name;
-  font-size: 11;
-  text-color: #808070;
+  font-size:    11;
+  text-color:   #808070;
+}
+line|z16[waterway=drain]
+{
+  width:    4;
+  z-index:  110;
+  color:    #B9D4D4;
+  casing-width: 0.6;
+  casing-color: #b0b0b0;
+}
+area|z16-[amenity=fast_food],
+node|z16-[amenity=fast_food]
+{
+  icon-image:   fastfood.svg;
 }
+
 line|z16[boundary=administrative][border_type=country]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 945;
-  dashes: 12,12;
+  width:    2;
+  z-index:  945;
+  dashes:   12,12;
+}
+area|z16-[amenity=bench],
+node|z16-[amenity=bench]
+{
+  icon-image:   bench.svg;
 }
 area|z16-[power=pole],
 node|z16-[power=pole]
 {
-  icon-image: symbols/power-pole.svg;
+  icon-image:   power-pole.svg;
 }
 area|z16-[natural=peak],
 node|z16-[natural=peak]
 {
-  text-offset: 10;
+  text-offset:  10;
   text: name;
-  font-size: 16;
-  text-color: #404040;
+  font-size:    16;
+  text-color:   #404040;
 }
 line|z16[route=ferry]
 {
-  color: #a8c8d8;
-  width: 2;
-  z-index: 877;
-  dashes: 12,8;
-  linecap: butt;
+  color:    #a8c8d8;
+  width:    2;
+  z-index:  877;
+  dashes:   12,8;
+  linecap:  butt;
+}
+area|z16-[landuse=allotments],
+area|z16-[landuse=basin],
+area|z16-[landuse=brownfield],
+area|z16-[landuse=cemetery],
+area|z16-[landuse=commercial],
+area|z16-[landuse=farm],
+area|z16-[landuse=farmland],
+area|z16-[landuse=farmyard],
+area|z16-[landuse=forest],
+area|z16-[landuse=garages],
+area|z16-[landuse=grass],
+area|z16-[landuse=greenfield],
+area|z16-[landuse=greenhouse_horticulture],
+area|z16-[landuse=industrial],
+area|z16-[landuse=landfill],
+area|z16-[landuse=meadow],
+area|z16-[landuse=military],
+area|z16-[landuse=orchard],
+area|z16-[landuse=quarry],
+area|z16-[landuse=railway],
+area|z16-[landuse=recreation_ground],
+area|z16-[landuse=reservoir],
+area|z16-[landuse=retail],
+area|z16-[landuse=salt_pond],
+area|z16-[landuse=village_green],
+area|z16-[landuse=vineyard],
+area|z16-[natural=bay],
+area|z16-[natural=grass],
+area|z16-[natural=greenfield],
+area|z16-[natural=greenhouse_horticulture],
+area|z16-[natural=meadow],
+area|z16-[natural=orchard],
+area|z16-[natural=salt_pond],
+area|z16-[natural=vineyard],
+area|z16[place=islet],
+node|z16-[landuse=allotments],
+node|z16-[landuse=basin],
+node|z16-[landuse=brownfield],
+node|z16-[landuse=cemetery],
+node|z16-[landuse=commercial],
+node|z16-[landuse=farm],
+node|z16-[landuse=farmland],
+node|z16-[landuse=farmyard],
+node|z16-[landuse=forest],
+node|z16-[landuse=garages],
+node|z16-[landuse=grass],
+node|z16-[landuse=greenfield],
+node|z16-[landuse=greenhouse_horticulture],
+node|z16-[landuse=industrial],
+node|z16-[landuse=landfill],
+node|z16-[landuse=meadow],
+node|z16-[landuse=military],
+node|z16-[landuse=orchard],
+node|z16-[landuse=quarry],
+node|z16-[landuse=railway],
+node|z16-[landuse=recreation_ground],
+node|z16-[landuse=reservoir],
+node|z16-[landuse=retail],
+node|z16-[landuse=salt_pond],
+node|z16-[landuse=village_green],
+node|z16-[landuse=vineyard],
+node|z16-[natural=bay],
+node|z16-[natural=grass],
+node|z16-[natural=greenfield],
+node|z16-[natural=greenhouse_horticulture],
+node|z16-[natural=meadow],
+node|z16-[natural=orchard],
+node|z16-[natural=salt_pond],
+node|z16-[natural=vineyard],
+node|z16[place=islet]
+{
+  text: name;
+  font-size:    16;
+  text-color:   #202020;
 }
 line|z16[railway=razed]
 {
-  opacity: 0.3;
-  color: #c2c2c2;
-  linecap: butt;
-  width: 3.2;
-  z-index: 541;
-  dashes: 2.4,2.4;
+  opacity:  0.3;
+  color:    #c2c2c2;
+  linecap:  butt;
+  width:    3.2;
+  z-index:  541;
+  dashes:   2.4,2.4;
 }
 line|z16[railway=abandoned]
 {
-  color: #b2b2b2;
-  width: 3.2;
-  z-index: 542;
-  opacity: 0.4;
+  color:    #b2b2b2;
+  width:    3.2;
+  z-index:  542;
+  opacity:  0.4;
 }
 area|z16[aerialway=station],
 node|z16[aerialway=station]
 {
   symbol-shape: circle;
-  symbol-fill-color: #3050d8;
-  symbol-size: 4;
+  symbol-fill-color:    #3050d8;
+  symbol-size:  4;
+}
+area|z16-[amenity=bicycle_rental],
+node|z16-[amenity=bicycle_rental]
+{
+  icon-image:   bicycle_rental.svg;
 }
 line|z16[power=minor_line]
 {
-  color: white;
-  width: 1.6;
-  z-index: 862;
-  opacity: 0.5;
+  color:    white;
+  width:    1.6;
+  z-index:  862;
+  opacity:  0.5;
+}
+area|z16-[amenity=theatre],
+node|z16-[amenity=theatre]
+{
+  icon-image:   theatre.svg;
+}
+area|z16-[amenity=embassy],
+node|z16-[amenity=embassy]
+{
+  icon-image:   embassy.svg;
 }
 line|z16[railway=rail]::d1p3
 {
-  color: #666666;
-  z-index: 543;
-  width: 4;
+  color:    #666666;
+  z-index:  543;
+  width:    4;
+}
+area|z16-[tourism=guest_house],
+area|z16-[tourism=hostel],
+node|z16-[tourism=guest_house],
+node|z16-[tourism=hostel]
+{
+  icon-image:   hostel.svg;
+}
+area|z16-[tourism=hotel],
+area|z16-[tourism=motel],
+node|z16-[tourism=hotel],
+node|z16-[tourism=motel]
+{
+  icon-image:   hotel.svg;
 }
 line|z16[boundary=administrative][border_type=region]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 940;
-  dashes: 12,4,4,4;
+  width:    1;
+  z-index:  940;
+  dashes:   12,4,4,4;
 }
-line|z16-[railway=monorail]::d1p3
+line|z16-[railway=monorail]::d1p3,
+line|z16-[railway=tram]::d1p3
 {
-  color: #4c0f4c;
-  width: 2;
-  z-index: 566;
-  dashes: 9.6,14.4;
-  linecap: butt;
+  color:    #4c0f4c;
+  width:    2;
+  z-index:  566;
+  dashes:   9.6,14.4;
+  linecap:  butt;
 }
 line|z16[railway=rail]
 {
-  color: #e6e6e6;
-  width: 2.4;
-  z-index: 631;
+  color:    #e6e6e6;
+  width:    2.4;
+  z-index:  631;
+}
+area|z16-[railway=subway_entrance],
+node|z16-[railway=subway_entrance]
+{
+  icon-image:   subway.svg;
 }
 line|z16[piste:lift=rope_tow]
 {
-  color: #d8d8c4;
-  width: 2;
-  dashes: 4,4;
-  linecap: butt;
+  color:    #d8d8c4;
+  width:    2;
+  dashes:   4,4;
+  linecap:  butt;
+}
+line|z16-[waterway=ditch],
+line|z16-[waterway=drain],
+line|z16-[waterway=stream]
+{
+  text: name;
+  font-size:    12;
+  text-color:   navy;
 }
 line|z16[barrier=hedge]
 {
-  color: #b0b0b0;
-  width: 0.4;
-  z-index: 879;
+  color:    #b0b0b0;
+  width:    0.4;
+  z-index:  879;
+}
+area|z16-[amenity=restaurant][hotel],
+node|z16-[amenity=restaurant][hotel]
+{
+  icon-image:   hotel_and_restaurant.svg;
 }
 line|z16[boundary=administrative][border_type=county]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 939;
-  dashes: 4,20;
+  width:    1;
+  z-index:  939;
+  dashes:   4,20;
 }
 line|z16[boundary=administrative][admin_level=8]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 929;
-  dashes: 12,4,4,4;
+  width:    1;
+  z-index:  929;
+  dashes:   12,4,4,4;
 }
 
 line|z16[boundary=administrative][admin_level=6]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 931;
-  dashes: 4,20;
+  width:    1;
+  z-index:  931;
+  dashes:   4,20;
+}
+area|z16-[place=hamlet],
+node|z16-[place=hamlet]
+{
+  text: name;
+  font-size:    16;
+  text-color:   #606060;
 }
 line|z16[boundary=national_park]
 {
-  color: #4ef94b;
-  linecap: butt;
+  color:    #4ef94b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 946;
-  dashes: 12,4,4,4;
+  width:    2;
+  z-index:  946;
+  dashes:   12,4,4,4;
 }
 line|z16[railway=narrow_gauge]::d1p2
 {
-  color: #e6e6e6;
-  width: 2;
-  z-index: 632;
+  color:    #e6e6e6;
+  width:    2;
+  z-index:  632;
+}
+area|z17-[amenity=toilets],
+node|z17-[amenity=toilets],
+{
+  icon-image:   toilets.svg;
 }
 line|z16[boundary=administrative][border_type=suburb]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 0.8;
-  z-index: 936;
-  dashes: 4,20;
+  width:    0.8;
+  z-index:  936;
+  dashes:   4,20;
 }
 area|z16-[natural=cave_entrance],
 area|z16-[natural=volcano],
 node|z16-[natural=cave_entrance],
 node|z16-[natural=volcano]
 {
-  text-offset: 10;
+  text-offset:  10;
   text: name;
-  font-size: 16;
-  text-color: #202020;
+  font-size:    16;
+  text-color:   #202020;
+}
+area|z16-[railway=level_crossing],
+node|z16-[railway=level_crossing]
+{
+  icon-image:   railway-crossing.svg;
+}
+line|z16[barrier=bollard],
+node|z16[barrier=block],
+node|z16[barrier=bollard],
+node|z16[barrier=stile],
+node|z16[barrier=toll_booth]
+{
+  symbol-shape: circle;
+  symbol-fill-color:    #707070;
+  symbol-size:  1.2;
 }
 line|z16[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 935;
-  dashes: 12,12;
+  width:    2;
+  z-index:  935;
+  dashes:   12,12;
 }
 line|z16[railway=preserved]::d1p2
 {
-  color: #e6e6e6;
-  width: 2;
-  z-index: 633;
+  color:    #e6e6e6;
+  width:    2;
+  z-index:  633;
 }
 line|z16[railway=abandoned]::d1p3
 {
-  opacity: 0.4;
-  color: #b2b2b2;
-  linecap: butt;
-  width: 2.4;
-  z-index: 645;
-  dashes: 12,12;
+  opacity:  0.4;
+  color:    #b2b2b2;
+  linecap:  butt;
+  width:    2.4;
+  z-index:  645;
+  dashes:   12,12;
 }
 line|z16[communication=line][location=underground]
 {
-  color: #f080f0;
-  width: 0.4;
-  z-index: 871;
-  dashes: 1.2,2,1.2,2,1.2,4.4;
-  linecap: butt;
+  color:    #f080f0;
+  width:    0.4;
+  z-index:  871;
+  dashes:   1.2,2,1.2,2,1.2,4.4;
+  linecap:  butt;
 }
 line|z16[man_made=pipeline]::d1p2
 {
-  color: #a0a0a0;
-  width: 0.8;
-  z-index: 876;
-  dashes: 1.2,2,1.2,2,1.2,4.4;
-  linecap: butt;
+  color:    #a0a0a0;
+  width:    0.8;
+  z-index:  876;
+  dashes:   1.2,2,1.2,2,1.2,4.4;
+  linecap:  butt;
 }
 line|z16[railway=disused]::d1p3
 {
-  opacity: 0.7;
-  color: grey;
-  linecap: butt;
-  width: 2.4;
-  z-index: 643;
-  dashes: 12,12;
+  opacity:  0.7;
+  color:    grey;
+  linecap:  butt;
+  width:    2.4;
+  z-index:  643;
+  dashes:   12,12;
 }
 line|z16[railway=funicular]::d1p2
 {
-  color: #e6b7b7;
-  width: 2;
-  z-index: 636;
-  dashes: 9.6,14.4;
-  linecap: butt;
+  color:    #e6b7b7;
+  width:    2;
+  z-index:  636;
+  dashes:   9.6,14.4;
+  linecap:  butt;
 }
 line|z16[power=minor_line]::d1p2
 {
-  color: grey;
-  width: 0.8;
-  z-index: 863;
-  dashes: 1.2,2,1.2,2,1.2,4.4;
-  linecap: butt;
+  color:    grey;
+  width:    0.8;
+  z-index:  863;
+  dashes:   1.2,2,1.2,2,1.2,4.4;
+  linecap:  butt;
 }
 line|z16[boundary=administrative][type=nation]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 944;
-  dashes: 12,12;
+  width:    2;
+  z-index:  944;
+  dashes:   12,12;
+}
+area|z16-[amenity=fire_station],
+node|z16-[amenity=fire_station]
+{
+  icon-image:   firebrigade.svg;
 }
 line|z16[railway=construction]::d1p3
 {
-  color: #606060;
-  width: 2.4;
-  z-index: 641;
-  dashes: 4,4,4,12;
-  linecap: butt;
+  color:    #606060;
+  width:    2.4;
+  z-index:  641;
+  dashes:   4,4,4,12;
+  linecap:  butt;
+}
+
+area|z16[amenity=taxi],
+area|z17-[amenity=taxi],
+node|z16[amenity=taxi],
+node|z17-[amenity=taxi]
+{
+  icon-image:   taxi.svg;
 }
 line|z16[railway=preserved]::d1p3
 {
-  color: #333333;
-  width: 2;
-  z-index: 648;
-  dashes: 12,12;
-  linecap: butt;
+  color:    #333333;
+  width:    2;
+  z-index:  648;
+  dashes:   12,12;
+  linecap:  butt;
 }
 line|z16[railway=narrow_gauge]
 {
-  color: #333333;
-  width: 3.2;
-  z-index: 544;
+  color:    #333333;
+  width:    3.2;
+  z-index:  544;
 }
 line|z16[power=minor_line]::d1p3
 {
-  color: grey;
-  width: 0.8;
-  z-index: 864;
-  dashes: 8,4;
-  linecap: butt;
+  color:    grey;
+  width:    0.8;
+  z-index:  864;
+  dashes:   8,4;
+  linecap:  butt;
+}
+area|z16-[amenity=fountain],
+node|z16-[amenity=fountain]
+{
+  icon-image:   fountain.svg;
+}
+line|z16[waterway=stream][intermittent=yes]
+{
+  color:    #B9D4D4;
+  width:    2;
+  dashes:   2.4,0.8;
+  linecap:  butt;
 }
 line|z16[barrier=wall]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 887;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  887;
 }
 line|z16[barrier=city_wall]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 898;
-  dashes: 0.0,2.0;
-  linecap: butt;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  898;
+  dashes:   0.0,2.0;
+  linecap:  butt;
 }
 line|z16[railway=siding]
 {
-  color: #333333;
-  width: 2.4;
-  z-index: 549;
+  color:    #333333;
+  width:    2.4;
+  z-index:  549;
+}
+area|z16-[amenity=car_rental],
+node|z16-[amenity=car_rental]
+{
+  icon-image:   car_rental.svg;
 }
 line|z16[railway=siding]::d1p2
 {
-  color: #e6e6e6;
-  width: 1.2;
-  z-index: 640;
+  color:    #e6e6e6;
+  width:    1.2;
+  z-index:  640;
+}
+area|z17-[amenity=drinking_water],
+node|z17-[amenity=drinking_water]
+{
+  icon-image:   drinking_water.svg;
+}
+line|z16[man_made=breakwater]
+{
+  color:    #707070;
+  width:    4;
+  z-index:  854;
 }
 line|z16[railway=funicular]::d1p3
 {
-  color: #4c0f0f;
-  width: 0.6;
-  z-index: 651;
+  color:    #4c0f0f;
+  width:    0.6;
+  z-index:  651;
+}
+area|z16-[amenity=marketplace],
+node|z16-[amenity=marketplace]
+{
+  icon-image:   supermarket.svg;
+}
+area|z16[amenity=pharmacy],
+area|z16-[amenity=doctors],
+area|z17-[amenity=pharmacy],
+node|z16[amenity=pharmacy],
+node|z16-[amenity=doctors],
+node|z17-[amenity=pharmacy]
+{
+  icon-image:   pharmacy.svg;
 }
 line|z16[aerialway=cable_car]
 {
-  color: #202020;
-  width: 1.6;
-  z-index: 850;
+  color:    #202020;
+  width:    1.6;
+  z-index:  850;
 }
 area|z16[railway=platform],
 line|z16[railway=platform]
 {
-  color: #bbbbbb;
-  width: 4;
-  z-index: 580;
+  color:    #bbbbbb;
+  width:    4;
+  z-index:  580;
 }
 line|z16[railway=disused]::d1p2
 {
-  color: #f2f2f2;
-  width: 2.4;
-  z-index: 627;
-  opacity: 0.7;
+  color:    #f2f2f2;
+  width:    2.4;
+  z-index:  627;
+  opacity:  0.7;
+}
+line|z16[waterway=stream]
+{
+  color:    #B9D4D4;
+  width:    2;
+  z-index:  108;
+}
+area|z16-[amenity=place_of_worship],
+node|z16-[amenity=place_of_worship]
+{
+  icon-image:   religion.svg;
 }
 line|z16[barrier=retaining_wall]
 {
-  color: #b0b0b0;
-  width: 1;
+  color:    #b0b0b0;
+  width:    1;
 }
 line|z16[communication=line]
 {
-  color: white;
-  width: 1.6;
-  z-index: 870;
-  opacity: 0.5;
+  color:    white;
+  width:    1.6;
+  z-index:  870;
+  opacity:  0.5;
+}
+line|z16[natural=spring],
+line|z16[waterway=river]
+{
+  color:    #B9D4D4;
+  width:    8;
+}
+area|z16-[railway=crossing],
+node|z16-[railway=crossing]
+{
+  icon-image:   railway-crossing-small.svg;
+}
+area|z16-[barrier=lift_gate],
+node|z16-[barrier=lift_gate]
+{
+  icon-image:   barrier.svg;
+}
+area|z16-[amenity=bar],
+area|z16-[amenity=nightclub],
+node|z16-[amenity=bar],
+node|z16-[amenity=nightclub]
+{
+  icon-image:   bar.svg;
+}
+area|z16-[historic=ruins],
+node|z16-[historic=ruins]
+{
+  icon-image:   ruins.svg;
 }
 line|z16[man_made=pier]
 {
-  color: #d0d0d0;
-  width: 0.4;
-  z-index: 855;
+  color:    #d0d0d0;
+  width:    0.4;
+  z-index:  855;
 }
 line|z16[boundary=administrative][border_type=state]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 941;
-  dashes: 12,4,4,4;
+  width:    2;
+  z-index:  941;
+  dashes:   12,4,4,4;
+}
+area|z16-[amenity=speed_trap],
+node|z16-[amenity=speed_trap]
+{
+  icon-image:   speed_trap.svg;
+}
+area|z16-[historic=memorial],
+area|z16-[historic=monument],
+node|z16-[historic=memorial],
+node|z16-[historic=monument]
+{
+  icon-image:   memorial.svg;
 }
 line|z16[boundary=administrative][admin_level=7]
 {
-  color: #f9574b;
-  width: 1;
-  z-index: 930;
+  color:    #f9574b;
+  width:    1;
+  z-index:  930;
   -x-kot-layer: top;
 }
 line|z16[railway=rail]::d1p5
 {
-  color: #666666;
-  width: 2.4;
-  z-index: 646;
-  dashes: 12,12;
-  linecap: butt;
+  color:    #666666;
+  width:    2.4;
+  z-index:  646;
+  dashes:   12,12;
+  linecap:  butt;
 }
 line|z16[man_made=pier]::d1p2
 {
-  color: #d0d0d0;
-  width: 3.2;
+  color:    #d0d0d0;
+  width:    3.2;
 }
 line|z16[barrier=city_wall]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 897;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  897;
 }
 area|z16-[railway=platform],
 line|z16-[railway=platform]
 {
-  fill-color: #bbbbbb;
+  fill-color:   #bbbbbb;
 }
 line|z16[boundary=administrative][border_type=municipality]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 937;
-  dashes: 12,4,4,4;
+  width:    1;
+  z-index:  937;
+  dashes:   12,4,4,4;
 }
 line|z16[railway=razed]::d1p2
 {
-  color: white;
-  width: 2.4;
-  z-index: 628;
-  opacity: 0.3;
+  color:    white;
+  width:    2.4;
+  z-index:  628;
+  opacity:  0.3;
 }
 line|z16[railway=razed]::d1p3
 {
-  opacity: 0.3;
-  color: #c2c2c2;
-  linecap: butt;
-  width: 2.4;
-  z-index: 644;
-  dashes: 2.4,2.4,2.4,2.4,2.4,12;
+  opacity:  0.3;
+  color:    #c2c2c2;
+  linecap:  butt;
+  width:    2.4;
+  z-index:  644;
+  dashes:   2.4,2.4,2.4,2.4,2.4,12;
 }
 line|z16[railway=abandoned]::d1p2
 {
-  color: white;
-  width: 2.4;
-  z-index: 629;
-  opacity: 0.4;
+  color:    white;
+  width:    2.4;
+  z-index:  629;
+  opacity:  0.4;
+}
+area|z16-[historic=castle],
+node|z16-[historic=castle]
+{
+  icon-image:   castle.svg;
+}
+line|z16[waterway=canal]
+{
+  color:    #B9D4D4;
+  width:    4.8;
 }
 line|z16[barrier=hedge]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 881;
-  dashes: 0.0,2.0;
-  linecap: butt;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  881;
+  dashes:   0.0,2.0;
+  linecap:  butt;
+}
+area|z17-[amenity=police],
+node|z17-[amenity=police]
+{
+  icon-image:   police.svg;
 }
 line|z16[railway=construction]
 {
-  color: #606060;
-  width: 3.2;
-  z-index: 538;
-  dashes: 4,4;
-  linecap: butt;
+  color:    #606060;
+  width:    3.2;
+  z-index:  538;
+  dashes:   4,4;
+  linecap:  butt;
 }
 line|z16[boundary=administrative][border_type=city]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 0.8;
-  z-index: 938;
-  dashes: 12,4,4,4;
+  width:    0.8;
+  z-index:  938;
+  dashes:   12,4,4,4;
+}
+area|z17-[amenity=hospital],
+node|z17-[amenity=hospital]
+{
+  icon-image:   hospital.svg;
+}
+line|z16[waterway=ditch]
+{
+  color:    #B9D4D4;
+  width:    0.6;
+  z-index:  111;
 }
 line|z16[railway=construction]::d1p2
 {
-  color: #f2f2f2;
-  width: 2.4;
-  z-index: 625;
+  color:    #f2f2f2;
+  width:    2.4;
+  z-index:  625;
+}
+node|z16-[natural=tree]
+{
+  icon-image:   tree.svg;
 }
 line|z16[boundary=administrative][type=nation]
 {
-  color: yellow;
-  width: 6;
-  z-index: 942;
+  color:    yellow;
+  width:    6;
+  z-index:  942;
   -x-kot-layer: top;
 }
-*|z16-[amenity=cafe]
+area|z16-[amenity=cafe],
+node|z16-[amenity=cafe]
 {
+  icon-image:   cafe.svg;
   z-index: 1;
 }
 line|z16[man_made=pipeline]
 {
-  color: white;
-  width: 1.6;
-  z-index: 874;
-  opacity: 0.5;
+  color:    white;
+  width:    1.6;
+  z-index:  874;
+  opacity:  0.5;
+}
+area|z16-[amenity=car_sharing],
+node|z16-[amenity=car_sharing]
+{
+  icon-image:   car_sharing.svg;
+}
+line|z16[waterway=stream][intermittent=ephemeral]
+{
+  color:    #B9D4D4;
+  width:    2;
+  z-index:  106;
+  dashes:   1.6,1.6;
+  linecap:  butt;
+}
+line|z16[waterway=weir]
+{
+  color:    #000044;
+  width:    2;
+  z-index:  130;
 }
 line|z16[piste:lift=magic_carpet]
 {
-  color: #101010;
-  width: 3.2;
+  color:    #101010;
+  width:    3.2;
 }
 line|z16[railway=preserved]
 {
-  color: #909090;
-  width: 3.2;
+  color:    #909090;
+  width:    3.2;
+}
+area|z16-[amenity=cinema],
+node|z16-[amenity=cinema]
+{
+  icon-image:   cinema.svg;
+}
+area|z16-[historic=archaeological_site],
+area|z16-[historic=museum],
+area|z16-[tourism=museum],
+node|z16-[historic=archaeological_site],
+node|z16-[historic=museum],
+node|z16-[tourism=museum]
+{
+  icon-image:   museum.svg;
 }
 line|z16[barrier=retaining_wall]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 891;
-  dashes: 0.0,2.0;
-  linecap: butt;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  891;
+  dashes:   0.0,2.0;
+  linecap:  butt;
 }
 line|z16[railway=siding]::d1p3
 {
-  color: #333333;
-  width: 1.2;
-  z-index: 654;
-  dashes: 8,16;
-  linecap: butt;
+  color:    #333333;
+  width:    1.2;
+  z-index:  654;
+  dashes:   8,16;
+  linecap:  butt;
+}
+line|z16[natural=glacier]
+{
+  color:    lightblue;
+  width:    3.2;
+  z-index:  8;
 }
 line|z16[boundary=administrative][admin_level=9]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 928;
-  dashes: 12,12;
+  width:    1;
+  z-index:  928;
+  dashes:   12,12;
+}
+area|z16-[amenity=post_office],
+node|z16-[amenity=post_office]
+{
+  icon-image:   postoffice.svg;
 }
 line|z16[aerialway=mixed_lift]
 {
-  color: #202020;
-  width: 1.6;
-  z-index: 853;
+  color:    #202020;
+  width:    1.6;
+  z-index:  853;
 }
 line|z16[railway=yard]::railfill
 {
-  color: #e6e6e6;
-  width: 1.2;
-  z-index: 639;
+  color:    #e6e6e6;
+  width:    1.2;
+  z-index:  639;
 }
 line|z16[railway=yard]::railborder
 {
-  color: #333333;
-  width: 2.4;
-  z-index: 548;
+  color:    #333333;
+  width:    2.4;
+  z-index:  548;
 }
 line|z16[railway=yard]::raildash
 {
-  color: #333333;
-  width: 1.2;
-  z-index: 653;
-  dashes: 8,16;
-  linecap: butt;
+  color:    #333333;
+  width:    1.2;
+  z-index:  653;
+  dashes:   8,16;
+  linecap:  butt;
+}
+area|z16-[amenity=library],
+node|z16-[amenity=library],
+{
+  icon-image:   library.svg;
 }
+
 line|z16[aerialway=gondola]
 {
-  color: #202020;
-  width: 1.6;
-  z-index: 851;
+  color:    #202020;
+  width:    1.6;
+  z-index:  851;
 }
 line|z16-[power=line]
 {
-  color: white;
-  width: 1.6;
-  z-index: 858;
-  opacity: 0.5;
+  color:    white;
+  width:    1.6;
+  z-index:  858;
+  opacity:  0.5;
 }
 line|z16-[power=line]::d1p2
 {
-  color: grey;
-  width: 0.8;
-  z-index: 861;
-  dashes: 16,8;
-  linecap: butt;
+  color:    grey;
+  width:    0.8;
+  z-index:  861;
+  dashes:   16,8;
+  linecap:  butt;
 }
 line|z16-[power=line][location=underground]
 {
-  color: grey;
-  width: 0.8;
-  z-index: 859;
-  dashes: 2.4,4,2.4,4,2.4,8.8;
-  linecap: butt;
+  color:    grey;
+  width:    0.8;
+  z-index:  859;
+  dashes:   2.4,4,2.4,4,2.4,8.8;
+  linecap:  butt;
 }
 line|z17-[piste:lift=magic_carpet]
 {
-  color: #101010;
-  width: 6.4;
+  color:    #101010;
+  width:    6.4;
 }
 line|z17-[railway=rail]
 {
-  color: #666666;
-  z-index: 568;
-  width: 4.4;
+  color:    #666666;
+  z-index:  568;
+  width:    4.4;
 }
 line|z17-[man_made=pipeline]
 {
-  color: white;
-  width: 1.6;
-  z-index: 947;
-  opacity: 0.5;
+  color:    white;
+  width:    1.6;
+  z-index:  947;
+  opacity:  0.5;
 }
 line|z17-[aerialway=cable_car]
 {
-  color: #202020;
-  width: 3.2;
-  z-index: 909;
+  color:    #202020;
+  width:    3.2;
+  z-index:  909;
 }
 line|z17-[boundary=administrative][admin_level=7]
 {
-  color: #f9574b;
-  width: 0.8;
-  z-index: 965;
+  color:    #f9574b;
+  width:    0.8;
+  z-index:  965;
   -x-kot-layer: top;
 }
 line|z17-[boundary=administrative][border_type=county]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 973;
-  dashes: 4,20;
+  width:    1;
+  z-index:  973;
+  dashes:   4,20;
+}
+area|z17-[sport=gymnastics],
+area|z17-[sport=multi],
+area|z17-[sport=skiing],
+node|z17-[sport=gymnastics],
+node|z17-[sport=multi],
+node|z17-[sport=skiing]
+{
+  icon-image:   gymnastics-borderless.svg;
 }
 line|z17-[communication=line]::d1p2
 {
-  color: #f080f0;
-  width: 0.8;
-  z-index: 933;
-  dashes: 8,4;
-  linecap: butt;
+  color:    #f080f0;
+  width:    0.8;
+  z-index:  933;
+  dashes:   8,4;
+  linecap:  butt;
+}
+area|z17-[leisure=playground],
+node|z17-[leisure=playground]
+{
+  icon-image:   playground.svg;
 }
 line|z17-[railway=razed]::d1p3
 {
-  opacity: 0.3;
-  color: #c2c2c2;
-  linecap: butt;
-  width: 2;
-  z-index: 678;
-  dashes: 2.4,2.4,2.4,2.4,2.4,12;
+  opacity:  0.3;
+  color:    #c2c2c2;
+  linecap:  butt;
+  width:    2;
+  z-index:  678;
+  dashes:   2.4,2.4,2.4,2.4,2.4,12;
 }
 line|z17-[railway=construction]::d1p2
 {
-  color: #f2f2f2;
-  width: 2;
-  z-index: 659;
+  color:    #f2f2f2;
+  width:    2;
+  z-index:  659;
 }
 line|z17-[railway=narrow_gauge]
 {
-  color: #333333;
-  width: 3.2;
-  z-index: 569;
+  color:    #333333;
+  width:    3.2;
+  z-index:  569;
+}
+area|z17-[sport=diving],
+area|z17-[sport=scuba_diving],
+node|z17-[sport=diving],
+node|z17-[sport=scuba_diving]
+{
+  icon-image:   diving-borderless.svg;
+}
+line|z17-[waterway=canal]
+{
+  width:    6.4;
+  color:    #B9D4D4;
+  casing-width: 0.8;
+  casing-color: #b0b0b0;
 }
 line|z17-[barrier=retaining_wall]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 958;
-  dashes: 0.0,4.0;
-  linecap: butt;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  958;
+  dashes:   0.0,4.0;
+  linecap:  butt;
 }
 line|z17-[boundary=administrative][type=nation]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 978;
-  dashes: 12,12;
+  width:    2;
+  z-index:  978;
+  dashes:   12,12;
 }
 area|z17-[building],
 node|z17-[building],
@@ -2810,590 +4400,852 @@ area|z17-[addr:housenumber][addr:street],
 node|z17-[addr:housenumber][addr:street]
 {
   text: "addr:housenumber";
-  font-size: 11;
-  text-color: #404040;
+  font-size:    11;
+  text-color:   #404040;
   text-position: center;
 }
+line|z17-[waterway=lock]
+{
+  color:    #f8f8f8;
+  width:    12;
+  z-index:  96;
+  casing-width: 2;
+  casing-color: #202020;
+}
+area|z17-[sport=cricket],
+node|z17-[sport=cricket]
+{
+  icon-image:   cricket-borderless.svg;
+}
 line|z17-[man_made=pipeline]::d1p2
 {
-  color: #a0a0a0;
-  width: 0.8;
-  z-index: 949;
-  dashes: 1.2,2,1.2,2,1.2,4.4;
-  linecap: butt;
+  color:    #a0a0a0;
+  width:    0.8;
+  z-index:  949;
+  dashes:   1.2,2,1.2,2,1.2,4.4;
+  linecap:  butt;
 }
 line|z17-[man_made=pipeline][location=overground]
 {
-  color: #a0a0a0;
-  width: 0.8;
-  z-index: 948;
-  dashes: 8,4;
-  linecap: butt;
+  color:    #a0a0a0;
+  width:    0.8;
+  z-index:  948;
+  dashes:   8,4;
+  linecap:  butt;
 }
 line|z17-[boundary=administrative][admin_level=2]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 969;
-  dashes: 12,12;
+  width:    2;
+  z-index:  969;
+  dashes:   12,12;
 }
 line|z17-[railway=narrow_gauge]::d1p2
 {
-  color: #e6e6e6;
-  width: 2;
-  z-index: 665;
+  color:    #e6e6e6;
+  width:    2;
+  z-index:  665;
 }
 line|z17-[railway=light_rail]
 {
-  color: #0f4c0f;
-  width: 3.2;
-  z-index: 571;
+  color:    #0f4c0f;
+  width:    3.2;
+  z-index:  571;
 }
 line|z17-[power=minor_line]::d1p3
 {
-  color: grey;
-  width: 0.8;
-  z-index: 923;
-  dashes: 8,4;
-  linecap: butt;
+  color:    grey;
+  width:    0.8;
+  z-index:  923;
+  dashes:   8,4;
+  linecap:  butt;
 }
 line|z17-[railway=yard]::d1p2
 {
-  color: #e6e6e6;
-  width: 1.36;
-  z-index: 672;
+  color:    #e6e6e6;
+  width:    1.36;
+  z-index:  672;
 }
 line|z17-[aerialway=mixed_lift]
 {
-  color: #202020;
-  width: 3.2;
-  z-index: 912;
+  color:    #202020;
+  width:    3.2;
+  z-index:  912;
+}
+line|z17-[natural=spring],
+line|z17-[waterway=river]
+{
+  color:    #B9D4D4;
+  width:    16;
+}
+area|z14-[tourism=camp_site],
+node|z14-[tourism=camp_site]
+{
+  icon-image:   campsite.svg;
+}
+area|z17-[leisure=slipway],
+node|z17-[leisure=slipway]
+{
+  icon-image:   slipway.svg;
 }
 line|z17-[boundary=administrative][border_type=country]::d2p2
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 979;
-  dashes: 12,12;
+  width:    2;
+  z-index:  979;
+  dashes:   12,12;
+}
+area|z17-[amenity=parking][location=underground][fee?],
+area|z17-[amenity=parking][parking=multi-storey][fee?],
+node|z17-[amenity=parking][location=underground][fee?],
+node|z17-[amenity=parking][parking=multi-storey][fee?]
+{
+  icon-image:   parking_roof_fee-permissive.svg;
 }
 line|z17-[railway=yard]
 {
-  color: #333333;
-  width: 2.4;
-  z-index: 577;
+  color:    #333333;
+  width:    2.4;
+  z-index:  577;
 }
 line|z17-[boundary=administrative][type=nation]
 {
-  color: yellow;
-  width: 6;
-  z-index: 976;
+  color:    yellow;
+  width:    6;
+  z-index:  976;
   -x-kot-layer: top;
 }
 line|z17-[barrier=hedge]
 {
-  color: #202020;
-  width: 0.8;
-  z-index: 953;
-  dashes: 0.0,4.0;
-  linecap: butt;
+  color:    #202020;
+  width:    0.8;
+  z-index:  953;
+  dashes:   0.0,4.0;
+  linecap:  butt;
+}
+line|z17-[waterway=weir]
+{
+  color:    #000044;
+  width:    3;
+  z-index:  132;
 }
 area|z17-[power=generator]::d1p3,
 node|z17-[power=generator]::d1p3
 {
-  z-index: 927;
+  z-index:  927;
 }
 line|z17-[railway=rail]::d1p5
 {
-  color: #666666;
-  width: 3.2;
-  z-index: 681;
-  dashes: 12,12;
-  linecap: butt;
+  color:    #666666;
+  width:    3.2;
+  z-index:  681;
+  dashes:   12,12;
+  linecap:  butt;
 }
 line|z17-[communication=line]
 {
-  color: white;
-  width: 1.6;
-  z-index: 930;
-  opacity: 0.5;
+  color:    white;
+  width:    1.6;
+  z-index:  930;
+  opacity:  0.5;
+}
+area|z17-[sport=equestrian],
+node|z17-[sport=equestrian]
+{
+  icon-image:   equestrian-borderless.svg;
 }
 line|z17-[boundary=administrative][border_type=suburb]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 0.8;
-  z-index: 970;
-  dashes: 4,20;
+  width:    0.8;
+  z-index:  970;
+  dashes:   4,20;
 }
 line|z17-[boundary=administrative][admin_level=9]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 963;
-  dashes: 12,12;
+  width:    1;
+  z-index:  963;
+  dashes:   12,12;
 }
 line|z17-[boundary=administrative][admin_level=5]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 967;
-  dashes: 12,12;
+  width:    1;
+  z-index:  967;
+  dashes:   12,12;
 }
 line|z17-[man_made=pier]
 {
-  color: #d0d0d0;
-  width: 0.4;
-  z-index: 914;
+  color:    #d0d0d0;
+  width:    0.4;
+  z-index:  914;
 }
 line|z17-[boundary=administrative][admin_level=6]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 966;
-  dashes: 4,20;
+  width:    1;
+  z-index:  966;
+  dashes:   4,20;
 }
 line|z17-[railway=spur]::d1p2
 {
-  color: #e6e6e6;
-  width: 1.36;
-  z-index: 671;
+  color:    #e6e6e6;
+  width:    1.36;
+  z-index:  671;
+}
+area|z17-[sport=curling],
+node|z17-[sport=curling]
+{
+  icon-image:   curling-borderless.svg;
 }
 line|z17-[railway=preserved]::d1p2
 {
-  color: #e6e6e6;
-  width: 2;
-  z-index: 666;
+  color:    #e6e6e6;
+  width:    2;
+  z-index:  666;
+}
+area|z17-[amenity=college],
+area|z17-[amenity=university],
+node|z17-[amenity=college],
+node|z17-[amenity=university]
+{
+  icon-image:   university.svg;
+}
+area|z17-[place=suburb],
+node|z17-[place=suburb]
+{
+  text: name;
+  font-size:    20;
+  text-color:   #909090;
+  z-index: 20;
+}
+area|z17-[place=village],
+node|z17-[place=village]
+{
+  font-size:    18;
+  text-halo-radius: 2;
+  text: name;
+  text-color:   #707070;
+  text-halo-color:  #eeeedd;
 }
 line|z17-[boundary=administrative][border_type=city]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 0.8;
-  z-index: 972;
-  dashes: 12,4,4,4;
+  width:    0.8;
+  z-index:  972;
+  dashes:   12,4,4,4;
 }
 line|z17-[railway=disused]::d1p3
 {
-  opacity: 0.7;
-  color: grey;
-  linecap: butt;
-  width: 2;
-  z-index: 677;
-  dashes: 12,12;
+  opacity:  0.7;
+  color:    grey;
+  linecap:  butt;
+  width:    2;
+  z-index:  677;
+  dashes:   12,12;
 }
 node|z17-[man_made=cairn]
 {
   symbol-shape: circle;
-  symbol-fill-color: white;
-  symbol-size: 3.2;
+  symbol-fill-color:    white;
+  symbol-size:  3.2;
 }
 line|z17-[aerialway=chair_lift]
 {
-  color: #202020;
-  width: 3.2;
+  color:    #202020;
+  width:    3.2;
+}
+area|z17-[amenity=parking][location=underground],
+area|z17-[amenity=parking][parking=multi-storey],
+node|z17-[amenity=parking][location=underground],
+node|z17-[amenity=parking][parking=multi-storey]
+{
+  icon-image:   parking_roof-permissive.svg;
+}
+area|z17-[tourism=picnic_site],
+node|z17-[tourism=picnic_site]
+{
+  icon-image:   picnic.svg;
+}
+area|z17-[amenity=parking][!access],
+area|z17-[amenity=parking][access?],
+node|z17-[amenity=parking][!access],
+node|z17-[amenity=parking][access?]
+{
+  icon-image:   parking.svg;
+}
+area|z17-[sport=american_football],
+area|z17-[sport=australian_football],
+area|z17-[sport=football],
+node|z17-[sport=american_football],
+node|z17-[sport=australian_football],
+node|z17-[sport=football]
+{
+  icon-image:   football-borderless.svg;
+}
+area|z16-[amenity=parking][fee?],
+node|z16-[amenity=parking][fee?]
+{
+  icon-image:   parking_fee.svg;
 }
 area|z17-[railway=platform],
 line|z17-[railway=platform]
 {
-  color: #bbbbbb;
-  width: 8;
+  color:    #bbbbbb;
+  width:    8;
 }
 line|z17-[barrier=wall]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 956;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  956;
 }
 line|z17-[communication=line][location=underground]
 {
-  color: #f080f0;
-  width: 0.8;
-  z-index: 931;
-  dashes: 1.2,2,1.2,2,1.2,4.4;
-  linecap: butt;
+  color:    #f080f0;
+  width:    0.8;
+  z-index:  931;
+  dashes:   1.2,2,1.2,2,1.2,4.4;
+  linecap:  butt;
+}
+area|z17-[man_made=windmill],
+node|z17-[man_made=windmill]
+{
+  icon-image:   windmill.svg;
 }
 line|z17-[boundary=administrative][admin_level=11]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 0.8;
-  z-index: 961;
-  dashes: 0.8,5.2;
+  width:    0.8;
+  z-index:  961;
+  dashes:   0.8,5.2;
 }
 line|z17-[railway=siding]::d1p3
 {
-  color: #333333;
-  width: 1.36;
-  z-index: 692;
-  dashes: 7.2,16.8;
-  linecap: butt;
+  color:    #333333;
+  width:    1.36;
+  z-index:  692;
+  dashes:   7.2,16.8;
+  linecap:  butt;
+}
+area|z17-[sport=swimming],
+node|z17-[sport=swimming]
+{
+  icon-image:   swimming-borderless.svg;
+}
+area|z17-[amenity=kindergarten],
+node|z17-[amenity=kindergarten]
+{
+  icon-image:   kindergarten2.svg;
+}
+area|z17-[place=locality],
+node|z17-[place=locality]
+{
+  text: name;
+  font-size:    16;
+  text-color:   #404040;
 }
 line|z17-[route=ferry]
 {
-  color: #a8c8d8;
-  width: 2;
-  z-index: 950;
-  dashes: 12,8;
-  linecap: butt;
+  color:    #a8c8d8;
+  width:    2;
+  z-index:  950;
+  dashes:   12,8;
+  linecap:  butt;
+}
+line|z17-[waterway=ditch]
+{
+  color:    #B9D4D4;
+  width:    0.8;
+  z-index:  113;
 }
 line|z17-[piste:lift=rope_tow]
 {
-  color: #d8d8c4;
-  width: 4;
-  dashes: 8,8;
-  linecap: butt;
+  color:    #d8d8c4;
+  width:    4;
+  dashes:   8,8;
+  linecap:  butt;
+}
+line|z17-[waterway=stream]
+{
+  color:    #B9D4D4;
+  width:    2.2;
+  z-index:  110;
 }
 line|z17-[railway=siding]::d1p2
 {
-  color: #e6e6e6;
-  width: 1.36;
-  z-index: 673;
+  color:    #e6e6e6;
+  width:    1.36;
+  z-index:  673;
 }
 line|z17-[man_made=cutline]
 {
-  color: #f1eee8;
-  width: 6;
-  z-index: 276;
+  color:    #f1eee8;
+  width:    6;
+  z-index:  276;
 }
 line|z17-[railway=razed]::d1p2
 {
-  color: white;
-  width: 2;
-  z-index: 662;
-  opacity: 0.3;
+  color:    white;
+  width:    2;
+  z-index:  662;
+  opacity:  0.3;
+}
+area|z17-[place=suburb]::d1p3,
+node|z17-[place=suburb]::d1p3
+{
+  text: int_name;
+  font-size:    14;
+  text-color:   #a0a0a0;
+  z-index: 20;
+}
+area|z17-[sport=tennis],
+node|z17-[sport=tennis]
+{
+  icon-image:   tennis-borderless.svg;
+}
+area|z17-[sport=soccer],
+node|z17-[sport=soccer]
+{
+  icon-image:   soccer-borderless.svg;
 }
 line|z17-[man_made=pier]::d1p3
 {
-  color: #e4e4e4;
-  width: 2.4;
-  z-index: 916;
+  color:    #e4e4e4;
+  width:    2.4;
+  z-index:  916;
+}
+area|z17-[sport=shooting],
+node|z17-[sport=shooting]
+{
+  icon-image:   shooting-borderless.svg;
+}
+area|z17-[tourism=information][information=guidepost],
+node|z17-[tourism=information][information=guidepost]
+{
+  icon-image:   information-guidepost.svg;
 }
 line|z16-[barrier=fence]
 {
-  color: #b0b0b0;
-  width: .1;
-  z-index: 954;
+  color:    #b0b0b0;
+  width:    .1;
+  z-index:  954;
 }
 line|z17-[railway=abandoned]
 {
-  color: #b2b2b2;
-  width: 3.2;
-  z-index: 565;
-  opacity: 0.4;
+  color:    #b2b2b2;
+  width:    3.2;
+  z-index:  565;
+  opacity:  0.4;
 }
 line|z17-[barrier=retaining_wall]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 957;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  957;
 }
 line|z17-[railway=construction]
 {
-  color: #606060;
-  width: 3.2;
-  z-index: 561;
-  dashes: 4,4;
-  linecap: butt;
+  color:    #606060;
+  width:    3.2;
+  z-index:  561;
+  dashes:   4,4;
+  linecap:  butt;
 }
 line|z17-[railway=disused]
 {
-  color: grey;
-  width: 3.2;
-  z-index: 564;
-  opacity: 0.7;
+  color:    grey;
+  width:    3.2;
+  z-index:  564;
+  opacity:  0.7;
 }
 line|z17-[railway=light_rail]::d1p3
 {
-  color: #0f4c0f;
-  width: 2;
-  z-index: 684;
-  dashes: 9.6,14.4;
-  linecap: butt;
+  color:    #0f4c0f;
+  width:    2;
+  z-index:  684;
+  dashes:   9.6,14.4;
+  linecap:  butt;
 }
 line|z17-[railway=rail]::d1p4
 {
-  color: #e6e6e6;
-  width: 3.2;
-  z-index: 664;
+  color:    #e6e6e6;
+  width:    3.2;
+  z-index:  664;
 }
 line|z17-[railway=spur]
 {
-  color: #333333;
-  width: 2.4;
-  z-index: 576;
+  color:    #333333;
+  width:    2.4;
+  z-index:  576;
 }
 line|z17-[barrier=city_wall]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 959;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  959;
 }
 line|z17-[railway=construction]::d1p3
 {
-  color: #606060;
-  width: 2;
-  z-index: 674;
-  dashes: 4,4,4,12;
-  linecap: butt;
+  color:    #606060;
+  width:    2;
+  z-index:  674;
+  dashes:   4,4,4,12;
+  linecap:  butt;
 }
 line|z17-[boundary=administrative][admin_level=10]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 0.8;
-  z-index: 962;
-  dashes: 4,20;
+  width:    0.8;
+  z-index:  962;
+  dashes:   4,20;
 }
 line|z17-[railway=siding]
 {
-  color: #333333;
-  width: 2.4;
-  z-index: 578;
+  color:    #333333;
+  width:    2.4;
+  z-index:  578;
 }
 line|z17-[railway=disused]::d1p2
 {
-  color: #f2f2f2;
-  width: 2;
-  z-index: 661;
-  opacity: 0.7;
+  color:    #f2f2f2;
+  width:    2;
+  z-index:  661;
+  opacity:  0.7;
 }
 line|z17-[boundary=administrative][border_type=region]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 974;
-  dashes: 12,4,4,4;
+  width:    2;
+  z-index:  974;
+  dashes:   12,4,4,4;
+}
+line|z17-[barrier=bollard],
+node|z17-[barrier=block],
+node|z17-[barrier=bollard],
+node|z17-[barrier=stile],
+node|z17-[barrier=toll_booth]
+{
+  symbol-shape: circle;
+  symbol-fill-color:    #707070;
+  symbol-size:  1.6;
 }
 line|z17-[boundary=administrative][border_type=state]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  dashes: 12,4,4,4;
+  width:    2;
+  dashes:   12,4,4,4;
 }
 area|z17-[building]::int_name,
 node|z17-[building]::int_name
 {
   text: int_name;
-  font-size: 11;
-  text-color: #404040;
+  font-size:    11;
+  text-color:   #404040;
 }
 area|z15-[historic=ship]
 {
-  fill-color: #cdcdb4;
+  fill-color:   #cdcdb4;
   text: name;
   font-size: 11;
 }
+line|z17-[waterway=stream][intermittent=yes]
+{
+  color:    #B9D4D4;
+  width:    2.2;
+  z-index:  108;
+  dashes:   2.4,0.8;
+  linecap:  butt;
+}
 line|z17-[railway=razed]
 {
-  opacity: 0.3;
-  color: #c2c2c2;
-  linecap: butt;
-  width: 3.2;
-  z-index: 567;
-  dashes: 2.4,2.4;
+  opacity:  0.3;
+  color:    #c2c2c2;
+  linecap:  butt;
+  width:    3.2;
+  z-index:  567;
+  dashes:   2.4,2.4;
 }
 line|z17-[boundary=national_park]
 {
-  color: #4ef94b;
-  linecap: butt;
+  color:    #4ef94b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 2;
-  z-index: 980;
-  dashes: 12,4,4,4;
+  width:    2;
+  z-index:  980;
+  dashes:   12,4,4,4;
 }
 line|z17-[railway=funicular]
 {
-  color: #4c0f0f;
-  width: 3.2;
-  z-index: 574;
+  color:    #4c0f0f;
+  width:    3.2;
+  z-index:  574;
 }
 line|z17-[man_made=pier]::d1p2
 {
-  color: #d0d0d0;
-  width: 3.2;
-  z-index: 915;
+  color:    #d0d0d0;
+  width:    3.2;
+  z-index:  915;
 }
 line|z17-[railway=abandoned]::d1p3
 {
-  opacity: 0.4;
-  color: #b2b2b2;
-  linecap: butt;
-  width: 2;
-  z-index: 679;
-  dashes: 12,12;
+  opacity:  0.4;
+  color:    #b2b2b2;
+  linecap:  butt;
+  width:    2;
+  z-index:  679;
+  dashes:   12,12;
 }
 line|z17-[barrier=city_wall]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 960;
-  dashes: 0.0,4.0;
-  linecap: butt;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  960;
+  dashes:   0.0,4.0;
+  linecap:  butt;
 }
 line|z17-[railway=light_rail]::d1p2
 {
-  color: #b7e6e6;
-  width: 2;
-  z-index: 667;
+  color:    #b7e6e6;
+  width:    2;
+  z-index:  667;
 }
 line|z17-[power=minor_line]::d1p2
 {
-  color: grey;
-  width: 0.8;
-  dashes: 1.2,2,1.2,2,1.2,4.4;
-  linecap: butt;
+  color:    grey;
+  width:    0.8;
+  dashes:   1.2,2,1.2,2,1.2,4.4;
+  linecap:  butt;
 }
 area|z17-[aerialway=station],
 node|z17-[aerialway=station]
 {
   symbol-shape: circle;
-  symbol-fill-color: #3050d8;
-  symbol-size: 3.2;
+  symbol-fill-color:    #3050d8;
+  symbol-size:  3.2;
 }
 line|z17-[railway=funicular]::d1p2
 {
-  color: #e6b7b7;
-  width: 2;
-  z-index: 670;
-  dashes: 9.6,14.4;
-  linecap: butt;
+  color:    #e6b7b7;
+  width:    2;
+  z-index:  670;
+  dashes:   9.6,14.4;
+  linecap:  butt;
 }
 line|z17-[aerialway=gondola]
 {
-  color: #202020;
-  width: 3.2;
-  z-index: 910;
+  color:    #202020;
+  width:    3.2;
+  z-index:  910;
 }
 line|z17-[railway=preserved]
 {
-  color: #909090;
-  width: 3.2;
-  z-index: 570;
+  color:    #909090;
+  width:    3.2;
+  z-index:  570;
 }
 line|z17-[boundary=administrative][border_type=municipality]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 971;
-  dashes: 12,4,4,4;
+  width:    1;
+  z-index:  971;
+  dashes:   12,4,4,4;
 }
 line|z17-[railway=preserved]::d1p3
 {
-  color: #333333;
-  width: 2;
-  z-index: 683;
-  dashes: 12,12;
-  linecap: butt;
+  color:    #333333;
+  width:    2;
+  z-index:  683;
+  dashes:   12,12;
+  linecap:  butt;
+}
+line|z17-[man_made=breakwater]
+{
+  color:    #707070;
+  width:    6.4;
+  z-index:  913;
 }
 line|z17-[boundary=administrative][admin_level=8]
 {
-  color: #f9574b;
-  linecap: butt;
+  color:    #f9574b;
+  linecap:  butt;
   -x-kot-layer: top;
-  width: 1;
-  z-index: 964;
-  dashes: 12,4,4,4;
+  width:    1;
+  z-index:  964;
+  dashes:   12,4,4,4;
+}
+line|z17-[waterway=stream][intermittent=ephemeral]
+{
+  color:    #B9D4D4;
+  width:    2.2;
+  z-index:  109;
+  dashes:   1.6,1.6;
+  linecap:  butt;
+}
+area|z17-[landuse=construction],
+node|z17-[landuse=construction]
+{
+  text: name;
+  font-size:    14;
+  text-color:   #404040;
 }
 line|z17-[railway=funicular]::d1p3
 {
-  color: #4c0f0f;
-  width: 0.64;
-  z-index: 688;
+  color:    #4c0f0f;
+  width:    0.64;
+  z-index:  688;
+}
+line|z17-[waterway=drain]
+{
+  width:    6.4;
+  z-index:  112;
+  color:    #B9D4D4;
+  casing-width: 0.8;
+  casing-color: #b0b0b0;
 }
 line|z17-[boundary=administrative][border_type=country]
 {
-  color: yellow;
-  width: 6;
-  z-index: 977;
+  color:    yellow;
+  width:    6;
+  z-index:  977;
   -x-kot-layer: top;
 }
 line|z17-[boundary=administrative][admin_level=2]
 {
-  color: #eeeedd;
-  width: 6;
+  color:    #eeeedd;
+  width:    6;
   -x-kot-layer: top;
 }
 line|z17-[railway=abandoned]::d1p2
 {
-  color: white;
-  width: 2;
-  z-index: 663;
-  opacity: 0.4;
+  color:    white;
+  width:    2;
+  z-index:  663;
+  opacity:  0.4;
+}
+line|z17-[natural=glacier]
+{
+  color:    lightblue;
+  width:    6.4;
+  z-index:  8;
 }
 line|z17-[railway=yard]::d1p3
 {
-  color: #333333;
-  width: 1.36;
-  z-index: 691;
-  dashes: 7.2,16.8;
-  linecap: butt;
+  color:    #333333;
+  width:    1.36;
+  z-index:  691;
+  dashes:   7.2,16.8;
+  linecap:  butt;
 }
 line|z17-[railway=spur]::d1p3
 {
-  color: #333333;
-  width: 1.36;
-  z-index: 690;
-  dashes: 7.2,16.8;
-  linecap: butt;
+  color:    #333333;
+  width:    1.36;
+  z-index:  690;
+  dashes:   7.2,16.8;
+  linecap:  butt;
+}
+line|z17-[waterway=dam]
+{
+  color:    #202020;
+  width:    4;
+  z-index:  133;
 }
 line|z17-[barrier=hedge]
 {
-  color: #b0b0b0;
-  width: 1;
-  z-index: 952;
+  color:    #b0b0b0;
+  width:    1;
+  z-index:  952;
 }
 line|z17-[piste:type=sled]
 {
-  color: #f0e0dc;
-  width: 20;
+  color:    #f0e0dc;
+  width:    20;
 }
 line|z17-[railway=narrow_gauge]::d1p3
 {
-  color: #333333;
-  width: 2;
-  z-index: 682;
-  dashes: 14.4,14.4;
-  linecap: butt;
+  color:    #333333;
+  width:    2;
+  z-index:  682;
+  dashes:   14.4,14.4;
+  linecap:  butt;
 }
 line|z17-[power=minor_line]
 {
-  color: white;
-  width: 1.6;
-  z-index: 921;
-  opacity: 0.5;
-}
-
-node|z16-[entrance]
+  color:    white;
+  width:    1.6;
+  z-index:  921;
+  opacity:  0.5;
+}
+line|z12-[railway=subway]                                         {width:3; color: #0f0f4c; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway]                           {text-color:  #3050d8; text-position: center;}
+node[railway=station][transport=subway]::int_name                 {text-color:  #3050d8; text-position: center;}
+line|z12-[railway=subway][colour]                                 {width:3; color: eval(tag("colour")); z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour]                   {text-color:  eval(tag("colour"));}
+node[railway=station][transport=subway][colour]::int_name         {text-color:  eval(tag("colour"));}
+line|z12-[railway=subway][colour=red]                             {width:3; color: #DD0000; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour=red]               {text-color:  #DD0000;}
+node[railway=station][transport=subway][colour=red]::int_name     {text-color:  #DD0000;}
+line|z12-[railway=subway][colour=blue]                            {width:3; color: #072889; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour=blue]              {text-color:  #072889;}
+node[railway=station][transport=subway][colour=blue]::int_name    {text-color:  #072889;}
+line|z12-[railway=subway][colour=purple]                          {width:3; color: #8B509C; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour=purple]            {text-color:  #8B509C;}
+node[railway=station][transport=subway][colour=purple]::int_name  {text-color:  #8B509C;}
+line|z12-[railway=subway][colour=orange]                          {width:3; color: #FF7700; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour=orange]            {text-color:  #FF7700;}
+node[railway=station][transport=subway][colour=orange]::int_name  {text-color:  #FF7700;}
+line|z12-[railway=subway][colour=green]                           {width:3; color: #006600; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour=green]             {text-color:  #006600;}
+node[railway=station][transport=subway][colour=green]::int_name   {text-color:  #006600;}
+line|z12-[railway=subway][colour=brown]                           {width:3; color: #BB7700; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour=brown]             {text-color:  #BB7700;}
+node[railway=station][transport=subway][colour=brown]::int_name   {text-color:  #BB7700;}
+line|z12-[railway=subway][colour=yellow]                          {width:3; color: #F7C600; z-index:15; dashes:3,3; opacity:0.3; linecap: butt; -x-kot-layer: top;}
+node[railway=station][transport=subway][colour=yellow]            {text-color:  #F7C600;}
+node[railway=station][transport=subway][colour=yellow]::int_name  {text-color:  #F7C600;}
+area[waterway=riverbank],
+line[waterway=river],
+line[waterway=canal]
+{
+  z-index: 20;
+}
+node|z17-[entrance]
 {
   symbol-shape: circle;
-  symbol-fill-color: #202020;
-  symbol-size: 2;
+  symbol-fill-color:  #202020;
+  symbol-size:  2;
   font-size: 9;
   text: ref;
   text-offset-x: 6;
   z-index: 10;
 }
-node|z17-[entrance]::flats
+node|z19-[entrance]::flats
 {
   text: "addr:flats";
   font-size: 9;
@@ -3402,63 +5254,288 @@ node|z17-[entrance]::flats
 node|z15-[railway=station][!transport],
 area|z15-[railway=station][!transport]
 { 
-  font-size: 12;
+  font-size:    12;
   text-halo-radius: 2;
   text: name;
-  text-color: #3050d8;
-  text-offset: 10;
-  text-halo-color: #f8fcff;
+  text-color:   #3050d8;
+  text-offset:  10;
+  text-halo-color:  #f8fcff;
   z-index: 170;
 }
+/* POI icons */
 
-@import("include/base_publictransport.mapcss");
-
+area|z17-[tourism=information][office],
+node|z17-[tourism=information][office]
+{
+  icon-image:   information-office.svg;
+}
+area|z17-[barrier=gate],
+node|z17-[barrier=gate]
+{
+  icon-image:   gate.svg;
+}
+area|z16[highway=bus_stop],
+node|z16[highway=bus_stop]
+{
+  icon-image:   bus-mini.svg;
+  z-index: 20;
+}
+area|z16-[amenity=bus_station],
+area|z17-[highway=bus_stop],
+node|z16-[amenity=bus_station],
+node|z17-[highway=bus_stop]
+{
+  icon-image:   bus.svg;
+  z-index: 20;
+}
+area|z17-[railway=tram_stop],
+node|z17-[railway=tram_stop]
+{
+  icon-image:   tramway.svg;
+}
+area|z16-[amenity=parking][parking=park_and_ride],
+node|z16-[amenity=parking][parking=park_and_ride]
+{
+  icon-image:   park_and_ride-permissive.svg;
+}
+area|z17-[man_made=lighthouse],
+node|z17-[man_made=lighthouse]
+{
+  icon-image:   lighthouse.svg;
+}
+area|z17-[tourism=information],
+node|z17-[tourism=information]
+{
+  icon-image:   information.svg;
+}
+area|z17-[amenity=post_box],
+node|z17-[amenity=post_box]
+{
+  icon-image:   postbox.svg;
+}
+area|z16-[amenity=bank],
+node|z16-[amenity=bank]
+{
+  icon-image:   bank.svg;
+  z-index:  5;
+}
+area|z16-[amenity=pub],
+node|z16-[amenity=pub]
+{
+  icon-image:   pub.svg;
+}
+node|z17-[amenity=recycling]
+{
+  icon-image:   recycling.svg;
+}
+node|z16-[amenity=telephone]
+{
+  icon-image:   telephone.svg;
+}
+area|z17-[sport=handball],
+node|z17-[sport=handball]
+{
+  icon-image:   handball-borderless.svg;
+}
+area|z17-[sport=golf],
+node|z17-[sport=golf],
+area|z17-[leisure=golf_course],
+node|z17-[leisure=golf_course]
+{
+  icon-image:   golfCourse.svg;
+}
+area|z17-[sport=baseball],
+node|z17-[sport=baseball]
+{
+  icon-image:   baseball-borderless.svg;
+}
+area|z17-[sport=athletics],
+node|z17-[sport=athletics]
+{
+  icon-image:   athletics-borderless.svg;
+}
+area|z17-[sport=bowls],
+node|z17-[sport=bowls]
+{
+  icon-image:   bowls-borderless.svg;
+}
+area|z17-[sport=archery],
+node|z17-[sport=archery]
+{
+  icon-image:   archery-borderless.svg;
+}
+area|z17-[sport=basketball],
+node|z17-[sport=basketball]
+{
+  icon-image:   basketball-borderless.svg;
+}
+area|z17-[amenity=school],
+node|z17-[amenity=school]
+{
+  icon-image:   school.svg;
+}
+area|z14-16[railway=halt],
+area|z14-15[railway=station],
+node|z14-16[railway=halt],
+node|z14-15[railway=station],
+{
+  icon-image:   railway-station-mini.svg;
+  z-index: 150;
+}
+area|z17-[railway=halt],
+area|z16-[railway=station],
+node|z17-[railway=halt],
+node|z16-[railway=station]
+{
+  icon-image:   railway-station.svg;
+}
+node|z12[railway=station][transport=subway],
+area|z12[railway=station][transport=subway]
+{ 
+  font-size:    10;
+  text-halo-radius: 2;
+  text: name;
+  text-offset:  10;
+  text-halo-color:  #f8fcff;
+  z-index: 170;
+  -x-kot-layer: top;
+}
+node|z12[railway=station][transport=subway]::int_name,
+area|z12[railway=station][transport=subway]::int_name
+{
+  font-size:  9;
+  text-halo-radius: 2;
+  text: int_name;
+  text-offset:  10;
+  text-halo-color:  #f8fcff;
+  z-index: 170;
+  -x-kot-layer: top;
+}
+node|z13-14[railway=station][transport=subway],
+area|z13-14[railway=station][transport=subway]
+{ 
+  font-size:    11;
+  text-halo-radius: 2;
+  text: name;
+  text-offset:  10;
+  text-halo-color:  #f8fcff;
+  z-index: 170;
+  -x-kot-layer: top;
+}
+node|z13-14[railway=station][transport=subway]::int_name,
+area|z13-14[railway=station][transport=subway]::int_name
+{
+  font-size:  10;
+  text-halo-radius: 2;
+  text: int_name;
+  text-offset:  10;
+  text-halo-color:  #f8fcff;
+  z-index: 170;
+  -x-kot-layer: top;
+}
+node|z15-[railway=station][transport=subway],
+area|z15-[railway=station][transport=subway]
+{ 
+  font-size:    12;
+  text-halo-radius: 2;
+  text: name;
+  text-offset:  10;
+  text-halo-color:  #f8fcff;
+  z-index: 170;
+  -x-kot-layer: top;
+}
+node|z15-[railway=station][transport=subway]::int_name,
+area|z15-[railway=station][transport=subway]::int_name
+{
+  font-size:  11;
+  text-halo-radius: 2;
+  text: int_name;
+  text-offset:  10;
+  text-halo-color:  #f8fcff;
+  z-index: 170;
+  -x-kot-layer: top;
+}
+area|z12-14[railway=station][transport=subway],
+node|z12-14[railway=station][transport=subway]
+{
+  icon-image:   subway-station-s.svg;
+}
+area|z15[railway=station][transport=subway],
+node|z15[railway=station][transport=subway]
+{
+  icon-image:   subway-station-m.svg;
+}
+area|z16-[railway=station][transport=subway],
+node|z16-[railway=station][transport=subway]
+{
+  icon-image:   subway-station-l.svg;
+}
 /* Eval magic */
+
+line[waterway]
+{
+  text-halo-color:  eval(prop("color"));
+}
+line[waterway],
 line[railway]
 {
   text-position: line;
 }
+node[highway=bus_stop],
+node[railway=tram_stop],
+node[railway=station],
+way[highway=bus_stop],
+way[railway=tram_stop],
+way[railway=station]
+{
+  text-position: center;
+}
 line|z15-[bridge?]::bridgewhite,
 line|z15-[tunnel?]::tunnelwhite,
 {
-  z-index: 3;
+  z-index:  3;
   casing-width: eval(prop("width")/2+4);
-  casing-linecap: butt;
+  casing-linecap:    butt;
   casing-color: white;
 }
 line|z15-[bridge?]::bridgeblack
 {
-  z-index: 2;
+  z-index:  2;
   casing-width: eval(prop("width")/2+5);
-  casing-linecap: butt;
+  casing-linecap:    butt;
   casing-color: #707070;
 }
 line|z15-[tunnel?]::tunnelblack
 {
-  z-index: 2;
+  z-index:  2;
   casing-width: eval(prop("width")/2+5);
-  casing-linecap: butt;
+  casing-linecap:    butt;
   casing-color: #707070;
-  casing-dashes: 5,5;
+  casing-dashes:    5,5;
 }
 line|z16-[oneway?]::arrows
 {
-  pattern-offset: 200;
+  pattern-offset:   200;
   z-index: 1000;
-  pattern-image: symbols/arrow.svg;
-  pattern-spacing: 234;
+  pattern-image:    arrow.svg;
+  pattern-spacing:  234;
 }
 line[access][access!=yes]::*
 {
-  opacity: 0;
-  casing-opacity: 0;
+  opacity:  0;
+  casing-opacity:  0;
+}
+line|z15-[marking=sport]
+{
+    width: 0.5;
+    color: white;
+}
+line|z15-[marking=sport][colour?]
+{
+    color: eval(tag("colour"));
 }
 line|z18-[lit]::lit
 {
   width: 0.3;
   color: yellow
 }
-@import("include/icons_maki.mapcss");
-@import("include/icons_nori.mapcss");
-@import("include/icons_neta.mapcss");
-@import("include/icon_colors.mapcss");
\ No newline at end of file
diff --git a/data/styles/symbols/airport.svg b/data/styles/symbols/airport.svg
index 276a2d56d8..5d9387e732 100755
--- a/data/styles/symbols/airport.svg
+++ b/data/styles/symbols/airport.svg
@@ -1,7 +1,90 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362)">
-        <rect ry="4.4" rx="4.4" y="1029.362" x="1" height="22" width="22" fill="#f0f0f0"/>
-        <rect width="20" height="20" x="2" y="2" transform="translate(0 1028.362)" rx="4" ry="4" fill="#005ce0"/>
-        <path d="m 19,5 0,2 -3,3 0,10 -2,0 -2,-6 -3,3 0,3 L 8,20 7,18 6,17 4,16 4,15 7,15 10,12 4,10 4,8 14,8 17,5 z" transform="translate(0 1028.362)" fill="#fff"/>
-    </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2997"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="airport.svg">
+  <defs
+     id="defs2999" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="26.83354"
+     inkscape:cx="14.219404"
+     inkscape:cy="12.33522"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1108"
+     inkscape:window-height="810"
+     inkscape:window-x="43"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3016"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3002">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <rect
+       ry="4.4000034"
+       rx="4.3999996"
+       y="1029.3622"
+       x="1"
+       height="22.000017"
+       width="22"
+       id="rect3020"
+       style="fill:#f0f0f0;fill-opacity:1;stroke:none" />
+    <rect
+       style="fill:#005ce0;fill-opacity:1;stroke:none"
+       id="rect3018"
+       width="20"
+       height="20"
+       x="2"
+       y="2"
+       transform="translate(0,1028.3622)"
+       rx="4"
+       ry="4" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 19,5 0,2 -3,3 0,10 -2,0 -2,-6 -3,3 0,3 L 8,20 7,18 6,17 4,16 4,15 7,15 10,12 4,10 4,8 14,8 17,5 z"
+       id="path2986"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1028.3622)"
+       sodipodi:nodetypes="cccccccccccccccccccc" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/alpine_hut.svg b/data/styles/symbols/alpine_hut.svg
index 600e058f4a..dc72309939 100644
--- a/data/styles/symbols/alpine_hut.svg
+++ b/data/styles/symbols/alpine_hut.svg
@@ -1,4 +1,60 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="37.28" height="37.28" viewBox="0 0 12 12">
-    <path d="M 3.8626611,5.2403431 L 3.8626611,9.4248926 L 8.0472106,9.4248926 L 8.0472106,5.2403431" stroke="#505050" stroke-width=".966" fill="none"/>
-    <path d="M 2.25,5.8563304 L 6,3.8563304 L 9.75,5.8563304 L 9.4989134,6.1120138 L 8.2452133,5.6063304 L 3.7469743,5.6024242 L 2.4998353,6.1063902 L 2.25,5.8563304 z" fill="#505050" fill-rule="evenodd" stroke="#505050" stroke-width=".4"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="37.279999"
+   height="37.279999"
+   viewBox="0 0 12 12"
+   id="symbol-alpine-hut"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="alpine_hut.svg">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="6.3304723"
+     inkscape:cx="18.639999"
+     inkscape:cy="17.139321"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-alpine-hut" />
+  <defs
+     id="defs36" />
+  <path
+     d="M 3.8626611,5.2403431 L 3.8626611,9.4248926 L 8.0472106,9.4248926 L 8.0472106,5.2403431"
+     id="path2984"
+     style="fill:none;fill-rule:evenodd;stroke:#505050;stroke-width:0.96566527999999996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 2.25,5.8563304 L 6,3.8563304 L 9.75,5.8563304 L 9.4989134,6.1120138 L 8.2452133,5.6063304 L 3.7469743,5.6024242 L 2.4998353,6.1063902 L 2.25,5.8563304 z"
+     id="path29"
+     style="fill:#505050;fill-opacity:1;fill-rule:evenodd;stroke:#505050;stroke-width:0.40000001000000002;stroke-linecap:butt;stroke-linejoin:miter;marker-mid:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
 </svg>
diff --git a/data/styles/symbols/api_pin.svg b/data/styles/symbols/api_pin.svg
new file mode 100644
index 0000000000..b787707928
--- /dev/null
+++ b/data/styles/symbols/api_pin.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_4" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="48px" height="64px" viewBox="0 0 48 64" enable-background="new 0 0 48 64" xml:space="preserve">
+<ellipse transform="matrix(0.0496 -0.9988 0.9988 0.0496 -36.6025 80.9658)" opacity="0.5" fill="#808285" enable-background="new    " cx="24.244" cy="59.716" rx="1.387" ry="4.166"/>
+<ellipse transform="matrix(0.0498 -0.9988 0.9988 0.0498 -36.5531 80.7913)" opacity="0.5" enable-background="new    " cx="24.184" cy="59.606" rx="0.784" ry="2.353"/>
+<path fill="#336600" d="M42.125,20.689c0-10.246-8.087-18.551-18.062-18.551S6,10.443,6,20.689c0,4.472,1.745,8.42,4.107,11.776
+	c2.197,3.121,4.364,7.096,7.818,13.114c2.405,4.192,4.471,9.91,5.492,12.961c0.109,0.326,0.155,0.587,0.264,0.739
+	c0.365,0.517,0.475,0.47,0.475,0.47s0.109,0.062,0.43-0.519c0.087-0.156,0.139-0.392,0.241-0.686
+	c1.138-3.268,3.411-9.545,5.319-13.309c2.097-4.131,6.258-10.584,7.461-12.305C40.078,29.395,42.125,25.388,42.125,20.689z"/>
+<path fill="#8AC33F" d="M41.167,20.829C41.167,10.879,33.581,3,24.25,3S7.219,10.925,7.219,20.875c0,4.342,1.79,8.131,3.999,11.39
+	c2.055,3.031,4.332,6.92,7.563,12.767c2.25,4.071,5.406,13.438,5.406,13.438s3.497-10.283,5.281-13.938
+	c1.962-4.011,6.22-10.173,7.345-11.845C39.123,29.251,41.167,25.391,41.167,20.829z"/>
+<g id="Fav_1_">
+	<path fill="#FFFFFF" d="M23.342,10.624c0.483-0.979,1.274-0.979,1.758,0l1.735,3.511c0.483,0.978,1.763,1.907,2.843,2.064
+		l3.885,0.564c1.08,0.157,1.324,0.909,0.543,1.67l-2.81,2.735c-0.78,0.762-1.271,2.265-1.085,3.34l0.662,3.859
+		c0.184,1.076-0.455,1.541-1.422,1.033l-3.475-1.825c-0.965-0.508-2.546-0.507-3.513,0L18.991,29.4
+		c-0.966,0.507-1.605,0.043-1.421-1.033l0.663-3.859c0.185-1.076-0.304-2.579-1.086-3.34l-2.81-2.736
+		c-0.782-0.762-0.538-1.513,0.542-1.67l3.886-0.564c1.08-0.157,2.359-1.086,2.842-2.064L23.342,10.624z"/>
+</g>
+</svg>
diff --git a/data/styles/symbols/archery-borderless.svg b/data/styles/symbols/archery-borderless.svg
index 7256bc51f1..a604ed67f1 100644
--- a/data/styles/symbols/archery-borderless.svg
+++ b/data/styles/symbols/archery-borderless.svg
@@ -1,13 +1,93 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="38" height="38" viewBox="0 0 300 300">
-    <path d="M 58.261298,71.858418 C 58.258258,80.787624 65.495987,88.027798 74.425237,88.027798 C 83.354477,88.027798 90.592208,80.787624 90.589168,71.858418 C 90.592208,62.929168 83.354477,55.688978 74.425237,55.688978 C 65.495987,55.688978 58.258258,62.929168 58.261298,71.858418 L 58.261298,71.858418 z" fill="#50524e" fill-rule="evenodd" stroke="#000"/>
-    <path d="M 69.959369,96.772801 C 71.98539,96.431432 74.06469,96.893278 75.755693,98.060241 L 100.59767,114.66154 L 132.88253,108.80052 C 137.17888,108.02087 141.29377,110.87171 142.07343,115.16807 C 142.85307,119.46441 140.00222,123.5793 135.70588,124.35895 L 100.24949,130.77021 C 98.240939,131.13384 96.169626,130.70547 94.470076,129.57498 L 66.978213,111.17239 C 64.254731,109.39894 62.896171,106.13781 63.555056,102.9553 C 64.213929,99.772781 66.755621,97.319131 69.959369,96.772801 z" fill="#50524e" fill-rule="evenodd" stroke="#fff" stroke-width=".789" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M 68.942546,109.29519 C 68.942546,109.29519 68.587219,166.30833 68.587219,166.30833" fill="#555" fill-rule="evenodd" stroke="#505050" stroke-width="34.34" stroke-linecap="round"/>
-    <path d="M 77.80665,173.55893 L 88.87122,200.50364 L 89.26628,236.07501" fill="#555" fill-rule="evenodd" stroke="#505050" stroke-width="19.737" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M 61.212962,171.91509 L 60.672082,201.03809 L 46.913852,233.84343" fill="#555" fill-rule="evenodd" stroke="#505050" stroke-width="19.737" stroke-linecap="round" stroke-linejoin="round"/>
-    <g stroke="#505050" fill="none">
-        <path d="M 406.57915,94.737891 C 406.57915,118.7182 387.13879,138.15809 363.1579,138.15809 C 339.177,138.15809 319.73665,118.7182 319.73665,94.737891 C 319.73665,70.757583 339.177,51.317695 363.1579,51.317695 C 387.13879,51.317695 406.57915,70.757583 406.57915,94.737891 L 406.57915,94.737891 z" stroke-width="7.894" transform="matrix(.667 0 0 1 -15.303 9.057)"/>
-        <path d="M 382.89618,94.736115 C 382.89618,105.63685 374.05936,114.47368 363.15862,114.47368 C 352.25788,114.47368 343.42105,105.63685 343.42105,94.736115 C 343.42105,83.835363 352.25788,74.998553 363.15862,74.998553 C 374.05936,74.998553 382.89618,83.835363 382.89618,94.736115 L 382.89618,94.736115 z" stroke-width="7.895" transform="matrix(.667 0 0 1 -15.303 9.057)"/>
-    </g>
-    <path d="M 106.23634,70.56298 C 122.2236,70.56298 135.18384,90.00286 135.18384,113.98317 L 135.18384,113.98317 C 135.18384,137.96348 122.2236,157.40337 106.23634,157.40337" stroke="#505050" stroke-width="6.446" fill="none"/>
-    <path d="M 109.06653,72.261094 C 109.27928,138.06644 108.9052,99.099774 109.06653,159.10148" stroke="#505050" stroke-width="1.579" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="38"
+   height="38"
+   viewBox="0 0 300 300"
+   id="symbol-archery-borderless"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="archery-borderless.svg">
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview14"
+     showgrid="false"
+     inkscape:zoom="6.2105263"
+     inkscape:cx="19"
+     inkscape:cy="17.470339"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-archery-borderless" />
+  <defs
+     id="defs2474" />
+  <path
+     d="M 58.261298,71.858418 C 58.258258,80.787624 65.495987,88.027798 74.425237,88.027798 C 83.354477,88.027798 90.592208,80.787624 90.589168,71.858418 C 90.592208,62.929168 83.354477,55.688978 74.425237,55.688978 C 65.495987,55.688978 58.258258,62.929168 58.261298,71.858418 L 58.261298,71.858418 z"
+     id="path2387"
+     style="fill:#50524e;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 69.959369,96.772801 C 71.98539,96.431432 74.06469,96.893278 75.755693,98.060241 L 100.59767,114.66154 L 132.88253,108.80052 C 137.17888,108.02087 141.29377,110.87171 142.07343,115.16807 C 142.85307,119.46441 140.00222,123.5793 135.70588,124.35895 L 100.24949,130.77021 C 98.240939,131.13384 96.169626,130.70547 94.470076,129.57498 L 66.978213,111.17239 C 64.254731,109.39894 62.896171,106.13781 63.555056,102.9553 C 64.213929,99.772781 66.755621,97.319131 69.959369,96.772801 z"
+     id="path3168"
+     style="fill:#50524e;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.78947365000000003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 68.942546,109.29519 C 68.942546,109.29519 68.587219,166.30833 68.587219,166.30833"
+     id="path2383"
+     style="fill:#555555;fill-opacity:1;fill-rule:evenodd;stroke:#505050;stroke-width:34.34040069999999645;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 77.80665,173.55893 L 88.87122,200.50364 L 89.26628,236.07501"
+     id="path3157"
+     style="fill:#555555;fill-opacity:1;fill-rule:evenodd;stroke:#505050;stroke-width:19.73684120000000064;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 61.212962,171.91509 L 60.672082,201.03809 L 46.913852,233.84343"
+     id="path2388"
+     style="fill:#555555;fill-opacity:1;fill-rule:evenodd;stroke:#505050;stroke-width:19.73684120000000064;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     transform="matrix(0.6666666,0,0,1,-15.302868,9.0566038)"
+     id="g3233"
+     style="stroke:#505050;stroke-opacity:1">
+    <path
+       d="M 406.57915,94.737891 C 406.57915,118.7182 387.13879,138.15809 363.1579,138.15809 C 339.177,138.15809 319.73665,118.7182 319.73665,94.737891 C 319.73665,70.757583 339.177,51.317695 363.1579,51.317695 C 387.13879,51.317695 406.57915,70.757583 406.57915,94.737891 L 406.57915,94.737891 z"
+       id="path3171"
+       style="fill:none;fill-rule:evenodd;stroke:#505050;stroke-width:7.89434480999999888;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 382.89618,94.736115 C 382.89618,105.63685 374.05936,114.47368 363.15862,114.47368 C 352.25788,114.47368 343.42105,105.63685 343.42105,94.736115 C 343.42105,83.835363 352.25788,74.998553 363.15862,74.998553 C 374.05936,74.998553 382.89618,83.835363 382.89618,94.736115 L 382.89618,94.736115 z"
+       id="path3175"
+       style="fill:none;fill-rule:evenodd;stroke:#505050;stroke-width:7.89473676999999885;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+  <path
+     d="M 106.23634,70.56298 C 122.2236,70.56298 135.18384,90.00286 135.18384,113.98317 L 135.18384,113.98317 C 135.18384,137.96348 122.2236,157.40337 106.23634,157.40337"
+     id="path2392"
+     style="fill:none;fill-rule:evenodd;stroke:#505050;stroke-width:6.44570541000000041;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 109.06653,72.261094 C 109.27928,138.06644 108.9052,99.099774 109.06653,159.10148"
+     id="path2398"
+     style="fill:none;fill-rule:evenodd;stroke:#505050;stroke-width:1.57894741999999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/archery.svg b/data/styles/symbols/archery.svg
index 91ae1566de..3bf34afed5 100644
--- a/data/styles/symbols/archery.svg
+++ b/data/styles/symbols/archery.svg
@@ -1,14 +1,61 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="38" height="38" viewBox="0 0 300 300">
-    <rect width="269.521" height="258.248" ry="20.87" x="15.29" y="20.639" stroke="#000" stroke-width="14.69" stroke-linejoin="round" fill="none"/>
-    <path d="M 58.261298,71.858418 C 58.258258,80.787624 65.495987,88.027798 74.425237,88.027798 C 83.354477,88.027798 90.592208,80.787624 90.589168,71.858418 C 90.592208,62.929168 83.354477,55.688978 74.425237,55.688978 C 65.495987,55.688978 58.258258,62.929168 58.261298,71.858418 L 58.261298,71.858418 z" fill-rule="evenodd" stroke="#000"/>
-    <path d="M 69.959369,96.772801 C 71.98539,96.431432 74.06469,96.893278 75.755693,98.060241 L 100.59767,114.66154 L 132.88253,108.80052 C 137.17888,108.02087 141.29377,110.87171 142.07343,115.16807 C 142.85307,119.46441 140.00222,123.5793 135.70588,124.35895 L 100.24949,130.77021 C 98.240939,131.13384 96.169626,130.70547 94.470076,129.57498 L 66.978213,111.17239 C 64.254731,109.39894 62.896171,106.13781 63.555056,102.9553 C 64.213929,99.772781 66.755621,97.319131 69.959369,96.772801 z" fill-rule="evenodd" stroke="#fff" stroke-width=".789" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M 68.942546,109.29519 C 68.942546,109.29519 68.587219,166.30833 68.587219,166.30833" stroke="#000" stroke-width="34.34" stroke-linecap="round" fill="none"/>
-    <path d="M 77.80665,173.55893 L 88.87122,200.50364 L 89.26628,236.07501" stroke="#000" stroke-width="19.737" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 61.212962,171.91509 L 60.672082,201.03809 L 46.913852,233.84343" stroke="#000" stroke-width="19.737" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <g stroke="#000" fill="none">
-        <path d="M 406.57915,94.737891 C 406.57915,118.7182 387.13879,138.15809 363.1579,138.15809 C 339.177,138.15809 319.73665,118.7182 319.73665,94.737891 C 319.73665,70.757583 339.177,51.317695 363.1579,51.317695 C 387.13879,51.317695 406.57915,70.757583 406.57915,94.737891 L 406.57915,94.737891 z" stroke-width="7.894" transform="matrix(.667 0 0 1 -15.303 9.057)"/>
-        <path d="M 382.89618,94.736115 C 382.89618,105.63685 374.05936,114.47368 363.15862,114.47368 C 352.25788,114.47368 343.42105,105.63685 343.42105,94.736115 C 343.42105,83.835363 352.25788,74.998553 363.15862,74.998553 C 374.05936,74.998553 382.89618,83.835363 382.89618,94.736115 L 382.89618,94.736115 z" stroke-width="7.895" transform="matrix(.667 0 0 1 -15.303 9.057)"/>
-    </g>
-    <path d="M 106.23634,70.56298 C 122.2236,70.56298 135.18384,90.00286 135.18384,113.98317 L 135.18384,113.98317 C 135.18384,137.96348 122.2236,157.40337 106.23634,157.40337" stroke="#000" stroke-width="6.446" fill="none"/>
-    <path d="M 109.06653,72.261094 C 109.27928,138.06644 108.9052,99.099774 109.06653,159.10148" stroke="#000" stroke-width="1.579" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="38"
+   height="38"
+   viewBox="0 0 300 300"
+   id="symbol-archery">
+  <defs
+     id="defs2474" />
+  <rect
+     width="269.52087"
+     height="258.24777"
+     ry="20.869576"
+     x="15.289689"
+     y="20.638819"
+     id="rect2471"
+     style="fill:none;stroke:#000000;stroke-width:14.68965149;stroke-linejoin:round;stroke-miterlimit:4" />
+  <path
+     d="M 58.261298,71.858418 C 58.258258,80.787624 65.495987,88.027798 74.425237,88.027798 C 83.354477,88.027798 90.592208,80.787624 90.589168,71.858418 C 90.592208,62.929168 83.354477,55.688978 74.425237,55.688978 C 65.495987,55.688978 58.258258,62.929168 58.261298,71.858418 L 58.261298,71.858418 z"
+     id="path2387"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 69.959369,96.772801 C 71.98539,96.431432 74.06469,96.893278 75.755693,98.060241 L 100.59767,114.66154 L 132.88253,108.80052 C 137.17888,108.02087 141.29377,110.87171 142.07343,115.16807 C 142.85307,119.46441 140.00222,123.5793 135.70588,124.35895 L 100.24949,130.77021 C 98.240939,131.13384 96.169626,130.70547 94.470076,129.57498 L 66.978213,111.17239 C 64.254731,109.39894 62.896171,106.13781 63.555056,102.9553 C 64.213929,99.772781 66.755621,97.319131 69.959369,96.772801 z"
+     id="path3168"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.78947365;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 68.942546,109.29519 C 68.942546,109.29519 68.587219,166.30833 68.587219,166.30833"
+     id="path2383"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:34.3404007;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 77.80665,173.55893 L 88.87122,200.50364 L 89.26628,236.07501"
+     id="path3157"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:19.7368412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 61.212962,171.91509 L 60.672082,201.03809 L 46.913852,233.84343"
+     id="path2388"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:19.7368412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     transform="matrix(0.6666666,0,0,1,-15.302868,9.0566038)"
+     id="g3233">
+    <path
+       d="M 406.57915,94.737891 C 406.57915,118.7182 387.13879,138.15809 363.1579,138.15809 C 339.177,138.15809 319.73665,118.7182 319.73665,94.737891 C 319.73665,70.757583 339.177,51.317695 363.1579,51.317695 C 387.13879,51.317695 406.57915,70.757583 406.57915,94.737891 L 406.57915,94.737891 z"
+       id="path3171"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:7.89434481;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 382.89618,94.736115 C 382.89618,105.63685 374.05936,114.47368 363.15862,114.47368 C 352.25788,114.47368 343.42105,105.63685 343.42105,94.736115 C 343.42105,83.835363 352.25788,74.998553 363.15862,74.998553 C 374.05936,74.998553 382.89618,83.835363 382.89618,94.736115 L 382.89618,94.736115 z"
+       id="path3175"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:7.89473677;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+  <path
+     d="M 106.23634,70.56298 C 122.2236,70.56298 135.18384,90.00286 135.18384,113.98317 L 135.18384,113.98317 C 135.18384,137.96348 122.2236,157.40337 106.23634,157.40337"
+     id="path2392"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6.44570541;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 109.06653,72.261094 C 109.27928,138.06644 108.9052,99.099774 109.06653,159.10148"
+     id="path2398"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.57894742;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/arrow.svg b/data/styles/symbols/arrow.svg
index 73031ea721..8f28bb91a4 100644
--- a/data/styles/symbols/arrow.svg
+++ b/data/styles/symbols/arrow.svg
@@ -1,4 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="18" height="18" viewBox="0 -17 792 594" enable-background="new 0 0 792 612">
-    <polygon transform="matrix(.88 0 0 .88 48.663 9.483)" points="634.646,211.018 548.506,199.825 548.591,267.392 6.923,267.392 6.923,305.663 548.634,305.663 548.718,374.713 634.646,362.949 784.07,286.093" stroke="#fff" stroke-width="49.5" stroke-opacity=".502" fill="none"/>
-    <polygon points="634.646,211.018 548.506,199.825 548.591,267.392 6.923,267.392 6.923,305.663 548.634,305.663 548.718,374.713 634.646,362.949 784.07,286.093" transform="matrix(.88 0 0 .88 48.663 9.483)" fill="#333"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="32px" height="32px" viewBox="0 -17 792 594" enable-background="new 0 0 792 612" xml:space="preserve">
+<polygon fill="#333333" points="548.591,267.392 6.923,267.392 6.923,305.663 548.634,305.663 548.718,374.713 634.646,362.949 
+	784.07,286.093 634.646,211.018 548.506,199.825 "/>
 </svg>
diff --git a/data/styles/symbols/athletics-borderless.svg b/data/styles/symbols/athletics-borderless.svg
index a155f0a973..6aa26a9804 100644
--- a/data/styles/symbols/athletics-borderless.svg
+++ b/data/styles/symbols/athletics-borderless.svg
@@ -1,10 +1,45 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24" viewBox="0 0 188 188">
-    <path d="M 96.54581,35.65625 L 96.54581,145.03125" stroke="#000" stroke-width="7.813" stroke-linecap="square" fill="none"/>
-    <path d="M 96.54581,82.53125 L 143.42081,129.40625" stroke="#000" stroke-width="7.813" fill="none"/>
-    <path d="M 98.55006,79.99909 C 125.48088,81.38016 150.3401,101.40564 150.3401,101.40564" stroke="#ef0000" stroke-width="19.531" stroke-linecap="round" fill="none"/>
-    <path d="M 143.42081,74.71875 L 143.42081,184.09375" stroke="#000" stroke-width="7.813" stroke-linecap="square" fill="none"/>
-    <path d="M 128.90625,160.65625 L 82.03125,113.78125 L 3.90625,113.78125 L 3.90625,152.84375 C 4.394532,167.24805 9.936524,177.37989 18.359375,184.09375 L 128.90625,184.09375 L 128.90625,160.65625 z" fill-rule="evenodd" stroke="#000" stroke-width="7.813"/>
-    <path d="M 85.41571,76.67186 C 85.41571,83.93072 79.524472,89.82197 72.265621,89.82197 C 65.006774,89.82197 59.115535,83.93072 59.115535,76.67186 C 59.115535,69.41303 65.006774,63.52178 72.265621,63.52178 C 79.524472,63.52178 85.41571,69.41303 85.41571,76.67186 z" fill="#ef0000" fill-rule="evenodd" overflow="visible" enable-background="accumulate"/>
-    <path d="M 155.17384,103.47724 C 182.10466,104.85831 176.58038,143.52821 176.58038,143.52821" stroke="#ef0000" stroke-width="11.719" stroke-linecap="round" fill="none"/>
-    <path d="M 99.08609,80.4577 C 125.39413,86.37918 130.48635,47.65002 130.48635,47.65002" stroke="#ef0000" stroke-width="11.719" stroke-linecap="round" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="24"
+   height="24"
+   viewBox="0 0 188 188"
+   id="symbol-athletics-borderless">
+  <defs
+     id="defs4" />
+  <path
+     d="M 96.54581,35.65625 L 96.54581,145.03125"
+     id="path3214"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:7.8125;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 96.54581,82.53125 L 143.42081,129.40625"
+     id="path3218"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:7.8125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 98.55006,79.99909 C 125.48088,81.38016 150.3401,101.40564 150.3401,101.40564"
+     id="path3249"
+     style="fill:none;fill-rule:evenodd;stroke:#ef0000;stroke-width:19.53125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 143.42081,74.71875 L 143.42081,184.09375"
+     id="path3216"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:7.8125;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 128.90625,160.65625 L 82.03125,113.78125 L 3.90625,113.78125 L 3.90625,152.84375 C 4.394532,167.24805 9.936524,177.37989 18.359375,184.09375 L 128.90625,184.09375 L 128.90625,160.65625 z"
+     id="path3220"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:7.8125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 85.41571,76.67186 C 85.41571,83.93072 79.524472,89.82197 72.265621,89.82197 C 65.006774,89.82197 59.115535,83.93072 59.115535,76.67186 C 59.115535,69.41303 65.006774,63.52178 72.265621,63.52178 C 79.524472,63.52178 85.41571,69.41303 85.41571,76.67186 z"
+     id="path3246"
+     style="opacity:1;fill:#ef0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:19.53125;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="M 155.17384,103.47724 C 182.10466,104.85831 176.58038,143.52821 176.58038,143.52821"
+     id="path3251"
+     style="fill:none;fill-rule:evenodd;stroke:#ef0000;stroke-width:11.71875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 99.08609,80.4577 C 125.39413,86.37918 130.48635,47.65002 130.48635,47.65002"
+     id="path3253"
+     style="fill:none;fill-rule:evenodd;stroke:#ef0000;stroke-width:11.71875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/athletics.svg b/data/styles/symbols/athletics.svg
index 965e2e9ecc..b905d1a196 100644
--- a/data/styles/symbols/athletics.svg
+++ b/data/styles/symbols/athletics.svg
@@ -1,11 +1,49 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="32" height="32" viewBox="0 0 250 250">
-    <path d="M 116.07706,70.3125 L 116.07706,179.6875" stroke="#000" stroke-width="7.813" stroke-linecap="square" fill="none"/>
-    <path d="M 116.07706,117.1875 L 162.95206,164.0625" stroke="#000" stroke-width="7.813" fill="none"/>
-    <path d="M 118.08131,114.65534 C 145.01213,116.03641 169.87135,136.06189 169.87135,136.06189" stroke="#ef0000" stroke-width="19.531" stroke-linecap="round" fill="none"/>
-    <path d="M 162.95206,109.375 L 162.95206,218.75" stroke="#000" stroke-width="7.813" stroke-linecap="square" fill="none"/>
-    <path d="M 148.4375,195.3125 L 101.5625,148.4375 L 23.4375,148.4375 L 23.4375,187.5 C 23.925782,201.9043 29.467774,212.03614 37.890625,218.75 L 148.4375,218.75 L 148.4375,195.3125 z" fill-rule="evenodd" stroke="#000" stroke-width="7.813"/>
-    <path d="M 59.676639,7.8570939 L 190.32335,7.8570939 C 219.03136,7.8570939 242.1429,31.747104 242.1429,61.422137 L 242.1429,188.57786 C 242.1429,218.25289 219.03136,242.1429 190.32335,242.1429 L 59.676639,242.1429 C 30.968611,242.1429 7.8570962,218.25289 7.8570962,188.57786 L 7.8570962,61.422137 C 7.8570962,31.747104 30.968611,7.8570939 59.676639,7.8570939 z" stroke="#000" stroke-width="15.625" stroke-linejoin="bevel" fill="none"/>
-    <path d="M 104.94696,111.32811 C 104.94696,118.58697 99.055722,124.47822 91.796871,124.47822 C 84.538024,124.47822 78.646785,118.58697 78.646785,111.32811 C 78.646785,104.06928 84.538024,98.178034 91.796871,98.178034 C 99.055722,98.178034 104.94696,104.06928 104.94696,111.32811 z" fill="#ef0000" fill-rule="evenodd" overflow="visible" enable-background="accumulate"/>
-    <path d="M 174.70509,138.13349 C 201.63591,139.51456 196.11163,178.18446 196.11163,178.18446" stroke="#ef0000" stroke-width="11.719" stroke-linecap="round" fill="none"/>
-    <path d="M 118.61734,115.11395 C 144.92538,121.03543 150.0176,82.306273 150.0176,82.306273" stroke="#ef0000" stroke-width="11.719" stroke-linecap="round" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="32"
+   height="32"
+   viewBox="0 0 250 250"
+   id="symbol-athletics">
+  <defs
+     id="defs4" />
+  <path
+     d="M 116.07706,70.3125 L 116.07706,179.6875"
+     id="path3214"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:7.8125;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 116.07706,117.1875 L 162.95206,164.0625"
+     id="path3218"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:7.8125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 118.08131,114.65534 C 145.01213,116.03641 169.87135,136.06189 169.87135,136.06189"
+     id="path3249"
+     style="fill:none;fill-rule:evenodd;stroke:#ef0000;stroke-width:19.53125;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 162.95206,109.375 L 162.95206,218.75"
+     id="path3216"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:7.8125;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 148.4375,195.3125 L 101.5625,148.4375 L 23.4375,148.4375 L 23.4375,187.5 C 23.925782,201.9043 29.467774,212.03614 37.890625,218.75 L 148.4375,218.75 L 148.4375,195.3125 z"
+     id="path3220"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:7.8125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 59.676639,7.8570939 L 190.32335,7.8570939 C 219.03136,7.8570939 242.1429,31.747104 242.1429,61.422137 L 242.1429,188.57786 C 242.1429,218.25289 219.03136,242.1429 190.32335,242.1429 L 59.676639,242.1429 C 30.968611,242.1429 7.8570962,218.25289 7.8570962,188.57786 L 7.8570962,61.422137 C 7.8570962,31.747104 30.968611,7.8570939 59.676639,7.8570939 z"
+     id="rect2403"
+     style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:15.625;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <path
+     d="M 104.94696,111.32811 C 104.94696,118.58697 99.055722,124.47822 91.796871,124.47822 C 84.538024,124.47822 78.646785,118.58697 78.646785,111.32811 C 78.646785,104.06928 84.538024,98.178034 91.796871,98.178034 C 99.055722,98.178034 104.94696,104.06928 104.94696,111.32811 z"
+     id="path3246"
+     style="opacity:1;fill:#ef0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:19.53125;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="M 174.70509,138.13349 C 201.63591,139.51456 196.11163,178.18446 196.11163,178.18446"
+     id="path3251"
+     style="fill:none;fill-rule:evenodd;stroke:#ef0000;stroke-width:11.71875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 118.61734,115.11395 C 144.92538,121.03543 150.0176,82.306273 150.0176,82.306273"
+     id="path3253"
+     style="fill:none;fill-rule:evenodd;stroke:#ef0000;stroke-width:11.71875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/atm.svg b/data/styles/symbols/atm.svg
index 0fa2d28018..2bfe1c66ea 100644
--- a/data/styles/symbols/atm.svg
+++ b/data/styles/symbols/atm.svg
@@ -1,10 +1,105 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24">
-    <title>
-        ATM Map Icon
-    </title>
-    <path d="M 3,0 3,6 21,6 21,0 3,0 z M 5,2 19,2 19,5 5,5 5,2 z" fill="#4d4d4d"/>
-    <path d="M 19.5,21 17,3 7,3 4.5,21 z" fill="#4d4d4d"/>
-    <text style="line-height:125%" x="-6.617" y="15.045" font-size="40" letter-spacing="0" word-spacing="0" font-family="Sans"/>
-    <text style="line-height:125%" x="-4.62" y="4.607" font-size="40" letter-spacing="0" word-spacing="0" font-family="Sans"/>
-    <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m 11.556391,4.875 0,0.875 C 10.878783,5.9226669 10.260423,6.3200773 9.7744362,6.84375 9.119662,7.5492994 8.669173,8.5046298 8.669173,9.541667 c 0,1.037037 0.5226976,1.906736 1.2180451,2.40625 0.4954579,0.35592 1.0744529,0.542591 1.6691729,0.631945 l 0,3.767361 C 11.296538,16.21618 11.031592,16.024783 10.81203,15.788194 10.384097,15.327077 10.112782,14.726852 10.112782,14.208333 a 0.72187669,0.77785556 0 1 0 -1.443609,0 c 0,1.037037 0.450489,1.992367 1.1052632,2.697917 C 10.260423,17.429924 10.878783,17.827333 11.556391,18 l 0,0.875 L 13,18.875 13,18 c 0.677608,-0.172667 1.295968,-0.570076 1.781955,-1.09375 0.654774,-0.70555 1.105263,-1.66088 1.105263,-2.697917 0,-1.037037 -0.522698,-1.906736 -1.218045,-2.40625 C 14.173715,11.446163 13.59472,11.259492 13,11.170138 l 0,-3.8645824 c 0.315372,0.08395 0.595588,0.2188387 0.81203,0.4131944 0.371669,0.3337422 0.631579,0.8290893 0.631579,1.822917 a 0.72187669,0.77785556 0 1 0 1.443609,0 c 0,-1.3395063 -0.461894,-2.3997147 -1.172932,-3.0381947 C 14.206587,6.0475817 13.605539,5.8248594 13,5.7256944 L 13,4.875 l -1.443609,0 z m -0.02256,2.5277777 c 0.0066,-0.00343 0.01593,0.00334 0.02256,0 l 0,3.5972223 c -0.330954,-0.07996 -0.628272,-0.200171 -0.857143,-0.364583 -0.387359,-0.278265 -0.586466,-0.575231 -0.586466,-1.09375 0,-0.518519 0.271315,-1.1187443 0.699248,-1.5798614 0.213967,-0.2305583 0.468905,-0.4282998 0.721805,-0.5590279 z M 13,12.75 c 0.330955,0.07996 0.628272,0.200171 0.857143,0.364583 0.387359,0.278265 0.586466,0.575231 0.586466,1.09375 0,0.518519 -0.271315,1.118744 -0.699248,1.579861 C 13.524799,16.024783 13.259853,16.21618 13,16.347223 L 13,12.75 z" color="#000" fill="#fff" overflow="visible" enable-background="accumulate" font-family="Sans"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="24"
+   height="24"
+   id="symbol-atm"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="atm.svg">
+  <title
+     id="title2983">ATM Map Icon</title>
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>ATM Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1059"
+     inkscape:window-height="716"
+     id="namedview8"
+     showgrid="true"
+     inkscape:zoom="17.531842"
+     inkscape:cx="22.986746"
+     inkscape:cy="9.3871637"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-atm">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs2387" />
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     d="M 3,0 3,6 21,6 21,0 3,0 z M 5,2 19,2 19,5 5,5 5,2 z"
+     id="rect2984"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     d="M 19.5,21 17,3 7,3 4.5,21 z"
+     id="path3754"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+  <text
+     xml:space="preserve"
+     style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+     x="-6.6165323"
+     y="15.044866"
+     id="text3759"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan3761"
+       x="-6.6165323"
+       y="15.044866" /></text>
+  <text
+     xml:space="preserve"
+     style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+     x="-4.6201649"
+     y="4.6067157"
+     id="text2987"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan2989"
+       x="-4.6201649"
+       y="4.6067157" /></text>
+  <path
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     d="m 11.556391,4.875 0,0.875 C 10.878783,5.9226669 10.260423,6.3200773 9.7744362,6.84375 9.119662,7.5492994 8.669173,8.5046298 8.669173,9.541667 c 0,1.037037 0.5226976,1.906736 1.2180451,2.40625 0.4954579,0.35592 1.0744529,0.542591 1.6691729,0.631945 l 0,3.767361 C 11.296538,16.21618 11.031592,16.024783 10.81203,15.788194 10.384097,15.327077 10.112782,14.726852 10.112782,14.208333 a 0.72187669,0.77785556 0 1 0 -1.443609,0 c 0,1.037037 0.450489,1.992367 1.1052632,2.697917 C 10.260423,17.429924 10.878783,17.827333 11.556391,18 l 0,0.875 L 13,18.875 13,18 c 0.677608,-0.172667 1.295968,-0.570076 1.781955,-1.09375 0.654774,-0.70555 1.105263,-1.66088 1.105263,-2.697917 0,-1.037037 -0.522698,-1.906736 -1.218045,-2.40625 C 14.173715,11.446163 13.59472,11.259492 13,11.170138 l 0,-3.8645824 c 0.315372,0.08395 0.595588,0.2188387 0.81203,0.4131944 0.371669,0.3337422 0.631579,0.8290893 0.631579,1.822917 a 0.72187669,0.77785556 0 1 0 1.443609,0 c 0,-1.3395063 -0.461894,-2.3997147 -1.172932,-3.0381947 C 14.206587,6.0475817 13.605539,5.8248594 13,5.7256944 L 13,4.875 l -1.443609,0 z m -0.02256,2.5277777 c 0.0066,-0.00343 0.01593,0.00334 0.02256,0 l 0,3.5972223 c -0.330954,-0.07996 -0.628272,-0.200171 -0.857143,-0.364583 -0.387359,-0.278265 -0.586466,-0.575231 -0.586466,-1.09375 0,-0.518519 0.271315,-1.1187443 0.699248,-1.5798614 0.213967,-0.2305583 0.468905,-0.4282998 0.721805,-0.5590279 z M 13,12.75 c 0.330955,0.07996 0.628272,0.200171 0.857143,0.364583 0.387359,0.278265 0.586466,0.575231 0.586466,1.09375 0,0.518519 -0.271315,1.118744 -0.699248,1.579861 C 13.524799,16.024783 13.259853,16.21618 13,16.347223 L 13,12.75 z"
+     id="path2991"
+     inkscape:connector-curvature="0" />
 </svg>
diff --git a/data/styles/symbols/bakery.svg b/data/styles/symbols/bakery.svg
index d4030cdfee..92eccfe92d 100644
--- a/data/styles/symbols/bakery.svg
+++ b/data/styles/symbols/bakery.svg
@@ -1,6 +1,72 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24">
-    <title>
-        Bakery Map Icon
-    </title>
-    <path d="M 10.959668,8.1379675 C 9.4392592,8.5453598 8.1497631,8.9507594 7.0458496,9.348434 c 0.046302,0.00278 0.094323,0.010583 0.1369238,0.027992 C 7.6939082,9.5856156 7.590676,11.007704 6.9631193,12.541112 6.335556,14.074544 5.4298997,15.142189 4.9187641,14.933003 4.4076282,14.723819 4.5108613,13.301726 5.1384179,11.768319 5.5931962,10.657088 6.1962029,9.7914838 6.6917156,9.475676 1.6597705,11.351511 0.90615395,13.118478 1.3697601,14.84868 c 0.5717674,2.133864 3.2009778,3.283406 11.6604599,1.016694 8.713537,-2.334785 10.161676,-4.576848 9.589908,-6.7107129 -0.406113,-1.515637 -1.76144,-2.570209 -5.608834,-2.217641 0.294918,0.4517372 0.15158,1.6952321 -0.388923,3.0159259 -0.627557,1.533407 -1.533213,2.601052 -2.044348,2.391867 -0.511137,-0.209185 -0.407904,-1.631278 0.219653,-3.1646845 0.400668,-0.9790163 0.910224,-1.7529336 1.366266,-2.1454706 -1.420483,0.1869807 -3.12694,0.5466894 -5.204274,1.1033096 z m 0.847352,-0.097638 c 0.07269,-0.00786 0.141483,0.01588 0.205376,0.042027 0.511135,0.2091854 0.407902,1.6312771 -0.219654,3.1646852 -0.627557,1.533407 -1.533213,2.601052 -2.0443484,2.391866 -0.5111363,-0.209184 -0.407903,-1.631277 0.2196534,-3.164684 0.470667,-1.1500558 1.100908,-2.0534561 1.60558,-2.3390043 0.08411,-0.047591 0.160703,-0.087035 0.233393,-0.09489 z" fill="#505050"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="24"
+   height="24"
+   id="symbol-bakery"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="bakery.svg">
+  <title
+     id="title2987">Bakery Map Icon</title>
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Bakery Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1106"
+     inkscape:window-height="693"
+     id="namedview6"
+     showgrid="true"
+     inkscape:zoom="19.010213"
+     inkscape:cx="11.86441"
+     inkscape:cy="11.966105"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-bakery">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2989"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4" />
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="M 10.959668,8.1379675 C 9.4392592,8.5453598 8.1497631,8.9507594 7.0458496,9.348434 c 0.046302,0.00278 0.094323,0.010583 0.1369238,0.027992 C 7.6939082,9.5856156 7.590676,11.007704 6.9631193,12.541112 6.335556,14.074544 5.4298997,15.142189 4.9187641,14.933003 4.4076282,14.723819 4.5108613,13.301726 5.1384179,11.768319 5.5931962,10.657088 6.1962029,9.7914838 6.6917156,9.475676 1.6597705,11.351511 0.90615395,13.118478 1.3697601,14.84868 c 0.5717674,2.133864 3.2009778,3.283406 11.6604599,1.016694 8.713537,-2.334785 10.161676,-4.576848 9.589908,-6.7107129 -0.406113,-1.515637 -1.76144,-2.570209 -5.608834,-2.217641 0.294918,0.4517372 0.15158,1.6952321 -0.388923,3.0159259 -0.627557,1.533407 -1.533213,2.601052 -2.044348,2.391867 -0.511137,-0.209185 -0.407904,-1.631278 0.219653,-3.1646845 0.400668,-0.9790163 0.910224,-1.7529336 1.366266,-2.1454706 -1.420483,0.1869807 -3.12694,0.5466894 -5.204274,1.1033096 z m 0.847352,-0.097638 c 0.07269,-0.00786 0.141483,0.01588 0.205376,0.042027 0.511135,0.2091854 0.407902,1.6312771 -0.219654,3.1646852 -0.627557,1.533407 -1.533213,2.601052 -2.0443484,2.391866 -0.5111363,-0.209184 -0.407903,-1.631277 0.2196534,-3.164684 0.470667,-1.1500558 1.100908,-2.0534561 1.60558,-2.3390043 0.08411,-0.047591 0.160703,-0.087035 0.233393,-0.09489 z"
+     id="path2984"
+     inkscape:connector-curvature="0" />
 </svg>
diff --git a/data/styles/symbols/bank.svg b/data/styles/symbols/bank.svg
index d6119dc19b..1cae24401f 100644
--- a/data/styles/symbols/bank.svg
+++ b/data/styles/symbols/bank.svg
@@ -1,4 +1,58 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18.64" viewBox="0 0 125 125" height="18.64">
-    <path d="M 65,0.2965772 L 0,50 L 15,50 L 15,125 L 110,125 L 110,50 L 125,50 L 65,0.2965772 z" fill="#4d4d4d"/>
-    <path d="M 62,102 C 57,102 43,100 44,91 C 45,82 55,87 62,88 L 62,75 C 54,73 44,67 44,56 C 44,45 54,38 62,38 C 62,32 62,30 65,30 C 68,30 68,32 68,38 C 74,38 88,40 85,47 C 82,54 73,51 68,50 L 68,63 C 77,65 87,71 87,82 C 87,93 78,102 68,102 C 68,108 68,110 65,110 C 62,110 62,108 62,102 z M 62,61 L 62,50 C 55,51 55,60 62,61 z M 68,77 L 68,88 C 75,87 75,78 68,77 z" fill="#fff"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="18.64"
+   id="bank"
+   viewBox="0 0 125 125"
+   height="18.64"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="bank.svg">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="12.660945"
+     inkscape:cx="9.3199997"
+     inkscape:cy="9.3199997"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="bank" />
+  <path
+     style="fill:#4d4d4d;stroke:none"
+     d="M 65,0.2965772 L 0,50 L 15,50 L 15,125 L 110,125 L 110,50 L 125,50 L 65,0.2965772 z"
+     id="path3" />
+  <path
+     style="fill:#ffffff; stroke:none"
+     d="M 62,102 C 57,102 43,100 44,91 C 45,82 55,87 62,88 L 62,75 C 54,73 44,67 44,56 C 44,45 54,38 62,38 C 62,32 62,30 65,30 C 68,30 68,32 68,38 C 74,38 88,40 85,47 C 82,54 73,51 68,50 L 68,63 C 77,65 87,71 87,82 C 87,93 78,102 68,102 C 68,108 68,110 65,110 C 62,110 62,108 62,102 z M 62,61 L 62,50 C 55,51 55,60 62,61 z M 68,77 L 68,88 C 75,87 75,78 68,77 z"
+     id="path5" />
 </svg>
diff --git a/data/styles/symbols/bar.svg b/data/styles/symbols/bar.svg
index f5927c5e69..37da8ab0c3 100644
--- a/data/styles/symbols/bar.svg
+++ b/data/styles/symbols/bar.svg
@@ -1,7 +1,61 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24" enable-background="new 0 0 99.801 100">
-    <title>
-        Bar Map Icon
-    </title>
-    <path d="M 57.862,-45.945"/>
-    <path d="M 2 2 L 11 12 L 11 20 L 7 20 C 6.446 20 6 20.446 6 21 C 6 21.554 6.446 22 7 22 L 17 22 C 17.554 22 18 21.554 18 21 C 18 20.446 17.554 20 17 20 L 13 20 L 13 12 L 22 2 L 2 2 z M 4.6875 3 L 19.3125 3 L 16.59375 6 L 7.40625 6 L 4.6875 3 z M 13 8 C 13.552285 8 14 8.4477153 14 9 C 14 9.5522847 13.552285 10 13 10 C 12.447715 10 12 9.5522847 12 9 C 12 8.4477153 12.447715 8 13 8 z" fill="#4d4d4d"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   enable-background="new 0 0 99.801 100"
+   xml:space="preserve"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="bar.svg"><title
+   id="title3768">Bar Map Icon</title><metadata
+   id="metadata11"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Bar Map Icon</dc:title><dc:creator><cc:Agent><dc:title>Yury Melnichek</dc:title></cc:Agent></dc:creator><dc:source>mapsforhumans.com</dc:source></cc:Work></rdf:RDF></metadata><defs
+   id="defs9" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="866"
+   inkscape:window-height="666"
+   id="namedview7"
+   showgrid="true"
+   inkscape:zoom="18.583333"
+   inkscape:cx="12"
+   inkscape:cy="12.15012"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"><inkscape:grid
+     type="xygrid"
+     id="grid2983"
+     empspacing="2"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
+
+<path
+   d="M 57.862,-45.945"
+   id="path5"
+   inkscape:connector-curvature="0" />
+<path
+   style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+   d="M 2 2 L 11 12 L 11 20 L 7 20 C 6.446 20 6 20.446 6 21 C 6 21.554 6.446 22 7 22 L 17 22 C 17.554 22 18 21.554 18 21 C 18 20.446 17.554 20 17 20 L 13 20 L 13 12 L 22 2 L 2 2 z M 4.6875 3 L 19.3125 3 L 16.59375 6 L 7.40625 6 L 4.6875 3 z M 13 8 C 13.552285 8 14 8.4477153 14 9 C 14 9.5522847 13.552285 10 13 10 C 12.447715 10 12 9.5522847 12 9 C 12 8.4477153 12.447715 8 13 8 z "
+   id="path2985" /></svg>
\ No newline at end of file
diff --git a/data/styles/symbols/barrier.svg b/data/styles/symbols/barrier.svg
index ee86fc879c..f08368e4a1 100644
--- a/data/styles/symbols/barrier.svg
+++ b/data/styles/symbols/barrier.svg
@@ -1,19 +1,154 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 350.5 350.49999" enable-background="new 0 0 566.93 566.93">
-    <g transform="translate(-82.726 -11.221)">
-        <polygon points="104.128,156.743 104.128,217 100.128,215 100.128,154.743" fill="#0084cb"/>
-        <polygon points="147,154.743 151.564,156.743 104.128,156.743 100.128,154.743" fill="#00b3ea"/>
-        <rect x="104.128" y="156.743" width="47.436" height="60.256" fill="#009edf"/>
-    </g>
-    <g>
-        <path d="m 419.128,184.256 c 0,5.5 -4.5,10 -10,10 H 130.003 c -5.5,0 -10,-4.5 -10,-10 v -12.052 c 0,-5.5 4.5,-10 10,-10 h 279.125 c 5.5,0 10,4.5 10,10 v 12.052 z" fill="#fff" transform="translate(-82.726 -11.221)"/>
-        <path d="m 419.128,184.256 c 0,5.5 -4.5,10 -10,10 H 130.003 c -5.5,0 -10,-4.5 -10,-10 v -12.052 c 0,-5.5 4.5,-10 10,-10 h 279.125 c 5.5,0 10,4.5 10,10 v 12.052 z" stroke="#ed1c24" stroke-width="3" fill="none" transform="translate(-82.726 -11.221)"/>
-    </g>
-    <g transform="translate(-82.726 -11.221)" fill="#ed1c24">
-        <polygon points="190.563,193.25 161.625,193.25 193.125,161.75 221.5,161.75"/>
-        <polygon points="139.938,193.25 125.25,193.25 120.003,184.247 142.5,161.75 170.875,161.75"/>
-        <polygon points="240.563,193.25 211.625,193.25 243.125,161.75 271.5,161.75"/>
-        <polygon points="290.688,193.25 261.75,193.25 293.25,161.75 321.625,161.75"/>
-        <polygon points="340.188,193.25 311.25,193.25 342.75,161.75 371.125,161.75"/>
-        <polygon points="390.688,193.25 361.75,193.25 393.25,161.75 410,161.75 417.064,166.394"/>
-    </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="32"
+   height="32"
+   viewBox="0 0 350.5 350.49999"
+   enable-background="new 0 0 566.93 566.93"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="barrier.svg"><metadata
+   id="metadata52"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs50" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="640"
+   inkscape:window-height="484"
+   id="namedview48"
+   showgrid="false"
+   fit-margin-top="15"
+   fit-margin-left="15"
+   fit-margin-right="15"
+   fit-margin-bottom="15"
+   inkscape:zoom="0.41627715"
+   inkscape:cx="198.337"
+   inkscape:cy="140.71465"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="svg2" />
+<g
+   id="BG"
+   display="none"
+   style="display:none"
+   transform="translate(-85.128,118.5)">
+	<g
+   display="inline"
+   id="g5"
+   style="display:inline">
+		<rect
+   x="72.077003"
+   y="96.179001"
+   width="451.923"
+   height="164.103"
+   id="rect7"
+   style="fill:#c2b59b" />
+	</g>
+</g>
+<g
+   id="cube"
+   transform="translate(-82.725754,-11.22127)">
+	<g
+   id="g10">
+		<polygon
+   points="104.128,156.743 104.128,217 100.128,215 100.128,154.743 "
+   id="polygon12"
+   style="fill:#0084cb" />
+	</g>
+	<g
+   id="g14">
+		<polygon
+   points="147,154.743 151.564,156.743 104.128,156.743 100.128,154.743 "
+   id="polygon16"
+   style="fill:#00b3ea" />
+	</g>
+	<g
+   id="g18">
+		<rect
+   x="104.128"
+   y="156.743"
+   width="47.436001"
+   height="60.256001"
+   id="rect20"
+   style="fill:#009edf" />
+	</g>
+</g>
+<g
+   id="barrier"
+   transform="translate(-82.725754,-11.22127)">
+	<g
+   id="g23">
+		<path
+   d="m 419.128,184.256 c 0,5.5 -4.5,10 -10,10 H 130.003 c -5.5,0 -10,-4.5 -10,-10 v -12.052 c 0,-5.5 4.5,-10 10,-10 h 279.125 c 5.5,0 10,4.5 10,10 v 12.052 z"
+   id="path25"
+   inkscape:connector-curvature="0"
+   style="fill:#ffffff" />
+	</g>
+	<g
+   id="g27">
+		<path
+   d="m 419.128,184.256 c 0,5.5 -4.5,10 -10,10 H 130.003 c -5.5,0 -10,-4.5 -10,-10 v -12.052 c 0,-5.5 4.5,-10 10,-10 h 279.125 c 5.5,0 10,4.5 10,10 v 12.052 z"
+   id="path29"
+   inkscape:connector-curvature="0"
+   style="fill:none;stroke:#ed1c24;stroke-width:3" />
+	</g>
+</g>
+<g
+   id="stripes"
+   transform="translate(-82.725754,-11.22127)">
+	<polygon
+   points="190.563,193.25 161.625,193.25 193.125,161.75 221.5,161.75 "
+   id="polygon32"
+   style="fill:#ed1c24" />
+	<polygon
+   points="139.938,193.25 125.25,193.25 120.003,184.247 142.5,161.75 170.875,161.75 "
+   id="polygon34"
+   style="fill:#ed1c24" />
+	<polygon
+   points="240.563,193.25 211.625,193.25 243.125,161.75 271.5,161.75 "
+   id="polygon36"
+   style="fill:#ed1c24" />
+	<polygon
+   points="290.688,193.25 261.75,193.25 293.25,161.75 321.625,161.75 "
+   id="polygon38"
+   style="fill:#ed1c24" />
+	<polygon
+   points="340.188,193.25 311.25,193.25 342.75,161.75 371.125,161.75 "
+   id="polygon40"
+   style="fill:#ed1c24" />
+	<polygon
+   points="390.688,193.25 361.75,193.25 393.25,161.75 410,161.75 417.064,166.394 "
+   id="polygon42"
+   style="fill:#ed1c24" />
+	<polygon
+   display="none"
+   points="439.938,193.98 411,193.98 442.5,162.48 410.875,162.48 "
+   id="polygon44"
+   style="fill:#ed1c24;display:none" />
+	<polygon
+   display="none"
+   points="419.128,175.728 418.25,189.625 412.5,193.98 400.875,193.98 "
+   id="polygon46"
+   style="fill:#ed1c24;display:none" />
+</g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/baseball-borderless.svg b/data/styles/symbols/baseball-borderless.svg
index 767c046d61..b47852d53a 100644
--- a/data/styles/symbols/baseball-borderless.svg
+++ b/data/styles/symbols/baseball-borderless.svg
@@ -1,7 +1,72 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="25" height="25" viewBox="0 0 300 300">
-    <path d="M 39.090816,260.90921 C 26.969728,248.7881 26.969728,224.54591 39.090816,212.42483 C 51.211907,200.30374 75.454099,200.30374 87.575173,212.42483 C 99.696269,224.54591 99.696269,248.7881 87.575173,260.90921 C 75.454099,273.03028 51.211907,273.03028 39.090816,260.90921 z" fill="#50524e" fill-rule="evenodd"/>
-    <path d="M 39.090816,212.42483 C 39.090816,212.42483 49.191725,220.50555 63.332998,220.50555 C 77.474263,220.50555 87.575173,212.42483 87.575173,212.42483" stroke="#fff" stroke-width="4.04" fill="none"/>
-    <path d="M 39.090816,260.90921 C 39.090816,260.90921 49.191725,252.82847 63.332998,252.82847 C 77.474263,252.82847 87.575173,260.90921 87.575173,260.90921" stroke="#fff" stroke-width="4.04" fill="none"/>
-    <path d="M 238.67679,297.78461 C 248.21215,290.61173 251.97113,282.83338 249.0123,276.39766 C 247.18129,272.41504 203.85749,230.40681 157.77016,187.92619 C 148.73504,179.59814 132.75765,164.85972 122.26488,155.17413 C 92.598199,127.78968 80.911051,117.12713 57.924089,96.474078 C 29.971921,71.359939 20.516652,61.668152 20.516652,58.130914 C 20.516652,51.433175 13.549793,47.907691 7.0635109,51.323136 C -2.6972564,56.46281 -2.210698,72.179734 7.7091856,72.179734 C 10.699467,72.179734 21.829061,81.902202 34.363659,95.464252 C 37.247465,98.584446 46.163087,108.2609 54.176141,116.96749 C 62.189202,125.67407 78.019156,142.52739 89.353825,154.41931 C 100.68849,166.31123 123.41955,190.79371 139.86732,208.82483 C 156.31507,226.85595 182.39734,254.7509 197.8279,270.81362 C 225.88347,300.01855 225.88347,300.01855 230.82122,299.99903 C 235.04681,299.98232 236.17981,299.66293 238.67679,297.78461 z" fill="#50524e"/>
-    <path d="M 136.05791,71.528011 C 136.05791,71.528011 110.08781,82.215411 102.10357,87.325323 C 95.378665,91.629253 93.583495,106.53683 119.94123,110.53921 C 146.29897,114.54161 151.99891,110.96493 172.06465,110.79351 C 180.90387,110.02643 182.23144,113.93417 180.95394,116.48911 L 174.74976,130.29911 C 170.12256,140.59888 177.8852,154.83116 185.86603,160.84728 C 191.64253,165.20174 205.85062,171.0294 221.0414,170.77702 C 235.34544,170.54182 247.07049,166.12689 258.70403,159.40385 C 270.33758,152.68082 287.99159,140.77787 295.29648,124.98796 C 302.60135,109.19805 299.03307,66.353803 297.02348,55.169076 C 294.95827,43.674832 283.84605,25.698909 273.94574,19.351554 C 264.18793,13.095551 254.89028,6.1239371 234.73327,1.9513782 C 214.51057,-2.2347839 197.24572,1.0522656 184.72733,4.3821967 C 172.2847,7.6919741 164.12616,12.703157 156.97115,17.175029 C 149.81617,21.646898 146.41793,27.339809 142.19703,37.378436 C 138.08997,47.146337 136.05791,71.528011 136.05791,71.528011 z M 213.9401,130.67313 C 211.1556,131.94632 208.90381,135.31321 208.97758,137.96949 C 209.0513,140.62273 210.64218,143.54476 212.71176,144.99562 C 214.78134,146.4465 217.14392,146.26288 220.42576,145.53609 C 223.6913,144.81294 231.23928,143.36434 233.79014,141.85107 C 236.37277,140.31895 237.90315,139.57213 238.82636,136.64288 C 239.74267,133.73555 237.91813,129.58958 235.0185,128.56038 C 232.1844,127.55446 228.44994,128.18583 223.80088,128.56798 C 219.65429,128.90883 216.69606,129.413 213.9401,130.67313 z" fill="#50524e" fill-rule="evenodd" stroke="#000" stroke-width=".44"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="25"
+   height="25"
+   viewBox="0 0 300 300"
+   id="symbol-baseball-borderless"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="baseball-borderless.svg">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="9.44"
+     inkscape:cx="12.5"
+     inkscape:cy="11.493644"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-baseball-borderless" />
+  <defs
+     id="defs16" />
+  <path
+     d="M 39.090816,260.90921 C 26.969728,248.7881 26.969728,224.54591 39.090816,212.42483 C 51.211907,200.30374 75.454099,200.30374 87.575173,212.42483 C 99.696269,224.54591 99.696269,248.7881 87.575173,260.90921 C 75.454099,273.03028 51.211907,273.03028 39.090816,260.90921 z"
+     id="path2393"
+     style="fill:#50524e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.93193000999999998px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 39.090816,212.42483 C 39.090816,212.42483 49.191725,220.50555 63.332998,220.50555 C 77.474263,220.50555 87.575173,212.42483 87.575173,212.42483"
+     id="path3303"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.04036236;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 39.090816,260.90921 C 39.090816,260.90921 49.191725,252.82847 63.332998,252.82847 C 77.474263,252.82847 87.575173,260.90921 87.575173,260.90921"
+     id="path3367"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.04036236;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 238.67679,297.78461 C 248.21215,290.61173 251.97113,282.83338 249.0123,276.39766 C 247.18129,272.41504 203.85749,230.40681 157.77016,187.92619 C 148.73504,179.59814 132.75765,164.85972 122.26488,155.17413 C 92.598199,127.78968 80.911051,117.12713 57.924089,96.474078 C 29.971921,71.359939 20.516652,61.668152 20.516652,58.130914 C 20.516652,51.433175 13.549793,47.907691 7.0635109,51.323136 C -2.6972564,56.46281 -2.210698,72.179734 7.7091856,72.179734 C 10.699467,72.179734 21.829061,81.902202 34.363659,95.464252 C 37.247465,98.584446 46.163087,108.2609 54.176141,116.96749 C 62.189202,125.67407 78.019156,142.52739 89.353825,154.41931 C 100.68849,166.31123 123.41955,190.79371 139.86732,208.82483 C 156.31507,226.85595 182.39734,254.7509 197.8279,270.81362 C 225.88347,300.01855 225.88347,300.01855 230.82122,299.99903 C 235.04681,299.98232 236.17981,299.66293 238.67679,297.78461 z"
+     id="path3446"
+     style="fill:#50524e;fill-opacity:1" />
+  <path
+     d="M 136.05791,71.528011 C 136.05791,71.528011 110.08781,82.215411 102.10357,87.325323 C 95.378665,91.629253 93.583495,106.53683 119.94123,110.53921 C 146.29897,114.54161 151.99891,110.96493 172.06465,110.79351 C 180.90387,110.02643 182.23144,113.93417 180.95394,116.48911 L 174.74976,130.29911 C 170.12256,140.59888 177.8852,154.83116 185.86603,160.84728 C 191.64253,165.20174 205.85062,171.0294 221.0414,170.77702 C 235.34544,170.54182 247.07049,166.12689 258.70403,159.40385 C 270.33758,152.68082 287.99159,140.77787 295.29648,124.98796 C 302.60135,109.19805 299.03307,66.353803 297.02348,55.169076 C 294.95827,43.674832 283.84605,25.698909 273.94574,19.351554 C 264.18793,13.095551 254.89028,6.1239371 234.73327,1.9513782 C 214.51057,-2.2347839 197.24572,1.0522656 184.72733,4.3821967 C 172.2847,7.6919741 164.12616,12.703157 156.97115,17.175029 C 149.81617,21.646898 146.41793,27.339809 142.19703,37.378436 C 138.08997,47.146337 136.05791,71.528011 136.05791,71.528011 z M 213.9401,130.67313 C 211.1556,131.94632 208.90381,135.31321 208.97758,137.96949 C 209.0513,140.62273 210.64218,143.54476 212.71176,144.99562 C 214.78134,146.4465 217.14392,146.26288 220.42576,145.53609 C 223.6913,144.81294 231.23928,143.36434 233.79014,141.85107 C 236.37277,140.31895 237.90315,139.57213 238.82636,136.64288 C 239.74267,133.73555 237.91813,129.58958 235.0185,128.56038 C 232.1844,127.55446 228.44994,128.18583 223.80088,128.56798 C 219.65429,128.90883 216.69606,129.413 213.9401,130.67313 z"
+     id="path3478"
+     style="fill:#50524e;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.44016922000000003px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/baseball.svg b/data/styles/symbols/baseball.svg
index 236a0fe060..0badb9ebb7 100644
--- a/data/styles/symbols/baseball.svg
+++ b/data/styles/symbols/baseball.svg
@@ -1,12 +1,48 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="36" height="36" viewBox="0 0 435 435">
-    <g transform="translate(67.28 67.887)">
-        <g>
-            <path d="M 39.090816,260.90921 C 26.969728,248.7881 26.969728,224.54591 39.090816,212.42483 C 51.211907,200.30374 75.454099,200.30374 87.575173,212.42483 C 99.696269,224.54591 99.696269,248.7881 87.575173,260.90921 C 75.454099,273.03028 51.211907,273.03028 39.090816,260.90921 z" fill-rule="evenodd"/>
-            <path d="M 39.090816,212.42483 C 39.090816,212.42483 49.191725,220.50555 63.332998,220.50555 C 77.474263,220.50555 87.575173,212.42483 87.575173,212.42483" stroke="#fff" stroke-width="4.04" fill="none"/>
-            <path d="M 39.090816,260.90921 C 39.090816,260.90921 49.191725,252.82847 63.332998,252.82847 C 77.474263,252.82847 87.575173,260.90921 87.575173,260.90921" stroke="#fff" stroke-width="4.04" fill="none"/>
-        </g>
-        <path d="M 238.67679,297.78461 C 248.21215,290.61173 251.97113,282.83338 249.0123,276.39766 C 247.18129,272.41504 203.85749,230.40681 157.77016,187.92619 C 148.73504,179.59814 132.75765,164.85972 122.26488,155.17413 C 92.598199,127.78968 80.911051,117.12713 57.924089,96.474078 C 29.971921,71.359939 20.516652,61.668152 20.516652,58.130914 C 20.516652,51.433175 13.549793,47.907691 7.0635109,51.323136 C -2.6972564,56.46281 -2.210698,72.179734 7.7091856,72.179734 C 10.699467,72.179734 21.829061,81.902202 34.363659,95.464252 C 37.247465,98.584446 46.163087,108.2609 54.176141,116.96749 C 62.189202,125.67407 78.019156,142.52739 89.353825,154.41931 C 100.68849,166.31123 123.41955,190.79371 139.86732,208.82483 C 156.31507,226.85595 182.39734,254.7509 197.8279,270.81362 C 225.88347,300.01855 225.88347,300.01855 230.82122,299.99903 C 235.04681,299.98232 236.17981,299.66293 238.67679,297.78461 z"/>
-        <path d="M 136.05791,71.528011 C 136.05791,71.528011 110.08781,82.215411 102.10357,87.325323 C 95.378665,91.629253 93.583495,106.53683 119.94123,110.53921 C 146.29897,114.54161 151.99891,110.96493 172.06465,110.79351 C 180.90387,110.02643 182.23144,113.93417 180.95394,116.48911 L 174.74976,130.29911 C 170.12256,140.59888 177.8852,154.83116 185.86603,160.84728 C 191.64253,165.20174 205.85062,171.0294 221.0414,170.77702 C 235.34544,170.54182 247.07049,166.12689 258.70403,159.40385 C 270.33758,152.68082 287.99159,140.77787 295.29648,124.98796 C 302.60135,109.19805 299.03307,66.353803 297.02348,55.169076 C 294.95827,43.674832 283.84605,25.698909 273.94574,19.351554 C 264.18793,13.095551 254.89028,6.1239371 234.73327,1.9513782 C 214.51057,-2.2347839 197.24572,1.0522656 184.72733,4.3821967 C 172.2847,7.6919741 164.12616,12.703157 156.97115,17.175029 C 149.81617,21.646898 146.41793,27.339809 142.19703,37.378436 C 138.08997,47.146337 136.05791,71.528011 136.05791,71.528011 z M 213.9401,130.67313 C 211.1556,131.94632 208.90381,135.31321 208.97758,137.96949 C 209.0513,140.62273 210.64218,143.54476 212.71176,144.99562 C 214.78134,146.4465 217.14392,146.26288 220.42576,145.53609 C 223.6913,144.81294 231.23928,143.36434 233.79014,141.85107 C 236.37277,140.31895 237.90315,139.57213 238.82636,136.64288 C 239.74267,133.73555 237.91813,129.58958 235.0185,128.56038 C 232.1844,127.55446 228.44994,128.18583 223.80088,128.56798 C 219.65429,128.90883 216.69606,129.413 213.9401,130.67313 z" fill-rule="evenodd" stroke="#000" stroke-width=".44"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="36"
+   height="36"
+   viewBox="0 0 435 435"
+   id="symbol-baseball">
+  <defs
+     id="defs16" />
+  <g
+     transform="translate(67.279567,67.887125)"
+     id="g3694">
+    <g
+       id="g3689">
+      <path
+         d="M 39.090816,260.90921 C 26.969728,248.7881 26.969728,224.54591 39.090816,212.42483 C 51.211907,200.30374 75.454099,200.30374 87.575173,212.42483 C 99.696269,224.54591 99.696269,248.7881 87.575173,260.90921 C 75.454099,273.03028 51.211907,273.03028 39.090816,260.90921 z"
+         id="path2393"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.93193001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         d="M 39.090816,212.42483 C 39.090816,212.42483 49.191725,220.50555 63.332998,220.50555 C 77.474263,220.50555 87.575173,212.42483 87.575173,212.42483"
+         id="path3303"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.04036236;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         d="M 39.090816,260.90921 C 39.090816,260.90921 49.191725,252.82847 63.332998,252.82847 C 77.474263,252.82847 87.575173,260.90921 87.575173,260.90921"
+         id="path3367"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.04036236;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
-    <rect width="409.672" height="392.537" ry="31.722" x="12.664" y="21.232" stroke="#000" stroke-width="22.328" stroke-linejoin="round" fill="none"/>
+    <path
+       d="M 238.67679,297.78461 C 248.21215,290.61173 251.97113,282.83338 249.0123,276.39766 C 247.18129,272.41504 203.85749,230.40681 157.77016,187.92619 C 148.73504,179.59814 132.75765,164.85972 122.26488,155.17413 C 92.598199,127.78968 80.911051,117.12713 57.924089,96.474078 C 29.971921,71.359939 20.516652,61.668152 20.516652,58.130914 C 20.516652,51.433175 13.549793,47.907691 7.0635109,51.323136 C -2.6972564,56.46281 -2.210698,72.179734 7.7091856,72.179734 C 10.699467,72.179734 21.829061,81.902202 34.363659,95.464252 C 37.247465,98.584446 46.163087,108.2609 54.176141,116.96749 C 62.189202,125.67407 78.019156,142.52739 89.353825,154.41931 C 100.68849,166.31123 123.41955,190.79371 139.86732,208.82483 C 156.31507,226.85595 182.39734,254.7509 197.8279,270.81362 C 225.88347,300.01855 225.88347,300.01855 230.82122,299.99903 C 235.04681,299.98232 236.17981,299.66293 238.67679,297.78461 z"
+       id="path3446"
+       style="fill:#000000" />
+    <path
+       d="M 136.05791,71.528011 C 136.05791,71.528011 110.08781,82.215411 102.10357,87.325323 C 95.378665,91.629253 93.583495,106.53683 119.94123,110.53921 C 146.29897,114.54161 151.99891,110.96493 172.06465,110.79351 C 180.90387,110.02643 182.23144,113.93417 180.95394,116.48911 L 174.74976,130.29911 C 170.12256,140.59888 177.8852,154.83116 185.86603,160.84728 C 191.64253,165.20174 205.85062,171.0294 221.0414,170.77702 C 235.34544,170.54182 247.07049,166.12689 258.70403,159.40385 C 270.33758,152.68082 287.99159,140.77787 295.29648,124.98796 C 302.60135,109.19805 299.03307,66.353803 297.02348,55.169076 C 294.95827,43.674832 283.84605,25.698909 273.94574,19.351554 C 264.18793,13.095551 254.89028,6.1239371 234.73327,1.9513782 C 214.51057,-2.2347839 197.24572,1.0522656 184.72733,4.3821967 C 172.2847,7.6919741 164.12616,12.703157 156.97115,17.175029 C 149.81617,21.646898 146.41793,27.339809 142.19703,37.378436 C 138.08997,47.146337 136.05791,71.528011 136.05791,71.528011 z M 213.9401,130.67313 C 211.1556,131.94632 208.90381,135.31321 208.97758,137.96949 C 209.0513,140.62273 210.64218,143.54476 212.71176,144.99562 C 214.78134,146.4465 217.14392,146.26288 220.42576,145.53609 C 223.6913,144.81294 231.23928,143.36434 233.79014,141.85107 C 236.37277,140.31895 237.90315,139.57213 238.82636,136.64288 C 239.74267,133.73555 237.91813,129.58958 235.0185,128.56038 C 232.1844,127.55446 228.44994,128.18583 223.80088,128.56798 C 219.65429,128.90883 216.69606,129.413 213.9401,130.67313 z"
+       id="path3478"
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.44016922px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+  <rect
+     width="409.67169"
+     height="392.53659"
+     ry="31.721754"
+     x="12.664154"
+     y="21.231705"
+     id="rect2471"
+     style="fill:none;stroke:#000000;stroke-width:22.32826805;stroke-linejoin:round;stroke-miterlimit:4" />
 </svg>
diff --git a/data/styles/symbols/basketball-borderless.svg b/data/styles/symbols/basketball-borderless.svg
index 842ee4ba43..fdc888ea16 100644
--- a/data/styles/symbols/basketball-borderless.svg
+++ b/data/styles/symbols/basketball-borderless.svg
@@ -1,7 +1,37 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="25" height="24.5" viewBox="0 0 500 490">
-    <path d="M 13.386033,245.92457 C 13.386033,375.30651 117.95887,480.31215 246.80755,480.31215 C 375.65623,480.31215 480.22907,375.30651 480.22907,245.92457 C 480.22907,116.54262 375.65623,11.536978 246.80755,11.536978 C 117.95887,11.536978 13.386033,116.54262 13.386033,245.92457" fill="#ff7006" fill-rule="evenodd" stroke="#000" stroke-width="12"/>
-    <path d="M 308.33727,472.70925 C 324.73347,447.64803 307.98273,374.21025 298.69712,321.82618 C 290.55394,275.88711 278.7749,228.21056 264.94798,180.00715 C 251.17359,131.98686 217.8896,34.559203 178.43989,21.513022" stroke="#000" stroke-width="10" fill="none"/>
-    <path d="M 420.1881,88.973658 C 278.0067,-2.4855797 44.794483,94.605195 13.984163,247.11626" stroke="#000" stroke-width="10" fill="none"/>
-    <path d="M 462.86178,334.76893 C 463.60781,242.45369 390.80053,178.69185 355.73631,138.25712 C 320.05101,97.106179 257.67383,40.167003 275.41294,14.110951" stroke="#000" stroke-width="10" fill="none"/>
-    <path d="M 95.162113,67.658938 C 184.98125,51.415051 161.28059,148.83725 142.93824,225.32019 C 124.8125,300.89989 99.939723,367.69308 136.24959,452.73461" stroke="#000" stroke-width="10" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.0"
+   width="25"
+   height="24.5"
+   viewBox="0 0 500 490"
+   id="symbol-basketball-borderless">
+  <defs
+     id="defs2406" />
+  <path
+     d="M 13.386033,245.92457 C 13.386033,375.30651 117.95887,480.31215 246.80755,480.31215 C 375.65623,480.31215 480.22907,375.30651 480.22907,245.92457 C 480.22907,116.54262 375.65623,11.536978 246.80755,11.536978 C 117.95887,11.536978 13.386033,116.54262 13.386033,245.92457"
+     id="path2414"
+     style="fill:#ff7006;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:12;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 308.33727,472.70925 C 324.73347,447.64803 307.98273,374.21025 298.69712,321.82618 C 290.55394,275.88711 278.7749,228.21056 264.94798,180.00715 C 251.17359,131.98686 217.8896,34.559203 178.43989,21.513022"
+     id="path3187"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     id="layer1">
+    <path
+       d="M 420.1881,88.973658 C 278.0067,-2.4855797 44.794483,94.605195 13.984163,247.11626"
+       id="path3193"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+  </g>
+  <path
+     d="M 462.86178,334.76893 C 463.60781,242.45369 390.80053,178.69185 355.73631,138.25712 C 320.05101,97.106179 257.67383,40.167003 275.41294,14.110951"
+     id="path3196"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 95.162113,67.658938 C 184.98125,51.415051 161.28059,148.83725 142.93824,225.32019 C 124.8125,300.89989 99.939723,367.69308 136.24959,452.73461"
+     id="path3208"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/basketball.svg b/data/styles/symbols/basketball.svg
index 053b436529..dd52fe014b 100644
--- a/data/styles/symbols/basketball.svg
+++ b/data/styles/symbols/basketball.svg
@@ -1,8 +1,41 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="35" height="35" viewBox="0 0 600 600">
-    <path d="M 70.52031,300.00002 C 70.52031,427.19705 173.32721,530.42945 300.00001,530.42945 C 426.67279,530.42945 529.47969,427.19705 529.47969,300.00002 C 529.47969,172.80296 426.67279,69.570552 300.00001,69.570552 C 173.32721,69.570552 70.52031,172.80296 70.52031,300.00002" fill="#ff7006" fill-rule="evenodd" stroke="#000" stroke-width="11.797"/>
-    <path d="M 360.49066,522.95494 C 376.60997,498.31694 360.14211,426.11931 351.01331,374.61986 C 343.00764,329.45657 331.42752,282.58515 317.8341,235.19575 C 304.29232,187.98638 271.57039,92.203997 232.78688,79.378129" stroke="#000" stroke-width="9.831" fill="none"/>
-    <path d="M 470.45263,145.69954 C 330.67227,55.784795 101.39836,151.23598 71.108339,301.17156" stroke="#000" stroke-width="9.831" fill="none"/>
-    <path d="M 512.40569,387.34404 C 513.13913,296.58774 441.56135,233.90266 407.08927,194.15076 C 372.00659,153.69473 310.68278,97.717098 328.12233,72.101059" stroke="#000" stroke-width="9.831" fill="none"/>
-    <path d="M 150.91542,124.74477 C 239.21777,108.7752 215.91735,204.55222 197.88475,279.74358 C 180.0651,354.04696 155.61235,419.7122 191.30906,503.31762" stroke="#000" stroke-width="9.831" fill="none"/>
-    <rect width="563.49" height="563.49" ry="51.226" x="18.255" y="18.255" stroke="#000" stroke-width="36.51" stroke-linejoin="bevel" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="35"
+   height="35"
+   viewBox="0 0 600 600"
+   id="symbol-basketball">
+  <defs
+     id="defs2406" />
+  <path
+     d="M 70.52031,300.00002 C 70.52031,427.19705 173.32721,530.42945 300.00001,530.42945 C 426.67279,530.42945 529.47969,427.19705 529.47969,300.00002 C 529.47969,172.80296 426.67279,69.570552 300.00001,69.570552 C 173.32721,69.570552 70.52031,172.80296 70.52031,300.00002"
+     id="path2414"
+     style="fill:#ff7006;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:11.79735374;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 360.49066,522.95494 C 376.60997,498.31694 360.14211,426.11931 351.01331,374.61986 C 343.00764,329.45657 331.42752,282.58515 317.8341,235.19575 C 304.29232,187.98638 271.57039,92.203997 232.78688,79.378129"
+     id="path3187"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:9.83112812;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 470.45263,145.69954 C 330.67227,55.784795 101.39836,151.23598 71.108339,301.17156"
+     id="path3193"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:9.83112812;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+  <path
+     d="M 512.40569,387.34404 C 513.13913,296.58774 441.56135,233.90266 407.08927,194.15076 C 372.00659,153.69473 310.68278,97.717098 328.12233,72.101059"
+     id="path3196"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:9.83112812;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 150.91542,124.74477 C 239.21777,108.7752 215.91735,204.55222 197.88475,279.74358 C 180.0651,354.04696 155.61235,419.7122 191.30906,503.31762"
+     id="path3208"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:9.83112812;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     width="563.48956"
+     height="563.48962"
+     ry="51.22633"
+     x="18.255203"
+     y="18.255173"
+     id="rect2386"
+     style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:36.51040649;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/bench.svg b/data/styles/symbols/bench.svg
index f861f76b33..0ad08e8602 100644
--- a/data/styles/symbols/bench.svg
+++ b/data/styles/symbols/bench.svg
@@ -1,6 +1,29 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="12" height="12" viewBox="0 0 580 580">
-    <path d="M 145,338.33333 L 386.66667,338.33333" stroke="#000" stroke-width="24.167" stroke-linecap="square" fill="none"/>
-    <path d="M 181.25,338.33333 L 145,483.33333" stroke="#000" stroke-width="24.167" fill="none"/>
-    <path d="M 350.41667,338.33333 L 386.66667,483.33333" stroke="#000" stroke-width="24.167" fill="none"/>
-    <path d="M 435,72.5 L 386.66667,338.33333" stroke="#000" stroke-width="24.167" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="12"
+   height="12"
+   viewBox="0 0 580 580"
+   id="bench">
+  <defs
+     id="defs14" />
+  <path
+     d="M 145,338.33333 L 386.66667,338.33333"
+     id="path2391"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:24.16666603;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 181.25,338.33333 L 145,483.33333"
+     id="path3163"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:24.16666603;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 350.41667,338.33333 L 386.66667,483.33333"
+     id="path3165"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:24.16666603;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 435,72.5 L 386.66667,338.33333"
+     id="path3167"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:24.16666603;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/bicycle_rental.svg b/data/styles/symbols/bicycle_rental.svg
index 4ff7436764..183548d5bb 100644
--- a/data/styles/symbols/bicycle_rental.svg
+++ b/data/styles/symbols/bicycle_rental.svg
@@ -1,5 +1,77 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24">
-    <rect width="3" height="19" x="20" y="4" fill="#505050"/>
-    <rect width="23" height="1" y="22" fill="#505050"/>
-    <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m 14.4375,10.4375 c -0.553649,-0.01823 -1.090535,0.03358 -1.625,0.125 C 11.743569,10.745351 10.735791,11.133884 9.75,11.75 9.4720262,11.847716 9.3354337,12.223194 9.4856462,12.476677 9.6358588,12.730161 10.030804,12.790653 10.25,12.59375 10.989815,12.131368 11.732521,11.813977 12.5,11.625 l 0,1.40625 -4.8125,0 -0.15625,-0.4375 0.46875,0 c 0.2641563,0.0037 0.507121,-0.235817 0.507121,-0.5 0,-0.264183 -0.2429647,-0.503736 -0.507121,-0.5 L 6,11.5625 c -0.041448,-0.0052 -0.083552,-0.0052 -0.125,0 -0.2618101,0.03271 -0.4702528,0.300695 -0.4375267,0.562503 C 5.4701993,12.386812 5.7381934,12.59524 6,12.5625 l 0.5,0 c 0.0018,0.04622 0.015068,0.0809 0.03125,0.125 L 6.6875,13.125 c -0.035221,0.02691 -0.066839,0.05853 -0.09375,0.09375 L 5.6875,14.375 C 5.169879,14.133942 4.6072784,13.96875 4,13.96875 c -2.2302388,0 -4.0625,1.832261 -4.0625,4.0625 0,2.230238 1.8322612,4.0625 4.0625,4.0625 1.9166115,0 3.5222643,-1.36345 3.9375,-3.15625 l 0.1875,0.03125 c 0.1650688,0.325123 0.4854106,0.5625 0.875,0.5625 0.5522847,0 1,-0.447715 1,-1 0,-0.211944 -0.075023,-0.40075 -0.1875,-0.5625 l 1.0625,-2.0625 1.90625,-1.53125 0.09375,0.25 c -1.141784,0.716515 -1.9375,1.962632 -1.9375,3.40625 0,2.230238 1.832261,4.0625 4.0625,4.0625 0.721809,0 1.444875,-0.03852 2.079202,-0.09375 l -0.0167,-0.46875 c 0,-0.02191 2.29e-4,-0.04072 0,-0.0625 1.02882,-0.621265 1.771616,-1.664506 1.9375,-2.90625 0.294601,-0.02032 0.634923,-0.03125 1,-0.03125 l 0,-1 c -0.357303,0 -0.694288,-0.01014 -1,0 -0.250563,-1.99202 -1.941506,-3.5625 -4,-3.5625 -0.41817,0 -0.80766,0.100266 -1.1875,0.21875 L 13.5,13.40625 l 0,-1.9375 c 0.769683,-0.06836 1.557959,-0.02058 2.375,0.1875 0.253618,0.06545 0.543925,-0.105757 0.609375,-0.359375 C 16.549825,11.043257 16.378618,10.75295 16.125,10.6875 15.56156,10.544007 14.991149,10.455733 14.4375,10.4375 z M 8,14.03125 l 3.5625,0 -1.375,1.09375 -0.09375,0.09375 L 10.0625,15.3125 9.09375,17.25 z m -0.9375,0.25 L 8.25,17.875 C 8.225879,17.90265 8.208502,17.93855 8.1875,17.96875 L 8.0625,17.9375 c -0.02812,-1.212827 -0.6269771,-2.275746 -1.5,-3 z M 4,15.09375 c 0.364637,0 0.7093211,0.06764 1.03125,0.1875 L 3.125,17.75 c -0.2265064,0.280021 -0.014949,0.780066 0.34375,0.8125 l 3.375,0.28125 C 6.4916435,20.080882 5.3529054,21 4,21 2.3642454,21 1.03125,19.667004 1.03125,18.03125 c 0,-1.635755 1.3329954,-2.9375 2.96875,-2.9375 z m 11,0 c 1.506407,0 2.720136,1.108215 2.90625,2.5625 -0.483627,0.08398 -0.898859,0.216983 -1.21875,0.46875 -0.535389,0.421369 -0.700856,1.073019 -0.71875,1.65625 C 15.95822,20.124675 15.96995,20.468115 16,20.8125 15.688186,20.923949 15.351006,21 15,21 c -1.635755,0 -2.9375,-1.332996 -2.9375,-2.96875 0,-0.997191 0.465908,-1.872035 1.21875,-2.40625 l 1.25,3.09375 c 0.09817,0.245437 0.410813,0.379425 0.65625,0.28125 0.245437,-0.09818 0.379425,-0.410813 0.28125,-0.65625 l -1.25,-3.15625 C 14.469063,15.118938 14.727374,15.09375 15,15.09375 z m -9.09375,0.6875 c 0.5945518,0.50219 0.9781493,1.233789 1.03125,2.0625 L 4.46875,17.625 z m 11.96875,2.9375 c -0.139293,0.583918 -0.447081,1.109208 -0.875,1.5 -0.0088,-0.13702 -0.03489,-0.28759 -0.03125,-0.40625 0.01398,-0.455714 0.102175,-0.684872 0.34375,-0.875 0.09741,-0.07666 0.299111,-0.155057 0.5625,-0.21875 z" color="#000" fill="#505050" overflow="visible" enable-background="accumulate" font-family="Sans"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="24"
+   height="24"
+   id="symbol-bicycle-rental"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="bicycle_rental.svg">
+  <metadata
+     id="metadata17">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="959"
+     inkscape:window-height="711"
+     id="namedview15"
+     showgrid="true"
+     inkscape:zoom="5.2015913"
+     inkscape:cx="16.050767"
+     inkscape:cy="2.3147699"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-bicycle-rental">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2994"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs2477" />
+  <rect
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="rect2996"
+     width="3"
+     height="19"
+     x="20"
+     y="4" />
+  <rect
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="rect2998"
+     width="23"
+     height="1"
+     x="0"
+     y="22" />
+  <path
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#505050;fill-opacity:1;stroke:none;stroke-width:0.94285715000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     d="m 14.4375,10.4375 c -0.553649,-0.01823 -1.090535,0.03358 -1.625,0.125 C 11.743569,10.745351 10.735791,11.133884 9.75,11.75 9.4720262,11.847716 9.3354337,12.223194 9.4856462,12.476677 9.6358588,12.730161 10.030804,12.790653 10.25,12.59375 10.989815,12.131368 11.732521,11.813977 12.5,11.625 l 0,1.40625 -4.8125,0 -0.15625,-0.4375 0.46875,0 c 0.2641563,0.0037 0.507121,-0.235817 0.507121,-0.5 0,-0.264183 -0.2429647,-0.503736 -0.507121,-0.5 L 6,11.5625 c -0.041448,-0.0052 -0.083552,-0.0052 -0.125,0 -0.2618101,0.03271 -0.4702528,0.300695 -0.4375267,0.562503 C 5.4701993,12.386812 5.7381934,12.59524 6,12.5625 l 0.5,0 c 0.0018,0.04622 0.015068,0.0809 0.03125,0.125 L 6.6875,13.125 c -0.035221,0.02691 -0.066839,0.05853 -0.09375,0.09375 L 5.6875,14.375 C 5.169879,14.133942 4.6072784,13.96875 4,13.96875 c -2.2302388,0 -4.0625,1.832261 -4.0625,4.0625 0,2.230238 1.8322612,4.0625 4.0625,4.0625 1.9166115,0 3.5222643,-1.36345 3.9375,-3.15625 l 0.1875,0.03125 c 0.1650688,0.325123 0.4854106,0.5625 0.875,0.5625 0.5522847,0 1,-0.447715 1,-1 0,-0.211944 -0.075023,-0.40075 -0.1875,-0.5625 l 1.0625,-2.0625 1.90625,-1.53125 0.09375,0.25 c -1.141784,0.716515 -1.9375,1.962632 -1.9375,3.40625 0,2.230238 1.832261,4.0625 4.0625,4.0625 0.721809,0 1.444875,-0.03852 2.079202,-0.09375 l -0.0167,-0.46875 c 0,-0.02191 2.29e-4,-0.04072 0,-0.0625 1.02882,-0.621265 1.771616,-1.664506 1.9375,-2.90625 0.294601,-0.02032 0.634923,-0.03125 1,-0.03125 l 0,-1 c -0.357303,0 -0.694288,-0.01014 -1,0 -0.250563,-1.99202 -1.941506,-3.5625 -4,-3.5625 -0.41817,0 -0.80766,0.100266 -1.1875,0.21875 L 13.5,13.40625 l 0,-1.9375 c 0.769683,-0.06836 1.557959,-0.02058 2.375,0.1875 0.253618,0.06545 0.543925,-0.105757 0.609375,-0.359375 C 16.549825,11.043257 16.378618,10.75295 16.125,10.6875 15.56156,10.544007 14.991149,10.455733 14.4375,10.4375 z M 8,14.03125 l 3.5625,0 -1.375,1.09375 -0.09375,0.09375 L 10.0625,15.3125 9.09375,17.25 z m -0.9375,0.25 L 8.25,17.875 C 8.225879,17.90265 8.208502,17.93855 8.1875,17.96875 L 8.0625,17.9375 c -0.02812,-1.212827 -0.6269771,-2.275746 -1.5,-3 z M 4,15.09375 c 0.364637,0 0.7093211,0.06764 1.03125,0.1875 L 3.125,17.75 c -0.2265064,0.280021 -0.014949,0.780066 0.34375,0.8125 l 3.375,0.28125 C 6.4916435,20.080882 5.3529054,21 4,21 2.3642454,21 1.03125,19.667004 1.03125,18.03125 c 0,-1.635755 1.3329954,-2.9375 2.96875,-2.9375 z m 11,0 c 1.506407,0 2.720136,1.108215 2.90625,2.5625 -0.483627,0.08398 -0.898859,0.216983 -1.21875,0.46875 -0.535389,0.421369 -0.700856,1.073019 -0.71875,1.65625 C 15.95822,20.124675 15.96995,20.468115 16,20.8125 15.688186,20.923949 15.351006,21 15,21 c -1.635755,0 -2.9375,-1.332996 -2.9375,-2.96875 0,-0.997191 0.465908,-1.872035 1.21875,-2.40625 l 1.25,3.09375 c 0.09817,0.245437 0.410813,0.379425 0.65625,0.28125 0.245437,-0.09818 0.379425,-0.410813 0.28125,-0.65625 l -1.25,-3.15625 C 14.469063,15.118938 14.727374,15.09375 15,15.09375 z m -9.09375,0.6875 c 0.5945518,0.50219 0.9781493,1.233789 1.03125,2.0625 L 4.46875,17.625 z m 11.96875,2.9375 c -0.139293,0.583918 -0.447081,1.109208 -0.875,1.5 -0.0088,-0.13702 -0.03489,-0.28759 -0.03125,-0.40625 0.01398,-0.455714 0.102175,-0.684872 0.34375,-0.875 0.09741,-0.07666 0.299111,-0.155057 0.5625,-0.21875 z"
+     id="path3000"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="sscsccccccscccsccccccsssccssccccsscccccccsccccscscccccccccccccsccccsssscsccssccsccsccccccscc" />
 </svg>
diff --git a/data/styles/symbols/bird.svg b/data/styles/symbols/bird.svg
index 3b3f00f5db..90eacbd298 100644
--- a/data/styles/symbols/bird.svg
+++ b/data/styles/symbols/bird.svg
@@ -1,11 +1,117 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24">
-    <title>
-        Birds Park Map Icon
-    </title>
-    <g>
-        <path d="M -1.5560836,6.6082327 C -2.8228262,5.3050126 -2.7953466,5.0382957 -3.478862,4.0323588 -3.8203472,3.6064401 -4.2805402,2.0419564 -4.1348979,1.4870513 -2.3093273,3.087641 -0.31427886,5.636444 1.5807833,5.7990076 3.318108,5.5637745 4.5593833,3.2962301 5.6809401,3.3507424 c 0.8986607,0 1.6135586,0.44511 1.9018797,1.3614767 L 9.85978,5.2882015 C 8.9705893,5.7657298 8.5214102,5.7660746 7.6322195,6.2436029 6.9726862,8.4187052 5.2929583,10.617447 2.9392689,10.837754 1.2141556,10.824215 -0.10356506,10.42219 -1.3090862,8.5900782 -1.8003687,7.7173541 -1.7866095,6.8446299 -1.5560836,5.9719058" fill="#4d4d4d" transform="matrix(1.524 0 0 1.572 7.303 -.337)"/>
-        <path d="m 0.25,12.75 -0.46875,0.375 c 0.46241486,0.58865 0.86530691,1.022172 0.875,2.375 l 0.59375,0 c -0.010633,-1.484004 -0.54405818,-2.16959 -1,-2.75 z m 0.09375,-0.125 c -0.80697666,-0.05044 -1.632415,0.0575 -2.4375,0.28125 l 0.1875,0.5625 c 0.7427654,-0.20643 1.47787632,-0.265054 2.21875,-0.21875 0.7042713,0.156331 1.24078,0.467268 1.9702513,1.78125 L 2.7893016,14.675901 C 1.9770564,13.21282 1.2093514,12.829554 0.375,12.65625 l 0,-0.03125 z m 0.5625,-2.5 L 0,12.96875 0.5625,13.15625 1.46875,10.3125 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" color="#000" fill="#4d4d4d" overflow="visible" enable-background="accumulate" font-family="Sans" transform="matrix(1.524 0 0 1.572 7.303 -.337)"/>
-        <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="M 3.1575746,12.375164 2.808918,12.855003 c 0.5885208,0.453502 1.0810391,0.771899 1.435393,2.077528 L 4.8071362,14.784014 C 4.4184227,13.351786 3.7378571,12.822318 3.1575746,12.375164 z m 0.056974,-0.144313 c -0.7778155,0.153082 -1.1622253,-0.03008 -1.8682897,0.387647 l 0.3706521,0.472283 c 0.6514099,-0.385388 0.9133801,-0.107253 1.6274803,-0.247799 0.7074769,-0.02501 1.4124422,0.110551 2.4391741,1.198579 L 6.2153865,13.636736 C 5.0721502,12.425249 4.0872569,12.212119 3.2521444,12.25325 l -0.00797,-0.03022 -0.029622,0.0078 z M 3.1098919,9.6728939 2.9764084,12.649208 3.5574505,12.689802 3.690934,9.713488 z" color="#000" fill="#4d4d4d" overflow="visible" enable-background="accumulate" font-family="Sans" transform="matrix(1.524 0 0 1.572 7.303 -.337)"/>
-        <path transform="matrix(.855 0 0 .994 11.183 2.335)" d="m 6.6442301,4.8604174 c 0,0.4638038 -0.4533964,0.8397911 -1.0126893,0.8397911 -0.5592929,0 -1.0126894,-0.3759873 -1.0126894,-0.8397911 0,-0.4638039 0.4533965,-0.8397912 1.0126894,-0.8397912 0.5592929,0 1.0126893,0.3759873 1.0126893,0.8397912 z" fill="#fff"/>
-    </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="24"
+   height="24"
+   id="symbol-bird"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="bird.svg">
+  <title
+     id="title2988">Birds Park Map Icon</title>
+  <metadata
+     id="metadata9">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Birds Park Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1178"
+     inkscape:window-height="749"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="20.243129"
+     inkscape:cx="19.9153"
+     inkscape:cy="11.104074"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-bird">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs3341" />
+  <g
+     id="g3803"
+     transform="matrix(1.5243069,0,0,1.5715193,7.3028534,-0.3369297)">
+    <path
+       sodipodi:nodetypes="ccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path2997"
+       d="M -1.5560836,6.6082327 C -2.8228262,5.3050126 -2.7953466,5.0382957 -3.478862,4.0323588 -3.8203472,3.6064401 -4.2805402,2.0419564 -4.1348979,1.4870513 -2.3093273,3.087641 -0.31427886,5.636444 1.5807833,5.7990076 3.318108,5.5637745 4.5593833,3.2962301 5.6809401,3.3507424 c 0.8986607,0 1.6135586,0.44511 1.9018797,1.3614767 L 9.85978,5.2882015 C 8.9705893,5.7657298 8.5214102,5.7660746 7.6322195,6.2436029 6.9726862,8.4187052 5.2929583,10.617447 2.9392689,10.837754 1.2141556,10.824215 -0.10356506,10.42219 -1.3090862,8.5900782 -1.8003687,7.7173541 -1.7866095,6.8446299 -1.5560836,5.9719058"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+    <path
+       sodipodi:nodetypes="ccccccccccccccccccc"
+       inkscape:connector-curvature="0"
+       d="m 0.25,12.75 -0.46875,0.375 c 0.46241486,0.58865 0.86530691,1.022172 0.875,2.375 l 0.59375,0 c -0.010633,-1.484004 -0.54405818,-2.16959 -1,-2.75 z m 0.09375,-0.125 c -0.80697666,-0.05044 -1.632415,0.0575 -2.4375,0.28125 l 0.1875,0.5625 c 0.7427654,-0.20643 1.47787632,-0.265054 2.21875,-0.21875 0.7042713,0.156331 1.24078,0.467268 1.9702513,1.78125 L 2.7893016,14.675901 C 1.9770564,13.21282 1.2093514,12.829554 0.375,12.65625 l 0,-0.03125 z m 0.5625,-2.5 L 0,12.96875 0.5625,13.15625 1.46875,10.3125 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.60000002;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path3773" />
+    <path
+       sodipodi:nodetypes="cccccccccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path3799"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.60000002;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="M 3.1575746,12.375164 2.808918,12.855003 c 0.5885208,0.453502 1.0810391,0.771899 1.435393,2.077528 L 4.8071362,14.784014 C 4.4184227,13.351786 3.7378571,12.822318 3.1575746,12.375164 z m 0.056974,-0.144313 c -0.7778155,0.153082 -1.1622253,-0.03008 -1.8682897,0.387647 l 0.3706521,0.472283 c 0.6514099,-0.385388 0.9133801,-0.107253 1.6274803,-0.247799 0.7074769,-0.02501 1.4124422,0.110551 2.4391741,1.198579 L 6.2153865,13.636736 C 5.0721502,12.425249 4.0872569,12.212119 3.2521444,12.25325 l -0.00797,-0.03022 -0.029622,0.0078 z M 3.1098919,9.6728939 2.9764084,12.649208 3.5574505,12.689802 3.690934,9.713488 z" />
+    <path
+       transform="matrix(0.56097563,0,0,0.63235293,2.546483,1.7004691)"
+       d="m 6.6442301,4.8604174 c 0,0.4638038 -0.4533964,0.8397911 -1.0126893,0.8397911 -0.5592929,0 -1.0126894,-0.3759873 -1.0126894,-0.8397911 0,-0.4638039 0.4533965,-0.8397912 1.0126894,-0.8397912 0.5592929,0 1.0126893,0.3759873 1.0126893,0.8397912 z"
+       sodipodi:ry="0.83979112"
+       sodipodi:rx="1.0126894"
+       sodipodi:cy="4.8604174"
+       sodipodi:cx="5.6315408"
+       id="path3801"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/bowls-borderless.svg b/data/styles/symbols/bowls-borderless.svg
index ac63e43ef8..d95d848371 100644
--- a/data/styles/symbols/bowls-borderless.svg
+++ b/data/styles/symbols/bowls-borderless.svg
@@ -1,4 +1,61 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="38" height="38" viewBox="0 0 300 300">
-    <path d="M 133.81685,208.8622 L 126.35503,240.31878 C 124.99394,245.51199 126.77374,249.59331 131.69442,252.56277 C 135.1066,254.53982 138.69086,254.81182 142.44721,253.37876 C 146.2033,251.94563 148.57756,249.32335 149.57,245.51188 L 158.56393,207.50471 C 159.4585,203.4602 158.48415,199.99258 155.64087,197.10185 L 134.75661,175.03208 L 162.66048,153.398 L 166.54511,167.06433 C 166.79653,168.31994 167.48101,169.46325 168.5985,170.49427 L 195.76983,191.98059 C 196.45337,192.64098 197.12373,193.10574 197.78094,193.37488 C 200.08277,194.31797 202.42725,194.22395 204.81434,193.09278 C 207.20108,191.96165 208.86684,190.24692 209.81164,187.94863 C 211.49695,183.8478 210.63576,180.33295 207.2281,177.40406 L 183.83954,158.62581 L 173.64264,125.97234 C 172.19694,121.54832 169.09517,117.88193 164.33727,114.97315 C 156.00428,110.02673 148.06788,110.41718 140.5281,116.14448 L 102.21218,145.59669 C 99.720069,147.45414 97.815921,150.2193 96.499761,153.89217 L 77.106834,203.17152 L 45.125616,232.63017 C 43.86149,233.83809 42.947508,234.8999 42.383669,235.81558 C 40.605024,238.73157 40.130919,241.74913 40.961422,244.86825 C 41.79188,247.98732 43.667492,250.43472 46.588322,252.2105 C 51.508856,255.17988 55.947032,254.88907 59.902852,251.33808 L 95.031256,219.14089 C 96.295295,217.93294 97.263831,216.5103 97.936863,214.87295 L 110.13221,184.4956 L 133.81685,208.8622 z M 175.35877,116.89965 C 179.79714,118.7181 184.31645,118.70038 188.91668,116.8465 C 193.5166,114.99285 196.76021,111.77017 198.64755,107.17852 C 200.4687,102.74732 200.41134,98.21769 198.47553,93.589598 C 196.53933,88.961767 193.35205,85.738614 188.9137,83.920118 C 184.30948,82.034104 179.73058,82.07567 175.17695,84.044796 C 170.62302,86.014182 167.43547,89.214488 165.6143,93.645672 C 163.72698,98.237322 163.72826,102.78934 165.61814,107.3017 C 167.5077,111.81428 170.75459,115.01359 175.35877,116.89965 L 175.35877,116.89965 z" style="text-align:start;line-height:125%;-inkscape-font-specification:NPSPICT3" font-size="40" fill="#555753" font-family="NPSPICT3"/>
-    <path d="M 249.05661,235.18867 A 16.132076,16.132076 0 1 1 216.79245,235.18867 A 16.132076,16.132076 0 1 1 249.05661,235.18867 z" transform="translate(-2.83 1.132)" fill="#555753" fill-rule="evenodd"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="38"
+   height="38"
+   viewBox="0 0 300 300"
+   id="symbol-bowls-borderless"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="bowls-borderless.svg">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="6.2105263"
+     inkscape:cx="19"
+     inkscape:cy="17.470339"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-bowls-borderless" />
+  <defs
+     id="defs2474" />
+  <path
+     d="M 133.81685,208.8622 L 126.35503,240.31878 C 124.99394,245.51199 126.77374,249.59331 131.69442,252.56277 C 135.1066,254.53982 138.69086,254.81182 142.44721,253.37876 C 146.2033,251.94563 148.57756,249.32335 149.57,245.51188 L 158.56393,207.50471 C 159.4585,203.4602 158.48415,199.99258 155.64087,197.10185 L 134.75661,175.03208 L 162.66048,153.398 L 166.54511,167.06433 C 166.79653,168.31994 167.48101,169.46325 168.5985,170.49427 L 195.76983,191.98059 C 196.45337,192.64098 197.12373,193.10574 197.78094,193.37488 C 200.08277,194.31797 202.42725,194.22395 204.81434,193.09278 C 207.20108,191.96165 208.86684,190.24692 209.81164,187.94863 C 211.49695,183.8478 210.63576,180.33295 207.2281,177.40406 L 183.83954,158.62581 L 173.64264,125.97234 C 172.19694,121.54832 169.09517,117.88193 164.33727,114.97315 C 156.00428,110.02673 148.06788,110.41718 140.5281,116.14448 L 102.21218,145.59669 C 99.720069,147.45414 97.815921,150.2193 96.499761,153.89217 L 77.106834,203.17152 L 45.125616,232.63017 C 43.86149,233.83809 42.947508,234.8999 42.383669,235.81558 C 40.605024,238.73157 40.130919,241.74913 40.961422,244.86825 C 41.79188,247.98732 43.667492,250.43472 46.588322,252.2105 C 51.508856,255.17988 55.947032,254.88907 59.902852,251.33808 L 95.031256,219.14089 C 96.295295,217.93294 97.263831,216.5103 97.936863,214.87295 L 110.13221,184.4956 L 133.81685,208.8622 z M 175.35877,116.89965 C 179.79714,118.7181 184.31645,118.70038 188.91668,116.8465 C 193.5166,114.99285 196.76021,111.77017 198.64755,107.17852 C 200.4687,102.74732 200.41134,98.21769 198.47553,93.589598 C 196.53933,88.961767 193.35205,85.738614 188.9137,83.920118 C 184.30948,82.034104 179.73058,82.07567 175.17695,84.044796 C 170.62302,86.014182 167.43547,89.214488 165.6143,93.645672 C 163.72698,98.237322 163.72826,102.78934 165.61814,107.3017 C 167.5077,111.81428 170.75459,115.01359 175.35877,116.89965 L 175.35877,116.89965 z"
+     id="path4705"
+     style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#555753;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3" />
+  <path
+     d="M 249.05661,235.18867 A 16.132076,16.132076 0 1 1 216.79245,235.18867 A 16.132076,16.132076 0 1 1 249.05661,235.18867 z"
+     transform="translate(-2.8301887,1.1320755)"
+     id="path2385"
+     style="fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/bowls.svg b/data/styles/symbols/bowls.svg
index 0cc68a99b3..d20e25da4b 100644
--- a/data/styles/symbols/bowls.svg
+++ b/data/styles/symbols/bowls.svg
@@ -1,5 +1,30 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="38" height="38" viewBox="0 0 300 300">
-    <rect width="269.521" height="258.248" ry="20.87" x="15.29" y="20.639" stroke="#000" stroke-width="14.69" stroke-linejoin="round" fill="none"/>
-    <path d="M 133.81685,208.8622 L 126.35503,240.31878 C 124.99394,245.51199 126.77374,249.59331 131.69442,252.56277 C 135.1066,254.53982 138.69086,254.81182 142.44721,253.37876 C 146.2033,251.94563 148.57756,249.32335 149.57,245.51188 L 158.56393,207.50471 C 159.4585,203.4602 158.48415,199.99258 155.64087,197.10185 L 134.75661,175.03208 L 162.66048,153.398 L 166.54511,167.06433 C 166.79653,168.31994 167.48101,169.46325 168.5985,170.49427 L 195.76983,191.98059 C 196.45337,192.64098 197.12373,193.10574 197.78094,193.37488 C 200.08277,194.31797 202.42725,194.22395 204.81434,193.09278 C 207.20108,191.96165 208.86684,190.24692 209.81164,187.94863 C 211.49695,183.8478 210.63576,180.33295 207.2281,177.40406 L 183.83954,158.62581 L 173.64264,125.97234 C 172.19694,121.54832 169.09517,117.88193 164.33727,114.97315 C 156.00428,110.02673 148.06788,110.41718 140.5281,116.14448 L 102.21218,145.59669 C 99.720069,147.45414 97.815921,150.2193 96.499761,153.89217 L 77.106834,203.17152 L 45.125616,232.63017 C 43.86149,233.83809 42.947508,234.8999 42.383669,235.81558 C 40.605024,238.73157 40.130919,241.74913 40.961422,244.86825 C 41.79188,247.98732 43.667492,250.43472 46.588322,252.2105 C 51.508856,255.17988 55.947032,254.88907 59.902852,251.33808 L 95.031256,219.14089 C 96.295295,217.93294 97.263831,216.5103 97.936863,214.87295 L 110.13221,184.4956 L 133.81685,208.8622 z M 175.35877,116.89965 C 179.79714,118.7181 184.31645,118.70038 188.91668,116.8465 C 193.5166,114.99285 196.76021,111.77017 198.64755,107.17852 C 200.4687,102.74732 200.41134,98.21769 198.47553,93.589598 C 196.53933,88.961767 193.35205,85.738614 188.9137,83.920118 C 184.30948,82.034104 179.73058,82.07567 175.17695,84.044796 C 170.62302,86.014182 167.43547,89.214488 165.6143,93.645672 C 163.72698,98.237322 163.72826,102.78934 165.61814,107.3017 C 167.5077,111.81428 170.75459,115.01359 175.35877,116.89965 L 175.35877,116.89965 z" style="text-align:start;line-height:125%;-inkscape-font-specification:NPSPICT3" font-size="40" font-family="NPSPICT3"/>
-    <path d="M 251.32076,232.92453 A 17.264151,17.264151 0 1 1 216.79246,232.92453 A 17.264151,17.264151 0 1 1 251.32076,232.92453 z" transform="matrix(.936 0 0 .936 11.52 17.674)" fill-rule="evenodd"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="38"
+   height="38"
+   viewBox="0 0 300 300"
+   id="symbol-bowls">
+  <defs
+     id="defs2474" />
+  <rect
+     width="269.52087"
+     height="258.24777"
+     ry="20.869576"
+     x="15.289689"
+     y="20.638819"
+     id="rect2471"
+     style="fill:none;stroke:#000000;stroke-width:14.68965149;stroke-linejoin:round;stroke-miterlimit:4" />
+  <path
+     d="M 133.81685,208.8622 L 126.35503,240.31878 C 124.99394,245.51199 126.77374,249.59331 131.69442,252.56277 C 135.1066,254.53982 138.69086,254.81182 142.44721,253.37876 C 146.2033,251.94563 148.57756,249.32335 149.57,245.51188 L 158.56393,207.50471 C 159.4585,203.4602 158.48415,199.99258 155.64087,197.10185 L 134.75661,175.03208 L 162.66048,153.398 L 166.54511,167.06433 C 166.79653,168.31994 167.48101,169.46325 168.5985,170.49427 L 195.76983,191.98059 C 196.45337,192.64098 197.12373,193.10574 197.78094,193.37488 C 200.08277,194.31797 202.42725,194.22395 204.81434,193.09278 C 207.20108,191.96165 208.86684,190.24692 209.81164,187.94863 C 211.49695,183.8478 210.63576,180.33295 207.2281,177.40406 L 183.83954,158.62581 L 173.64264,125.97234 C 172.19694,121.54832 169.09517,117.88193 164.33727,114.97315 C 156.00428,110.02673 148.06788,110.41718 140.5281,116.14448 L 102.21218,145.59669 C 99.720069,147.45414 97.815921,150.2193 96.499761,153.89217 L 77.106834,203.17152 L 45.125616,232.63017 C 43.86149,233.83809 42.947508,234.8999 42.383669,235.81558 C 40.605024,238.73157 40.130919,241.74913 40.961422,244.86825 C 41.79188,247.98732 43.667492,250.43472 46.588322,252.2105 C 51.508856,255.17988 55.947032,254.88907 59.902852,251.33808 L 95.031256,219.14089 C 96.295295,217.93294 97.263831,216.5103 97.936863,214.87295 L 110.13221,184.4956 L 133.81685,208.8622 z M 175.35877,116.89965 C 179.79714,118.7181 184.31645,118.70038 188.91668,116.8465 C 193.5166,114.99285 196.76021,111.77017 198.64755,107.17852 C 200.4687,102.74732 200.41134,98.21769 198.47553,93.589598 C 196.53933,88.961767 193.35205,85.738614 188.9137,83.920118 C 184.30948,82.034104 179.73058,82.07567 175.17695,84.044796 C 170.62302,86.014182 167.43547,89.214488 165.6143,93.645672 C 163.72698,98.237322 163.72826,102.78934 165.61814,107.3017 C 167.5077,111.81428 170.75459,115.01359 175.35877,116.89965 L 175.35877,116.89965 z"
+     id="path4705"
+     style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3" />
+  <path
+     d="M 251.32076,232.92453 A 17.264151,17.264151 0 1 1 216.79246,232.92453 A 17.264151,17.264151 0 1 1 251.32076,232.92453 z"
+     transform="matrix(0.9362719,0,0,0.9362719,11.519755,17.674025)"
+     id="path2387"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/building.svg b/data/styles/symbols/building.svg
index bc3b479a61..900852864f 100644
--- a/data/styles/symbols/building.svg
+++ b/data/styles/symbols/building.svg
@@ -1,3 +1,55 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="9" height="9">
-    <path d="M 1,1 L 8,1 L 8,8 L 1,8 L 1,1 z" fill="#bdad5f"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="9"
+   height="9"
+   id="symbol-building"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="building.svg">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="26.222222"
+     inkscape:cx="4.5"
+     inkscape:cy="4.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-building" />
+  <path
+     d="M 1,1 L 8,1 L 8,8 L 1,8 L 1,1 z"
+     id="building"
+     style="fill:#bdad5f;fill-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/bureau_de_change.svg b/data/styles/symbols/bureau_de_change.svg
index 4846f385ed..10517d841b 100644
--- a/data/styles/symbols/bureau_de_change.svg
+++ b/data/styles/symbols/bureau_de_change.svg
@@ -1,38 +1,114 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="16" height="16">
-    <text x="29.937" y="48.564" font-size="10.581" fill="#fff" font-family="Bitstream Vera Sans"/>
-    <g transform="translate(-.114 -47.972)">
-        <rect width="14.958" height="14.915" x=".637" y="48.535" fill="#fff" stroke="#19008e" stroke-width="1.045" stroke-linecap="round" stroke-linejoin="bevel"/>
-        <g>
-            <path d="M 13.403099,3.7840113 A 7.3965516,7.3965516 0 1 1 13.380389,3.693948" transform="matrix(.415 0 0 .418 2.302 50.368)" fill="#19008e" stroke="#76727e" stroke-width="1.282" stroke-linecap="round" stroke-linejoin="bevel"/>
-            <text x="3.705" y="52.905" transform="scale(.973 1.028)" font-size="4.81" fill="#fff" font-family="Bitstream Vera Sans">
-                <tspan x="3.705" y="52.905">
-                    £
-                </tspan>
-            </text>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="16"
+   height="16"
+   id="symbol-bureau-de-change">
+  <defs
+     id="defs15806" />
+  <text
+     x="29.936853"
+     y="48.563526"
+     id="text17171"
+     xml:space="preserve"
+     style="font-size:10.58129311px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
+       x="29.936853"
+       y="48.563526"
+       id="tspan17173" /></text>
+  <g
+     transform="translate(-0.1141925,-47.972181)"
+     id="g17242">
+    <g
+       id="g17334">
+      <g
+         id="g2438">
+        <rect
+           width="14.95812"
+           height="14.914521"
+           x="0.63685054"
+           y="48.535"
+           id="rect16604"
+           style="fill:#ffffff;fill-opacity:1;stroke:#19008e;stroke-width:1.04531598;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <g
+           id="g2433">
+          <path
+             d="M 13.403099,3.7840113 A 7.3965516,7.3965516 0 1 1 13.380389,3.693948"
+             transform="matrix(0.415209,0,0,0.4175176,2.3023187,50.36814)"
+             id="path17155"
+             style="fill:#19008e;fill-opacity:1;stroke:#76727e;stroke-width:1.28168929;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <text
+             x="3.7054453"
+             y="52.904945"
+             transform="scale(0.9728108,1.0279491)"
+             id="text17167"
+             xml:space="preserve"
+             style="font-size:4.8099227px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
+               x="3.7054453"
+               y="52.904945"
+               id="tspan17169">£</tspan></text>
         </g>
-        <g transform="matrix(.442 0 0 .467 -1.205 34.183)">
-            <path d="M 13.403099,3.7840113 A 7.3965516,7.3965516 0 1 1 13.380389,3.693948" transform="matrix(.939 0 0 .894 7.948 48.417)" fill="#19008e" stroke="#76727e" stroke-width="1.282" stroke-linecap="round" stroke-linejoin="bevel"/>
-            <text x="9.837" y="56.995" font-size="10.581" fill="#fff" font-family="Bitstream Vera Sans">
-                <tspan x="9.837" y="56.995">
-                    €
-                </tspan>
-            </text>
+        <g
+           transform="matrix(0.4422092,0,0,0.4672733,-1.2045273,34.182867)"
+           id="g17353">
+          <path
+             d="M 13.403099,3.7840113 A 7.3965516,7.3965516 0 1 1 13.380389,3.693948"
+             transform="matrix(0.9389425,0,0,0.893519,7.9477824,48.41716)"
+             id="path17355"
+             style="opacity:1;fill:#19008e;fill-opacity:1;stroke:#76727e;stroke-width:1.28168929;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <text
+             x="9.8373585"
+             y="56.995323"
+             id="text17357"
+             xml:space="preserve"
+             style="font-size:10.58129311px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
+               x="9.8373585"
+               y="56.995323"
+               id="tspan17359">€</tspan></text>
         </g>
-        <g transform="matrix(.442 0 0 .468 5.193 34.184)">
-            <path d="M 13.403099,3.7840113 A 7.3965516,7.3965516 0 1 1 13.380389,3.693948" transform="matrix(.939 0 0 .894 7.948 48.417)" fill="#19008e" stroke="#76727e" stroke-width="1.282" stroke-linecap="round" stroke-linejoin="bevel" stroke-dashoffset=".385"/>
-            <text x="8.61" y="57.725" font-size="10.581" fill="#fff" font-family="Bitstream Vera Sans">
-                <tspan x="8.61" y="57.725">
-                    ￥
-                </tspan>
-            </text>
+        <g
+           transform="matrix(0.4708471,0,0,0.4975345,5.0060161,32.776251)"
+           id="g17361">
+          <g
+             transform="matrix(0.9391778,0,0,0.9391778,0.3980803,2.8271725)"
+             id="g18670">
+            <path
+               d="M 13.403099,3.7840113 A 7.3965516,7.3965516 0 1 1 13.380389,3.693948"
+               transform="matrix(0.9389425,0,0,0.893519,7.9477824,48.41716)"
+               id="path17363"
+               style="opacity:1;fill:#19008e;fill-opacity:1;stroke:#76727e;stroke-width:1.28168929;stroke-linecap:round;stroke-linejoin:bevel;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.38450678;stroke-opacity:1" />
+            <text
+               x="8.6101561"
+               y="57.724503"
+               id="text17365"
+               xml:space="preserve"
+               style="font-size:10.58129311px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
+                 x="8.6101561"
+                 y="57.724503"
+                 id="tspan17367">￥</tspan></text>
+          </g>
         </g>
-        <g>
-            <path d="M 13.403099,3.7840113 A 7.3965516,7.3965516 0 1 1 13.380389,3.693948" transform="matrix(.415 0 0 .418 8.708 50.367)" fill="#19008e" stroke="#76727e" stroke-width="1.282" stroke-linecap="round" stroke-linejoin="bevel"/>
-            <text x="10.29" y="52.945" transform="scale(.973 1.028)" font-size="4.81" fill="#fff" font-family="Bitstream Vera Sans">
-                <tspan x="10.29" y="52.945">
-                    $
-                </tspan>
-            </text>
+        <g
+           id="g2425">
+          <path
+             d="M 13.403099,3.7840113 A 7.3965516,7.3965516 0 1 1 13.380389,3.693948"
+             transform="matrix(0.415209,0,0,0.4175176,8.7080334,50.366857)"
+             id="path17371"
+             style="fill:#19008e;fill-opacity:1;stroke:#76727e;stroke-width:1.28168929;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <text
+             x="10.290194"
+             y="52.945057"
+             transform="scale(0.9728108,1.0279491)"
+             id="text17373"
+             xml:space="preserve"
+             style="font-size:4.8099227px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
+               x="10.290194"
+               y="52.945057"
+               id="tspan17375">$</tspan></text>
         </g>
+      </g>
     </g>
+  </g>
 </svg>
diff --git a/data/styles/symbols/bus-mini.svg b/data/styles/symbols/bus-mini.svg
index 1b47d16640..7e6108fc3a 100644
--- a/data/styles/symbols/bus-mini.svg
+++ b/data/styles/symbols/bus-mini.svg
@@ -1,8 +1,92 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 51.502147 51.502147">
-    <title>
-        Bus Stop Map Icon
-    </title>
-    <rect ry="6.867" rx="6.867" y="8.584" x="8.607" height="34.335" width="34.335" fill="#f2f2f2"/>
-    <rect width="30.043" height="30.043" x="10.753" y="10.73" rx="6.009" ry="6.009" fill="#003cd8"/>
-    <path d="m 25.436741,14.892863 c -0.287299,0.0012 -0.575784,0.01362 -0.869531,0.04948 -2.068508,0.165377 -4.852801,0.846691 -5.969216,1.805672 -1.328143,1.140854 -1.104199,2.242123 -1.692061,8.088422 l -0.02349,0.915202 0,8.583126 1.316048,0 0,1.014143 c 10e-4,0.06752 0,0.233519 0,0.272089 0,0.771396 0.583147,1.409906 1.316048,1.409906 0.732898,0 1.339547,-0.63851 1.339547,-1.409906 0,-0.05892 -10e-4,-0.191245 0,-0.272089 0.0024,-0.183735 -3.85e-4,-0.358373 0,-0.618379 l 0,-0.395764 3.713135,0 1.762563,0 3.713135,0 0,0.395764 c 3.85e-4,0.260006 -0.0024,0.434644 0,0.618379 10e-4,0.08085 0,0.213158 0,0.272089 0,0.771396 0.606649,1.409906 1.339547,1.409906 0.732902,0 1.316049,-0.63851 1.316049,-1.409906 0,-0.03857 -10e-4,-0.204571 0,-0.272089 l 0,-1.014143 1.316047,0 0,-8.583126 -0.02349,-0.915202 C 33.403206,18.990139 33.62715,17.88887 32.299006,16.74802 c -1.120542,-0.962528 -3.898383,-1.643623 -5.969214,-1.805673 -0.319616,-0.04102 -0.605733,-0.05075 -0.893033,-0.04948 z m -3.125612,1.756201 6.274726,0 c 0.309494,0 0.54052,0.24316 0.54052,0.56891 0,0.325752 -0.231026,0.593645 -0.54052,0.593645 l -6.274726,0 c -0.309494,0 -0.54052,-0.267893 -0.54052,-0.593645 0,-0.32575 0.231026,-0.56891 0.54052,-0.56891 z m -2.796602,2.201436 5.076184,0 1.71556,0 5.052684,0 c 0.416624,0 0.707426,0.355541 0.752027,0.791527 l 0.56402,5.318075 c 0.0446,0.435986 -0.335403,0.791525 -0.752026,0.791525 l -5.616705,0 -1.71556,0 -5.616703,0 c -0.416623,0 -0.82013,-0.355539 -0.775528,-0.791525 l 0.564021,-5.318075 c 0.0446,-0.435986 0.335403,-0.791527 0.752026,-0.791527 z m 0,10.017767 c 0.7329,0 1.339549,0.613776 1.339549,1.385173 0,0.771397 -0.606649,1.409907 -1.339549,1.409907 -0.7329,0 -1.316047,-0.63851 -1.316047,-1.409907 0,-0.771397 0.583147,-1.385173 1.316047,-1.385173 z m 11.867929,0 c 0.732901,0 1.316048,0.613776 1.316048,1.385173 0,0.771397 -0.583147,1.409907 -1.316048,1.409907 -0.732901,0 -1.316049,-0.63851 -1.316049,-1.409907 0,-0.771397 0.583148,-1.385173 1.316049,-1.385173 z" fill="#fff"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   id="symbol-bus"
+   viewBox="0 0 51.502147 51.502147"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="bus.svg">
+  <title
+     id="title2983">Bus Stop Map Icon</title>
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Bus Stop Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs21" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="876"
+     inkscape:window-height="731"
+     id="namedview19"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="19.136028"
+     inkscape:cx="8.3640658"
+     inkscape:cy="11.681623"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-bus">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <rect
+     ry="6.8669534"
+     rx="6.8669534"
+     y="8.5836887"
+     x="8.6071787"
+     height="34.334766"
+     width="34.334766"
+     id="rect2995"
+     style="fill:#f2f2f2;fill-opacity:1;stroke:none" />
+  <rect
+     style="fill:#003cd8;fill-opacity:1;stroke:none"
+     id="rect2993"
+     width="30.042919"
+     height="30.042919"
+     x="10.753102"
+     y="10.729613"
+     rx="6.008584"
+     ry="6.008584" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 25.436741,14.892863 c -0.287299,0.0012 -0.575784,0.01362 -0.869531,0.04948 -2.068508,0.165377 -4.852801,0.846691 -5.969216,1.805672 -1.328143,1.140854 -1.104199,2.242123 -1.692061,8.088422 l -0.02349,0.915202 0,8.583126 1.316048,0 0,1.014143 c 10e-4,0.06752 0,0.233519 0,0.272089 0,0.771396 0.583147,1.409906 1.316048,1.409906 0.732898,0 1.339547,-0.63851 1.339547,-1.409906 0,-0.05892 -10e-4,-0.191245 0,-0.272089 0.0024,-0.183735 -3.85e-4,-0.358373 0,-0.618379 l 0,-0.395764 3.713135,0 1.762563,0 3.713135,0 0,0.395764 c 3.85e-4,0.260006 -0.0024,0.434644 0,0.618379 10e-4,0.08085 0,0.213158 0,0.272089 0,0.771396 0.606649,1.409906 1.339547,1.409906 0.732902,0 1.316049,-0.63851 1.316049,-1.409906 0,-0.03857 -10e-4,-0.204571 0,-0.272089 l 0,-1.014143 1.316047,0 0,-8.583126 -0.02349,-0.915202 C 33.403206,18.990139 33.62715,17.88887 32.299006,16.74802 c -1.120542,-0.962528 -3.898383,-1.643623 -5.969214,-1.805673 -0.319616,-0.04102 -0.605733,-0.05075 -0.893033,-0.04948 z m -3.125612,1.756201 6.274726,0 c 0.309494,0 0.54052,0.24316 0.54052,0.56891 0,0.325752 -0.231026,0.593645 -0.54052,0.593645 l -6.274726,0 c -0.309494,0 -0.54052,-0.267893 -0.54052,-0.593645 0,-0.32575 0.231026,-0.56891 0.54052,-0.56891 z m -2.796602,2.201436 5.076184,0 1.71556,0 5.052684,0 c 0.416624,0 0.707426,0.355541 0.752027,0.791527 l 0.56402,5.318075 c 0.0446,0.435986 -0.335403,0.791525 -0.752026,0.791525 l -5.616705,0 -1.71556,0 -5.616703,0 c -0.416623,0 -0.82013,-0.355539 -0.775528,-0.791525 l 0.564021,-5.318075 c 0.0446,-0.435986 0.335403,-0.791527 0.752026,-0.791527 z m 0,10.017767 c 0.7329,0 1.339549,0.613776 1.339549,1.385173 0,0.771397 -0.606649,1.409907 -1.339549,1.409907 -0.7329,0 -1.316047,-0.63851 -1.316047,-1.409907 0,-0.771397 0.583147,-1.385173 1.316047,-1.385173 z m 11.867929,0 c 0.732901,0 1.316048,0.613776 1.316048,1.385173 0,0.771397 -0.583147,1.409907 -1.316048,1.409907 -0.732901,0 -1.316049,-0.63851 -1.316049,-1.409907 0,-0.771397 0.583148,-1.385173 1.316049,-1.385173 z"
+     id="path3057"
+     inkscape:connector-curvature="0" />
 </svg>
diff --git a/data/styles/symbols/bus.svg b/data/styles/symbols/bus.svg
index f24586fda2..a443de46b5 100644
--- a/data/styles/symbols/bus.svg
+++ b/data/styles/symbols/bus.svg
@@ -1,8 +1,93 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 51.502147 51.502147">
-    <title>
-        Bus Stop Map Icon
-    </title>
-    <rect ry="9.442" rx="9.442" y="2.146" x="2.146" height="47.21" width="47.21" fill="#f2f2f2"/>
-    <rect width="20" height="20" x="2" y="2" transform="scale(2.146)" rx="4" ry="4" fill="#003cd8"/>
-    <path d="m 25.733857,10.319543 c -0.420925,0.0019 -0.843587,0.01938 -1.273958,0.07043 -3.030592,0.235453 -7.109885,1.205459 -8.745557,2.570788 -1.945872,1.624268 -1.617772,3.192176 -2.479054,11.515721 l -0.03443,1.303002 0,12.220044 1.928155,0 0,1.443866 c 0.0016,0.09613 0,0.332466 0,0.387379 0,1.09826 0.854373,2.007326 1.928153,2.007326 1.073778,0 1.962584,-0.909066 1.962584,-2.007326 0,-0.08389 -0.0015,-0.27228 0,-0.387379 0.0035,-0.261589 -5.63e-4,-0.510227 0,-0.880406 l 0,-0.56346 5.44015,0 2.582348,0 5.440149,0 0,0.56346 c 5.66e-4,0.370179 -0.0035,0.618817 0,0.880406 0.0015,0.115099 0,0.303479 0,0.387379 0,1.09826 0.888807,2.007326 1.962585,2.007326 1.073781,0 1.928155,-0.909066 1.928155,-2.007326 0,-0.05491 -0.0016,-0.291252 0,-0.387379 l 0,-1.443866 1.928154,0 0,-12.220044 -0.03443,-1.303002 C 37.405579,16.152939 37.73368,14.585031 35.787806,12.960768 34.146089,11.59039 30.076247,10.620694 27.042251,10.38998 26.573979,10.33157 26.154788,10.31771 25.733861,10.31955 z m -4.579365,2.500354 9.193162,0 c 0.453443,0 0.791921,0.346194 0.791921,0.809974 0,0.463782 -0.338478,0.84519 -0.791921,0.84519 l -9.193162,0 c -0.453443,0 -0.79192,-0.381408 -0.79192,-0.84519 0,-0.46378 0.338477,-0.809974 0.79192,-0.809974 z m -4.097327,3.134248 7.437165,0 2.513485,0 7.402734,0 c 0.6104,0 1.036458,0.506194 1.101803,1.12692 l 0.826351,7.571497 c 0.06535,0.620727 -0.491403,1.126919 -1.101801,1.126919 l -8.229087,0 -2.513485,0 -8.229085,0 c -0.610399,0 -1.20158,-0.506192 -1.136234,-1.126919 l 0.826351,-7.571497 c 0.06535,-0.620726 0.491403,-1.12692 1.101803,-1.12692 z m 0,14.262585 c 1.073779,0 1.962585,0.873851 1.962585,1.972112 0,1.098259 -0.888806,2.007325 -1.962585,2.007325 -1.07378,0 -1.928154,-0.909066 -1.928154,-2.007325 0,-1.098261 0.854374,-1.972112 1.928154,-1.972112 z m 17.387816,0 c 1.07378,0 1.928155,0.873851 1.928155,1.972112 0,1.098259 -0.854375,2.007325 -1.928155,2.007325 -1.073779,0 -1.928154,-0.909066 -1.928154,-2.007325 0,-1.098261 0.854375,-1.972112 1.928154,-1.972112 z" fill="#fff"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   id="symbol-bus"
+   viewBox="0 0 51.502147 51.502147"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="bus.svg">
+  <title
+     id="title2983">Bus Stop Map Icon</title>
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Bus Stop Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs21" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="876"
+     inkscape:window-height="731"
+     id="namedview19"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="19.136028"
+     inkscape:cx="-3.068839"
+     inkscape:cy="11.681623"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-bus">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <rect
+     ry="9.4420605"
+     rx="9.4420605"
+     y="2.1459229"
+     x="2.1459229"
+     height="47.2103"
+     width="47.2103"
+     id="rect2995"
+     style="fill:#f2f2f2;fill-opacity:1;stroke:none" />
+  <rect
+     style="fill:#003cd8;fill-opacity:1;stroke:none"
+     id="rect2993"
+     width="20"
+     height="20"
+     x="2"
+     y="2"
+     transform="scale(2.1459228,2.1459228)"
+     rx="4"
+     ry="4" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 25.733857,10.319543 c -0.420925,0.0019 -0.843587,0.01938 -1.273958,0.07043 -3.030592,0.235453 -7.109885,1.205459 -8.745557,2.570788 -1.945872,1.624268 -1.617772,3.192176 -2.479054,11.515721 l -0.03443,1.303002 0,12.220044 1.928155,0 0,1.443866 c 0.0016,0.09613 0,0.332466 0,0.387379 0,1.09826 0.854373,2.007326 1.928153,2.007326 1.073778,0 1.962584,-0.909066 1.962584,-2.007326 0,-0.08389 -0.0015,-0.27228 0,-0.387379 0.0035,-0.261589 -5.63e-4,-0.510227 0,-0.880406 l 0,-0.56346 5.44015,0 2.582348,0 5.440149,0 0,0.56346 c 5.66e-4,0.370179 -0.0035,0.618817 0,0.880406 0.0015,0.115099 0,0.303479 0,0.387379 0,1.09826 0.888807,2.007326 1.962585,2.007326 1.073781,0 1.928155,-0.909066 1.928155,-2.007326 0,-0.05491 -0.0016,-0.291252 0,-0.387379 l 0,-1.443866 1.928154,0 0,-12.220044 -0.03443,-1.303002 C 37.405579,16.152939 37.73368,14.585031 35.787806,12.960768 34.146089,11.59039 30.076247,10.620694 27.042251,10.38998 26.573979,10.33157 26.154788,10.31771 25.733861,10.31955 z m -4.579365,2.500354 9.193162,0 c 0.453443,0 0.791921,0.346194 0.791921,0.809974 0,0.463782 -0.338478,0.84519 -0.791921,0.84519 l -9.193162,0 c -0.453443,0 -0.79192,-0.381408 -0.79192,-0.84519 0,-0.46378 0.338477,-0.809974 0.79192,-0.809974 z m -4.097327,3.134248 7.437165,0 2.513485,0 7.402734,0 c 0.6104,0 1.036458,0.506194 1.101803,1.12692 l 0.826351,7.571497 c 0.06535,0.620727 -0.491403,1.126919 -1.101801,1.126919 l -8.229087,0 -2.513485,0 -8.229085,0 c -0.610399,0 -1.20158,-0.506192 -1.136234,-1.126919 l 0.826351,-7.571497 c 0.06535,-0.620726 0.491403,-1.12692 1.101803,-1.12692 z m 0,14.262585 c 1.073779,0 1.962585,0.873851 1.962585,1.972112 0,1.098259 -0.888806,2.007325 -1.962585,2.007325 -1.07378,0 -1.928154,-0.909066 -1.928154,-2.007325 0,-1.098261 0.854374,-1.972112 1.928154,-1.972112 z m 17.387816,0 c 1.07378,0 1.928155,0.873851 1.928155,1.972112 0,1.098259 -0.854375,2.007325 -1.928155,2.007325 -1.073779,0 -1.928154,-0.909066 -1.928154,-2.007325 0,-1.098261 0.854375,-1.972112 1.928154,-1.972112 z"
+     id="path3057"
+     inkscape:connector-curvature="0" />
 </svg>
diff --git a/data/styles/symbols/bus_sta.svg b/data/styles/symbols/bus_sta.svg
index 676faa863d..ebdf3012b9 100644
--- a/data/styles/symbols/bus_sta.svg
+++ b/data/styles/symbols/bus_sta.svg
@@ -1,7 +1,84 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 51.502147 51.502147">
-    <title>
-        Bus Stop Map Icon
-    </title>
-    <path d="m 25.727523,4.2918456 c -0.575781,0.00255 -1.153939,0.026963 -1.742641,0.097989 C 19.839349,4.7174337 14.259303,6.0670571 12.021876,7.9667178 9.3601267,10.226653 9.8089334,12.408173 8.6307892,23.989194 l -0.047098,1.81294 0,17.002439 2.6375135,0 0,2.008932 c 0.0022,0.133747 0,0.46258 0,0.538982 0,1.528072 1.168694,2.792908 2.637512,2.792908 1.468816,0 2.68461,-1.264836 2.68461,-2.792908 0,-0.116727 -0.0021,-0.378837 0,-0.538982 0.0048,-0.363963 -7.71e-4,-0.709908 0,-1.224959 l 0,-0.783973 7.441555,0 3.532382,0 7.441555,0 0,0.783973 c 7.73e-4,0.515051 -0.0048,0.860996 0,1.224959 0.0021,0.160145 0,0.422248 0,0.538982 0,1.528072 1.215794,2.792908 2.68461,2.792908 1.46882,0 2.637514,-1.264836 2.637514,-2.792908 0,-0.0764 -0.0022,-0.405235 0,-0.538982 l 0,-2.008932 2.637513,0 0,-17.00244 -0.0471,-1.812939 C 41.693212,12.408173 42.142019,10.226653 39.480268,7.9667244 37.234571,6.06004 31.667453,4.710847 27.517264,4.3898418 26.876717,4.3085708 26.303307,4.2892846 25.727523,4.2918523 z m -6.264092,3.4788848 12.575283,0 c 0.620263,0 1.083265,0.4816779 1.083265,1.1269618 0,0.6452854 -0.463002,1.1759608 -1.083265,1.1759608 l -12.575283,0 c -0.620262,0 -1.083264,-0.5306754 -1.083264,-1.1759608 0,-0.6452839 0.463002,-1.1269618 1.083264,-1.1269618 z m -5.604714,4.3608556 10.173263,0 3.438185,0 10.126165,0 c 0.834963,0 1.417765,0.704297 1.50715,1.567948 l 1.130363,10.534653 c 0.08939,0.863652 -0.672188,1.567946 -1.507149,1.567946 l -11.256529,0 -3.438185,0 -11.256527,0 c -0.834962,0 -1.643636,-0.704294 -1.554249,-1.567946 l 1.130362,-10.534653 c 0.08939,-0.863651 0.672188,-1.567948 1.507151,-1.567948 z m 0,19.844343 c 1.468817,0 2.68461,1.215839 2.68461,2.74391 0,1.528071 -1.215793,2.792907 -2.68461,2.792907 -1.468819,0 -2.637513,-1.264836 -2.637513,-2.792907 0,-1.528071 1.168694,-2.74391 2.637513,-2.74391 z m 23.784712,0 c 1.468819,0 2.637514,1.215839 2.637514,2.74391 0,1.528071 -1.168695,2.792907 -2.637514,2.792907 -1.468818,0 -2.637513,-1.264836 -2.637513,-2.792907 0,-1.528071 1.168695,-2.74391 2.637513,-2.74391 z" fill="#348"/>
-    <path transform="matrix(1.837 0 0 1.837 -7.246 27.624)" d="m 12.992518,26.492094 a 2.0613129,2.0613129 0 1 1 -4.1226261,0 2.0613129,2.0613129 0 1 1 4.1226261,0 z" fill="#fff"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   id="symbol-bus"
+   viewBox="0 0 51.502147 51.502147"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="bus.svg">
+  <title
+     id="title2983">Bus Stop Map Icon</title>
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Bus Stop Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.comz</dc:source>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs21" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="876"
+     inkscape:window-height="731"
+     id="namedview19"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="19.136028"
+     inkscape:cx="13.705802"
+     inkscape:cy="11.531081"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-bus">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#334488;fill-opacity:1;stroke:none"
+     d="m 25.727523,4.2918456 c -0.575781,0.00255 -1.153939,0.026963 -1.742641,0.097989 C 19.839349,4.7174337 14.259303,6.0670571 12.021876,7.9667178 9.3601267,10.226653 9.8089334,12.408173 8.6307892,23.989194 l -0.047098,1.81294 0,17.002439 2.6375135,0 0,2.008932 c 0.0022,0.133747 0,0.46258 0,0.538982 0,1.528072 1.168694,2.792908 2.637512,2.792908 1.468816,0 2.68461,-1.264836 2.68461,-2.792908 0,-0.116727 -0.0021,-0.378837 0,-0.538982 0.0048,-0.363963 -7.71e-4,-0.709908 0,-1.224959 l 0,-0.783973 7.441555,0 3.532382,0 7.441555,0 0,0.783973 c 7.73e-4,0.515051 -0.0048,0.860996 0,1.224959 0.0021,0.160145 0,0.422248 0,0.538982 0,1.528072 1.215794,2.792908 2.68461,2.792908 1.46882,0 2.637514,-1.264836 2.637514,-2.792908 0,-0.0764 -0.0022,-0.405235 0,-0.538982 l 0,-2.008932 2.637513,0 0,-17.00244 -0.0471,-1.812939 C 41.693212,12.408173 42.142019,10.226653 39.480268,7.9667244 37.234571,6.06004 31.667453,4.710847 27.517264,4.3898418 26.876717,4.3085708 26.303307,4.2892846 25.727523,4.2918523 z m -6.264092,3.4788848 12.575283,0 c 0.620263,0 1.083265,0.4816779 1.083265,1.1269618 0,0.6452854 -0.463002,1.1759608 -1.083265,1.1759608 l -12.575283,0 c -0.620262,0 -1.083264,-0.5306754 -1.083264,-1.1759608 0,-0.6452839 0.463002,-1.1269618 1.083264,-1.1269618 z m -5.604714,4.3608556 10.173263,0 3.438185,0 10.126165,0 c 0.834963,0 1.417765,0.704297 1.50715,1.567948 l 1.130363,10.534653 c 0.08939,0.863652 -0.672188,1.567946 -1.507149,1.567946 l -11.256529,0 -3.438185,0 -11.256527,0 c -0.834962,0 -1.643636,-0.704294 -1.554249,-1.567946 l 1.130362,-10.534653 c 0.08939,-0.863651 0.672188,-1.567948 1.507151,-1.567948 z m 0,19.844343 c 1.468817,0 2.68461,1.215839 2.68461,2.74391 0,1.528071 -1.215793,2.792907 -2.68461,2.792907 -1.468819,0 -2.637513,-1.264836 -2.637513,-2.792907 0,-1.528071 1.168694,-2.74391 2.637513,-2.74391 z m 23.784712,0 c 1.468819,0 2.637514,1.215839 2.637514,2.74391 0,1.528071 -1.168695,2.792907 -2.637514,2.792907 -1.468818,0 -2.637513,-1.264836 -2.637513,-2.792907 0,-1.528071 1.168695,-2.74391 2.637513,-2.74391 z"
+     id="path3057"
+     inkscape:connector-curvature="0" />
+  <path
+     transform="matrix(1.83704,0,0,1.83704,-7.2464453,27.624254)"
+     d="m 12.992518,26.492094 a 2.0613129,2.0613129 0 1 1 -4.1226261,0 2.0613129,2.0613129 0 1 1 4.1226261,0 z"
+     sodipodi:ry="2.0613129"
+     sodipodi:rx="2.0613129"
+     sodipodi:cy="26.492094"
+     sodipodi:cx="10.931205"
+     id="path3833"
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     sodipodi:type="arc" />
 </svg>
diff --git a/data/styles/symbols/cafe.svg b/data/styles/symbols/cafe.svg
index fa3b6c77d4..0d6e9b2942 100644
--- a/data/styles/symbols/cafe.svg
+++ b/data/styles/symbols/cafe.svg
@@ -1,9 +1,109 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24">
-    <title>
-        Cafe Map Icon
-    </title>
-    <path d="M 6 10 C 6 10.852249 6.0226526 11.569338 6.03125 12.34375 C 5.2814432 12.013146 4.5154593 12 4 12 C 1.9749559 12 0 14.106767 0 16.5 C 0 18.893233 1.9749559 21 4 21 C 5.7837149 21 6.5237898 20.755024 7.21875 20.5 C 7.6437945 21.41527 8.2324115 22.232412 9 23 L 19 23 C 22 20 22 16 22 10 L 6 10 z M 4 14 C 5.2214854 14 5.6808579 14.365859 6.09375 14.65625 C 6.1668745 16.127334 6.2889585 17.462992 6.59375 18.65625 C 6.364901 18.806938 5.9423077 19 4 19 C 2.8798456 19 2 18.134672 2 17 C 2 15.065087 3 14 4 14 z" fill="#4d4d4d"/>
-    <path d="m 14,9 c 0,-5.9999994 -2.16343,-3.000001 0,-9 0,5.999999 2.16343,4.5 0,9 z" fill="#4d4d4d"/>
-    <path d="m 18,9 c 0,-5.9999994 -2.16343,-3.000001 0,-9 0,5.999999 2.16343,4.5 0,9 z" fill="#4d4d4d"/>
-    <path d="m 10,9 c 0,-5.9999994 -2.16343,-3.000001 0,-9 0,5.999999 2.16343,4.5 0,9 z" fill="#4d4d4d"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="24"
+   height="24"
+   id="symbol-cafe"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="cafe.svg">
+  <title
+     id="title2988">Cafe Map Icon</title>
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Cafe Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="974"
+     inkscape:window-height="694"
+     id="namedview9"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="21.273311"
+     inkscape:cx="7.3014949"
+     inkscape:cy="10.378331"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-cafe">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs2230" />
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     d="M 6 10 C 6 10.852249 6.0226526 11.569338 6.03125 12.34375 C 5.2814432 12.013146 4.5154593 12 4 12 C 1.9749559 12 0 14.106767 0 16.5 C 0 18.893233 1.9749559 21 4 21 C 5.7837149 21 6.5237898 20.755024 7.21875 20.5 C 7.6437945 21.41527 8.2324115 22.232412 9 23 L 19 23 C 22 20 22 16 22 10 L 6 10 z M 4 14 C 5.2214854 14 5.6808579 14.365859 6.09375 14.65625 C 6.1668745 16.127334 6.2889585 17.462992 6.59375 18.65625 C 6.364901 18.806938 5.9423077 19 4 19 C 2.8798456 19 2 18.134672 2 17 C 2 15.065087 3 14 4 14 z "
+     id="rect2992" />
+  <path
+     style="fill:#4d4d4d;stroke:none"
+     d="m 14,9 c 0,-5.9999994 -2.16343,-3.000001 0,-9 0,5.999999 2.16343,4.5 0,9 z"
+     id="path3783"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccc" />
+  <path
+     sodipodi:nodetypes="ccc"
+     inkscape:connector-curvature="0"
+     id="path3790"
+     d="m 18,9 c 0,-5.9999994 -2.16343,-3.000001 0,-9 0,5.999999 2.16343,4.5 0,9 z"
+     style="fill:#4d4d4d;stroke:none" />
+  <path
+     style="fill:#4d4d4d;stroke:none"
+     d="m 10,9 c 0,-5.9999994 -2.16343,-3.000001 0,-9 0,5.999999 2.16343,4.5 0,9 z"
+     id="path3792"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccc" />
 </svg>
diff --git a/data/styles/symbols/campSite.svg b/data/styles/symbols/campSite.svg
index 0b6beec708..829664c71a 100644
--- a/data/styles/symbols/campSite.svg
+++ b/data/styles/symbols/campSite.svg
@@ -1,3 +1,66 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="0 0 128.75537 128.75537" height="24" fill="#00f">
-    <path d="m 10,3.53125 -0.875,0.5 2,3.46875 L 4,20 l -2,0 0,2 20,0 0,-2 -2,0 -7.125,-12.5 2,-3.46875 L 14,3.53125 12,7 z m 2,8.625 L 16.53125,20 7.46875,20 z" transform="scale(5.365)" fill="#50524e"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="campSite"
+   viewBox="0 0 128.75537 128.75537"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="campSite.svg"
+   style="fill:#0000ff;fill-opacity:1">
+  <metadata
+     id="metadata9">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1041"
+     inkscape:window-height="739"
+     id="namedview5"
+     showgrid="true"
+     inkscape:zoom="41.688476"
+     inkscape:cx="16.507457"
+     inkscape:cy="18.302459"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="campSite">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#50524e;fill-opacity:1;stroke:none"
+     d="m 10,3.53125 -0.875,0.5 2,3.46875 L 4,20 l -2,0 0,2 20,0 0,-2 -2,0 -7.125,-12.5 2,-3.46875 L 14,3.53125 12,7 z m 2,8.625 L 16.53125,20 7.46875,20 z"
+     transform="scale(5.3648071,5.3648071)"
+     id="rect2988"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccccccccccccc" />
 </svg>
diff --git a/data/styles/symbols/cannon.svg b/data/styles/symbols/cannon.svg
index c3a823e039..064d2f07d5 100644
--- a/data/styles/symbols/cannon.svg
+++ b/data/styles/symbols/cannon.svg
@@ -1,3 +1,70 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="37.28" viewBox="0 0 12 12" height="37.28">
-    <path d="m 1.2052385,7.4832392 -0.198302,0 0,-0.3645544 0.198302,0 0,-2.3150049 1.2486362,0 0,2.3149282 1.8746066,0 0.4255542,-5.8044539 c 0,0 0,-0.34591944 -0.3987174,-0.61128765 l 3.2079831,0 C 7.1377473,0.98379112 7.166699,1.3141542 7.166699,1.3141542 l 0.4255544,5.8044539 1.8724915,0 0,-2.3150051 1.2518081,0 0,2.3150051 0.226328,0 0,0.364554 -0.226328,0 0,2.281969 -1.2518081,0 0,-2.281969 -1.8447292,0 0.1714636,2.0996918 c 0.083684,0.7941801 -1.0492768,0.9595931 -1.6194586,0.9920901 0.255148,0.04998 0.3718808,0.182278 0.3987174,0.314653 0.027895,0.198526 -0.3139768,0.413917 -0.5970186,0.413917 -0.3109363,0 -0.6496346,-0.215391 -0.6258383,-0.413917 0.030933,-0.132376 0.1435689,-0.264752 0.3987176,-0.314653 -0.564894,-0.0325 -1.7010272,-0.19791 -1.6184016,-0.9920901 l 0.1704072,-2.0996918 -1.8447292,0 0,2.281969 -1.2486362,0 0,-2.2818919 0,0 z" fill="#4f4f4f"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="37.28"
+   id="symbol-shelter"
+   viewBox="0 0 12 12"
+   height="37.28"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="cannon.svg">
+  <metadata
+     id="metadata38">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs36">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 18.639999 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="37.279999 : 18.639999 : 1"
+       inkscape:persp3d-origin="18.639999 : 12.426666 : 1"
+       id="perspective11" />
+    <inkscape:perspective
+       id="perspective2825"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-height="856"
+     inkscape:window-width="1009"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="14.339397"
+     inkscape:cx="17.774927"
+     inkscape:cy="15.307223"
+     inkscape:window-x="20"
+     inkscape:window-y="11"
+     inkscape:current-layer="symbol-shelter"
+     showgrid="false"
+     inkscape:window-maximized="0" />
+  <path
+     d="m 1.2052385,7.4832392 -0.198302,0 0,-0.3645544 0.198302,0 0,-2.3150049 1.2486362,0 0,2.3149282 1.8746066,0 0.4255542,-5.8044539 c 0,0 0,-0.34591944 -0.3987174,-0.61128765 l 3.2079831,0 C 7.1377473,0.98379112 7.166699,1.3141542 7.166699,1.3141542 l 0.4255544,5.8044539 1.8724915,0 0,-2.3150051 1.2518081,0 0,2.3150051 0.226328,0 0,0.364554 -0.226328,0 0,2.281969 -1.2518081,0 0,-2.281969 -1.8447292,0 0.1714636,2.0996918 c 0.083684,0.7941801 -1.0492768,0.9595931 -1.6194586,0.9920901 0.255148,0.04998 0.3718808,0.182278 0.3987174,0.314653 0.027895,0.198526 -0.3139768,0.413917 -0.5970186,0.413917 -0.3109363,0 -0.6496346,-0.215391 -0.6258383,-0.413917 0.030933,-0.132376 0.1435689,-0.264752 0.3987176,-0.314653 -0.564894,-0.0325 -1.7010272,-0.19791 -1.6184016,-0.9920901 l 0.1704072,-2.0996918 -1.8447292,0 0,2.281969 -1.2486362,0 0,-2.2818919 0,0 z"
+     id="path3"
+     style="fill:#4f4f4f;fill-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/car_rental.svg b/data/styles/symbols/car_rental.svg
index 6e6e237764..b5b0587fdf 100644
--- a/data/styles/symbols/car_rental.svg
+++ b/data/styles/symbols/car_rental.svg
@@ -1,7 +1,96 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24">
-    <title>
-        Cafe Map Icon
-    </title>
-    <path d="M 5 8 L 3 15 L 3 20 L 4 20 L 4 23 L 7 23 L 7 20 L 17 20 L 17 23 L 20 23 L 20 20 L 21 20 L 21 15 L 19 8 L 5 8 z M 6 9 L 18 9 L 19.46875 14 L 4.53125 14 L 6 9 z M 5.5 16 C 6.3284271 16 7 16.671573 7 17.5 C 7 18.328427 6.3284271 19 5.5 19 C 4.6715729 19 4 18.328427 4 17.5 C 4 16.671573 4.6715729 16 5.5 16 z M 18.46875 16 C 19.297177 16 19.96875 16.671573 19.96875 17.5 C 19.96875 18.328427 19.297177 19 18.46875 19 C 17.640323 19 16.96875 18.328427 16.96875 17.5 C 16.96875 16.671573 17.640323 16 18.46875 16 z" fill="#4d4d4d" fill-rule="evenodd"/>
-    <path d="m 8.5312499,0 c -1.9424295,0 -3.53125,1.5670033 -3.53125,3.5 0,1.9329967 1.5888205,3.5 3.53125,3.5 C 9.9375099,7 11.124724,6.1869032 11.6875,5 L 13,5 14,4 15,5 16,4 17,5 18,5 19,4 19,3 18,2 11.6875,2 C 11.124724,0.81309676 9.9375099,0 8.5312499,0 z m -1.0625,2.28125 c 0.6820917,0 1.25,0.5460912 1.25,1.21875 0,0.6726588 -0.5679083,1.21875 -1.25,1.21875 -0.6820917,0 -1.21875,-0.5460912 -1.21875,-1.21875 0,-0.6726588 0.5366583,-1.21875 1.21875,-1.21875 z" fill="#4d4d4d" fill-rule="evenodd"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="24"
+   height="24"
+   id="symbol-cafe"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="car_rental.svg">
+  <title
+     id="title2988">Cafe Map Icon</title>
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Cafe Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1298"
+     inkscape:window-height="819"
+     id="namedview9"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="30.085005"
+     inkscape:cx="8.4373846"
+     inkscape:cy="18.951865"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-cafe">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs2230" />
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     d="M 5 8 L 3 15 L 3 20 L 4 20 L 4 23 L 7 23 L 7 20 L 17 20 L 17 23 L 20 23 L 20 20 L 21 20 L 21 15 L 19 8 L 5 8 z M 6 9 L 18 9 L 19.46875 14 L 4.53125 14 L 6 9 z M 5.5 16 C 6.3284271 16 7 16.671573 7 17.5 C 7 18.328427 6.3284271 19 5.5 19 C 4.6715729 19 4 18.328427 4 17.5 C 4 16.671573 4.6715729 16 5.5 16 z M 18.46875 16 C 19.297177 16 19.96875 16.671573 19.96875 17.5 C 19.96875 18.328427 19.297177 19 18.46875 19 C 17.640323 19 16.96875 18.328427 16.96875 17.5 C 16.96875 16.671573 17.640323 16 18.46875 16 z "
+     id="rect3008" />
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     d="m 8.5312499,0 c -1.9424295,0 -3.53125,1.5670033 -3.53125,3.5 0,1.9329967 1.5888205,3.5 3.53125,3.5 C 9.9375099,7 11.124724,6.1869032 11.6875,5 L 13,5 14,4 15,5 16,4 17,5 18,5 19,4 19,3 18,2 11.6875,2 C 11.124724,0.81309676 9.9375099,0 8.5312499,0 z m -1.0625,2.28125 c 0.6820917,0 1.25,0.5460912 1.25,1.21875 0,0.6726588 -0.5679083,1.21875 -1.25,1.21875 -0.6820917,0 -1.21875,-0.5460912 -1.21875,-1.21875 0,-0.6726588 0.5366583,-1.21875 1.21875,-1.21875 z"
+     id="path3798"
+     inkscape:connector-curvature="0" />
 </svg>
diff --git a/data/styles/symbols/car_repair.svg b/data/styles/symbols/car_repair.svg
index 5ff5bd4179..0f7ef50701 100644
--- a/data/styles/symbols/car_repair.svg
+++ b/data/styles/symbols/car_repair.svg
@@ -1,7 +1,98 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24">
-    <title>
-        Cafe Map Icon
-    </title>
-    <path d="m 5,9 -2,7 0,5 1,0 0,3 3,0 0,-3 10,0 0,3 3,0 0,-3 1,0 0,-5 L 19,9 5,9 z m 1,1 12,0 1.46875,5 L 4.53125,15 6,10 z M 5.5,17 C 6.3284271,17 7,17.671573 7,18.5 7,19.328427 6.3284271,20 5.5,20 4.6715729,20 4,19.328427 4,18.5 4,17.671573 4.6715729,17 5.5,17 z m 12.96875,0 c 0.828427,0 1.5,0.671573 1.5,1.5 0,0.828427 -0.671573,1.5 -1.5,1.5 -0.828427,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.671573,-1.5 1.5,-1.5 z" fill="#4d4d4d" fill-rule="evenodd"/>
-    <path d="M 7,3 6,1 3,1 2,3 2,3 5,3 5,3 5,5 5,5 2,5 3,7 6,7 7,5 l 9,0 1,2 3,0 1,-2 -3,0 0,-2 3,0 -1,-2 -3,0 -1,2 z" fill="#4d4d4d"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="24"
+   height="24"
+   id="symbol-cafe"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="taxi.svg">
+  <title
+     id="title2988">Cafe Map Icon</title>
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Cafe Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1298"
+     inkscape:window-height="819"
+     id="namedview9"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="30.085005"
+     inkscape:cx="5.7782526"
+     inkscape:cy="14.963167"
+     inkscape:window-x="207"
+     inkscape:window-y="47"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-cafe">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs2230" />
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     d="m 5,9 -2,7 0,5 1,0 0,3 3,0 0,-3 10,0 0,3 3,0 0,-3 1,0 0,-5 L 19,9 5,9 z m 1,1 12,0 1.46875,5 L 4.53125,15 6,10 z M 5.5,17 C 6.3284271,17 7,17.671573 7,18.5 7,19.328427 6.3284271,20 5.5,20 4.6715729,20 4,19.328427 4,18.5 4,17.671573 4.6715729,17 5.5,17 z m 12.96875,0 c 0.828427,0 1.5,0.671573 1.5,1.5 0,0.828427 -0.671573,1.5 -1.5,1.5 -0.828427,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.671573,-1.5 1.5,-1.5 z"
+     id="rect3008"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     d="M 7,3 6,1 3,1 2,3 2,3 5,3 5,3 5,5 5,5 2,5 3,7 6,7 7,5 l 9,0 1,2 3,0 1,-2 -3,0 0,-2 3,0 -1,-2 -3,0 -1,2 z"
+     id="path4534"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccccccccccccccccccc" />
 </svg>
diff --git a/data/styles/symbols/car_sharing.svg b/data/styles/symbols/car_sharing.svg
index 0bc3d57a9a..d5287b8cd3 100644
--- a/data/styles/symbols/car_sharing.svg
+++ b/data/styles/symbols/car_sharing.svg
@@ -1,36 +1,123 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="16" height="16">
-    <defs>
-        <marker refX="10" refY="5" markerWidth="4" orient="auto" viewBox="0 0 10 10">
-            <path d="M 10,0 L 0,5 L 10,10 L 10,0 z"/>
-        </marker>
-        <marker refY="5" markerWidth="4" orient="auto" viewBox="0 0 10 10">
-            <path d="M 0,0 L 10,5 L 0,10 L 0,0 z"/>
-        </marker>
-    </defs>
-    <g>
-        <g transform="matrix(.021 0 0 .022 -44.537 -19.943)">
-            <g>
-                <path d="M 95.872,81.671 C 118.422,81.671 136.706,63.387 136.706,40.835 C 136.706,18.284 118.422,0 95.872,0 C 73.319,0 55.038,18.284 55.038,40.835 C 55.038,63.387 73.319,81.671 95.872,81.671 z" transform="matrix(1.038 0 0 1.149 2194.329 891.247)"/>
-                <path transform="matrix(1.038 0 0 1.149 2194.329 891.247)"/>
-            </g>
-            <path d="M 2248.5,995.46875 C 2218.4813,995.46876 2194.3438,1022.569 2194.3438,1056.375 L 2194.3438,1070.6875 L 2231.375,1070.6875 L 2231.375,1068.7188 L 2240.125,1068.7188 L 2240.125,1070.6875 L 2347.5313,1070.6875 L 2347.5313,1068.7188 L 2356.0938,1068.7188 L 2356.0938,1070.6875 L 2392.8438,1070.6875 L 2392.8438,1057.25 C 2392.8438,1026.0768 2370.9907,995.53125 2338.0313,995.53125 L 2248.5,995.46875 z"/>
-        </g>
-        <path d="M 0.022176996,11.263985 C -0.018098961,8.5755549 -0.17920276,10.888855 1.6102,6.9031012 C 2.904784,4.1938302 1.5929389,4.9232493 8.2902535,4.8242567 C 14.251094,4.9336696 13.048569,4.1521491 14.417951,7.0281445 C 16.132556,10.711711 16.00022,8.7839603 15.988713,11.185833 C 15.925422,13.822162 17.001367,13.144845 7.9795533,13.233417 C -0.97321429,13.124004 0.085467689,13.811742 0.022176996,11.263985 z M 1.8345945,8.6693375 L 3.0601341,6.1059503 C 3.2887907,5.6506102 3.2158395,5.7178272 3.7505789,5.71519 L 12.318914,5.7143538 C 12.782762,5.7158976 12.714712,5.6886249 12.905792,6.0894837 L 14.124512,8.6380765 L 1.8345945,8.6693375 z M 0.95811327,13.5275 L 3.2500064,13.522869 C 3.2429742,16.128515 3.4814334,15.983212 2.2316004,16 C 0.74330825,15.994789 0.9785709,16.130832 0.95811327,13.5275 z M 12.760883,13.546025 L 15.056612,13.546025 C 15.041269,16.155724 15.25096,15.977422 13.951901,15.984368 C 12.60873,15.968159 12.779423,16.160356 12.760883,13.546025 z" fill-rule="evenodd"/>
-        <circle cx="150" cy="412" r="66.5" transform="matrix(.017 0 0 .015 -.427 4.308)" fill="#fff"/>
-        <circle cx="850" cy="412" r="66.5" transform="matrix(.017 0 0 .015 -.427 4.308)" fill="#fff"/>
-        <g transform="matrix(.021 0 0 .022 -39.436 -19.943)">
-            <g>
-                <path d="M 95.872,81.671 C 118.422,81.671 136.706,63.387 136.706,40.835 C 136.706,18.284 118.422,0 95.872,0 C 73.319,0 55.038,18.284 55.038,40.835 C 55.038,63.387 73.319,81.671 95.872,81.671 z" transform="matrix(1.038 0 0 1.149 2194.329 891.247)"/>
-                <path transform="matrix(1.038 0 0 1.149 2194.329 891.247)"/>
-            </g>
-            <path d="M 2248.5,995.46875 C 2218.4813,995.46876 2194.3438,1022.569 2194.3438,1056.375 L 2194.3438,1070.6875 L 2231.375,1070.6875 L 2231.375,1068.7188 L 2240.125,1068.7188 L 2240.125,1070.6875 L 2347.5313,1070.6875 L 2347.5313,1068.7188 L 2356.0938,1068.7188 L 2356.0938,1070.6875 L 2392.8438,1070.6875 L 2392.8438,1057.25 C 2392.8438,1026.0768 2370.9907,995.53125 2338.0313,995.53125 L 2248.5,995.46875 z"/>
-        </g>
-        <g transform="matrix(.021 0 0 .022 -34.334 -19.943)">
-            <g>
-                <path d="M 95.872,81.671 C 118.422,81.671 136.706,63.387 136.706,40.835 C 136.706,18.284 118.422,0 95.872,0 C 73.319,0 55.038,18.284 55.038,40.835 C 55.038,63.387 73.319,81.671 95.872,81.671 z" transform="matrix(1.038 0 0 1.149 2194.329 891.247)"/>
-                <path transform="matrix(1.038 0 0 1.149 2194.329 891.247)"/>
-            </g>
-            <path d="M 2248.5,995.46875 C 2218.4813,995.46876 2194.3438,1022.569 2194.3438,1056.375 L 2194.3438,1070.6875 L 2231.375,1070.6875 L 2231.375,1068.7188 L 2240.125,1068.7188 L 2240.125,1070.6875 L 2347.5313,1070.6875 L 2347.5313,1068.7188 L 2356.0938,1068.7188 L 2356.0938,1070.6875 L 2392.8438,1070.6875 L 2392.8438,1057.25 C 2392.8438,1026.0768 2370.9907,995.53125 2338.0313,995.53125 L 2248.5,995.46875 z"/>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="16"
+   height="15.999999"
+   id="symbol-carsharing">
+  <defs
+     id="defs8">
+    <marker
+       markerUnits="strokeWidth"
+       refX="10"
+       refY="5"
+       markerWidth="4"
+       markerHeight="3"
+       orient="auto"
+       viewBox="0 0 10 10"
+       id="ArrowStart">
+      <path
+         d="M 10,0 L 0,5 L 10,10 L 10,0 z "
+         id="path1515" />
+    </marker>
+    <marker
+       markerUnits="strokeWidth"
+       refX="0"
+       refY="5"
+       markerWidth="4"
+       markerHeight="3"
+       orient="auto"
+       viewBox="0 0 10 10"
+       id="ArrowEnd">
+      <path
+         d="M 0,0 L 10,5 L 0,10 L 0,0 z "
+         id="path1512" />
+    </marker>
+  </defs>
+  <g
+     id="g2179">
+    <g
+       transform="matrix(2.0646103e-2,0,0,2.2375986e-2,-44.536555,-19.942524)"
+       id="g3246">
+      <g
+         transform="matrix(1.0380952,0,0,1.1492407,2194.3289,891.24668)"
+         style="fill:#000000;fill-opacity:1"
+         id="g2248">
+        <path
+           d="M 95.872,81.671 C 118.422,81.671 136.706,63.387 136.706,40.835 C 136.706,18.284 118.422,0 95.872,0 C 73.319,0 55.038,18.284 55.038,40.835 C 55.038,63.387 73.319,81.671 95.872,81.671 z "
+           style="fill:#000000;fill-opacity:1;stroke:none"
+           id="path2250" />
+        <path
+           d=""
+           style="fill:#000000;fill-opacity:1;stroke:none"
+           id="path2252" />
+      </g>
+      <path
+         d="M 2248.5,995.46875 C 2218.4813,995.46876 2194.3438,1022.569 2194.3438,1056.375 L 2194.3438,1070.6875 L 2231.375,1070.6875 L 2231.375,1068.7188 L 2240.125,1068.7188 L 2240.125,1070.6875 L 2347.5313,1070.6875 L 2347.5313,1068.7188 L 2356.0938,1068.7188 L 2356.0938,1070.6875 L 2392.8438,1070.6875 L 2392.8438,1057.25 C 2392.8438,1026.0768 2370.9907,995.53125 2338.0313,995.53125 L 2248.5,995.46875 z "
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         id="path2254" />
     </g>
+    <path
+       d="M 0.022176996,11.263985 C -0.018098961,8.5755549 -0.17920276,10.888855 1.6102,6.9031012 C 2.904784,4.1938302 1.5929389,4.9232493 8.2902535,4.8242567 C 14.251094,4.9336696 13.048569,4.1521491 14.417951,7.0281445 C 16.132556,10.711711 16.00022,8.7839603 15.988713,11.185833 C 15.925422,13.822162 17.001367,13.144845 7.9795533,13.233417 C -0.97321429,13.124004 0.085467689,13.811742 0.022176996,11.263985 z M 1.8345945,8.6693375 L 3.0601341,6.1059503 C 3.2887907,5.6506102 3.2158395,5.7178272 3.7505789,5.71519 L 12.318914,5.7143538 C 12.782762,5.7158976 12.714712,5.6886249 12.905792,6.0894837 L 14.124512,8.6380765 L 1.8345945,8.6693375 z M 0.95811327,13.5275 L 3.2500064,13.522869 C 3.2429742,16.128515 3.4814334,15.983212 2.2316004,16 C 0.74330825,15.994789 0.9785709,16.130832 0.95811327,13.5275 z M 12.760883,13.546025 L 15.056612,13.546025 C 15.041269,16.155724 15.25096,15.977422 13.951901,15.984368 C 12.60873,15.968159 12.779423,16.160356 12.760883,13.546025 z "
+       style="fill:#000000;fill-rule:evenodd;stroke:none"
+       id="Car" />
+    <circle
+       cx="150"
+       cy="412"
+       r="66.5"
+       transform="matrix(1.6829592e-2,0,0,1.5239649e-2,-0.4266121,4.3084532)"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="LeftLamp" />
+    <circle
+       cx="850"
+       cy="412"
+       r="66.5"
+       transform="matrix(1.6829592e-2,0,0,1.5239649e-2,-0.4266121,4.3084532)"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="RightLamp" />
+    <g
+       transform="matrix(2.0646103e-2,0,0,2.2375986e-2,-39.435516,-19.942524)"
+       id="g3262">
+      <g
+         transform="matrix(1.0380952,0,0,1.1492407,2194.3289,891.24668)"
+         style="fill:#000000;fill-opacity:1"
+         id="g3264">
+        <path
+           d="M 95.872,81.671 C 118.422,81.671 136.706,63.387 136.706,40.835 C 136.706,18.284 118.422,0 95.872,0 C 73.319,0 55.038,18.284 55.038,40.835 C 55.038,63.387 73.319,81.671 95.872,81.671 z "
+           style="fill:#000000;fill-opacity:1;stroke:none"
+           id="path3266" />
+        <path
+           d=""
+           style="fill:#000000;fill-opacity:1;stroke:none"
+           id="path3268" />
+      </g>
+      <path
+         d="M 2248.5,995.46875 C 2218.4813,995.46876 2194.3438,1022.569 2194.3438,1056.375 L 2194.3438,1070.6875 L 2231.375,1070.6875 L 2231.375,1068.7188 L 2240.125,1068.7188 L 2240.125,1070.6875 L 2347.5313,1070.6875 L 2347.5313,1068.7188 L 2356.0938,1068.7188 L 2356.0938,1070.6875 L 2392.8438,1070.6875 L 2392.8438,1057.25 C 2392.8438,1026.0768 2370.9907,995.53125 2338.0313,995.53125 L 2248.5,995.46875 z "
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         id="path3270" />
+    </g>
+    <g
+       transform="matrix(2.0646103e-2,0,0,2.2375986e-2,-34.334478,-19.942524)"
+       id="g3272">
+      <g
+         transform="matrix(1.0380952,0,0,1.1492407,2194.3289,891.24668)"
+         style="fill:#000000;fill-opacity:1"
+         id="g3274">
+        <path
+           d="M 95.872,81.671 C 118.422,81.671 136.706,63.387 136.706,40.835 C 136.706,18.284 118.422,0 95.872,0 C 73.319,0 55.038,18.284 55.038,40.835 C 55.038,63.387 73.319,81.671 95.872,81.671 z "
+           style="fill:#000000;fill-opacity:1;stroke:none"
+           id="path3276" />
+        <path
+           d=""
+           style="fill:#000000;fill-opacity:1;stroke:none"
+           id="path3278" />
+      </g>
+      <path
+         d="M 2248.5,995.46875 C 2218.4813,995.46876 2194.3438,1022.569 2194.3438,1056.375 L 2194.3438,1070.6875 L 2231.375,1070.6875 L 2231.375,1068.7188 L 2240.125,1068.7188 L 2240.125,1070.6875 L 2347.5313,1070.6875 L 2347.5313,1068.7188 L 2356.0938,1068.7188 L 2356.0938,1070.6875 L 2392.8438,1070.6875 L 2392.8438,1057.25 C 2392.8438,1026.0768 2370.9907,995.53125 2338.0313,995.53125 L 2248.5,995.46875 z "
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         id="path3280" />
+    </g>
+  </g>
 </svg>
diff --git a/data/styles/symbols/castle.svg b/data/styles/symbols/castle.svg
index 0eb17a9d0e..b97c04ad25 100644
--- a/data/styles/symbols/castle.svg
+++ b/data/styles/symbols/castle.svg
@@ -1,3 +1,69 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <path d="M 6 3 L 5 4 L 5 6 L 5 10 L 6 10 L 6 24 L 19 24 L 19 10 L 20 10 L 20 6 L 20 4 L 19 3 L 18 4 L 18 6 L 17 6 L 17 4 L 16 3 L 15 4 L 15 6 L 14 6 L 14 4 L 12.5 3 L 11 4 L 11 6 L 10 6 L 10 4 L 9 3 L 8 4 L 8 6 L 7 6 L 7 4 L 6 3 z M 10 10 C 10.552285 10 11 10.4477 11 11 L 11 14 L 9 14 L 9 11 C 9 10.4477 9.4477152 10 10 10 z M 15 10 C 15.552285 10 16 10.4477 16 11 L 16 14 L 14 14 L 14 11 C 14 10.4477 14.447715 10 15 10 z" transform="translate(0 -1028.362) translate(0 1028.362)" fill="#4d4d4d" fill-rule="evenodd"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg3882"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="memorial.svg">
+  <defs
+     id="defs3884" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="11.3506"
+     inkscape:cy="16.781288"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1146"
+     inkscape:window-height="690"
+     inkscape:window-x="20"
+     inkscape:window-y="20"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3890"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3887">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <path
+       style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="M 6 3 L 5 4 L 5 6 L 5 10 L 6 10 L 6 24 L 19 24 L 19 10 L 20 10 L 20 6 L 20 4 L 19 3 L 18 4 L 18 6 L 17 6 L 17 4 L 16 3 L 15 4 L 15 6 L 14 6 L 14 4 L 12.5 3 L 11 4 L 11 6 L 10 6 L 10 4 L 9 3 L 8 4 L 8 6 L 7 6 L 7 4 L 6 3 z M 10 10 C 10.552285 10 11 10.4477 11 11 L 11 14 L 9 14 L 9 11 C 9 10.4477 9.4477152 10 10 10 z M 15 10 C 15.552285 10 16 10.4477 16 11 L 16 14 L 14 14 L 14 11 C 14 10.4477 14.447715 10 15 10 z "
+       transform="translate(0,1028.3622)"
+       id="rect4465" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/cave_entrance.svg b/data/styles/symbols/cave_entrance.svg
index eeb45ce196..0ae66f07d3 100644
--- a/data/styles/symbols/cave_entrance.svg
+++ b/data/styles/symbols/cave_entrance.svg
@@ -1,6 +1,28 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="16" height="16">
-    <path d="M 0.5,10 L 2,10" stroke="#000" stroke-linecap="square" fill="none"/>
-    <path d="M 14,10 L 15.5,10" stroke="#000" stroke-linecap="square" fill="none"/>
-    <path d="M 0.5,12 L 15.5,12" stroke="#000" stroke-linecap="square" fill="none"/>
-    <path d="M 2,10.5 C 2,1 14,1 14,10.5" stroke="#000" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="16"
+   height="16"
+   id="symbol-cave-entrance">
+  <defs
+     id="defs4" />
+  <path
+     d="M 0.5,10 L 2,10"
+     id="path3161"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 14,10 L 15.5,10"
+     id="path3163"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 0.5,12 L 15.5,12"
+     id="path3170"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 2,10.5 C 2,1 14,1 14,10.5"
+     id="path2384"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/church.svg b/data/styles/symbols/church.svg
index 8f91d44b14..eb6a3d63d7 100644
--- a/data/styles/symbols/church.svg
+++ b/data/styles/symbols/church.svg
@@ -1,3 +1,60 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18.64" viewBox="0 0 10 10" height="18.64">
-    <path d="M 0 10 L 0 5 L 5 5 L 5 10 z M 0 2 L 5 2 L 5 3 L 0 3 z M 2 0 L 2 5 L 3 5 L 3 0 z" fill="#555753" transform="translate(2.5)"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="18.64"
+   id="church"
+   viewBox="0 0 10 10"
+   fill="#000000"
+   height="18.64"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="church.svg">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="12.660945"
+     inkscape:cx="9.3199997"
+     inkscape:cy="8.5696607"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="church" />
+  <g
+     transform="translate (2.5,0)"
+     id="g3"
+     style="fill:#555753">
+    <path
+       d="M 0 10 L 0 5 L 5 5 L 5 10 z M 0 2 L 5 2 L 5 3 L 0 3 z M 2 0 L 2 5 L 3 5 L 3 0 z"
+       id="path5"
+       style="fill:#555753" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/cinema.svg b/data/styles/symbols/cinema.svg
index c33a87c721..d7596251a0 100755
--- a/data/styles/symbols/cinema.svg
+++ b/data/styles/symbols/cinema.svg
@@ -1,7 +1,64 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" enable-background="new 0 0 100 95.76">
-    <title>
-        Cinema Map Icon
-    </title>
-    <path d="M 2 3 L 2 21 L 4 21 L 4 19 L 6 19 L 6 21 L 8 21 L 8 19 L 16 19 L 16 21 L 17.9375 21 L 17.9375 19 L 19.9375 19 L 19.9375 21 L 22 21 L 22 3 L 19.9375 3 L 19.9375 5 L 17.9375 5 L 17.9375 3 L 16 3 L 16 5 L 8 5 L 8 3 L 6 3 L 6 5 L 4 5 L 4 3 L 2 3 z M 4 7 L 6 7 L 6 9 L 4 9 L 4 7 z M 8 7 L 16 7 L 16 17 L 8 17 L 8 7 z M 17.9375 7 L 19.9375 7 L 19.9375 9 L 17.9375 9 L 17.9375 7 z M 4 11 L 6 11 L 6 13 L 4 13 L 4 11 z M 17.9375 11 L 19.9375 11 L 19.9375 13 L 17.9375 13 L 17.9375 11 z M 4 15 L 6 15 L 6 17 L 4 17 L 4 15 z M 17.9375 15 L 19.9375 15 L 19.9375 17 L 17.9375 17 L 17.9375 15 z" fill="#505050"/>
-    <rect width="8" height="10" x="8" y="7" fill="#f2f2f2"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   enable-background="new 0 0 100 95.76"
+   xml:space="preserve"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="cinema.svg"><title
+   id="title3018">Cinema Map Icon</title><metadata
+   id="metadata11"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Cinema Map Icon</dc:title><dc:creator><cc:Agent><dc:title>Yury Melnichek</dc:title></cc:Agent></dc:creator><dc:source>mapsforhumans.com</dc:source></cc:Work></rdf:RDF></metadata><defs
+   id="defs9" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1064"
+   inkscape:window-height="758"
+   id="namedview7"
+   showgrid="true"
+   inkscape:zoom="17.159503"
+   inkscape:cx="12.984407"
+   inkscape:cy="11.97"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"><inkscape:grid
+     type="xygrid"
+     id="grid2983"
+     empspacing="2"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
+
+
+<path
+   style="fill:#505050;fill-opacity:1;stroke:none"
+   d="M 2 3 L 2 21 L 4 21 L 4 19 L 6 19 L 6 21 L 8 21 L 8 19 L 16 19 L 16 21 L 17.9375 21 L 17.9375 19 L 19.9375 19 L 19.9375 21 L 22 21 L 22 3 L 19.9375 3 L 19.9375 5 L 17.9375 5 L 17.9375 3 L 16 3 L 16 5 L 8 5 L 8 3 L 6 3 L 6 5 L 4 5 L 4 3 L 2 3 z M 4 7 L 6 7 L 6 9 L 4 9 L 4 7 z M 8 7 L 16 7 L 16 17 L 8 17 L 8 7 z M 17.9375 7 L 19.9375 7 L 19.9375 9 L 17.9375 9 L 17.9375 7 z M 4 11 L 6 11 L 6 13 L 4 13 L 4 11 z M 17.9375 11 L 19.9375 11 L 19.9375 13 L 17.9375 13 L 17.9375 11 z M 4 15 L 6 15 L 6 17 L 4 17 L 4 15 z M 17.9375 15 L 19.9375 15 L 19.9375 17 L 17.9375 17 L 17.9375 15 z "
+   id="rect2984" /><rect
+   style="fill:#f2f2f2;fill-opacity:1;stroke:none"
+   id="rect3784"
+   width="8"
+   height="10"
+   x="8"
+   y="7" /></svg>
\ No newline at end of file
diff --git a/data/styles/symbols/clothes.svg b/data/styles/symbols/clothes.svg
index 928b26d6f1..04d031c610 100644
--- a/data/styles/symbols/clothes.svg
+++ b/data/styles/symbols/clothes.svg
@@ -1,3 +1,71 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <path d="m 8,7 2,1 5,0 2,-1 5,3 -2,3 -3,-1 0,10 -9,0 0,-10 -3,1 -2,-3 z" transform="translate(0 -1028.362) translate(0 1028.362)" fill="#4d4d4d"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg3882"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="castle.svg">
+  <defs
+     id="defs3884" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="11.3506"
+     inkscape:cy="16.781288"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1146"
+     inkscape:window-height="690"
+     inkscape:window-x="20"
+     inkscape:window-y="20"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3890"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3887">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <path
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       d="m 8,7 2,1 5,0 2,-1 5,3 -2,3 -3,-1 0,10 -9,0 0,-10 -3,1 -2,-3 z"
+       id="path4513"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1028.3622)"
+       sodipodi:nodetypes="ccccccccccccc" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/cricket-borderless.svg b/data/styles/symbols/cricket-borderless.svg
index 66a872f295..5c318c9ae7 100644
--- a/data/styles/symbols/cricket-borderless.svg
+++ b/data/styles/symbols/cricket-borderless.svg
@@ -1,15 +1,65 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="38" height="38" viewBox="0 0 300 300">
-    <path d="M 89.567965,58.513471 L 116.05979,116.83402" stroke="#000" stroke-width="11.842" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 89.567965,58.513471 L 124.55035,133.81515" stroke="#000" stroke-width="3.947" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 208.33376,72.024058 C 208.3368,80.953264 201.09907,88.193438 192.16982,88.193438 C 183.24058,88.193438 176.00285,80.953264 176.00589,72.024058 C 176.00285,63.094808 183.24058,55.854618 192.16982,55.854618 C 201.09907,55.854618 208.3368,63.094808 208.33376,72.024058 L 208.33376,72.024058 z" fill-rule="evenodd" stroke="#000"/>
-    <path d="M 181.00118,104.74292 C 178.94682,104.77285 176.98503,105.60241 175.53243,107.05542 L 154.09493,127.86792 L 121.28243,127.93042 C 116.91593,127.93905 113.38318,131.48579 113.3918,135.8523 C 113.40043,140.2188 116.94718,143.75155 121.31368,143.74292 L 157.34493,143.64917 C 159.38612,143.6443 161.3461,142.8491 162.81368,141.43042 L 186.53243,118.36792 C 188.89108,116.13202 189.63871,112.67924 188.41622,109.66793 C 187.19374,106.65661 184.25092,104.70202 181.00118,104.74292 z" fill-rule="evenodd" stroke="#fff" stroke-width=".789" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M 197.47492,114.94362 C 197.47492,114.94362 198.18543,162.12326 198.18543,162.12326" stroke="#000" stroke-width="44.174" stroke-linecap="round" fill="none"/>
-    <path d="M 183.12803,174.29061 L 172.06346,201.23532 L 171.6684,236.80669" stroke="#000" stroke-width="19.737" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 206.56378,105.19934 C 204.90963,106.41798 203.79565,108.23343 203.45843,110.26014 L 198.11475,139.65694 L 171.45287,158.78305 C 167.90504,161.3285 167.09245,166.26807 169.6379,169.81592 C 172.18335,173.36374 177.12293,174.17633 180.67076,171.63088 L 209.93344,150.60815 C 211.59144,149.41756 212.72392,147.63112 213.09329,145.62364 L 218.98511,113.06991 C 219.60442,109.87947 218.2055,106.63546 215.46021,104.89596 C 212.71492,103.15644 209.18418,103.27686 206.56378,105.19934 z" fill-rule="evenodd" stroke="#fff" stroke-width=".789" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M 209.34436,174.91092 L 209.88524,204.03392 L 223.64347,236.83926" stroke="#000" stroke-width="19.737" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 55.70477,176.95141 L 56.393328,244.80243" stroke="#000" stroke-width="5.921" stroke-linecap="square" stroke-linejoin="round" fill="none"/>
-    <path d="M 73.534963,176.95141 L 74.223521,244.80243" stroke="#000" stroke-width="5.921" stroke-linecap="square" stroke-linejoin="round" fill="none"/>
-    <path d="M 91.365147,176.95141 L 92.053705,244.80243" stroke="#000" stroke-width="5.921" stroke-linecap="square" stroke-linejoin="round" fill="none"/>
-    <path d="M 70.189028,171.30663 L 59.690084,171.42915" stroke="#000" stroke-width="3.947" stroke-linecap="square" stroke-linejoin="round" fill="none"/>
-    <path d="M 87.932578,170.97804 L 77.433634,171.10056" stroke="#000" stroke-width="3.947" stroke-linecap="square" stroke-linejoin="round" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="38"
+   height="38"
+   viewBox="0 0 300 300"
+   id="symbol-cricket-borderless">
+  <defs
+     id="defs2474" />
+  <path
+     d="M 89.567965,58.513471 L 116.05979,116.83402"
+     id="path2390"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:11.84210491;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 89.567965,58.513471 L 124.55035,133.81515"
+     id="path3158"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.94736838;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 208.33376,72.024058 C 208.3368,80.953264 201.09907,88.193438 192.16982,88.193438 C 183.24058,88.193438 176.00285,80.953264 176.00589,72.024058 C 176.00285,63.094808 183.24058,55.854618 192.16982,55.854618 C 201.09907,55.854618 208.3368,63.094808 208.33376,72.024058 L 208.33376,72.024058 z"
+     id="path2387"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 181.00118,104.74292 C 178.94682,104.77285 176.98503,105.60241 175.53243,107.05542 L 154.09493,127.86792 L 121.28243,127.93042 C 116.91593,127.93905 113.38318,131.48579 113.3918,135.8523 C 113.40043,140.2188 116.94718,143.75155 121.31368,143.74292 L 157.34493,143.64917 C 159.38612,143.6443 161.3461,142.8491 162.81368,141.43042 L 186.53243,118.36792 C 188.89108,116.13202 189.63871,112.67924 188.41622,109.66793 C 187.19374,106.65661 184.25092,104.70202 181.00118,104.74292 z"
+     id="path3168"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.78947365;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 197.47492,114.94362 C 197.47492,114.94362 198.18543,162.12326 198.18543,162.12326"
+     id="path2383"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:44.17389679;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 183.12803,174.29061 L 172.06346,201.23532 L 171.6684,236.80669"
+     id="path3157"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:19.7368412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 206.56378,105.19934 C 204.90963,106.41798 203.79565,108.23343 203.45843,110.26014 L 198.11475,139.65694 L 171.45287,158.78305 C 167.90504,161.3285 167.09245,166.26807 169.6379,169.81592 C 172.18335,173.36374 177.12293,174.17633 180.67076,171.63088 L 209.93344,150.60815 C 211.59144,149.41756 212.72392,147.63112 213.09329,145.62364 L 218.98511,113.06991 C 219.60442,109.87947 218.2055,106.63546 215.46021,104.89596 C 212.71492,103.15644 209.18418,103.27686 206.56378,105.19934 z"
+     id="path3159"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.78947365;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 209.34436,174.91092 L 209.88524,204.03392 L 223.64347,236.83926"
+     id="path2388"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:19.7368412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 55.70477,176.95141 L 56.393328,244.80243"
+     id="path3172"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.92105246;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 73.534963,176.95141 L 74.223521,244.80243"
+     id="path3174"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.92105246;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 91.365147,176.95141 L 92.053705,244.80243"
+     id="path3176"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.92105246;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 70.189028,171.30663 L 59.690084,171.42915"
+     id="path3178"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.94736838;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 87.932578,170.97804 L 77.433634,171.10056"
+     id="path3180"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.94736838;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/cricket.svg b/data/styles/symbols/cricket.svg
index 1b6f16bc4d..094b7ae19b 100644
--- a/data/styles/symbols/cricket.svg
+++ b/data/styles/symbols/cricket.svg
@@ -1,16 +1,73 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="38" height="38" viewBox="0 0 300 300">
-    <path d="M 89.567965,58.513471 L 116.05979,116.83402" stroke="#000" stroke-width="11.842" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 89.567965,58.513471 L 124.55035,133.81515" stroke="#000" stroke-width="3.947" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <rect width="269.521" height="258.248" ry="20.87" x="15.29" y="20.639" stroke="#000" stroke-width="14.69" stroke-linejoin="round" fill="none"/>
-    <path d="M 208.33376,72.024058 C 208.3368,80.953264 201.09907,88.193438 192.16982,88.193438 C 183.24058,88.193438 176.00285,80.953264 176.00589,72.024058 C 176.00285,63.094808 183.24058,55.854618 192.16982,55.854618 C 201.09907,55.854618 208.3368,63.094808 208.33376,72.024058 L 208.33376,72.024058 z" fill-rule="evenodd" stroke="#000"/>
-    <path d="M 181.00118,104.74292 C 178.94682,104.77285 176.98503,105.60241 175.53243,107.05542 L 154.09493,127.86792 L 121.28243,127.93042 C 116.91593,127.93905 113.38318,131.48579 113.3918,135.8523 C 113.40043,140.2188 116.94718,143.75155 121.31368,143.74292 L 157.34493,143.64917 C 159.38612,143.6443 161.3461,142.8491 162.81368,141.43042 L 186.53243,118.36792 C 188.89108,116.13202 189.63871,112.67924 188.41622,109.66793 C 187.19374,106.65661 184.25092,104.70202 181.00118,104.74292 z" fill-rule="evenodd" stroke="#fff" stroke-width=".789" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M 197.47492,114.94362 C 197.47492,114.94362 198.18543,162.12326 198.18543,162.12326" stroke="#000" stroke-width="44.174" stroke-linecap="round" fill="none"/>
-    <path d="M 183.12803,174.29061 L 172.06346,201.23532 L 171.6684,236.80669" stroke="#000" stroke-width="19.737" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 206.56378,105.19934 C 204.90963,106.41798 203.79565,108.23343 203.45843,110.26014 L 198.11475,139.65694 L 171.45287,158.78305 C 167.90504,161.3285 167.09245,166.26807 169.6379,169.81592 C 172.18335,173.36374 177.12293,174.17633 180.67076,171.63088 L 209.93344,150.60815 C 211.59144,149.41756 212.72392,147.63112 213.09329,145.62364 L 218.98511,113.06991 C 219.60442,109.87947 218.2055,106.63546 215.46021,104.89596 C 212.71492,103.15644 209.18418,103.27686 206.56378,105.19934 z" fill-rule="evenodd" stroke="#fff" stroke-width=".789" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M 209.34436,174.91092 L 209.88524,204.03392 L 223.64347,236.83926" stroke="#000" stroke-width="19.737" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 55.70477,176.95141 L 56.393328,244.80243" stroke="#000" stroke-width="5.921" stroke-linecap="square" stroke-linejoin="round" fill="none"/>
-    <path d="M 73.534963,176.95141 L 74.223521,244.80243" stroke="#000" stroke-width="5.921" stroke-linecap="square" stroke-linejoin="round" fill="none"/>
-    <path d="M 91.365147,176.95141 L 92.053705,244.80243" stroke="#000" stroke-width="5.921" stroke-linecap="square" stroke-linejoin="round" fill="none"/>
-    <path d="M 70.189028,171.30663 L 59.690084,171.42915" stroke="#000" stroke-width="3.947" stroke-linecap="square" stroke-linejoin="round" fill="none"/>
-    <path d="M 87.932578,170.97804 L 77.433634,171.10056" stroke="#000" stroke-width="3.947" stroke-linecap="square" stroke-linejoin="round" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="38"
+   height="38"
+   viewBox="0 0 300 300"
+   id="symbol-cricket">
+  <defs
+     id="defs2474" />
+  <path
+     d="M 89.567965,58.513471 L 116.05979,116.83402"
+     id="path2390"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:11.84210491;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 89.567965,58.513471 L 124.55035,133.81515"
+     id="path3158"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.94736838;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     width="269.52087"
+     height="258.24777"
+     ry="20.869576"
+     x="15.289689"
+     y="20.638819"
+     id="rect2471"
+     style="fill:none;stroke:#000000;stroke-width:14.68965149;stroke-linejoin:round;stroke-miterlimit:4" />
+  <path
+     d="M 208.33376,72.024058 C 208.3368,80.953264 201.09907,88.193438 192.16982,88.193438 C 183.24058,88.193438 176.00285,80.953264 176.00589,72.024058 C 176.00285,63.094808 183.24058,55.854618 192.16982,55.854618 C 201.09907,55.854618 208.3368,63.094808 208.33376,72.024058 L 208.33376,72.024058 z"
+     id="path2387"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 181.00118,104.74292 C 178.94682,104.77285 176.98503,105.60241 175.53243,107.05542 L 154.09493,127.86792 L 121.28243,127.93042 C 116.91593,127.93905 113.38318,131.48579 113.3918,135.8523 C 113.40043,140.2188 116.94718,143.75155 121.31368,143.74292 L 157.34493,143.64917 C 159.38612,143.6443 161.3461,142.8491 162.81368,141.43042 L 186.53243,118.36792 C 188.89108,116.13202 189.63871,112.67924 188.41622,109.66793 C 187.19374,106.65661 184.25092,104.70202 181.00118,104.74292 z"
+     id="path3168"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.78947365;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 197.47492,114.94362 C 197.47492,114.94362 198.18543,162.12326 198.18543,162.12326"
+     id="path2383"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:44.17389679;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 183.12803,174.29061 L 172.06346,201.23532 L 171.6684,236.80669"
+     id="path3157"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:19.7368412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 206.56378,105.19934 C 204.90963,106.41798 203.79565,108.23343 203.45843,110.26014 L 198.11475,139.65694 L 171.45287,158.78305 C 167.90504,161.3285 167.09245,166.26807 169.6379,169.81592 C 172.18335,173.36374 177.12293,174.17633 180.67076,171.63088 L 209.93344,150.60815 C 211.59144,149.41756 212.72392,147.63112 213.09329,145.62364 L 218.98511,113.06991 C 219.60442,109.87947 218.2055,106.63546 215.46021,104.89596 C 212.71492,103.15644 209.18418,103.27686 206.56378,105.19934 z"
+     id="path3159"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.78947365;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 209.34436,174.91092 L 209.88524,204.03392 L 223.64347,236.83926"
+     id="path2388"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:19.7368412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 55.70477,176.95141 L 56.393328,244.80243"
+     id="path3172"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.92105246;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 73.534963,176.95141 L 74.223521,244.80243"
+     id="path3174"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.92105246;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 91.365147,176.95141 L 92.053705,244.80243"
+     id="path3176"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.92105246;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 70.189028,171.30663 L 59.690084,171.42915"
+     id="path3178"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.94736838;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 87.932578,170.97804 L 77.433634,171.10056"
+     id="path3180"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.94736838;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/curling-borderless.svg b/data/styles/symbols/curling-borderless.svg
index 6f7f3d0b61..addeb1f5b4 100644
--- a/data/styles/symbols/curling-borderless.svg
+++ b/data/styles/symbols/curling-borderless.svg
@@ -1,8 +1,42 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="38" height="38" viewBox="0 0 300 300">
-    <path d="M 133.81685,208.8622 L 126.35503,240.31878 C 124.99394,245.51199 126.77374,249.59331 131.69442,252.56277 C 135.1066,254.53982 138.69086,254.81182 142.44721,253.37876 C 146.2033,251.94563 148.57756,249.32335 149.57,245.51188 L 158.56393,207.50471 C 159.4585,203.4602 158.48415,199.99258 155.64087,197.10185 L 134.75661,175.03208 L 162.66048,153.398 L 166.54511,167.06433 C 166.79653,168.31994 167.48101,169.46325 168.5985,170.49427 L 195.76983,191.98059 C 196.45337,192.64098 197.12373,193.10574 197.78094,193.37488 C 200.08277,194.31797 202.42725,194.22395 204.81434,193.09278 C 207.20108,191.96165 208.86684,190.24692 209.81164,187.94863 C 211.49695,183.8478 210.63576,180.33295 207.2281,177.40406 L 183.83954,158.62581 L 173.64264,125.97234 C 172.19694,121.54832 169.09517,117.88193 164.33727,114.97315 C 156.00428,110.02673 148.06788,110.41718 140.5281,116.14448 L 102.21218,145.59669 C 99.720069,147.45414 97.815921,150.2193 96.499761,153.89217 L 77.106834,203.17152 L 45.125616,232.63017 C 43.86149,233.83809 42.947508,234.8999 42.383669,235.81558 C 40.605024,238.73157 40.130919,241.74913 40.961422,244.86825 C 41.79188,247.98732 43.667492,250.43472 46.588322,252.2105 C 51.508856,255.17988 55.947032,254.88907 59.902852,251.33808 L 95.031256,219.14089 C 96.295295,217.93294 97.263831,216.5103 97.936863,214.87295 L 110.13221,184.4956 L 133.81685,208.8622 z M 175.35877,116.89965 C 179.79714,118.7181 184.31645,118.70038 188.91668,116.8465 C 193.5166,114.99285 196.76021,111.77017 198.64755,107.17852 C 200.4687,102.74732 200.41134,98.21769 198.47553,93.589598 C 196.53933,88.961767 193.35205,85.738614 188.9137,83.920118 C 184.30948,82.034104 179.73058,82.07567 175.17695,84.044796 C 170.62302,86.014182 167.43547,89.214488 165.6143,93.645672 C 163.72698,98.237322 163.72826,102.78934 165.61814,107.3017 C 167.5077,111.81428 170.75459,115.01359 175.35877,116.89965 L 175.35877,116.89965 z" style="text-align:start;line-height:125%;-inkscape-font-specification:NPSPICT3" font-size="40" font-family="NPSPICT3"/>
-    <g transform="matrix(.454 0 0 .453 18.633 20.358)">
-        <rect width="118.496" height="18.157" x="406.645" y="467.606"/>
-        <rect width="116.927" height="63.109" rx="31.118" ry="31.555" x="407.429" y="445.129" stroke="#000" stroke-width="10" fill="none"/>
-        <path d="M 432.74572,445.14884 L 449.94678,445.14884 L 467.14785,445.14884 L 484.34892,445.14884 C 484.34892,431.44683 480.58149,429.63641 475.01444,429.63641 L 444.18435,429.63641 C 437.39209,429.63641 433.44408,426.06557 433.44408,421.63173 C 433.44408,416.37088 437.9171,414.63494 444.05397,414.63494 L 483.74131,414.63494 C 492.8433,414.63494 501.55,430.68041 501.55,445.14884 C 510.28526,445.14884 511.47978,448.66503 517.17978,454.36502 L 417.11594,454.36502 C 422.81594,448.66503 424.01044,445.14884 432.74572,445.14884 z"/>
-    </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="38"
+   height="38"
+   viewBox="0 0 300 300"
+   id="symbol-curling-borderless">
+  <defs
+     id="defs2474" />
+  <path
+     d="M 133.81685,208.8622 L 126.35503,240.31878 C 124.99394,245.51199 126.77374,249.59331 131.69442,252.56277 C 135.1066,254.53982 138.69086,254.81182 142.44721,253.37876 C 146.2033,251.94563 148.57756,249.32335 149.57,245.51188 L 158.56393,207.50471 C 159.4585,203.4602 158.48415,199.99258 155.64087,197.10185 L 134.75661,175.03208 L 162.66048,153.398 L 166.54511,167.06433 C 166.79653,168.31994 167.48101,169.46325 168.5985,170.49427 L 195.76983,191.98059 C 196.45337,192.64098 197.12373,193.10574 197.78094,193.37488 C 200.08277,194.31797 202.42725,194.22395 204.81434,193.09278 C 207.20108,191.96165 208.86684,190.24692 209.81164,187.94863 C 211.49695,183.8478 210.63576,180.33295 207.2281,177.40406 L 183.83954,158.62581 L 173.64264,125.97234 C 172.19694,121.54832 169.09517,117.88193 164.33727,114.97315 C 156.00428,110.02673 148.06788,110.41718 140.5281,116.14448 L 102.21218,145.59669 C 99.720069,147.45414 97.815921,150.2193 96.499761,153.89217 L 77.106834,203.17152 L 45.125616,232.63017 C 43.86149,233.83809 42.947508,234.8999 42.383669,235.81558 C 40.605024,238.73157 40.130919,241.74913 40.961422,244.86825 C 41.79188,247.98732 43.667492,250.43472 46.588322,252.2105 C 51.508856,255.17988 55.947032,254.88907 59.902852,251.33808 L 95.031256,219.14089 C 96.295295,217.93294 97.263831,216.5103 97.936863,214.87295 L 110.13221,184.4956 L 133.81685,208.8622 z M 175.35877,116.89965 C 179.79714,118.7181 184.31645,118.70038 188.91668,116.8465 C 193.5166,114.99285 196.76021,111.77017 198.64755,107.17852 C 200.4687,102.74732 200.41134,98.21769 198.47553,93.589598 C 196.53933,88.961767 193.35205,85.738614 188.9137,83.920118 C 184.30948,82.034104 179.73058,82.07567 175.17695,84.044796 C 170.62302,86.014182 167.43547,89.214488 165.6143,93.645672 C 163.72698,98.237322 163.72826,102.78934 165.61814,107.3017 C 167.5077,111.81428 170.75459,115.01359 175.35877,116.89965 L 175.35877,116.89965 z"
+     id="path4705"
+     style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3" />
+  <g
+     transform="matrix(0.4535981,0,0,0.4528602,18.632903,20.358258)"
+     id="g3188"
+     style="display:inline">
+    <rect
+       width="118.49619"
+       height="18.15666"
+       x="406.64481"
+       y="467.6058"
+       id="rect1873"
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.12500119;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       width="116.92729"
+       height="63.109482"
+       rx="31.117723"
+       ry="31.554741"
+       x="407.42923"
+       y="445.12936"
+       id="rect2780"
+       style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 432.74572,445.14884 L 449.94678,445.14884 L 467.14785,445.14884 L 484.34892,445.14884 C 484.34892,431.44683 480.58149,429.63641 475.01444,429.63641 L 444.18435,429.63641 C 437.39209,429.63641 433.44408,426.06557 433.44408,421.63173 C 433.44408,416.37088 437.9171,414.63494 444.05397,414.63494 L 483.74131,414.63494 C 492.8433,414.63494 501.55,430.68041 501.55,445.14884 C 510.28526,445.14884 511.47978,448.66503 517.17978,454.36502 L 417.11594,454.36502 C 422.81594,448.66503 424.01044,445.14884 432.74572,445.14884 z"
+       id="rect2782"
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/curling.svg b/data/styles/symbols/curling.svg
index b321faee2c..98483695d6 100644
--- a/data/styles/symbols/curling.svg
+++ b/data/styles/symbols/curling.svg
@@ -1,11 +1,54 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="38" height="38" viewBox="0 0 300 300">
-    <g transform="matrix(2.172 0 0 2.172 -178.996 -179.909)">
-        <rect width="124.106" height="118.915" ry="9.61" x="89.462" y="92.346" stroke="#000" stroke-width="6.764" stroke-linejoin="round" fill="none"/>
-        <path d="M 144.04033,179.01698 L 140.6044,193.50174 C 139.97766,195.89305 140.7972,197.77237 143.06302,199.13971 C 144.63422,200.05008 146.28466,200.17533 148.01434,199.51545 C 149.7439,198.85554 150.83717,197.64806 151.29416,195.893 L 155.43558,178.3919 C 155.8475,176.52953 155.39884,174.9328 154.0896,173.60171 L 144.47306,163.43928 L 157.32191,153.47747 L 159.11066,159.77038 C 159.22643,160.34855 159.54161,160.87501 160.05618,161.34976 L 172.56772,171.24353 C 172.88247,171.54762 173.19115,171.76163 173.49377,171.88556 C 174.55369,172.31982 175.63325,172.27653 176.73243,171.75566 C 177.83145,171.23481 178.59848,170.44523 179.03353,169.38694 C 179.80956,167.49864 179.41301,165.88016 177.84389,164.5315 L 167.0742,155.88471 L 162.37885,140.84882 C 161.71315,138.8117 160.28488,137.12344 158.09402,135.78404 C 154.25694,133.50637 150.60248,133.68616 147.13065,136.3234 L 129.48738,149.88521 C 128.33984,150.74051 127.46304,152.01378 126.85699,153.70502 L 117.92716,176.3966 L 103.20082,189.96138 C 102.61873,190.51759 102.19787,191.00652 101.93824,191.42816 C 101.11923,192.77088 100.90092,194.16037 101.28334,195.59663 C 101.66574,197.03286 102.5294,198.15981 103.87435,198.9775 C 106.1401,200.34481 108.18374,200.2109 110.00527,198.57578 L 126.18079,183.74999 C 126.76284,183.19377 127.20882,182.53869 127.51873,181.78474 L 133.1343,167.79693 L 144.04033,179.01698 z M 163.16907,136.67113 C 165.2128,137.50847 167.2938,137.50031 169.41206,136.64666 C 171.53018,135.79311 173.02376,134.30917 173.89282,132.19486 C 174.7314,130.15443 174.70499,128.06868 173.81361,125.93759 C 172.92205,123.80662 171.45441,122.32246 169.41069,121.4851 C 167.29059,120.61665 165.18215,120.63579 163.08535,121.54251 C 160.98841,122.44935 159.52064,123.92299 158.68205,125.96341 C 157.813,128.07772 157.81359,130.17378 158.68382,132.25158 C 159.5539,134.32948 161.04899,135.80266 163.16907,136.67113 L 163.16907,136.67113 z" style="text-align:start;line-height:125%;-inkscape-font-specification:NPSPICT3" font-size="40" font-family="NPSPICT3"/>
-        <g transform="matrix(.209 0 0 .209 91.002 92.217)">
-            <rect width="118.496" height="18.157" x="406.645" y="467.606"/>
-            <rect width="116.927" height="63.109" rx="31.118" ry="31.555" x="407.429" y="445.129" stroke="#000" stroke-width="10" fill="none"/>
-            <path d="M 432.74572,445.14884 L 449.94678,445.14884 L 467.14785,445.14884 L 484.34892,445.14884 C 484.34892,431.44683 480.58149,429.63641 475.01444,429.63641 L 444.18435,429.63641 C 437.39209,429.63641 433.44408,426.06557 433.44408,421.63173 C 433.44408,416.37088 437.9171,414.63494 444.05397,414.63494 L 483.74131,414.63494 C 492.8433,414.63494 501.55,430.68041 501.55,445.14884 C 510.28526,445.14884 511.47978,448.66503 517.17978,454.36502 L 417.11594,454.36502 C 422.81594,448.66503 424.01044,445.14884 432.74572,445.14884 z"/>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="38"
+   height="38"
+   viewBox="0 0 300 300"
+   id="symbol-curling">
+  <defs
+     id="defs2474" />
+  <g
+     transform="matrix(2.1717017,0,0,2.1717017,-178.99578,-179.90928)"
+     id="g2485">
+    <rect
+       width="124.10584"
+       height="118.91494"
+       ry="9.6097803"
+       x="89.462318"
+       y="92.346062"
+       id="rect2471"
+       style="fill:none;stroke:#000000;stroke-width:6.7641201;stroke-linejoin:round;stroke-miterlimit:4" />
+    <path
+       d="M 144.04033,179.01698 L 140.6044,193.50174 C 139.97766,195.89305 140.7972,197.77237 143.06302,199.13971 C 144.63422,200.05008 146.28466,200.17533 148.01434,199.51545 C 149.7439,198.85554 150.83717,197.64806 151.29416,195.893 L 155.43558,178.3919 C 155.8475,176.52953 155.39884,174.9328 154.0896,173.60171 L 144.47306,163.43928 L 157.32191,153.47747 L 159.11066,159.77038 C 159.22643,160.34855 159.54161,160.87501 160.05618,161.34976 L 172.56772,171.24353 C 172.88247,171.54762 173.19115,171.76163 173.49377,171.88556 C 174.55369,172.31982 175.63325,172.27653 176.73243,171.75566 C 177.83145,171.23481 178.59848,170.44523 179.03353,169.38694 C 179.80956,167.49864 179.41301,165.88016 177.84389,164.5315 L 167.0742,155.88471 L 162.37885,140.84882 C 161.71315,138.8117 160.28488,137.12344 158.09402,135.78404 C 154.25694,133.50637 150.60248,133.68616 147.13065,136.3234 L 129.48738,149.88521 C 128.33984,150.74051 127.46304,152.01378 126.85699,153.70502 L 117.92716,176.3966 L 103.20082,189.96138 C 102.61873,190.51759 102.19787,191.00652 101.93824,191.42816 C 101.11923,192.77088 100.90092,194.16037 101.28334,195.59663 C 101.66574,197.03286 102.5294,198.15981 103.87435,198.9775 C 106.1401,200.34481 108.18374,200.2109 110.00527,198.57578 L 126.18079,183.74999 C 126.76284,183.19377 127.20882,182.53869 127.51873,181.78474 L 133.1343,167.79693 L 144.04033,179.01698 z M 163.16907,136.67113 C 165.2128,137.50847 167.2938,137.50031 169.41206,136.64666 C 171.53018,135.79311 173.02376,134.30917 173.89282,132.19486 C 174.7314,130.15443 174.70499,128.06868 173.81361,125.93759 C 172.92205,123.80662 171.45441,122.32246 169.41069,121.4851 C 167.29059,120.61665 165.18215,120.63579 163.08535,121.54251 C 160.98841,122.44935 159.52064,123.92299 158.68205,125.96341 C 157.813,128.07772 157.81359,130.17378 158.68382,132.25158 C 159.5539,134.32948 161.04899,135.80266 163.16907,136.67113 L 163.16907,136.67113 z"
+       id="path4705"
+       style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3" />
+    <g
+       transform="matrix(0.2088676,0,0,0.2085278,91.001763,92.216872)"
+       id="g3188"
+       style="display:inline">
+      <rect
+         width="118.49619"
+         height="18.15666"
+         x="406.64481"
+         y="467.6058"
+         id="rect1873"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.12500119;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         width="116.92729"
+         height="63.109482"
+         rx="31.117723"
+         ry="31.554741"
+         x="407.42923"
+         y="445.12936"
+         id="rect2780"
+         style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         d="M 432.74572,445.14884 L 449.94678,445.14884 L 467.14785,445.14884 L 484.34892,445.14884 C 484.34892,431.44683 480.58149,429.63641 475.01444,429.63641 L 444.18435,429.63641 C 437.39209,429.63641 433.44408,426.06557 433.44408,421.63173 C 433.44408,416.37088 437.9171,414.63494 444.05397,414.63494 L 483.74131,414.63494 C 492.8433,414.63494 501.55,430.68041 501.55,445.14884 C 510.28526,445.14884 511.47978,448.66503 517.17978,454.36502 L 417.11594,454.36502 C 422.81594,448.66503 424.01044,445.14884 432.74572,445.14884 z"
+         id="rect2782"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1" />
     </g>
+  </g>
 </svg>
diff --git a/data/styles/symbols/current-position.svg b/data/styles/symbols/current-position.svg
new file mode 100644
index 0000000000..64e2550603
--- /dev/null
+++ b/data/styles/symbols/current-position.svg
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.47 r22583"
+   width="98"
+   height="98"
+   version="1.0"
+   sodipodi:docname="current-position.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="C:\Documents and Settings\Molumen\Desktop\ihs_logo_1.png"
+   inkscape:export-xdpi="156.52174"
+   inkscape:export-ydpi="156.52174"
+   sodipodi:modified="true">
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>blue cristal ball</dc:title>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>blue</rdf:li>
+            <rdf:li>cristal</rdf:li>
+            <rdf:li>ball</rdf:li>
+            <rdf:li>round</rdf:li>
+            <rdf:li>sphere</rdf:li>
+            <rdf:li>spheric</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:description>a blue cristal bsll</dc:description>
+        <dc:date>14 11 2006</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>molumen</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs5">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 80.02256 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="150.19098 : 80.02256 : 1"
+       inkscape:persp3d-origin="75.09549 : 53.348373 : 1"
+       id="perspective38" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4448">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4450" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4452" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3598"
+       inkscape:collect="always">
+      <stop
+         id="stop3600"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop3602"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2173">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.87450981"
+         offset="0"
+         id="stop2175" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1"
+         id="stop2177" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2165">
+      <stop
+         style="stop-color:#1f2259;stop-opacity:1;"
+         offset="0"
+         id="stop2167" />
+      <stop
+         style="stop-color:#2fb5ea;stop-opacity:1"
+         offset="1"
+         id="stop2169" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter4404"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.4664203"
+         id="feGaussianBlur4406" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       x="-0.10097001"
+       width="1.2019399"
+       y="-0.13814203"
+       height="1.2762841"
+       id="filter4444"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.4113281"
+         id="feGaussianBlur4446" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter4694"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.84246365"
+         id="feGaussianBlur4696" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2165"
+       id="linearGradient2870"
+       gradientUnits="userSpaceOnUse"
+       x1="194.68881"
+       y1="31.85433"
+       x2="194.68881"
+       y2="74.711746" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2173"
+       id="radialGradient2872"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.162441,2.106734,-1.6909162,0.2626576,228.26265,-371.42976)"
+       cx="180.72482"
+       cy="38.594139"
+       fx="180.72482"
+       fy="38.594139"
+       r="28.884468" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4448"
+       id="linearGradient2874"
+       gradientUnits="userSpaceOnUse"
+       x1="181.99649"
+       y1="36.387283"
+       x2="183.27852"
+       y2="53.875359" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3598"
+       id="radialGradient2876"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0178578,0,6.2330308e-7,-1.182413,391.62431,74.388699)"
+       cx="194.07924"
+       cy="26.293318"
+       fx="194.07924"
+       fy="26.293318"
+       r="28.884468" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-height="756"
+     inkscape:window-width="1086"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="1"
+     inkscape:cx="-51.904287"
+     inkscape:cy="43.466321"
+     inkscape:window-x="56"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2"
+     showgrid="true"
+     inkscape:window-maximized="0"
+     inkscape:snap-grids="true"
+     inkscape:snap-page="false"
+     inkscape:snap-object-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2878"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <g
+     id="g2849"
+     transform="matrix(0.35054333,0,0,0.35054333,23.675777,21.41695)">
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#linearGradient2870);fill-opacity:1;stroke:none;filter:url(#filter4694)"
+       id="path4478"
+       sodipodi:cx="193.56345"
+       sodipodi:cy="56.485737"
+       sodipodi:rx="28.884468"
+       sodipodi:ry="28.884468"
+       d="m 222.44791,56.485737 c 0,15.952451 -12.93201,28.884468 -28.88446,28.884468 -15.95246,0 -28.88447,-12.932017 -28.88447,-28.884468 0,-15.952451 12.93201,-28.884468 28.88447,-28.884468 15.95245,0 28.88446,12.932017 28.88446,28.884468 z"
+       transform="matrix(2.2102466,0,0,2.2102466,-352.72746,-49.013559)" />
+    <path
+       transform="matrix(1.2432766,-0.22232045,0.15663483,0.87594519,-181.33818,35.469891)"
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient2872);fill-opacity:1;stroke:url(#linearGradient2874);stroke-width:0.81503248;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4404)"
+       id="path2163"
+       sodipodi:cx="193.56345"
+       sodipodi:cy="56.485737"
+       sodipodi:rx="28.884468"
+       sodipodi:ry="28.884468"
+       d="m 222.44791,56.485737 c 0,15.952451 -12.93201,28.884468 -28.88446,28.884468 -15.95246,0 -28.88447,-12.932017 -28.88447,-28.884468 0,-15.952451 12.93201,-28.884468 28.88447,-28.884468 15.95245,0 28.88446,12.932017 28.88446,28.884468 z" />
+    <path
+       d="m 222.44791,56.485737 c 0,15.952451 -12.93201,28.884468 -28.88446,28.884468 -15.95246,0 -28.88447,-12.932017 -28.88447,-28.884468 0,-15.952451 12.93201,-28.884468 28.88447,-28.884468 15.95245,0 28.88446,12.932017 28.88446,28.884468 z"
+       sodipodi:ry="28.884468"
+       sodipodi:rx="28.884468"
+       sodipodi:cy="56.485737"
+       sodipodi:cx="193.56345"
+       id="path3476"
+       style="fill:url(#radialGradient2876);fill-opacity:1;stroke:none;filter:url(#filter4444)"
+       sodipodi:type="arc"
+       transform="matrix(-1.5097116,0.66176709,-0.48369504,-1.1034704,406.77518,35.243766)" />
+  </g>
+</svg>
diff --git a/data/styles/symbols/disused.svg b/data/styles/symbols/disused.svg
index dedec03bd6..cbc391c7e4 100644
--- a/data/styles/symbols/disused.svg
+++ b/data/styles/symbols/disused.svg
@@ -1,3 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="9.32" viewBox="0 0 10 10" stroke="#a00000" height="9.32">
-    <svg:path d="M 0 0 L 10 10 M 0 10 L 10 0"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="9.32" id="symbol-disused" viewBox="0 0 10 10" stroke-width="1px" stroke="#a00000" height="9.32">
+   <svg:path d="M 0 0 L 10 10 M 0 10 L 10 0"/>
 </svg>
diff --git a/data/styles/symbols/diving-borderless.svg b/data/styles/symbols/diving-borderless.svg
index e2c35b6b5f..f86c76a4af 100644
--- a/data/styles/symbols/diving-borderless.svg
+++ b/data/styles/symbols/diving-borderless.svg
@@ -1,9 +1,41 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="38" height="38" viewBox="0 0 300 300">
-    <path d="M 249.86451,143.66087 C 249.86755,152.59011 242.62982,159.83031 233.70057,159.83031 C 224.77133,159.83031 217.5336,152.59011 217.53664,143.66087 C 217.5336,134.73162 224.77133,127.49143 233.70057,127.49143 C 242.62982,127.49143 249.86755,134.73162 249.86451,143.66087 L 249.86451,143.66087 z" fill-rule="evenodd" stroke="#000"/>
-    <path d="M 208.51188,169.98162 L 160.96472,206.20804" stroke="#000" stroke-width="31.579" stroke-linecap="round" fill="none"/>
-    <path d="M 192.66282,146.20803 L 164.92698,167.71747" stroke="#000" stroke-width="15.789" stroke-linecap="round" fill="none"/>
-    <path d="M 150.77603,215.26463 L 124.75129,235.09301 L 95.870386,213.56652" stroke="#000" stroke-width="19.737" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 241.5651,213.80305 L 210.14302,204.68689 L 210.25716,168.66629" stroke="#000" stroke-width="15.789" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 87.280534,199.69532 L 54.082856,231.4" stroke="#000" stroke-width="7.895" stroke-linecap="round" fill="none"/>
-    <path d="M 15.709913,98.718935 C 15.709913,98.718935 37.503993,78.272129 49.282433,78.272129 C 61.060873,78.272129 71.076514,98.718935 82.854953,98.718935 C 94.633393,98.718935 104.64903,78.272128 116.42748,78.272129 C 128.20592,78.272129 138.22156,98.718935 150.00001,98.718935 C 161.77844,98.718935 171.79407,78.272129 183.57252,78.272129 C 195.35097,78.272129 205.3666,98.718935 217.14504,98.718935 C 228.92348,98.718935 238.93913,78.272129 250.71756,78.272129 C 262.496,78.272129 284.29009,98.718935 284.29009,98.718935" stroke="#000" stroke-width="15.63" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="38"
+   height="38"
+   viewBox="0 0 300 300"
+   id="symbol-diving-borderless">
+  <defs
+     id="defs2474" />
+  <path
+     d="M 249.86451,143.66087 C 249.86755,152.59011 242.62982,159.83031 233.70057,159.83031 C 224.77133,159.83031 217.5336,152.59011 217.53664,143.66087 C 217.5336,134.73162 224.77133,127.49143 233.70057,127.49143 C 242.62982,127.49143 249.86755,134.73162 249.86451,143.66087 L 249.86451,143.66087 z"
+     id="path2387"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 208.51188,169.98162 L 160.96472,206.20804"
+     id="path2383"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:31.57894707;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 192.66282,146.20803 L 164.92698,167.71747"
+     id="path3155"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:15.78947353;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 150.77603,215.26463 L 124.75129,235.09301 L 95.870386,213.56652"
+     id="path3157"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:19.7368412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 241.5651,213.80305 L 210.14302,204.68689 L 210.25716,168.66629"
+     id="path3159"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:15.78947353;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 87.280534,199.69532 L 54.082856,231.4"
+     id="path3161"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:7.89473677;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 15.709913,98.718935 C 15.709913,98.718935 37.503993,78.272129 49.282433,78.272129 C 61.060873,78.272129 71.076514,98.718935 82.854953,98.718935 C 94.633393,98.718935 104.64903,78.272128 116.42748,78.272129 C 128.20592,78.272129 138.22156,98.718935 150.00001,98.718935 C 161.77844,98.718935 171.79407,78.272129 183.57252,78.272129 C 195.35097,78.272129 205.3666,98.718935 217.14504,98.718935 C 228.92348,98.718935 238.93913,78.272129 250.71756,78.272129 C 262.496,78.272129 284.29009,98.718935 284.29009,98.718935"
+     id="path3265"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:15.63035202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/diving.svg b/data/styles/symbols/diving.svg
index 7ac26706cf..ab74b03beb 100644
--- a/data/styles/symbols/diving.svg
+++ b/data/styles/symbols/diving.svg
@@ -1,10 +1,49 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="38" height="38" viewBox="0 0 300 300">
-    <rect width="269.521" height="258.248" ry="20.87" x="15.29" y="20.639" stroke="#000" stroke-width="14.69" stroke-linejoin="round" fill="none"/>
-    <path d="M 249.86451,143.66087 C 249.86755,152.59011 242.62982,159.83031 233.70057,159.83031 C 224.77133,159.83031 217.5336,152.59011 217.53664,143.66087 C 217.5336,134.73162 224.77133,127.49143 233.70057,127.49143 C 242.62982,127.49143 249.86755,134.73162 249.86451,143.66087 L 249.86451,143.66087 z" fill-rule="evenodd" stroke="#000"/>
-    <path d="M 208.51188,169.98162 L 160.96472,206.20804" stroke="#000" stroke-width="31.579" stroke-linecap="round" fill="none"/>
-    <path d="M 192.66282,146.20803 L 164.92698,167.71747" stroke="#000" stroke-width="15.789" stroke-linecap="round" fill="none"/>
-    <path d="M 150.77603,215.26463 L 124.75129,235.09301 L 95.870386,213.56652" stroke="#000" stroke-width="19.737" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 241.5651,213.80305 L 210.14302,204.68689 L 210.25716,168.66629" stroke="#000" stroke-width="15.789" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 87.280534,199.69532 L 54.082856,231.4" stroke="#000" stroke-width="7.895" stroke-linecap="round" fill="none"/>
-    <path d="M 15.709913,98.718935 C 15.709913,98.718935 37.503993,78.272129 49.282433,78.272129 C 61.060873,78.272129 71.076514,98.718935 82.854953,98.718935 C 94.633393,98.718935 104.64903,78.272128 116.42748,78.272129 C 128.20592,78.272129 138.22156,98.718935 150.00001,98.718935 C 161.77844,98.718935 171.79407,78.272129 183.57252,78.272129 C 195.35097,78.272129 205.3666,98.718935 217.14504,98.718935 C 228.92348,98.718935 238.93913,78.272129 250.71756,78.272129 C 262.496,78.272129 284.29009,98.718935 284.29009,98.718935" stroke="#000" stroke-width="15.63" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="38"
+   height="38"
+   viewBox="0 0 300 300"
+   id="symbol-diving">
+  <defs
+     id="defs2474" />
+  <rect
+     width="269.52087"
+     height="258.24777"
+     ry="20.869576"
+     x="15.289689"
+     y="20.638819"
+     id="rect2471"
+     style="fill:none;stroke:#000000;stroke-width:14.68965149;stroke-linejoin:round;stroke-miterlimit:4" />
+  <path
+     d="M 249.86451,143.66087 C 249.86755,152.59011 242.62982,159.83031 233.70057,159.83031 C 224.77133,159.83031 217.5336,152.59011 217.53664,143.66087 C 217.5336,134.73162 224.77133,127.49143 233.70057,127.49143 C 242.62982,127.49143 249.86755,134.73162 249.86451,143.66087 L 249.86451,143.66087 z"
+     id="path2387"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 208.51188,169.98162 L 160.96472,206.20804"
+     id="path2383"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:31.57894707;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 192.66282,146.20803 L 164.92698,167.71747"
+     id="path3155"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:15.78947353;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 150.77603,215.26463 L 124.75129,235.09301 L 95.870386,213.56652"
+     id="path3157"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:19.7368412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 241.5651,213.80305 L 210.14302,204.68689 L 210.25716,168.66629"
+     id="path3159"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:15.78947353;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 87.280534,199.69532 L 54.082856,231.4"
+     id="path3161"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:7.89473677;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 15.709913,98.718935 C 15.709913,98.718935 37.503993,78.272129 49.282433,78.272129 C 61.060873,78.272129 71.076514,98.718935 82.854953,98.718935 C 94.633393,98.718935 104.64903,78.272128 116.42748,78.272129 C 128.20592,78.272129 138.22156,98.718935 150.00001,98.718935 C 161.77844,98.718935 171.79407,78.272129 183.57252,78.272129 C 195.35097,78.272129 205.3666,98.718935 217.14504,98.718935 C 228.92348,98.718935 238.93913,78.272129 250.71756,78.272129 C 262.496,78.272129 284.29009,98.718935 284.29009,98.718935"
+     id="path3265"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:15.63035202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/doctor.svg b/data/styles/symbols/doctor.svg
index dce611a4e1..3e03fb320a 100644
--- a/data/styles/symbols/doctor.svg
+++ b/data/styles/symbols/doctor.svg
@@ -1,4 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="18.64" viewBox="0 0 36 36" height="18.64">
-    <svg:ellipse fill="#32cd32" cx="18" cy="18" rx="18" ry="18"/>
-    <svg:path fill="#fff" d="M32 21.44 A16 16 -180 1 0 0 21.44 A16 16 -180 1 0 32 21.44 Z M10 6.94 L22 6.94 L22 15.44 L30.5 15.44 L30.5 27.44 L22 27.44 L22 35.94 L10 35.94 L10 27.44 L1.5 27.44 L1.5 15.44 L10 15.44 L 10 6.94 Z" transform="translate(2 -3.44)"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="symbol-doctor" viewBox="0 0 36 36" height="18.64">
+   <svg:ellipse fill="limegreen" cx="18" cy="18" rx="18" ry="18"/>
+   <svg:path fill="#ffffff" d="M32 21.44 A16 16 -180 1 0 0 21.44 A16 16 -180 1 0 32 21.44 Z M10 6.94 L22 6.94 L22 15.44 L30.5 15.44 L30.5 27.44 L22 27.44 L22 35.94 L10 35.94 L10 27.44 L1.5 27.44 L1.5 15.44 L10 15.44 L 10 6.94 Z" transform="translate(2,-3.44)"/>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/dog_park.svg b/data/styles/symbols/dog_park.svg
index 3f911761d0..9af0dec84f 100755
--- a/data/styles/symbols/dog_park.svg
+++ b/data/styles/symbols/dog_park.svg
@@ -1,6 +1,61 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24" enable-background="new 0 0 100 92.316">
-    <title>
-        Dog Run Map Icon
-    </title>
-    <path d="m 12.865719,4.441906 c -0.717438,-0.4142137 -1.746753,0.025465 -2.299038,0.9820509 -0.552284,0.9565851 -0.4184,2.067837 0.299038,2.4820507 0.717439,0.4142138 1.746754,-0.025465 2.299039,-0.982051 0.552284,-0.9565849 0.4184,-2.0678369 -0.299039,-2.4820506 z m 3.464102,2.0000002 C 15.612382,6.0276925 14.583068,6.4673716 14.030783,7.4239571 13.478498,8.380542 13.612382,9.491793 14.329821,9.9060076 15.047259,10.320221 16.076574,9.8805415 16.628859,8.9239558 17.181144,7.967372 17.04726,6.8561192 16.329821,6.4419062 z M 7.9016181,5.039982 C 7.1841786,4.6257687 6.1548643,5.0654477 5.6025797,6.022033 5.0502951,6.9786178 5.1841788,8.0898702 5.9016177,8.5040838 6.6190566,8.9182973 7.6483714,8.4786179 8.2006556,7.522033 8.7529408,6.5654477 8.6190566,5.4541956 7.9016181,5.039982 z m 10.3923049,6 c -0.717439,-0.414214 -1.746753,0.02547 -2.299039,0.98205 -0.552284,0.956586 -0.418401,2.067838 0.299039,2.482051 0.717439,0.414214 1.746752,-0.02547 2.299038,-0.98205 0.552284,-0.956586 0.4184,-2.067838 -0.299038,-2.482051 z m -5.857777,-0.582378 c -2.429199,-1.5208456 -2.7320503,0.732051 -4.0980757,1.098077 -1.8623558,0.499016 -3.7014316,0.13941 -4.5034403,1.52853 -1.0511927,1.820718 3.4641021,1.999999 5.196153,3 1.73205,0.999999 4.14496,4.820718 5.196152,3 0.740049,-1.281802 -0.225471,-2.784761 -0.692712,-4.52853 -0.366026,-1.366026 1.106621,-2.717784 -1.098077,-4.098077 z" fill="#4d4d4d"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   enable-background="new 0 0 100 92.316"
+   xml:space="preserve"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="dog_park.svg"><title
+   id="title2998">Dog Run Map Icon</title><metadata
+   id="metadata13"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Dog Run Map Icon</dc:title><dc:creator><cc:Agent><dc:title>Yury Melnichek</dc:title></cc:Agent></dc:creator><dc:source>mapsforhumans.com</dc:source></cc:Work></rdf:RDF></metadata><defs
+   id="defs11" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1101"
+   inkscape:window-height="793"
+   id="namedview9"
+   showgrid="true"
+   inkscape:zoom="21.983141"
+   inkscape:cx="12.132272"
+   inkscape:cy="11.794105"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"><inkscape:grid
+     type="xygrid"
+     id="grid2984"
+     empspacing="2"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
+
+
+
+<path
+   style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+   d="m 12.865719,4.441906 c -0.717438,-0.4142137 -1.746753,0.025465 -2.299038,0.9820509 -0.552284,0.9565851 -0.4184,2.067837 0.299038,2.4820507 0.717439,0.4142138 1.746754,-0.025465 2.299039,-0.982051 0.552284,-0.9565849 0.4184,-2.0678369 -0.299039,-2.4820506 z m 3.464102,2.0000002 C 15.612382,6.0276925 14.583068,6.4673716 14.030783,7.4239571 13.478498,8.380542 13.612382,9.491793 14.329821,9.9060076 15.047259,10.320221 16.076574,9.8805415 16.628859,8.9239558 17.181144,7.967372 17.04726,6.8561192 16.329821,6.4419062 z M 7.9016181,5.039982 C 7.1841786,4.6257687 6.1548643,5.0654477 5.6025797,6.022033 5.0502951,6.9786178 5.1841788,8.0898702 5.9016177,8.5040838 6.6190566,8.9182973 7.6483714,8.4786179 8.2006556,7.522033 8.7529408,6.5654477 8.6190566,5.4541956 7.9016181,5.039982 z m 10.3923049,6 c -0.717439,-0.414214 -1.746753,0.02547 -2.299039,0.98205 -0.552284,0.956586 -0.418401,2.067838 0.299039,2.482051 0.717439,0.414214 1.746752,-0.02547 2.299038,-0.98205 0.552284,-0.956586 0.4184,-2.067838 -0.299038,-2.482051 z m -5.857777,-0.582378 c -2.429199,-1.5208456 -2.7320503,0.732051 -4.0980757,1.098077 -1.8623558,0.499016 -3.7014316,0.13941 -4.5034403,1.52853 -1.0511927,1.820718 3.4641021,1.999999 5.196153,3 1.73205,0.999999 4.14496,4.820718 5.196152,3 0.740049,-1.281802 -0.225471,-2.784761 -0.692712,-4.52853 -0.366026,-1.366026 1.106621,-2.717784 -1.098077,-4.098077 z"
+   id="path2986"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="sssssssssssssssssssssssssss" /></svg>
\ No newline at end of file
diff --git a/data/styles/symbols/drinking_water.svg b/data/styles/symbols/drinking_water.svg
index ade7611122..5267d56eaf 100644
--- a/data/styles/symbols/drinking_water.svg
+++ b/data/styles/symbols/drinking_water.svg
@@ -1,8 +1,77 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18.64" viewBox="0 0 20 20" height="18.64">
-    <path d="m 13.15793,11.31759 c 0.47094,-0.26052 0.67969,-0.28557 0.69472,-0.19205 l 0.20374,0.18203 c 0.20708,0.20875 0.49933,0.12692 0.79659,-0.17034 l -1.1189,6.41781 -3.60219,0 -1.14562,-6.24747 c 0.20708,0.20875 0.59118,0.18537 0.79659,0.01002 0.45424,-0.39078 0.40247,-0.46927 0.69472,-0.19205 l 0.20207,0.18203 c 0.08016,0.08016 0.19706,0.1002 0.31062,0.11857 l -0.02672,-1.09051 0.4175,-0.01002 0.02505,1.01703 c 0.02004,-0.01336 0.05344,-0.0084 0.07181,-0.02672 0.42919,-0.41583 0.48096,-0.33734 0.69639,-0.19038 l 0.18537,0.18203 c 0.20875,0.20875 0.56112,0.14028 0.79826,0.01002 z" fill="#0028d0"/>
-    <path d="m 10.91512,8.27986 0.4175,-0.01002 0.03173,1.22411 -0.4175,0.01002 -0.03173,-1.22411 z" fill="#0028d0"/>
-    <path d="m 12.04237,9.25681 0.03173,1.22578 -0.4175,0.01002 -0.03173,-1.22578 0.4175,-0.01002 z" fill="#0028d0"/>
-    <path d="M 11.62487,7.31961 12.04237,7.30959 12.0741,8.53537 11.6566,8.54539 11.62487,7.31961 z" fill="#0028d0"/>
-    <path d="m 2.26118,4.82129 0,-2.84067 5.71641,0.72311 c 1.71342,0.29225 4.58582,0.78323 4.58582,4.18836 l -1.96392,0 c 0,-1.25417 -0.93854,-1.52805 -3.00433,-1.68336 L 2.26118,4.82129 z" fill="#505050"/>
-    <path d="m 14.99493,19.02631 -6.1122,0 -1.7869,-9.83463 0.82164,-0.14863 c 0,0 1.54475,8.51199 1.66165,9.14826 l 4.71274,0 C 14.40375,17.54836 15.865,9.08981 15.865,9.08981 l 0.82331,0.14195 -1.69338,9.79455 z" fill="#505050"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="18.64"
+   id="drinking_water"
+   viewBox="0 0 20 20"
+   stroke="none"
+   fill-opacity="1"
+   fill-rule="nonzero"
+   height="18.64"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="drinking_water.svg">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="12.660945"
+     inkscape:cx="9.3199997"
+     inkscape:cy="9.2805082"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="drinking_water" />
+  <path
+     d="m 13.15793,11.31759 c 0.47094,-0.26052 0.67969,-0.28557 0.69472,-0.19205 l 0.20374,0.18203 c 0.20708,0.20875 0.49933,0.12692 0.79659,-0.17034 l -1.1189,6.41781 -3.60219,0 -1.14562,-6.24747 c 0.20708,0.20875 0.59118,0.18537 0.79659,0.01002 0.45424,-0.39078 0.40247,-0.46927 0.69472,-0.19205 l 0.20207,0.18203 c 0.08016,0.08016 0.19706,0.1002 0.31062,0.11857 l -0.02672,-1.09051 0.4175,-0.01002 0.02505,1.01703 c 0.02004,-0.01336 0.05344,-0.0084 0.07181,-0.02672 0.42919,-0.41583 0.48096,-0.33734 0.69639,-0.19038 l 0.18537,0.18203 c 0.20875,0.20875 0.56112,0.14028 0.79826,0.01002 z"
+     id="path2998"
+     style="fill:#0028d0" />
+  <path
+     d="m 10.91512,8.27986 0.4175,-0.01002 0.03173,1.22411 -0.4175,0.01002 -0.03173,-1.22411 z"
+     id="path2996"
+     style="fill:#0028d0" />
+  <path
+     d="m 12.04237,9.25681 0.03173,1.22578 -0.4175,0.01002 -0.03173,-1.22578 0.4175,-0.01002 z"
+     id="path2994"
+     style="fill:#0028d0" />
+  <path
+     d="M 11.62487,7.31961 12.04237,7.30959 12.0741,8.53537 11.6566,8.54539 11.62487,7.31961 z"
+     id="path2992"
+     style="fill:#0028d0" />
+  <path
+     d="m 2.26118,4.82129 0,-2.84067 5.71641,0.72311 c 1.71342,0.29225 4.58582,0.78323 4.58582,4.18836 l -1.96392,0 c 0,-1.25417 -0.93854,-1.52805 -3.00433,-1.68336 L 2.26118,4.82129 z"
+     id="path2990"
+     style="fill:#505050;fill-opacity:1" />
+  <path
+     d="m 14.99493,19.02631 -6.1122,0 -1.7869,-9.83463 0.82164,-0.14863 c 0,0 1.54475,8.51199 1.66165,9.14826 l 4.71274,0 C 14.40375,17.54836 15.865,9.08981 15.865,9.08981 l 0.82331,0.14195 -1.69338,9.79455 z"
+     id="path5"
+     style="fill:#505050;fill-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/earthquakeCamp.svg b/data/styles/symbols/earthquakeCamp.svg
index 0b6beec708..4c7301c9a9 100644
--- a/data/styles/symbols/earthquakeCamp.svg
+++ b/data/styles/symbols/earthquakeCamp.svg
@@ -1,3 +1,67 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="0 0 128.75537 128.75537" height="24" fill="#00f">
-    <path d="m 10,3.53125 -0.875,0.5 2,3.46875 L 4,20 l -2,0 0,2 20,0 0,-2 -2,0 -7.125,-12.5 2,-3.46875 L 14,3.53125 12,7 z m 2,8.625 L 16.53125,20 7.46875,20 z" transform="scale(5.365)" fill="#50524e"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="campSite"
+   viewBox="0 0 128.75537 128.75537"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="campSite.svg"
+   style="fill:#0000ff;fill-opacity:1">
+  <metadata
+     id="metadata9">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1041"
+     inkscape:window-height="739"
+     id="namedview5"
+     showgrid="true"
+     inkscape:zoom="41.688476"
+     inkscape:cx="16.507457"
+     inkscape:cy="13.50497"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="campSite">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#50524e;fill-opacity:1;stroke:none"
+     d="m 10,3.53125 -0.875,0.5 2,3.46875 L 4,20 l -2,0 0,2 20,0 0,-2 -2,0 -7.125,-12.5 2,-3.46875 L 14,3.53125 12,7 z m 2,8.625 L 16.53125,20 7.46875,20 z"
+     transform="scale(5.3648071,5.3648071)"
+     id="rect2988"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccccccccccccc" />
 </svg>
diff --git a/data/styles/symbols/embassy.svg b/data/styles/symbols/embassy.svg
index 0e92b0377d..a68ad164cc 100644
--- a/data/styles/symbols/embassy.svg
+++ b/data/styles/symbols/embassy.svg
@@ -1,6 +1,76 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g fill="#4d4d4d" fill-rule="evenodd">
-        <path d="m 12,1037.3622 -3.1720432,5.093 -3.7006948,5.9418 0.8488244,0.5287 4.2293686,-6.7907 2.794545,0.2272 3,3 0,-3 2.000001,0 -3,-3 z" transform="translate(0 -1034.362)"/>
-        <path d="m 6.0000003,1037.3622 3.172043,5.093 3.7006947,5.9418 -0.848824,0.5287 L 7.7945453,1042.135 5,1042.3622 l -3,3 0,-3 -2,0 3,-3 z" transform="translate(0 -1034.362)"/>
-    </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="18"
+   height="18"
+   id="svg3839"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="embassy.svg">
+  <defs
+     id="defs3841" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="9.4522038"
+     inkscape:cy="8.4977421"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1084"
+     inkscape:window-height="674"
+     inkscape:window-x="20"
+     inkscape:window-y="20"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3847"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3844">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1034.3622)">
+    <path
+       style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 12,1037.3622 -3.1720432,5.093 -3.7006948,5.9418 0.8488244,0.5287 4.2293686,-6.7907 2.794545,0.2272 3,3 0,-3 2.000001,0 -3,-3 z"
+       id="rect3849"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path3861"
+       d="m 6.0000003,1037.3622 3.172043,5.093 3.7006947,5.9418 -0.848824,0.5287 L 7.7945453,1042.135 5,1042.3622 l -3,3 0,-3 -2,0 3,-3 z"
+       style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/equestrian-borderless.svg b/data/styles/symbols/equestrian-borderless.svg
index f195bf1ed6..1156883a1a 100644
--- a/data/styles/symbols/equestrian-borderless.svg
+++ b/data/styles/symbols/equestrian-borderless.svg
@@ -1,4 +1,21 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="28" height="28" viewBox="0 0 475 475">
-    <path d="M 1.16435,153.79625 C -1.08688,170.10755 1.08323,185.67606 8.0635,202.19461 C 12.68823,218.22489 17.60122,234.89966 21.70977,244.55259 C 38.59169,255.61281 47.10486,249.09881 55.04706,239.85883 C 58.16249,226.16337 46.57022,194.41725 59.83028,190.34448 C 71.60518,188.12816 82.64405,214.95198 87.67082,227.36564 C 92.69759,239.7793 92.17338,265.00693 95.40984,275.80968 C 99.38888,285.86985 107.36727,285.69452 107.05881,291.47025 C 106.74866,297.27756 92.6356,307.41511 87.31405,313.12954 C 81.91689,318.92516 81.58727,321.65275 81.84633,329.56172 C 86.18891,338.19242 98.59819,383.41953 103.83335,397.77956 C 109.28283,407.89843 106.13192,406.9768 118.09588,410.91369 C 120.19933,397.56426 120.71653,395.02643 121.7507,387.87088 C 116.47294,382.94307 112.0234,380.48706 110.75719,376.87737 C 109.49098,373.26768 109.91557,375.24627 109.25751,368.09708 C 108.59945,360.94789 100.26688,338.99414 100.12045,327.36302 C 113.41286,314.18964 125.9847,308.97 139.62449,308.65954 C 149.69788,321.62529 171.50805,377.89384 177.79708,395.08145 C 183.9431,411.87824 181.57614,410.87695 181.11565,418.63219 C 178.92947,424.65357 169.85203,427.4735 166.68679,431.08634 C 163.52155,434.69918 166.28756,430.85479 160.01632,440.53753 C 171.4227,440.27648 176.40312,440.54976 185.51305,440.42806 C 185.74609,432.761 182.31469,434.07615 184.4137,430.74557 C 186.51271,427.41499 193.42488,427.23131 197.35321,423.91728 C 201.67154,410.80713 189.15159,389.35381 187.55992,377.56034 C 185.97092,365.78666 187.57882,364.96534 183.71716,352.35687 C 179.86871,339.79152 177.5604,330.172 176.56222,308.40376 C 216.54137,312.39047 252.6735,310.47635 278.95788,298.82345 C 296.13182,320.62541 295.19686,325.79234 301.73665,332.76336 C 305.89432,341.7135 310.86222,350.95572 305.19294,359.56682 C 295.59951,369.72672 270.09887,385.82813 264.66632,393.36763 C 262.52914,404.83019 258.49927,407.88584 257.44074,415.51068 C 256.37902,423.15845 257.34618,422.70045 258.69879,434.35747 C 267.26985,427.34068 274.48266,421.94788 280.05901,416.92477 C 277.00462,408.29244 273.97677,413.40884 275.65983,404.36114 C 283.56813,402.06111 301.18454,381.40909 312.5661,373.89317 C 323.94766,366.37725 332.18258,362.73547 343.81959,353.791 C 347.92432,358.4988 351.82175,372.96447 349.47683,385.67396 C 347.1039,398.53524 339.87322,414.29225 333.92543,424.14946 C 327.34995,429.76976 322.57664,429.28514 318.53451,429.64621 C 315.12007,432.83189 315.83314,430.69128 309.26716,440.01203 C 319.80575,439.91742 326.1062,439.82528 333.13993,439.54215 C 337.0352,435.64981 338.74401,436.31696 350.41569,434.04362 C 356.752,413.41033 369.83209,378.68088 379.62829,360.54403 C 371.49127,345.9528 361.64604,325.62886 364.3943,312.01567 C 369.81024,298.24556 386.13883,279.52678 389.8363,266.78714 C 393.53377,254.0475 396.16094,245.92184 394.86317,238.36004 C 393.5654,230.79824 389.47134,225.70438 386.69427,219.51505 C 390.66487,217.87648 394.59819,218.08015 409.78064,236.16045 C 424.96309,254.24075 452.48003,348.0078 458.15208,357.08905 C 463.9515,366.37423 473.22726,359.16063 474.65008,354.24175 C 476.14907,349.05956 433.9864,235.95529 418.57545,221.86889 C 403.30708,207.91281 390.85187,209.06123 378.14463,206.27239 C 365.43739,200.35152 347.5645,188.82123 332.11342,184.10427 C 315.95767,180.99799 296.73188,188.94947 271.94313,187.797 C 247.15438,186.64453 194.70491,177.27709 170.12214,169.10005 C 145.87168,159.32241 130.69488,145.01745 113.16522,136.73152 C 94.83022,130.15693 73.84633,125.58228 57.13827,125.73001 C 48.71052,126.90049 26.41992,136.25931 15.32638,141.39612 C 13.05092,137.69366 12.68435,132.5696 8.95189,131.90076 C 1.59867,134.71111 2.97622,147.69413 1.16435,153.79625 z" fill-rule="evenodd"/>
-    <path d="M 229.13172,35.72017 C 218.54358,36.25746 210.10048,45.03051 210.10047,55.75142 C 210.10047,66.34666 218.34356,75.03068 228.75672,75.75142 C 224.50476,76.2931 220.3949,78.17574 217.13172,81.43892 C 213.75703,84.81361 211.84574,107.72153 211.38172,133.28267 C 191.4981,141.87065 170.49848,150.17519 163.16297,155.40767 C 161.22171,158.99825 161.43922,163.45304 167.56922,166.03267 C 174.9159,163.37052 191.64309,156.77925 211.28797,148.78267 C 211.31124,153.88682 211.40219,158.92175 211.53797,163.84517 C 197.75276,179.91244 176.02089,210.20291 174.00672,215.78267 C 175.36268,220.18185 196.95353,258.84792 202.47547,284.75142 C 205.58746,298.52228 185.96111,289.34047 188.10047,304.68892 C 208.10431,301.7831 221.70022,298.73846 233.78797,297.09517 C 230.60047,287.36036 215.29549,241.31903 199.88172,220.15767 C 223.87787,200.42654 236.57045,192.78406 252.48234,167.54679 C 251.74376,141.03642 253.30084,89.26428 245.47547,81.43892 C 241.90983,77.87328 237.3309,75.94268 232.66297,75.62642 C 242.54773,74.39141 250.19423,65.96906 250.19422,55.75142 C 250.19422,44.68468 241.22971,35.72018 230.16297,35.72017 C 229.81713,35.72017 229.47327,35.70284 229.13172,35.72017 z" fill-rule="evenodd" stroke="#fff" stroke-width="2.5"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="28"
+   height="28"
+   viewBox="0 0 475 475"
+   id="symbol-equestrian-borderless">
+  <defs
+     id="defs4" />
+  <path
+     d="M 1.16435,153.79625 C -1.08688,170.10755 1.08323,185.67606 8.0635,202.19461 C 12.68823,218.22489 17.60122,234.89966 21.70977,244.55259 C 38.59169,255.61281 47.10486,249.09881 55.04706,239.85883 C 58.16249,226.16337 46.57022,194.41725 59.83028,190.34448 C 71.60518,188.12816 82.64405,214.95198 87.67082,227.36564 C 92.69759,239.7793 92.17338,265.00693 95.40984,275.80968 C 99.38888,285.86985 107.36727,285.69452 107.05881,291.47025 C 106.74866,297.27756 92.6356,307.41511 87.31405,313.12954 C 81.91689,318.92516 81.58727,321.65275 81.84633,329.56172 C 86.18891,338.19242 98.59819,383.41953 103.83335,397.77956 C 109.28283,407.89843 106.13192,406.9768 118.09588,410.91369 C 120.19933,397.56426 120.71653,395.02643 121.7507,387.87088 C 116.47294,382.94307 112.0234,380.48706 110.75719,376.87737 C 109.49098,373.26768 109.91557,375.24627 109.25751,368.09708 C 108.59945,360.94789 100.26688,338.99414 100.12045,327.36302 C 113.41286,314.18964 125.9847,308.97 139.62449,308.65954 C 149.69788,321.62529 171.50805,377.89384 177.79708,395.08145 C 183.9431,411.87824 181.57614,410.87695 181.11565,418.63219 C 178.92947,424.65357 169.85203,427.4735 166.68679,431.08634 C 163.52155,434.69918 166.28756,430.85479 160.01632,440.53753 C 171.4227,440.27648 176.40312,440.54976 185.51305,440.42806 C 185.74609,432.761 182.31469,434.07615 184.4137,430.74557 C 186.51271,427.41499 193.42488,427.23131 197.35321,423.91728 C 201.67154,410.80713 189.15159,389.35381 187.55992,377.56034 C 185.97092,365.78666 187.57882,364.96534 183.71716,352.35687 C 179.86871,339.79152 177.5604,330.172 176.56222,308.40376 C 216.54137,312.39047 252.6735,310.47635 278.95788,298.82345 C 296.13182,320.62541 295.19686,325.79234 301.73665,332.76336 C 305.89432,341.7135 310.86222,350.95572 305.19294,359.56682 C 295.59951,369.72672 270.09887,385.82813 264.66632,393.36763 C 262.52914,404.83019 258.49927,407.88584 257.44074,415.51068 C 256.37902,423.15845 257.34618,422.70045 258.69879,434.35747 C 267.26985,427.34068 274.48266,421.94788 280.05901,416.92477 C 277.00462,408.29244 273.97677,413.40884 275.65983,404.36114 C 283.56813,402.06111 301.18454,381.40909 312.5661,373.89317 C 323.94766,366.37725 332.18258,362.73547 343.81959,353.791 C 347.92432,358.4988 351.82175,372.96447 349.47683,385.67396 C 347.1039,398.53524 339.87322,414.29225 333.92543,424.14946 C 327.34995,429.76976 322.57664,429.28514 318.53451,429.64621 C 315.12007,432.83189 315.83314,430.69128 309.26716,440.01203 C 319.80575,439.91742 326.1062,439.82528 333.13993,439.54215 C 337.0352,435.64981 338.74401,436.31696 350.41569,434.04362 C 356.752,413.41033 369.83209,378.68088 379.62829,360.54403 C 371.49127,345.9528 361.64604,325.62886 364.3943,312.01567 C 369.81024,298.24556 386.13883,279.52678 389.8363,266.78714 C 393.53377,254.0475 396.16094,245.92184 394.86317,238.36004 C 393.5654,230.79824 389.47134,225.70438 386.69427,219.51505 C 390.66487,217.87648 394.59819,218.08015 409.78064,236.16045 C 424.96309,254.24075 452.48003,348.0078 458.15208,357.08905 C 463.9515,366.37423 473.22726,359.16063 474.65008,354.24175 C 476.14907,349.05956 433.9864,235.95529 418.57545,221.86889 C 403.30708,207.91281 390.85187,209.06123 378.14463,206.27239 C 365.43739,200.35152 347.5645,188.82123 332.11342,184.10427 C 315.95767,180.99799 296.73188,188.94947 271.94313,187.797 C 247.15438,186.64453 194.70491,177.27709 170.12214,169.10005 C 145.87168,159.32241 130.69488,145.01745 113.16522,136.73152 C 94.83022,130.15693 73.84633,125.58228 57.13827,125.73001 C 48.71052,126.90049 26.41992,136.25931 15.32638,141.39612 C 13.05092,137.69366 12.68435,132.5696 8.95189,131.90076 C 1.59867,134.71111 2.97622,147.69413 1.16435,153.79625 z"
+     id="path2416"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 229.13172,35.72017 C 218.54358,36.25746 210.10048,45.03051 210.10047,55.75142 C 210.10047,66.34666 218.34356,75.03068 228.75672,75.75142 C 224.50476,76.2931 220.3949,78.17574 217.13172,81.43892 C 213.75703,84.81361 211.84574,107.72153 211.38172,133.28267 C 191.4981,141.87065 170.49848,150.17519 163.16297,155.40767 C 161.22171,158.99825 161.43922,163.45304 167.56922,166.03267 C 174.9159,163.37052 191.64309,156.77925 211.28797,148.78267 C 211.31124,153.88682 211.40219,158.92175 211.53797,163.84517 C 197.75276,179.91244 176.02089,210.20291 174.00672,215.78267 C 175.36268,220.18185 196.95353,258.84792 202.47547,284.75142 C 205.58746,298.52228 185.96111,289.34047 188.10047,304.68892 C 208.10431,301.7831 221.70022,298.73846 233.78797,297.09517 C 230.60047,287.36036 215.29549,241.31903 199.88172,220.15767 C 223.87787,200.42654 236.57045,192.78406 252.48234,167.54679 C 251.74376,141.03642 253.30084,89.26428 245.47547,81.43892 C 241.90983,77.87328 237.3309,75.94268 232.66297,75.62642 C 242.54773,74.39141 250.19423,65.96906 250.19422,55.75142 C 250.19422,44.68468 241.22971,35.72018 230.16297,35.72017 C 229.81713,35.72017 229.47327,35.70284 229.13172,35.72017 z"
+     id="path3210"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/equestrian.svg b/data/styles/symbols/equestrian.svg
index 66ca3a9cbd..0427b645bd 100644
--- a/data/styles/symbols/equestrian.svg
+++ b/data/styles/symbols/equestrian.svg
@@ -1,5 +1,30 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="35" height="35" viewBox="0 0 610 610">
-    <path d="M 68.664349,221.29625 C 66.413119,237.60755 68.583229,253.17606 75.563499,269.69461 C 80.188229,285.72489 85.101219,302.39966 89.209769,312.05259 C 106.09169,323.11281 114.60486,316.59881 122.54706,307.35883 C 125.66249,293.66337 114.07022,261.91725 127.33028,257.84448 C 139.10518,255.62816 150.14405,282.45198 155.17082,294.86564 C 160.19759,307.2793 159.67338,332.50693 162.90984,343.30968 C 166.88888,353.36985 174.86727,353.19452 174.55881,358.97025 C 174.24866,364.77756 160.1356,374.91511 154.81405,380.62954 C 149.41689,386.42516 149.08727,389.15275 149.34633,397.06172 C 153.68891,405.69242 166.09819,450.91953 171.33335,465.27956 C 176.78283,475.39843 173.63192,474.4768 185.59588,478.41369 C 187.69933,465.06426 188.21653,462.52643 189.2507,455.37088 C 183.97294,450.44307 179.5234,447.98706 178.25719,444.37737 C 176.99098,440.76768 177.41557,442.74627 176.75751,435.59708 C 176.09945,428.44789 167.76688,406.49414 167.62045,394.86302 C 180.91286,381.68964 193.4847,376.47 207.12449,376.15954 C 217.19788,389.12529 239.00805,445.39384 245.29708,462.58145 C 251.4431,479.37824 249.07614,478.37695 248.61565,486.13219 C 246.42947,492.15357 237.35203,494.9735 234.18679,498.58634 C 231.02155,502.19918 233.78756,498.35479 227.51632,508.03753 C 238.9227,507.77648 243.90312,508.04976 253.01305,507.92806 C 253.24609,500.261 249.81469,501.57615 251.9137,498.24557 C 254.01271,494.91499 260.92488,494.73131 264.85321,491.41728 C 269.17154,478.30713 256.65159,456.85381 255.05992,445.06034 C 253.47092,433.28666 255.07882,432.46534 251.21716,419.85687 C 247.36871,407.29152 245.0604,397.672 244.06222,375.90376 C 284.04137,379.89047 320.1735,377.97635 346.45788,366.32345 C 363.63182,388.12541 362.69686,393.29234 369.23665,400.26336 C 373.39432,409.2135 378.36222,418.45572 372.69294,427.06682 C 363.09951,437.22672 337.59887,453.32813 332.16632,460.86763 C 330.02914,472.33019 325.99927,475.38584 324.94074,483.01068 C 323.87902,490.65845 324.84618,490.20045 326.19879,501.85747 C 334.76985,494.84068 341.98266,489.44788 347.55901,484.42477 C 344.50462,475.79244 341.47677,480.90884 343.15983,471.86114 C 351.06813,469.56111 368.68454,448.90909 380.0661,441.39317 C 391.44766,433.87725 399.68258,430.23547 411.31959,421.291 C 415.42432,425.9988 419.32175,440.46447 416.97683,453.17396 C 414.6039,466.03524 407.37322,481.79225 401.42543,491.64946 C 394.84995,497.26976 390.07664,496.78514 386.03451,497.14621 C 382.62007,500.33189 383.33314,498.19128 376.76716,507.51203 C 387.30575,507.41742 393.6062,507.32528 400.63993,507.04215 C 404.5352,503.14981 406.24401,503.81696 417.91569,501.54362 C 424.252,480.91033 437.33209,446.18088 447.12829,428.04403 C 438.99127,413.4528 429.14604,393.12886 431.8943,379.51567 C 437.31024,365.74556 453.63883,347.02678 457.3363,334.28714 C 461.03377,321.5475 463.66094,313.42184 462.36317,305.86004 C 461.0654,298.29824 456.97134,293.20438 454.19427,287.01505 C 458.16487,285.37648 462.09819,285.58015 477.28064,303.66045 C 492.46309,321.74075 519.98003,415.5078 525.65208,424.58905 C 531.4515,433.87423 540.72726,426.66063 542.15008,421.74175 C 543.64907,416.55956 501.4864,303.45529 486.07545,289.36889 C 470.80708,275.41281 458.35187,276.56123 445.64463,273.77239 C 432.93739,267.85152 415.0645,256.32123 399.61342,251.60427 C 383.45767,248.49799 364.23188,256.44947 339.44313,255.297 C 314.65438,254.14453 262.20491,244.77709 237.62214,236.60005 C 213.37168,226.82241 198.19488,212.51745 180.66522,204.23152 C 162.33022,197.65693 141.34633,193.08228 124.63827,193.23001 C 116.21052,194.40049 93.919919,203.75931 82.826379,208.89612 C 80.550919,205.19366 80.184349,200.0696 76.451889,199.40076 C 69.098669,202.21111 70.476219,215.19413 68.664349,221.29625 z" fill-rule="evenodd"/>
-    <path d="M 296.63172,103.22017 C 286.04358,103.75746 277.60048,112.53051 277.60047,123.25142 C 277.60047,133.84666 285.84356,142.53068 296.25672,143.25142 C 292.00476,143.7931 287.8949,145.67574 284.63172,148.93892 C 281.25703,152.31361 279.34574,175.22153 278.88172,200.78267 C 258.9981,209.37065 237.99848,217.67519 230.66297,222.90767 C 228.72171,226.49825 228.93922,230.95304 235.06922,233.53267 C 242.4159,230.87052 259.14309,224.27925 278.78797,216.28267 C 278.81124,221.38682 278.90219,226.42175 279.03797,231.34517 C 265.25276,247.41244 243.52089,277.70291 241.50672,283.28267 C 242.86268,287.68185 264.45353,326.34792 269.97547,352.25142 C 273.08746,366.02228 253.46111,356.84047 255.60047,372.18892 C 275.60431,369.2831 289.20022,366.23846 301.28797,364.59517 C 298.10047,354.86036 282.79549,308.81903 267.38172,287.65767 C 291.37787,267.92654 304.07045,260.28406 319.98234,235.04679 C 319.24376,208.53642 320.80084,156.76428 312.97547,148.93892 C 309.40983,145.37328 304.8309,143.44268 300.16297,143.12642 C 310.04773,141.89141 317.69423,133.46906 317.69422,123.25142 C 317.69422,112.18468 308.72971,103.22018 297.66297,103.22017 C 297.31713,103.22017 296.97327,103.20284 296.63172,103.22017 z" fill-rule="evenodd" stroke="#fff" stroke-width="2.5"/>
-    <rect width="581.125" height="581.125" rx="50.19" ry="50.796" x="14.438" y="14.438" stroke="#000" stroke-width="28.875" stroke-linejoin="bevel" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="35"
+   height="35"
+   viewBox="0 0 610 610"
+   id="symbol-equestrian">
+  <defs
+     id="defs4" />
+  <path
+     d="M 68.664349,221.29625 C 66.413119,237.60755 68.583229,253.17606 75.563499,269.69461 C 80.188229,285.72489 85.101219,302.39966 89.209769,312.05259 C 106.09169,323.11281 114.60486,316.59881 122.54706,307.35883 C 125.66249,293.66337 114.07022,261.91725 127.33028,257.84448 C 139.10518,255.62816 150.14405,282.45198 155.17082,294.86564 C 160.19759,307.2793 159.67338,332.50693 162.90984,343.30968 C 166.88888,353.36985 174.86727,353.19452 174.55881,358.97025 C 174.24866,364.77756 160.1356,374.91511 154.81405,380.62954 C 149.41689,386.42516 149.08727,389.15275 149.34633,397.06172 C 153.68891,405.69242 166.09819,450.91953 171.33335,465.27956 C 176.78283,475.39843 173.63192,474.4768 185.59588,478.41369 C 187.69933,465.06426 188.21653,462.52643 189.2507,455.37088 C 183.97294,450.44307 179.5234,447.98706 178.25719,444.37737 C 176.99098,440.76768 177.41557,442.74627 176.75751,435.59708 C 176.09945,428.44789 167.76688,406.49414 167.62045,394.86302 C 180.91286,381.68964 193.4847,376.47 207.12449,376.15954 C 217.19788,389.12529 239.00805,445.39384 245.29708,462.58145 C 251.4431,479.37824 249.07614,478.37695 248.61565,486.13219 C 246.42947,492.15357 237.35203,494.9735 234.18679,498.58634 C 231.02155,502.19918 233.78756,498.35479 227.51632,508.03753 C 238.9227,507.77648 243.90312,508.04976 253.01305,507.92806 C 253.24609,500.261 249.81469,501.57615 251.9137,498.24557 C 254.01271,494.91499 260.92488,494.73131 264.85321,491.41728 C 269.17154,478.30713 256.65159,456.85381 255.05992,445.06034 C 253.47092,433.28666 255.07882,432.46534 251.21716,419.85687 C 247.36871,407.29152 245.0604,397.672 244.06222,375.90376 C 284.04137,379.89047 320.1735,377.97635 346.45788,366.32345 C 363.63182,388.12541 362.69686,393.29234 369.23665,400.26336 C 373.39432,409.2135 378.36222,418.45572 372.69294,427.06682 C 363.09951,437.22672 337.59887,453.32813 332.16632,460.86763 C 330.02914,472.33019 325.99927,475.38584 324.94074,483.01068 C 323.87902,490.65845 324.84618,490.20045 326.19879,501.85747 C 334.76985,494.84068 341.98266,489.44788 347.55901,484.42477 C 344.50462,475.79244 341.47677,480.90884 343.15983,471.86114 C 351.06813,469.56111 368.68454,448.90909 380.0661,441.39317 C 391.44766,433.87725 399.68258,430.23547 411.31959,421.291 C 415.42432,425.9988 419.32175,440.46447 416.97683,453.17396 C 414.6039,466.03524 407.37322,481.79225 401.42543,491.64946 C 394.84995,497.26976 390.07664,496.78514 386.03451,497.14621 C 382.62007,500.33189 383.33314,498.19128 376.76716,507.51203 C 387.30575,507.41742 393.6062,507.32528 400.63993,507.04215 C 404.5352,503.14981 406.24401,503.81696 417.91569,501.54362 C 424.252,480.91033 437.33209,446.18088 447.12829,428.04403 C 438.99127,413.4528 429.14604,393.12886 431.8943,379.51567 C 437.31024,365.74556 453.63883,347.02678 457.3363,334.28714 C 461.03377,321.5475 463.66094,313.42184 462.36317,305.86004 C 461.0654,298.29824 456.97134,293.20438 454.19427,287.01505 C 458.16487,285.37648 462.09819,285.58015 477.28064,303.66045 C 492.46309,321.74075 519.98003,415.5078 525.65208,424.58905 C 531.4515,433.87423 540.72726,426.66063 542.15008,421.74175 C 543.64907,416.55956 501.4864,303.45529 486.07545,289.36889 C 470.80708,275.41281 458.35187,276.56123 445.64463,273.77239 C 432.93739,267.85152 415.0645,256.32123 399.61342,251.60427 C 383.45767,248.49799 364.23188,256.44947 339.44313,255.297 C 314.65438,254.14453 262.20491,244.77709 237.62214,236.60005 C 213.37168,226.82241 198.19488,212.51745 180.66522,204.23152 C 162.33022,197.65693 141.34633,193.08228 124.63827,193.23001 C 116.21052,194.40049 93.919919,203.75931 82.826379,208.89612 C 80.550919,205.19366 80.184349,200.0696 76.451889,199.40076 C 69.098669,202.21111 70.476219,215.19413 68.664349,221.29625 z"
+     id="path2416"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 296.63172,103.22017 C 286.04358,103.75746 277.60048,112.53051 277.60047,123.25142 C 277.60047,133.84666 285.84356,142.53068 296.25672,143.25142 C 292.00476,143.7931 287.8949,145.67574 284.63172,148.93892 C 281.25703,152.31361 279.34574,175.22153 278.88172,200.78267 C 258.9981,209.37065 237.99848,217.67519 230.66297,222.90767 C 228.72171,226.49825 228.93922,230.95304 235.06922,233.53267 C 242.4159,230.87052 259.14309,224.27925 278.78797,216.28267 C 278.81124,221.38682 278.90219,226.42175 279.03797,231.34517 C 265.25276,247.41244 243.52089,277.70291 241.50672,283.28267 C 242.86268,287.68185 264.45353,326.34792 269.97547,352.25142 C 273.08746,366.02228 253.46111,356.84047 255.60047,372.18892 C 275.60431,369.2831 289.20022,366.23846 301.28797,364.59517 C 298.10047,354.86036 282.79549,308.81903 267.38172,287.65767 C 291.37787,267.92654 304.07045,260.28406 319.98234,235.04679 C 319.24376,208.53642 320.80084,156.76428 312.97547,148.93892 C 309.40983,145.37328 304.8309,143.44268 300.16297,143.12642 C 310.04773,141.89141 317.69423,133.46906 317.69422,123.25142 C 317.69422,112.18468 308.72971,103.22018 297.66297,103.22017 C 297.31713,103.22017 296.97327,103.20284 296.63172,103.22017 z"
+     id="path3210"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     width="581.12482"
+     height="581.12482"
+     rx="50.190037"
+     ry="50.795956"
+     x="14.437581"
+     y="14.437555"
+     id="rect2388"
+     style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:28.87516212;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/fastfood.svg b/data/styles/symbols/fastfood.svg
index 1398003a0e..f01473bda9 100644
--- a/data/styles/symbols/fastfood.svg
+++ b/data/styles/symbols/fastfood.svg
@@ -1,8 +1,97 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24">
-    <path d="m 1,9 2,14 7.15625,0 C 9.419098,22.480223 8.8124702,21.732528 8.4375,20.84375 7.5942733,20.483493 7,19.566824 7,18.5 c 0,-0.908906 0.4443422,-1.687469 1.09375,-2.125 0.4228592,-2.323133 2.235702,-4.077159 4.4375,-4.09375 L 13,9 1,9 z" fill="#505050"/>
-    <rect width="12" height="1" x="1" y="7" fill="#505050"/>
-    <rect width="1" height="6.325" x="2.667" y="1.054" transform="matrix(1 0 .316 .949 0 0)" fill="#505050"/>
-    <path d="m 13,13 c -1.753503,0 -3.207349,1.250399 -3.75,3 L 18.018145,16 22.75,16 C 22.207349,14.250399 20.753503,13 19,13 z m -3,4 c -1.108,0 -2,0.669 -2,1.5 0,0.831 0.892,1.5 2,1.5 l 12,0 c 1.108,0 2,-0.669 2,-1.5 C 24,17.669 23.108,17 22,17 L 21,17 17.988607,20 15,17 z m -0.375,4 c 0.708999,1.243658 1.953067,2.0625 3.375,2.0625 l 6,0 c 1.421933,0 2.666001,-0.818842 3.375,-2.0625 z" fill="#505050"/>
-    <rect width="4" height="1" y="1" fill="#505050"/>
-    <path d="m 16,17 4,0 -2,2 z" fill="#505050"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="24"
+   height="24"
+   id="symbol-fastfood"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="fastfood.svg">
+  <metadata
+     id="metadata27">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1017"
+     inkscape:window-height="702"
+     id="namedview25"
+     showgrid="true"
+     inkscape:zoom="16.927381"
+     inkscape:cx="10.834908"
+     inkscape:cy="14.050916"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-fastfood">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3004"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4" />
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="m 1,9 2,14 7.15625,0 C 9.419098,22.480223 8.8124702,21.732528 8.4375,20.84375 7.5942733,20.483493 7,19.566824 7,18.5 c 0,-0.908906 0.4443422,-1.687469 1.09375,-2.125 0.4228592,-2.323133 2.235702,-4.077159 4.4375,-4.09375 L 13,9 1,9 z"
+     id="path3006"
+     inkscape:connector-curvature="0" />
+  <rect
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="rect3776"
+     width="12"
+     height="1"
+     x="1"
+     y="7" />
+  <rect
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="rect3778"
+     width="1"
+     height="6.3245554"
+     x="2.6666665"
+     y="1.0540925"
+     transform="matrix(1,0,0.31622776,0.9486833,0,0)" />
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="m 13,13 c -1.753503,0 -3.207349,1.250399 -3.75,3 L 18.018145,16 22.75,16 C 22.207349,14.250399 20.753503,13 19,13 z m -3,4 c -1.108,0 -2,0.669 -2,1.5 0,0.831 0.892,1.5 2,1.5 l 12,0 c 1.108,0 2,-0.669 2,-1.5 C 24,17.669 23.108,17 22,17 L 21,17 17.988607,20 15,17 z m -0.375,4 c 0.708999,1.243658 1.953067,2.0625 3.375,2.0625 l 6,0 c 1.421933,0 2.666001,-0.818842 3.375,-2.0625 z"
+     id="rect3782"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="scccsssssssscccscsscc" />
+  <rect
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="rect3806"
+     width="4"
+     height="1"
+     x="0"
+     y="1" />
+  <path
+     style="fill:#505050;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+     d="m 16,17 4,0 -2,2 z"
+     id="path3808"
+     inkscape:connector-curvature="0" />
 </svg>
diff --git a/data/styles/symbols/firebrigade.svg b/data/styles/symbols/firebrigade.svg
index 240abcd52d..1f11df6006 100644
--- a/data/styles/symbols/firebrigade.svg
+++ b/data/styles/symbols/firebrigade.svg
@@ -1,13 +1,71 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="40" height="40">
-    <path d="M 32.424287,14.005435 C 32.424541,13.030855 32.983727,12.240992 33.673429,12.240992 C 34.363132,12.240992 34.922317,13.030855 34.922572,14.005435" fill="#00f"/>
-    <circle cx="748" cy="412" r="77" transform="matrix(-.039 0 0 .039 39.398 10.122)"/>
-    <path d="M 27.960236,13.479197 L 34.9098,13.958933 C 36.088422,14.048181 35.728697,13.728279 37.03177,17.186598 C 38.298188,20.430829 38.084641,19.301609 38.070996,21.012418 L 38.070996,24.840656 C 38.060525,25.841697 37.910633,26.088083 36.823922,26.096192 C 36.666699,21.043222 29.431192,21.025395 29.287075,26.125192 L 14.242368,26.134868 C 14.249632,24.820349 13.693743,23.818711 12.804365,23.092091 L 27.960236,23.080006 L 27.960236,19.138177 L 29.567421,19.138177 L 29.567421,15.064628 L 27.960236,15.064628 L 27.960236,13.479197 z M 30.909967,15.061001 L 30.970384,19.139384 L 36.098876,19.739961 C 37.008253,19.858286 37.06094,19.618993 36.728454,18.809486 L 35.738765,16.170323 C 35.490232,15.352256 35.484602,15.348722 34.779295,15.301476 L 30.909967,15.061001 z M 8.1362786,23.098132 C 7.2147363,23.837026 6.6941776,24.887834 6.7031092,26.138486 L 4.5098468,26.140908 L 2.0120603,25.256347 L 2.019315,23.099338 L 8.1362786,23.098132 z" fill="#d40000" fill-rule="evenodd"/>
-    <path d="M 27.986825,13.470736 L 27.986825,15.064628 L 23.538664,15.064628 L 23.538664,19.138177 L 27.986825,19.138177 L 27.986825,23.182718 L 2.0531478,23.182718 L 2.0531478,13.470736 L 21.855352,13.470736 L 21.855352,22.287286 L 22.561064,22.287286 L 22.561064,13.470736 L 27.986825,13.470736 z" fill="#d40000"/>
-    <circle cx="164" cy="412" r="77" transform="matrix(-.039 0 0 .039 39.398 10.122)"/>
-    <rect width="8.635" height="7.875" x="2.988" y="14.467" fill="#333"/>
-    <rect width="8.635" height="7.875" x="2.988" y="14.467" fill="#808080"/>
-    <rect width="8.635" height="7.875" x="12.166" y="14.413" fill="#808080"/>
-    <path d="M 33.727741,11.990645 L 33.727741,10.420954" stroke="#00f" stroke-width=".416" fill="none"/>
-    <path d="M 34.42317,12.153583 L 35.313359,10.860724" stroke="#00f" stroke-width=".416" fill="none"/>
-    <path d="M 33.032319,12.09927 L 32.14212,10.806412" stroke="#00f" stroke-width=".416" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="40"
+   height="40"
+   id="symbol-firebrigade">
+  <path
+     d="M 32.424287,14.005435 C 32.424541,13.030855 32.983727,12.240992 33.673429,12.240992 C 34.363132,12.240992 34.922317,13.030855 34.922572,14.005435"
+     id="path3172"
+     style="fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <circle
+     cx="748"
+     cy="412"
+     r="77"
+     transform="matrix(-3.86691e-2,0,0,3.86691e-2,39.397834,10.122231)"
+     id="circle10"
+     style="fill:#000000;stroke:none" />
+  <defs
+     id="defs13" />
+  <path
+     d="M 27.960236,13.479197 L 34.9098,13.958933 C 36.088422,14.048181 35.728697,13.728279 37.03177,17.186598 C 38.298188,20.430829 38.084641,19.301609 38.070996,21.012418 L 38.070996,24.840656 C 38.060525,25.841697 37.910633,26.088083 36.823922,26.096192 C 36.666699,21.043222 29.431192,21.025395 29.287075,26.125192 L 14.242368,26.134868 C 14.249632,24.820349 13.693743,23.818711 12.804365,23.092091 L 27.960236,23.080006 L 27.960236,19.138177 L 29.567421,19.138177 L 29.567421,15.064628 L 27.960236,15.064628 L 27.960236,13.479197 z M 30.909967,15.061001 L 30.970384,19.139384 L 36.098876,19.739961 C 37.008253,19.858286 37.06094,19.618993 36.728454,18.809486 L 35.738765,16.170323 C 35.490232,15.352256 35.484602,15.348722 34.779295,15.301476 L 30.909967,15.061001 z M 8.1362786,23.098132 C 7.2147363,23.837026 6.6941776,24.887834 6.7031092,26.138486 L 4.5098468,26.140908 L 2.0120603,25.256347 L 2.019315,23.099338 L 8.1362786,23.098132 z"
+     id="path4"
+     style="fill:#d40000;fill-rule:evenodd;stroke:none" />
+  <path
+     d="M 27.986825,13.470736 L 27.986825,15.064628 L 23.538664,15.064628 L 23.538664,19.138177 L 27.986825,19.138177 L 27.986825,23.182718 L 2.0531478,23.182718 L 2.0531478,13.470736 L 21.855352,13.470736 L 21.855352,22.287286 L 22.561064,22.287286 L 22.561064,13.470736 L 27.986825,13.470736 z"
+     id="rect6"
+     style="fill:#d40000;stroke:none" />
+  <circle
+     cx="164"
+     cy="412"
+     r="77"
+     transform="matrix(-3.86691e-2,0,0,3.86691e-2,39.397834,10.122231)"
+     id="circle8"
+     style="fill:#000000;stroke:none" />
+  <rect
+     width="8.635375"
+     height="7.8750281"
+     x="2.9879844"
+     y="14.467077"
+     id="rect3160"
+     style="fill:#333333;fill-opacity:1;stroke:none;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     width="8.635375"
+     height="7.8750281"
+     x="2.9879844"
+     y="14.467077"
+     id="rect3162"
+     style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     width="8.635375"
+     height="7.8750281"
+     x="12.166475"
+     y="14.412751"
+     id="rect3166"
+     style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 33.727741,11.990645 L 33.727741,10.420954"
+     id="path3174"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.41625309;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 34.42317,12.153583 L 35.313359,10.860724"
+     id="path5118"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.41625309;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 33.032319,12.09927 L 32.14212,10.806412"
+     id="path5120"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.41625309;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/football-borderless.svg b/data/styles/symbols/football-borderless.svg
index 53fb807213..d481224523 100644
--- a/data/styles/symbols/football-borderless.svg
+++ b/data/styles/symbols/football-borderless.svg
@@ -1,9 +1,80 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="25" height="25" viewBox="0 0 210 210">
-    <path d="M 199.97001,24.393446 C 213.95651,40.415139 210.25187,118.62186 156.03758,164.14699 C 104.58191,207.35563 23.283639,203.40372 8.7254719,185.85744 C -5.1284962,169.15621 5.1037227,89.585406 56.318384,46.091373 C 110.88831,-0.25504222 186.24668,8.6732148 199.97001,24.393446 z" fill="#505050" fill-rule="evenodd" stroke="#000" stroke-width="2"/>
-    <path d="M 32.587862,109.87932 C 44.642263,85.645396 97.973979,41.906691 123.71906,33.354119" stroke="#fff" stroke-width="8.4" fill="none"/>
-    <path d="M 61.687443,53.372341 L 80.641601,76.639681" stroke="#fff" stroke-width="8.4" fill="none"/>
-    <path d="M 41.125374,75.565343 L 59.683305,97.247777" stroke="#fff" stroke-width="8.4" fill="none"/>
-    <path d="M 24.155375,99.192999 L 41.920854,120.87543" stroke="#fff" stroke-width="8.4" fill="none"/>
-    <path d="M 114.7718,20.866088 L 130.55614,42.548523" stroke="#fff" stroke-width="8.4" fill="none"/>
-    <path d="M 88.821087,35.926628 L 106.58657,58.401516" stroke="#fff" stroke-width="8.4" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="25"
+   height="25"
+   viewBox="0 0 210 210"
+   id="symbol-football-borderless"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="football-borderless.svg">
+  <metadata
+     id="metadata13">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="9.44"
+     inkscape:cx="12.5"
+     inkscape:cy="12.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-football-borderless" />
+  <defs
+     id="defs4" />
+  <path
+     d="M 199.97001,24.393446 C 213.95651,40.415139 210.25187,118.62186 156.03758,164.14699 C 104.58191,207.35563 23.283639,203.40372 8.7254719,185.85744 C -5.1284962,169.15621 5.1037227,89.585406 56.318384,46.091373 C 110.88831,-0.25504222 186.24668,8.6732148 199.97001,24.393446 z"
+     id="path2416"
+     style="fill:#505050;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 32.587862,109.87932 C 44.642263,85.645396 97.973979,41.906691 123.71906,33.354119"
+     id="path3199"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:8.39999962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 61.687443,53.372341 L 80.641601,76.639681"
+     id="path3201"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:8.39999962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 41.125374,75.565343 L 59.683305,97.247777"
+     id="path3203"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:8.39999962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 24.155375,99.192999 L 41.920854,120.87543"
+     id="path3205"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:8.39999962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 114.7718,20.866088 L 130.55614,42.548523"
+     id="path3207"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:8.39999962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 88.821087,35.926628 L 106.58657,58.401516"
+     id="path3209"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:8.39999962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/football.svg b/data/styles/symbols/football.svg
index 467bef2d0c..c9faadf6b9 100644
--- a/data/styles/symbols/football.svg
+++ b/data/styles/symbols/football.svg
@@ -1,10 +1,45 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="32" height="32" viewBox="0 0 250 250">
-    <path d="M 211.52524,51.561015 C 224.26806,66.158053 220.89283,137.41061 171.4993,178.88763 C 124.61909,218.25414 50.549886,214.65363 37.286237,198.66757 C 24.664169,183.45142 33.986535,110.95608 80.647168,71.329554 C 130.36472,29.10428 199.02219,37.238633 211.52524,51.561015 z" fill-rule="evenodd" stroke="#000" stroke-width="1.822"/>
-    <path d="M 59.026774,129.44545 C 70.009293,107.36642 118.59874,67.516976 142.05455,59.724902" stroke="#fff" stroke-width="7.653" fill="none"/>
-    <path d="M 85.538809,77.963096 L 102.80756,99.161498" stroke="#fff" stroke-width="7.653" fill="none"/>
-    <path d="M 66.805127,98.182688 L 83.712879,117.93711" stroke="#fff" stroke-width="7.653" fill="none"/>
-    <path d="M 51.344107,119.70936 L 67.529872,139.46378" stroke="#fff" stroke-width="7.653" fill="none"/>
-    <path d="M 133.90289,48.347311 L 148.28368,68.101736" stroke="#fff" stroke-width="7.653" fill="none"/>
-    <path d="M 110.25972,62.068662 L 126.44549,82.545074" stroke="#fff" stroke-width="7.653" fill="none"/>
-    <path d="M 59.676639,7.8570939 L 190.32335,7.8570939 C 219.03136,7.8570939 242.1429,31.747104 242.1429,61.422137 L 242.1429,188.57786 C 242.1429,218.25289 219.03136,242.1429 190.32335,242.1429 L 59.676639,242.1429 C 30.968611,242.1429 7.8570962,218.25289 7.8570962,188.57786 L 7.8570962,61.422137 C 7.8570962,31.747104 30.968611,7.8570939 59.676639,7.8570939 z" stroke="#000" stroke-width="15.714" stroke-linejoin="bevel" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="32"
+   height="32"
+   viewBox="0 0 250 250"
+   id="symbol-football">
+  <defs
+     id="defs4" />
+  <path
+     d="M 211.52524,51.561015 C 224.26806,66.158053 220.89283,137.41061 171.4993,178.88763 C 124.61909,218.25414 50.549886,214.65363 37.286237,198.66757 C 24.664169,183.45142 33.986535,110.95608 80.647168,71.329554 C 130.36472,29.10428 199.02219,37.238633 211.52524,51.561015 z"
+     id="path2416"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.82215917;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 59.026774,129.44545 C 70.009293,107.36642 118.59874,67.516976 142.05455,59.724902"
+     id="path3199"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:7.65306854;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 85.538809,77.963096 L 102.80756,99.161498"
+     id="path3201"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:7.65306854;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 66.805127,98.182688 L 83.712879,117.93711"
+     id="path3203"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:7.65306854;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 51.344107,119.70936 L 67.529872,139.46378"
+     id="path3205"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:7.65306854;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 133.90289,48.347311 L 148.28368,68.101736"
+     id="path3207"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:7.65306854;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 110.25972,62.068662 L 126.44549,82.545074"
+     id="path3209"
+     style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:7.65306854;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 59.676639,7.8570939 L 190.32335,7.8570939 C 219.03136,7.8570939 242.1429,31.747104 242.1429,61.422137 L 242.1429,188.57786 C 242.1429,218.25289 219.03136,242.1429 190.32335,242.1429 L 59.676639,242.1429 C 30.968611,242.1429 7.8570962,218.25289 7.8570962,188.57786 L 7.8570962,61.422137 C 7.8570962,31.747104 30.968611,7.8570939 59.676639,7.8570939 z"
+     id="rect2403"
+     style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:15.71419239;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/fountain.svg b/data/styles/symbols/fountain.svg
index 0284faa4aa..f1dc1f6257 100644
--- a/data/styles/symbols/fountain.svg
+++ b/data/styles/symbols/fountain.svg
@@ -1,14 +1,138 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24">
-    <title>
-        Fontain Map Icon
-    </title>
-    <path d="M 2.3125,13.96875 C 3.3359946,15.57196 6.7842055,16.770079 11,16.9375 L 11,20 c -2.1751852,0.179862 -3.9425821,0.950853 -4.65625,1.96875 l 11.3125,0 C 16.942582,20.950853 15.175185,20.179862 13,20 l 0,-3.0625 c 4.215794,-0.167421 7.664005,-1.36554 8.6875,-2.96875 l -19.375,0 z" fill="#666"/>
-    <path d="m 11.200837,13.02345 c 0.333395,-1.317805 -1.185445,-1.164101 -1.5706543,-2.382908 -0.4102838,-1.298141 1.4292853,-0.6510476 1.8399953,0.648446 0.152524,0.497253 0.392188,0.965414 -0.269341,1.734462 z" fill="#00f"/>
-    <path d="M 11.191984,10.131575 C 10.35981,8.45608 9.612405,9.2948682 8.4470001,8.0467458 7.2057362,6.7173808 8.757443,6.6692499 10,8 c 0.472822,0.511229 0.972794,0.9507861 1.191984,2.131575 z" fill="#00f"/>
-    <path d="M 8.1012699,6.4420982 C 5.6570561,5.9582206 6.8398826,6.990305 5,7 3.0403563,7.0103267 3.0253687,5.9272864 4.9870542,5.9169491 5.7405085,5.9160494 6.3916072,5.8518731 8.1012699,6.4420982 z" fill="#00f"/>
-    <path d="m 12.657263,13.02345 c -0.333395,-1.317805 1.185445,-1.164101 1.570654,-2.382908 0.410284,-1.298141 -1.429285,-0.6510476 -1.839995,0.648446 -0.152524,0.497253 -0.392188,0.965414 0.269341,1.734462 z" fill="#00f"/>
-    <path d="M 12.666116,10.131575 C 13.49829,8.45608 14.245695,9.2948682 15.4111,8.0467458 16.652364,6.7173808 15.100657,6.6692499 13.8581,8 13.385278,8.511229 12.885306,8.9507861 12.666116,10.131575 z" fill="#00f"/>
-    <path d="M 15.860472,6.7307405 C 18.249588,6.0233172 17.167077,7.1601755 19,7 20.95223,6.829399 20.867185,5.7495989 18.91292,5.9203781 c -0.750321,0.068651 -1.404564,0.064848 -3.052448,0.8103624 z" fill="#00f"/>
-    <path d="M 12,9 C 11,6 10.612405,6.2948682 9.4470001,5.0467458 8.2057362,3.7173808 9.5541233,3.398157 10.79668,4.7289071 11.269502,5.2401361 12,7.480345 12,9 z" fill="#00f"/>
-    <path d="M 12,9 C 13,6 13.387595,6.2948682 14.553,5.0467458 15.794264,3.7173808 14.242557,3.3303838 13,4.6611339 12.527178,5.1723629 12,7 12,9 z" fill="#00f"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="24"
+   height="24"
+   id="symbol-fountain"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="fountain.svg">
+  <title
+     id="title3793">Fontain Map Icon</title>
+  <metadata
+     id="metadata15">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Fontain Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+        <dc:source>mapsforhumans.com</dc:source>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="954"
+     inkscape:window-height="715"
+     id="namedview13"
+     showgrid="true"
+     inkscape:zoom="59.020365"
+     inkscape:cx="10.188923"
+     inkscape:cy="17.70163"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-fountain">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2992"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4" />
+  <path
+     style="fill:#666666;fill-opacity:1;stroke:none"
+     d="M 2.3125,13.96875 C 3.3359946,15.57196 6.7842055,16.770079 11,16.9375 L 11,20 c -2.1751852,0.179862 -3.9425821,0.950853 -4.65625,1.96875 l 11.3125,0 C 16.942582,20.950853 15.175185,20.179862 13,20 l 0,-3.0625 c 4.215794,-0.167421 7.664005,-1.36554 8.6875,-2.96875 l -19.375,0 z"
+     id="path2994"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#0000ff;fill-opacity:1;stroke:none"
+     d="m 11.200837,13.02345 c 0.333395,-1.317805 -1.185445,-1.164101 -1.5706543,-2.382908 -0.4102838,-1.298141 1.4292853,-0.6510476 1.8399953,0.648446 0.152524,0.497253 0.392188,0.965414 -0.269341,1.734462 z"
+     id="path3009"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path3779"
+     d="M 11.191984,10.131575 C 10.35981,8.45608 9.612405,9.2948682 8.4470001,8.0467458 7.2057362,6.7173808 8.757443,6.6692499 10,8 c 0.472822,0.511229 0.972794,0.9507861 1.191984,2.131575 z"
+     style="fill:#0000ff;fill-opacity:1;stroke:none" />
+  <path
+     style="fill:#0000ff;fill-opacity:1;stroke:none"
+     d="M 8.1012699,6.4420982 C 5.6570561,5.9582206 6.8398826,6.990305 5,7 3.0403563,7.0103267 3.0253687,5.9272864 4.9870542,5.9169491 5.7405085,5.9160494 6.3916072,5.8518731 8.1012699,6.4420982 z"
+     id="path3781"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path3783"
+     d="m 12.657263,13.02345 c -0.333395,-1.317805 1.185445,-1.164101 1.570654,-2.382908 0.410284,-1.298141 -1.429285,-0.6510476 -1.839995,0.648446 -0.152524,0.497253 -0.392188,0.965414 0.269341,1.734462 z"
+     style="fill:#0000ff;fill-opacity:1;stroke:none" />
+  <path
+     style="fill:#0000ff;fill-opacity:1;stroke:none"
+     d="M 12.666116,10.131575 C 13.49829,8.45608 14.245695,9.2948682 15.4111,8.0467458 16.652364,6.7173808 15.100657,6.6692499 13.8581,8 13.385278,8.511229 12.885306,8.9507861 12.666116,10.131575 z"
+     id="path3785"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path3787"
+     d="M 15.860472,6.7307405 C 18.249588,6.0233172 17.167077,7.1601755 19,7 20.95223,6.829399 20.867185,5.7495989 18.91292,5.9203781 c -0.750321,0.068651 -1.404564,0.064848 -3.052448,0.8103624 z"
+     style="fill:#0000ff;fill-opacity:1;stroke:none" />
+  <path
+     style="fill:#0000ff;fill-opacity:1;stroke:none"
+     d="M 12,9 C 11,6 10.612405,6.2948682 9.4470001,5.0467458 8.2057362,3.7173808 9.5541233,3.398157 10.79668,4.7289071 11.269502,5.2401361 12,7.480345 12,9 z"
+     id="path3789"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path3791"
+     d="M 12,9 C 13,6 13.387595,6.2948682 14.553,5.0467458 15.794264,3.7173808 14.242557,3.3303838 13,4.6611339 12.527178,5.1723629 12,7 12,9 z"
+     style="fill:#0000ff;fill-opacity:1;stroke:none" />
 </svg>
diff --git a/data/styles/symbols/gate.svg b/data/styles/symbols/gate.svg
index 0dd1906a1e..565f7e5503 100644
--- a/data/styles/symbols/gate.svg
+++ b/data/styles/symbols/gate.svg
@@ -1,3 +1,69 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <path d="M 5 4 L 5 22 L 7 22 L 7 12 L 7.03125 12 C 7.0163621 11.835058 7 11.668819 7 11.5 C 7 8.4624339 9.4624339 6 12.5 6 C 15.537566 6 18 8.4624339 18 11.5 C 18 11.668819 17.983638 11.835058 17.96875 12 L 18 12 L 18 22 L 20 22 L 20 4 L 5 4 z" transform="translate(0 -1028.362) translate(0 1028.362)" fill="#4d4d4d" fill-rule="evenodd"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg3882"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="Новый документ 6">
+  <defs
+     id="defs3884" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="11.3506"
+     inkscape:cy="16.781288"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="992"
+     inkscape:window-height="663"
+     inkscape:window-x="20"
+     inkscape:window-y="20"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3890"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3887">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <path
+       style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="M 5 4 L 5 22 L 7 22 L 7 12 L 7.03125 12 C 7.0163621 11.835058 7 11.668819 7 11.5 C 7 8.4624339 9.4624339 6 12.5 6 C 15.537566 6 18 8.4624339 18 11.5 C 18 11.668819 17.983638 11.835058 17.96875 12 L 18 12 L 18 22 L 20 22 L 20 4 L 5 4 z "
+       transform="translate(0,1028.3622)"
+       id="rect4410" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/golfCourse.svg b/data/styles/symbols/golfCourse.svg
index 9a44dfb449..fbbd510702 100644
--- a/data/styles/symbols/golfCourse.svg
+++ b/data/styles/symbols/golfCourse.svg
@@ -1,8 +1,78 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24" enable-background="new 0 0 54.298 99.999">
-    <g fill="#4d4d4d">
-        <path d="m 3.924553,4.2657567 c -0.9771678,0 -1.7656886,0.7802156 -1.7656886,1.7400611 0,0.9631676 0.7885208,1.7417221 1.7656886,1.7417221 0.9712355,0 1.7604682,-0.7787918 1.7604682,-1.7417221 C 5.6847839,5.0459723 4.8957885,4.2657567 3.924553,4.2657567 z" transform="translate(6)"/>
-        <path d="M 12.870693,7.7083868 C 12.804488,7.3325165 12.496721,7.1191911 12.477975,7.1054282 L 2.1125925,0.27142315 1.1496622,1.6664619 C 0.97026953,1.9414831 1.0485758,2.3071499 1.3235971,2.4860679 1.5971946,2.6671216 1.9621494,2.5935611 2.1415421,2.3187772 L 2.7051102,1.5126968 11.123987,7.0676988 4.2266255,8.3092097 C 3.7382789,8.3913127 3.384714,8.8796593 3.493631,9.3578024 l 1.5011082,5.8027346 -4.85499112,7.281775 c -0.29020792,0.497126 -0.11437467,1.134018 0.38773487,1.419005 0.50709265,0.288547 1.14920435,0.112951 1.44131065,-0.383938 0,0 5.0633333,-7.614695 5.0820794,-7.662628 0,0 0.2612583,1.05666 0.2612583,1.061881 l -0.7598085,5.712564 c -0.095391,0.568788 0.2904453,1.099847 0.8642169,1.195476 0.5737717,0.09539 1.1185938,-0.285225 1.2139851,-0.850454 l 0.7859106,-5.876295 c 0.023967,-0.150443 -0.00688,-0.479804 -0.041052,-0.625027 L 7.643628,9.552619 12.148614,8.7413182 c 0.481465,-0.085188 0.807504,-0.5495679 0.722079,-1.0329314 z" transform="translate(6)"/>
-        <path transform="matrix(1.39 0 0 1.39 -.947 -7.851)" d="m 16.507203,20.024641 c 0,0.397286 -0.322064,0.719351 -0.719351,0.719351 -0.397286,0 -0.71935,-0.322065 -0.71935,-0.719351 0,-0.397286 0.322064,-0.719351 0.71935,-0.719351 0.397287,0 0.719351,0.322065 0.719351,0.719351 z"/>
-        <path d="m 14,21 c 0.666667,0.383578 1.333333,0.409954 2,0 -0.333333,0.666667 -1,1.312846 -1,3 0,-1.687154 -0.666667,-2.333333 -1,-3 z" transform="translate(6)"/>
-    </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   enable-background="new 0 0 54.298 99.999"
+   xml:space="preserve"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="noun_project_227.svg"><metadata
+   id="metadata11"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs9" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1071"
+   inkscape:window-height="689"
+   id="namedview7"
+   showgrid="true"
+   inkscape:zoom="5.879542"
+   inkscape:cx="5.7853844"
+   inkscape:cy="18.676904"
+   inkscape:window-x="64"
+   inkscape:window-y="111"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"><inkscape:grid
+     type="xygrid"
+     id="grid3001"
+     empspacing="2"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
+
+
+<g
+   id="g3775"
+   transform="translate(6,0)"><path
+     style="fill:#4d4d4d"
+     inkscape:connector-curvature="0"
+     id="path3"
+     d="m 3.924553,4.2657567 c -0.9771678,0 -1.7656886,0.7802156 -1.7656886,1.7400611 0,0.9631676 0.7885208,1.7417221 1.7656886,1.7417221 0.9712355,0 1.7604682,-0.7787918 1.7604682,-1.7417221 C 5.6847839,5.0459723 4.8957885,4.2657567 3.924553,4.2657567 z" /><path
+     style="fill:#4d4d4d"
+     inkscape:connector-curvature="0"
+     id="path5"
+     d="M 12.870693,7.7083868 C 12.804488,7.3325165 12.496721,7.1191911 12.477975,7.1054282 L 2.1125925,0.27142315 1.1496622,1.6664619 C 0.97026953,1.9414831 1.0485758,2.3071499 1.3235971,2.4860679 1.5971946,2.6671216 1.9621494,2.5935611 2.1415421,2.3187772 L 2.7051102,1.5126968 11.123987,7.0676988 4.2266255,8.3092097 C 3.7382789,8.3913127 3.384714,8.8796593 3.493631,9.3578024 l 1.5011082,5.8027346 -4.85499112,7.281775 c -0.29020792,0.497126 -0.11437467,1.134018 0.38773487,1.419005 0.50709265,0.288547 1.14920435,0.112951 1.44131065,-0.383938 0,0 5.0633333,-7.614695 5.0820794,-7.662628 0,0 0.2612583,1.05666 0.2612583,1.061881 l -0.7598085,5.712564 c -0.095391,0.568788 0.2904453,1.099847 0.8642169,1.195476 0.5737717,0.09539 1.1185938,-0.285225 1.2139851,-0.850454 l 0.7859106,-5.876295 c 0.023967,-0.150443 -0.00688,-0.479804 -0.041052,-0.625027 L 7.643628,9.552619 12.148614,8.7413182 c 0.481465,-0.085188 0.807504,-0.5495679 0.722079,-1.0329314 z" /><path
+     transform="matrix(1.3901428,0,0,1.3901428,-6.9473684,-7.8507215)"
+     d="m 16.507203,20.024641 c 0,0.397286 -0.322064,0.719351 -0.719351,0.719351 -0.397286,0 -0.71935,-0.322065 -0.71935,-0.719351 0,-0.397286 0.322064,-0.719351 0.71935,-0.719351 0.397287,0 0.719351,0.322065 0.719351,0.719351 z"
+     sodipodi:ry="0.71935058"
+     sodipodi:rx="0.71935058"
+     sodipodi:cy="20.024641"
+     sodipodi:cx="15.787852"
+     id="path2999"
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     sodipodi:type="arc" /><path
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path3005"
+     d="m 14,21 c 0.666667,0.383578 1.333333,0.409954 2,0 -0.333333,0.666667 -1,1.312846 -1,3 0,-1.687154 -0.666667,-2.333333 -1,-3 z"
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none" /></g></svg>
\ No newline at end of file
diff --git a/data/styles/symbols/gymnastics-borderless.svg b/data/styles/symbols/gymnastics-borderless.svg
index 5a226d4207..fd20f4fa42 100644
--- a/data/styles/symbols/gymnastics-borderless.svg
+++ b/data/styles/symbols/gymnastics-borderless.svg
@@ -1,8 +1,37 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="38" height="38" viewBox="0 0 300 300">
-    <path d="M 142.10734,83.91085 C 142.11038,92.840056 134.87265,100.08023 125.9434,100.08023 C 117.01416,100.08023 109.77643,92.840056 109.77947,83.91085 C 109.77643,74.9816 117.01416,67.74141 125.9434,67.74141 C 134.87265,67.74141 142.11038,74.9816 142.10734,83.91085 L 142.10734,83.91085 z" fill-rule="evenodd" stroke="#000"/>
-    <path d="M 149.85669,118.26878 C 164.00763,132.41972 165.42631,153.13772 150.14329,178.04338" stroke="#000" stroke-width="31.579" stroke-linecap="round" fill="none"/>
-    <path d="M 142.6415,184.94852 L 113.78657,188.92784 L 79.245291,180.42022" stroke="#000" stroke-width="19.737" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 215.38225,95.396218 L 191.54911,118.32771 L 155.52851,118.21357" stroke="#000" stroke-width="15.789" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 157.3585,183.8335 L 186.21343,179.85418 L 220.75471,188.3618" stroke="#000" stroke-width="19.737" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 89.302099,140.96922 L 113.13523,118.03771 L 149.15584,118.15185" stroke="#000" stroke-width="15.789" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="38"
+   height="38"
+   viewBox="0 0 300 300"
+   id="symbol-gymnastics-borderless">
+  <defs
+     id="defs2474" />
+  <path
+     d="M 142.10734,83.91085 C 142.11038,92.840056 134.87265,100.08023 125.9434,100.08023 C 117.01416,100.08023 109.77643,92.840056 109.77947,83.91085 C 109.77643,74.9816 117.01416,67.74141 125.9434,67.74141 C 134.87265,67.74141 142.11038,74.9816 142.10734,83.91085 L 142.10734,83.91085 z"
+     id="path2387"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 149.85669,118.26878 C 164.00763,132.41972 165.42631,153.13772 150.14329,178.04338"
+     id="path2383"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:31.57894707;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 142.6415,184.94852 L 113.78657,188.92784 L 79.245291,180.42022"
+     id="path3157"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:19.7368412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 215.38225,95.396218 L 191.54911,118.32771 L 155.52851,118.21357"
+     id="path3159"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:15.78947353;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 157.3585,183.8335 L 186.21343,179.85418 L 220.75471,188.3618"
+     id="path2388"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:19.7368412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 89.302099,140.96922 L 113.13523,118.03771 L 149.15584,118.15185"
+     id="path2390"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:15.78947353;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/gymnastics.svg b/data/styles/symbols/gymnastics.svg
index e8d0926b2c..fe73b95794 100644
--- a/data/styles/symbols/gymnastics.svg
+++ b/data/styles/symbols/gymnastics.svg
@@ -1,9 +1,45 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="38" height="38" viewBox="0 0 300 300">
-    <rect width="269.521" height="258.248" ry="20.87" x="15.29" y="20.639" stroke="#000" stroke-width="14.69" stroke-linejoin="round" fill="none"/>
-    <path d="M 142.10734,83.91085 C 142.11038,92.840056 134.87265,100.08023 125.9434,100.08023 C 117.01416,100.08023 109.77643,92.840056 109.77947,83.91085 C 109.77643,74.9816 117.01416,67.74141 125.9434,67.74141 C 134.87265,67.74141 142.11038,74.9816 142.10734,83.91085 L 142.10734,83.91085 z" fill-rule="evenodd" stroke="#000"/>
-    <path d="M 149.85669,118.26878 C 164.00763,132.41972 165.42631,153.13772 150.14329,178.04338" stroke="#000" stroke-width="31.579" stroke-linecap="round" fill="none"/>
-    <path d="M 142.6415,184.94852 L 113.78657,188.92784 L 79.245291,180.42022" stroke="#000" stroke-width="19.737" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 215.38225,95.396218 L 191.54911,118.32771 L 155.52851,118.21357" stroke="#000" stroke-width="15.789" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 157.3585,183.8335 L 186.21343,179.85418 L 220.75471,188.3618" stroke="#000" stroke-width="19.737" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 89.302099,140.96922 L 113.13523,118.03771 L 149.15584,118.15185" stroke="#000" stroke-width="15.789" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="38"
+   height="38"
+   viewBox="0 0 300 300"
+   id="symbol-gymnastics">
+  <defs
+     id="defs2474" />
+  <rect
+     width="269.52087"
+     height="258.24777"
+     ry="20.869576"
+     x="15.289689"
+     y="20.638819"
+     id="rect2471"
+     style="fill:none;stroke:#000000;stroke-width:14.68965149;stroke-linejoin:round;stroke-miterlimit:4" />
+  <path
+     d="M 142.10734,83.91085 C 142.11038,92.840056 134.87265,100.08023 125.9434,100.08023 C 117.01416,100.08023 109.77643,92.840056 109.77947,83.91085 C 109.77643,74.9816 117.01416,67.74141 125.9434,67.74141 C 134.87265,67.74141 142.11038,74.9816 142.10734,83.91085 L 142.10734,83.91085 z"
+     id="path2387"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 149.85669,118.26878 C 164.00763,132.41972 165.42631,153.13772 150.14329,178.04338"
+     id="path2383"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:31.57894707;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 142.6415,184.94852 L 113.78657,188.92784 L 79.245291,180.42022"
+     id="path3157"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:19.7368412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 215.38225,95.396218 L 191.54911,118.32771 L 155.52851,118.21357"
+     id="path3159"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:15.78947353;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 157.3585,183.8335 L 186.21343,179.85418 L 220.75471,188.3618"
+     id="path2388"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:19.7368412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 89.302099,140.96922 L 113.13523,118.03771 L 149.15584,118.15185"
+     id="path2390"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:15.78947353;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/hairdresser.svg b/data/styles/symbols/hairdresser.svg
index 1e64f5b0e4..3ba4ea3272 100644
--- a/data/styles/symbols/hairdresser.svg
+++ b/data/styles/symbols/hairdresser.svg
@@ -1,24 +1,274 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 8)" fill="#4d4d4d">
-        <path d="M 4.5,9 C 3.1192882,9 2,10.119288 2,11.5 2,12.880712 3.1192882,14 4.5,14 5.8807118,14 7,12.880712 7,11.5 7,10.119288 5.8807118,9 4.5,9 z m 0,1.25 c 0.6903559,0 1.25,0.559644 1.25,1.25 0,0.690356 -0.5596441,1.25 -1.25,1.25 -0.6903559,0 -1.25,-0.559644 -1.25,-1.25 0,-0.690356 0.5596441,-1.25 1.25,-1.25 z"/>
-        <path d="M 11.5,9 C 10.119288,9 9,10.119288 9,11.5 9,12.880712 10.119288,14 11.5,14 12.880712,14 14,12.880712 14,11.5 14,10.119288 12.880712,9 11.5,9 z m 0,1.25 c 0.690356,0 1.25,0.559644 1.25,1.25 0,0.690356 -0.559644,1.25 -1.25,1.25 -0.690356,0 -1.25,-0.559644 -1.25,-1.25 0,-0.690356 0.559644,-1.25 1.25,-1.25 z"/>
-        <path d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z" transform="matrix(.5 0 0 .5 10 2)"/>
-        <rect width="2" height="18" x="20" y="-5" ry=".101"/>
-        <path transform="matrix(.5 0 0 .5 10 -16)" d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"/>
-        <rect width="5.5" height="1" x="15.5" y="-6" ry=".062"/>
-        <path d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z" transform="matrix(.25 0 0 .25 10 -11)"/>
-        <path d="m 2,2 4,11 -1,5 1,1 2,-5 2,5 1,-1 -1,-5 4,-11 -6,9 z" transform="translate(0 -8)"/>
-        <rect ry=".062" y="-4" x="15.5" height="1" width="6.5"/>
-        <path transform="matrix(.25 0 0 .25 10 -9)" d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"/>
-        <rect width="6.5" height="1" x="15.5" y="-2" ry=".062"/>
-        <path d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z" transform="matrix(.25 0 0 .25 10 -7)"/>
-        <rect ry=".062" x="15.5" height="1" width="6.5"/>
-        <path transform="matrix(.25 0 0 .25 10 -5)" d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"/>
-        <rect width="6.5" height="1" x="15.5" y="2" ry=".062"/>
-        <path d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z" transform="matrix(.25 0 0 .25 10 -3)"/>
-        <rect ry=".062" y="4" x="15.5" height="1" width="6.5"/>
-        <path transform="matrix(.25 0 0 .25 10 -1)" d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"/>
-        <rect width="6.5" height="1" x="15.5" y="6" ry=".062"/>
-        <path d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z" transform="matrix(.25 0 0 .25 10 1)"/>
-    </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2816"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="hairdresser.svg">
+  <defs
+     id="defs2818">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective2824" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="2.0006907"
+     inkscape:cy="11.925233"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1109"
+     inkscape:window-height="756"
+     inkscape:window-x="168"
+     inkscape:window-y="37"
+     inkscape:window-maximized="0"
+     inkscape:snap-from-guide="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2997"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2821">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:description />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+        <dc:date>11-11-11</dc:date>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title></dc:title>
+          </cc:Agent>
+        </dc:publisher>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,8)">
+    <path
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       d="M 4.5,9 C 3.1192882,9 2,10.119288 2,11.5 2,12.880712 3.1192882,14 4.5,14 5.8807118,14 7,12.880712 7,11.5 7,10.119288 5.8807118,9 4.5,9 z m 0,1.25 c 0.6903559,0 1.25,0.559644 1.25,1.25 0,0.690356 -0.5596441,1.25 -1.25,1.25 -0.6903559,0 -1.25,-0.559644 -1.25,-1.25 0,-0.690356 0.5596441,-1.25 1.25,-1.25 z"
+       id="path2999"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       d="M 11.5,9 C 10.119288,9 9,10.119288 9,11.5 9,12.880712 10.119288,14 11.5,14 12.880712,14 14,12.880712 14,11.5 14,10.119288 12.880712,9 11.5,9 z m 0,1.25 c 0.690356,0 1.25,0.559644 1.25,1.25 0,0.690356 -0.559644,1.25 -1.25,1.25 -0.690356,0 -1.25,-0.559644 -1.25,-1.25 0,-0.690356 0.559644,-1.25 1.25,-1.25 z"
+       id="path3003"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="path3007"
+       sodipodi:cx="22"
+       sodipodi:cy="22"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"
+       transform="matrix(0.5,0,0,0.5,10,2)" />
+    <rect
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="rect3009"
+       width="2"
+       height="18"
+       x="20"
+       y="-5"
+       ry="0.1013614" />
+    <path
+       transform="matrix(0.5,0,0,0.5,10,-16)"
+       d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"
+       sodipodi:ry="2"
+       sodipodi:rx="2"
+       sodipodi:cy="22"
+       sodipodi:cx="22"
+       id="path3017"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <rect
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="rect3019"
+       width="5.5"
+       height="1"
+       x="15.5"
+       y="-6"
+       ry="0.061943077" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="path3021"
+       sodipodi:cx="22"
+       sodipodi:cy="22"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"
+       transform="matrix(0.25,0,0,0.25,10,-11)" />
+    <path
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       d="m 2,2 4,11 -1,5 1,1 2,-5 2,5 1,-1 -1,-5 4,-11 -6,9 z"
+       transform="translate(0,-8)"
+       id="path3057"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccc" />
+    <rect
+       ry="0.061943077"
+       y="-4"
+       x="15.5"
+       height="1"
+       width="6.5"
+       id="rect3005"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+    <path
+       transform="matrix(0.25,0,0,0.25,10,-9)"
+       d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"
+       sodipodi:ry="2"
+       sodipodi:rx="2"
+       sodipodi:cy="22"
+       sodipodi:cx="22"
+       id="path3008"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <rect
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="rect3010"
+       width="6.5"
+       height="1"
+       x="15.5"
+       y="-2"
+       ry="0.061943077" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="path3012"
+       sodipodi:cx="22"
+       sodipodi:cy="22"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"
+       transform="matrix(0.25,0,0,0.25,10,-7)" />
+    <rect
+       ry="0.061943077"
+       y="0"
+       x="15.5"
+       height="1"
+       width="6.5"
+       id="rect3014"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+    <path
+       transform="matrix(0.25,0,0,0.25,10,-5)"
+       d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"
+       sodipodi:ry="2"
+       sodipodi:rx="2"
+       sodipodi:cy="22"
+       sodipodi:cx="22"
+       id="path3016"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <rect
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="rect3018"
+       width="6.5"
+       height="1"
+       x="15.5"
+       y="2"
+       ry="0.061943077" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="path3020"
+       sodipodi:cx="22"
+       sodipodi:cy="22"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"
+       transform="matrix(0.25,0,0,0.25,10,-3)" />
+    <rect
+       ry="0.061943077"
+       y="4"
+       x="15.5"
+       height="1"
+       width="6.5"
+       id="rect3022"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+    <path
+       transform="matrix(0.25,0,0,0.25,10,-1)"
+       d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"
+       sodipodi:ry="2"
+       sodipodi:rx="2"
+       sodipodi:cy="22"
+       sodipodi:cx="22"
+       id="path3024"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <rect
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="rect3026"
+       width="6.5"
+       height="1"
+       x="15.5"
+       y="6"
+       ry="0.061943077" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="path3028"
+       sodipodi:cx="22"
+       sodipodi:cy="22"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"
+       transform="matrix(0.25,0,0,0.25,10,1)" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/handball-borderless.svg b/data/styles/symbols/handball-borderless.svg
index 47a305843d..1fd796d33e 100644
--- a/data/styles/symbols/handball-borderless.svg
+++ b/data/styles/symbols/handball-borderless.svg
@@ -1,7 +1,71 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="35" height="35">
-    <path d="M 16.589448,18.010913 C 16.589448,18.010913 13.05624,20.70255 12.293558,21.213292 C 11.518624,21.732245 11.098373,21.944279 10.465907,21.31787 C 9.8428713,20.700812 10.366579,20.423544 10.948589,19.848537 C 11.518144,19.285823 15.103458,16.441775 15.103458,16.441775 L 16.589448,18.010913 z" fill="#505050" fill-rule="evenodd"/>
-    <path d="M 17.58643,18.809652 C 17.58643,18.809652 9.2457335,28.998698 8.7472953,29.652571 C 8.2420429,30.315382 8.4440585,30.700868 8.8533125,31.016895 C 9.2532074,31.325705 9.812923,31.249828 10.238458,30.722454 C 10.656681,30.204128 18.913822,19.966775 18.913822,19.966775 L 17.58643,18.809652 z" fill="#505050" fill-rule="evenodd"/>
-    <path d="M 17.464983,5.1398254 C 17.465947,5.6035435 17.210058,6.0324156 16.793918,6.2645464 C 16.377778,6.4966772 15.864772,6.4966772 15.448632,6.2645464 C 15.032492,6.0324156 14.776603,5.6035435 14.777567,5.1398254 C 14.776603,4.6761073 15.032492,4.2472351 15.448632,4.0151044 C 15.864772,3.7829736 16.377778,3.7829736 16.793918,4.0151044 C 17.210058,4.2472351 17.465947,4.6761073 17.464983,5.1398254 z" fill="#505050" stroke="#000" stroke-width=".338"/>
-    <path d="M 24.984297,10.22404 C 26.426958,10.959748 29.698074,14.081862 29.698074,14.081862 C 30.780527,15.400055 30.801967,16.833131 29.168881,17.689998 C 27.612294,18.506724 25.533288,19.331673 24.498495,19.658419 C 23.473319,19.982137 23.00366,19.969339 22.866867,19.293586 C 22.730668,18.620778 23.45578,18.204887 24.125677,17.910469 C 24.821232,17.604793 25.497399,17.429284 26.915888,16.531386 C 28.348685,15.624426 27.906069,15.352546 26.851746,14.458703 C 25.789469,13.558116 24.484784,13.291543 23.69671,14.394588 C 22.590858,15.873326 20.915653,18.522663 20.569765,18.952821 C 20.229438,19.376051 19.876684,19.693889 19.351934,19.439065 C 18.831567,19.186368 16.130816,17.021808 15.755227,16.432973 C 15.396489,15.870577 15.364756,15.728135 15.823321,15.096226 C 16.276477,14.471757 17.250359,13.300122 17.250359,13.300122 C 18.445397,11.80368 19.659172,11.143585 16.963382,10.68032 C 14.271343,10.217701 13.67584,8.2056826 13.531733,6.6850334 C 13.396458,5.257585 14.079132,4.9809583 14.393516,5.4552365 C 14.711822,5.9354331 14.679835,7.3830144 15.840412,8.1609147 C 17.021706,8.9527009 20.222949,8.3886395 21.960419,8.8990018 C 23.697888,9.4093653 23.554,9.4946379 24.984297,10.22404 z" fill="#505050" fill-rule="evenodd"/>
-    <path d="M 27.071176,7.0635363 C 27.071176,8.2591549 26.101953,9.2284166 24.906342,9.2284166 C 23.710761,9.2284166 22.741538,8.2591549 22.741538,7.0635363 C 22.741538,5.8679176 23.710761,4.8986559 24.906342,4.8986559 C 26.101953,4.8986559 27.071176,5.8679176 27.071176,7.0635363 L 27.071176,7.0635363 z" fill="#505050"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="35"
+   height="35"
+   id="symbol-handball-borderless"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="handball-borderless.svg">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="6.7428571"
+     inkscape:cx="17.5"
+     inkscape:cy="17.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-handball-borderless" />
+  <defs
+     id="defs3341" />
+  <path
+     d="M 16.589448,18.010913 C 16.589448,18.010913 13.05624,20.70255 12.293558,21.213292 C 11.518624,21.732245 11.098373,21.944279 10.465907,21.31787 C 9.8428713,20.700812 10.366579,20.423544 10.948589,19.848537 C 11.518144,19.285823 15.103458,16.441775 15.103458,16.441775 L 16.589448,18.010913 z "
+     style="fill:#505050;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path8185" />
+  <path
+     d="M 17.58643,18.809652 C 17.58643,18.809652 9.2457335,28.998698 8.7472953,29.652571 C 8.2420429,30.315382 8.4440585,30.700868 8.8533125,31.016895 C 9.2532074,31.325705 9.812923,31.249828 10.238458,30.722454 C 10.656681,30.204128 18.913822,19.966775 18.913822,19.966775 L 17.58643,18.809652 z "
+     style="fill:#505050;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path8187" />
+  <path
+     d="M 17.464983,5.1398254 C 17.465947,5.6035435 17.210058,6.0324156 16.793918,6.2645464 C 16.377778,6.4966772 15.864772,6.4966772 15.448632,6.2645464 C 15.032492,6.0324156 14.776603,5.6035435 14.777567,5.1398254 C 14.776603,4.6761073 15.032492,4.2472351 15.448632,4.0151044 C 15.864772,3.7829736 16.377778,3.7829736 16.793918,4.0151044 C 17.210058,4.2472351 17.465947,4.6761073 17.464983,5.1398254 z "
+     style="fill:#505050;fill-opacity:1;stroke:#000000;stroke-width:0.33762848000000001;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path8189" />
+  <path
+     d="M 24.984297,10.22404 C 26.426958,10.959748 29.698074,14.081862 29.698074,14.081862 C 30.780527,15.400055 30.801967,16.833131 29.168881,17.689998 C 27.612294,18.506724 25.533288,19.331673 24.498495,19.658419 C 23.473319,19.982137 23.00366,19.969339 22.866867,19.293586 C 22.730668,18.620778 23.45578,18.204887 24.125677,17.910469 C 24.821232,17.604793 25.497399,17.429284 26.915888,16.531386 C 28.348685,15.624426 27.906069,15.352546 26.851746,14.458703 C 25.789469,13.558116 24.484784,13.291543 23.69671,14.394588 C 22.590858,15.873326 20.915653,18.522663 20.569765,18.952821 C 20.229438,19.376051 19.876684,19.693889 19.351934,19.439065 C 18.831567,19.186368 16.130816,17.021808 15.755227,16.432973 C 15.396489,15.870577 15.364756,15.728135 15.823321,15.096226 C 16.276477,14.471757 17.250359,13.300122 17.250359,13.300122 C 18.445397,11.80368 19.659172,11.143585 16.963382,10.68032 C 14.271343,10.217701 13.67584,8.2056826 13.531733,6.6850334 C 13.396458,5.257585 14.079132,4.9809583 14.393516,5.4552365 C 14.711822,5.9354331 14.679835,7.3830144 15.840412,8.1609147 C 17.021706,8.9527009 20.222949,8.3886395 21.960419,8.8990018 C 23.697888,9.4093653 23.554,9.4946379 24.984297,10.22404 z "
+     style="fill:#505050;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path8191" />
+  <path
+     d="M 27.071176,7.0635363 C 27.071176,8.2591549 26.101953,9.2284166 24.906342,9.2284166 C 23.710761,9.2284166 22.741538,8.2591549 22.741538,7.0635363 C 22.741538,5.8679176 23.710761,4.8986559 24.906342,4.8986559 C 26.101953,4.8986559 27.071176,5.8679176 27.071176,7.0635363 L 27.071176,7.0635363 z "
+     style="fill:#505050;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path8193" />
 </svg>
diff --git a/data/styles/symbols/handball.svg b/data/styles/symbols/handball.svg
index b672e1ecc1..e2eb9aa2e9 100644
--- a/data/styles/symbols/handball.svg
+++ b/data/styles/symbols/handball.svg
@@ -1,10 +1,46 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="35" height="35">
-    <g transform="matrix(.123 0 0 .123 -6.234 -39.227)">
-        <path d="M 185.45832,465.0883 C 185.45832,465.0883 156.74867,486.9591 150.55137,491.10912 C 144.25452,495.32585 140.8397,497.04873 135.7005,491.95886 C 130.63792,486.94498 134.89339,484.69205 139.62261,480.01985 C 144.25062,475.44754 173.38367,452.33833 173.38367,452.33833 L 185.45832,465.0883 z" fill-rule="evenodd"/>
-        <path d="M 193.55946,471.57843 C 193.55946,471.57843 125.78578,554.36915 121.73564,559.68217 C 117.63013,565.06782 119.27164,568.20007 122.5971,570.76794 C 125.84651,573.27716 130.39457,572.66063 133.85232,568.37547 C 137.25066,564.16383 204.3454,480.98059 204.3454,480.98059 L 193.55946,471.57843 z" fill-rule="evenodd"/>
-        <path d="M 176.96875,238.12976 C 176.96919,238.41135 176.8524,238.67178 176.66247,238.81274 C 176.47254,238.9537 176.2384,238.9537 176.04847,238.81274 C 175.85854,238.67178 175.74175,238.41135 175.74219,238.12976 C 175.74175,237.84817 175.85854,237.58774 176.04847,237.44678 C 176.2384,237.30582 176.47254,237.30582 176.66247,237.44678 C 176.8524,237.58774 176.96919,237.84817 176.96875,238.12976 z" transform="matrix(17.803 0 0 13.381 -2958.086 -2825.883)" stroke="#000" stroke-width=".178"/>
-        <path d="M 253.67202,401.81635 C 265.3946,407.79432 291.97458,433.16294 291.97458,433.16294 C 300.77023,443.87387 300.94444,455.51828 287.67454,462.48072 C 275.02624,469.117 258.13294,475.82009 249.72456,478.47505 C 241.39433,481.10541 237.57804,481.00142 236.4665,475.51062 C 235.3598,470.04374 241.25181,466.66443 246.69517,464.27215 C 252.34701,461.78839 257.84132,460.3623 269.36748,453.06646 C 281.0099,445.69699 277.41335,443.48784 268.84628,436.22495 C 260.21458,428.90726 249.61315,426.74123 243.20953,435.70399 C 234.22375,447.71942 220.6116,469.24651 217.80103,472.74174 C 215.03565,476.18068 212.16929,478.76326 207.90535,476.6927 C 203.67702,474.63942 181.73163,457.05137 178.67972,452.26681 C 175.76474,447.69708 175.50689,446.53967 179.23303,441.40512 C 182.91522,436.33102 190.82866,426.81094 190.82866,426.81094 C 200.53913,414.65166 210.40186,409.28808 188.49678,405.52384 C 166.62218,401.76484 161.78333,385.41626 160.61236,373.06028 C 159.51316,361.4616 165.06034,359.21388 167.61492,363.06761 C 170.20137,366.96943 169.94145,378.7317 179.37191,385.0525 C 188.9707,391.48613 214.98292,386.90287 229.10101,391.0498 C 243.2191,395.19674 242.04991,395.88962 253.67202,401.81635 z" fill-rule="evenodd"/>
-        <path d="M 179.09375,229.38562 C 179.09375,229.74374 178.77895,230.03406 178.39062,230.03406 C 178.0023,230.03406 177.6875,229.74374 177.6875,229.38562 C 177.6875,229.0275 178.0023,228.73718 178.39062,228.73718 C 178.77895,228.73718 179.09375,229.0275 179.09375,229.38562 L 179.09375,229.38562 z" transform="matrix(25.018 0 0 27.128 -4209.889 -5846.558)"/>
-        <rect width="269.398" height="269.398" ry="21.771" x="58.158" y="326.235" stroke="#000" stroke-width="15" stroke-linejoin="round" fill="none"/>
-    </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="35"
+   height="35"
+   id="symbol-handball">
+  <defs
+     id="defs3341" />
+  <g
+     transform="matrix(0.1230669,0,0,0.1230699,-6.2343325,-39.227458)"
+     id="layer1">
+    <path
+       d="M 185.45832,465.0883 C 185.45832,465.0883 156.74867,486.9591 150.55137,491.10912 C 144.25452,495.32585 140.8397,497.04873 135.7005,491.95886 C 130.63792,486.94498 134.89339,484.69205 139.62261,480.01985 C 144.25062,475.44754 173.38367,452.33833 173.38367,452.33833 L 185.45832,465.0883 z "
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path8185" />
+    <path
+       d="M 193.55946,471.57843 C 193.55946,471.57843 125.78578,554.36915 121.73564,559.68217 C 117.63013,565.06782 119.27164,568.20007 122.5971,570.76794 C 125.84651,573.27716 130.39457,572.66063 133.85232,568.37547 C 137.25066,564.16383 204.3454,480.98059 204.3454,480.98059 L 193.55946,471.57843 z "
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path8187" />
+    <path
+       d="M 176.96875,238.12976 C 176.96919,238.41135 176.8524,238.67178 176.66247,238.81274 C 176.47254,238.9537 176.2384,238.9537 176.04847,238.81274 C 175.85854,238.67178 175.74175,238.41135 175.74219,238.12976 C 175.74175,237.84817 175.85854,237.58774 176.04847,237.44678 C 176.2384,237.30582 176.47254,237.30582 176.66247,237.44678 C 176.8524,237.58774 176.96919,237.84817 176.96875,238.12976 z "
+       transform="matrix(17.803476,0,0,13.380889,-2958.0863,-2825.8832)"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.1777451;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path8189" />
+    <path
+       d="M 253.67202,401.81635 C 265.3946,407.79432 291.97458,433.16294 291.97458,433.16294 C 300.77023,443.87387 300.94444,455.51828 287.67454,462.48072 C 275.02624,469.117 258.13294,475.82009 249.72456,478.47505 C 241.39433,481.10541 237.57804,481.00142 236.4665,475.51062 C 235.3598,470.04374 241.25181,466.66443 246.69517,464.27215 C 252.34701,461.78839 257.84132,460.3623 269.36748,453.06646 C 281.0099,445.69699 277.41335,443.48784 268.84628,436.22495 C 260.21458,428.90726 249.61315,426.74123 243.20953,435.70399 C 234.22375,447.71942 220.6116,469.24651 217.80103,472.74174 C 215.03565,476.18068 212.16929,478.76326 207.90535,476.6927 C 203.67702,474.63942 181.73163,457.05137 178.67972,452.26681 C 175.76474,447.69708 175.50689,446.53967 179.23303,441.40512 C 182.91522,436.33102 190.82866,426.81094 190.82866,426.81094 C 200.53913,414.65166 210.40186,409.28808 188.49678,405.52384 C 166.62218,401.76484 161.78333,385.41626 160.61236,373.06028 C 159.51316,361.4616 165.06034,359.21388 167.61492,363.06761 C 170.20137,366.96943 169.94145,378.7317 179.37191,385.0525 C 188.9707,391.48613 214.98292,386.90287 229.10101,391.0498 C 243.2191,395.19674 242.04991,395.88962 253.67202,401.81635 z "
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path8191" />
+    <path
+       d="M 179.09375,229.38562 C 179.09375,229.74374 178.77895,230.03406 178.39062,230.03406 C 178.0023,230.03406 177.6875,229.74374 177.6875,229.38562 C 177.6875,229.0275 178.0023,228.73718 178.39062,228.73718 C 178.77895,228.73718 179.09375,229.0275 179.09375,229.38562 L 179.09375,229.38562 z "
+       transform="matrix(25.017727,0,0,27.127655,-4209.8892,-5846.5582)"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path8193" />
+    <rect
+       width="269.39795"
+       height="269.39795"
+       ry="21.770645"
+       x="58.158169"
+       y="326.23465"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:15;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3941" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/helipad.svg b/data/styles/symbols/helipad.svg
index e1b6a599e4..299a8ed754 100644
--- a/data/styles/symbols/helipad.svg
+++ b/data/styles/symbols/helipad.svg
@@ -1,13 +1,105 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 700 700" width="37.28" height="37.28">
-    <path d="m 104.97375,323.96689 c 34.77389,0.19188 62.85219,-24.75254 62.6362,-55.45335 0.21599,-30.70082 -27.86231,-55.64523 -62.6362,-55.64523 -34.341912,0 -62.420207,24.94441 -62.636193,55.64523 0.215986,30.70081 28.294281,55.64523 62.636193,55.45335 z" fill="#505050"/>
-    <path d="m 104.97375,303.81948 c 22.24666,0 39.95758,-15.73417 39.95758,-35.30594 0,-19.57177 -17.71092,-35.49782 -39.95758,-35.49782 -21.814672,0 -39.741584,15.92605 -39.741584,35.49782 0,19.57177 17.926912,35.30594 39.741584,35.30594 z" fill="#fff"/>
-    <path d="m 306.48952,446.77015 c -47.7331,0 -47.7331,57.18027 0,57.18027 l 276.89518,0 c 46.43719,0 46.43719,-57.18027 0,-57.18027 l -276.89518,0 z" fill="#505050"/>
-    <polygon points="321.89,163.85 301.55,163.85 301.55,212.63 321.89,212.63 321.89,212.63" transform="matrix(1.2 0 0 1.066 1.888 23.237)" fill="#505050"/>
-    <polygon points="353.57,154.67 270.41,154.67 270.41,165.11 353.57,165.11 353.57,165.11" transform="matrix(1.2 0 0 1.066 1.888 23.237)" fill="#505050"/>
-    <path d="m 434.78573,180.44057 159.61431,0 c 21.3827,0 21.3827,27.0551 0,27.0551 l -159.61431,0 c -20.73474,0 -20.73474,-27.0551 0,-27.0551 z" fill="#505050"/>
-    <path d="m 158.10653,180.44057 157.88641,0 c 21.3827,0 21.3827,27.0551 0,27.0551 l -157.88641,0 c -22.46264,0 -22.89461,-27.0551 0,-27.0551 z" fill="#505050"/>
-    <path d="m 331.32801,409.92917 c -20.51875,0 -30.67014,-13.23973 -34.12593,-24.56065 L 281.21905,349.67882 98.710138,285.20711 c -22.030667,-7.48333 -16.630995,-36.6491 8.423482,-36.6491 l 396.11995,0 c 44.06133,0 68.68383,23.60125 80.13113,48.54566 l 31.75008,68.69308 c 11.4473,23.60125 -7.77553,44.13242 -36.2858,44.13242 l -247.52097,0 z" fill="#505050"/>
-    <polygon points="357.89,232.07 322.25,232.07 322.25,289.13 357.89,289.13 357.89,289.13" transform="matrix(1.2 0 0 1.066 1.888 23.237)" fill="#fff"/>
-    <polygon points="414.23,289.13 378.95,289.13 378.95,232.07 414.23,232.07 414.23,232.07" transform="matrix(1.2 0 0 1.066 1.888 23.237)" fill="#fff"/>
-    <path d="m 524.85226,273.11866 c 13.1752,2.8782 26.3504,13.43161 34.98987,30.70082 l 13.60718,27.82261 -48.59705,0 0,-58.52343 z" fill="#fff"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="symbol-helipad"
+   viewBox="0 0 700 700"
+   width="37.28"
+   height="37.28"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="helipad.svg">
+  <metadata
+     id="metadata35">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs33" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview31"
+     showgrid="false"
+     inkscape:zoom="6.3304723"
+     inkscape:cx="18.639999"
+     inkscape:cy="15.323264"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-helipad" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path9"
+     d="m 104.97375,323.96689 c 34.77389,0.19188 62.85219,-24.75254 62.6362,-55.45335 0.21599,-30.70082 -27.86231,-55.64523 -62.6362,-55.64523 -34.341912,0 -62.420207,24.94441 -62.636193,55.64523 0.215986,30.70081 28.294281,55.64523 62.636193,55.45335 z"
+     style="fill:#505050;fill-rule:nonzero;stroke:none;fill-opacity:1" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path11"
+     d="m 104.97375,303.81948 c 22.24666,0 39.95758,-15.73417 39.95758,-35.30594 0,-19.57177 -17.71092,-35.49782 -39.95758,-35.49782 -21.814672,0 -39.741584,15.92605 -39.741584,35.49782 0,19.57177 17.926912,35.30594 39.741584,35.30594 z"
+     style="fill:#ffffff;fill-rule:nonzero;stroke:none;fill-opacity:1" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path13"
+     d="m 306.48952,446.77015 c -47.7331,0 -47.7331,57.18027 0,57.18027 l 276.89518,0 c 46.43719,0 46.43719,-57.18027 0,-57.18027 l -276.89518,0 z"
+     style="fill:#505050;fill-rule:nonzero;stroke:none;fill-opacity:1" />
+  <polygon
+     id="polygon15"
+     points="321.89,163.85 301.55,163.85 301.55,212.63 321.89,212.63 321.89,212.63 "
+     style="fill:#505050;fill-rule:nonzero;stroke:none;fill-opacity:1"
+     transform="matrix(1.1999271,0,0,1.0660006,1.8880147,23.237473)" />
+  <polygon
+     id="polygon17"
+     points="353.57,154.67 270.41,154.67 270.41,165.11 353.57,165.11 353.57,165.11 "
+     style="fill:#505050;fill-rule:nonzero;stroke:none;fill-opacity:1"
+     transform="matrix(1.1999271,0,0,1.0660006,1.8880147,23.237473)" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path19"
+     d="m 434.78573,180.44057 159.61431,0 c 21.3827,0 21.3827,27.0551 0,27.0551 l -159.61431,0 c -20.73474,0 -20.73474,-27.0551 0,-27.0551 z"
+     style="fill:#505050;fill-rule:nonzero;stroke:none;fill-opacity:1" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path21"
+     d="m 158.10653,180.44057 157.88641,0 c 21.3827,0 21.3827,27.0551 0,27.0551 l -157.88641,0 c -22.46264,0 -22.89461,-27.0551 0,-27.0551 z"
+     style="fill:#505050;fill-rule:nonzero;stroke:none;fill-opacity:1" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path23"
+     d="m 331.32801,409.92917 c -20.51875,0 -30.67014,-13.23973 -34.12593,-24.56065 L 281.21905,349.67882 98.710138,285.20711 c -22.030667,-7.48333 -16.630995,-36.6491 8.423482,-36.6491 l 396.11995,0 c 44.06133,0 68.68383,23.60125 80.13113,48.54566 l 31.75008,68.69308 c 11.4473,23.60125 -7.77553,44.13242 -36.2858,44.13242 l -247.52097,0 z"
+     style="fill:#505050;fill-rule:nonzero;stroke:none;fill-opacity:1" />
+  <polygon
+     id="polygon25"
+     points="357.89,232.07 322.25,232.07 322.25,289.13 357.89,289.13 357.89,289.13 "
+     style="fill:#ffffff;fill-rule:nonzero;stroke:none"
+     transform="matrix(1.1999271,0,0,1.0660006,1.8880147,23.237473)" />
+  <polygon
+     id="polygon27"
+     points="414.23,289.13 378.95,289.13 378.95,232.07 414.23,232.07 414.23,232.07 "
+     style="fill:#ffffff;fill-rule:nonzero;stroke:none"
+     transform="matrix(1.1999271,0,0,1.0660006,1.8880147,23.237473)" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path29"
+     d="m 524.85226,273.11866 c 13.1752,2.8782 26.3504,13.43161 34.98987,30.70082 l 13.60718,27.82261 -48.59705,0 0,-58.52343 z"
+     style="fill:#ffffff;fill-rule:nonzero;stroke:none" />
 </svg>
diff --git a/data/styles/symbols/hospital.svg b/data/styles/symbols/hospital.svg
index 7f9e1ff9b6..2625496981 100644
--- a/data/styles/symbols/hospital.svg
+++ b/data/styles/symbols/hospital.svg
@@ -1,3 +1,64 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="0 0 22.4 22.4" height="24" stroke="#e60202" stroke-width="3" fill="none">
-    <path d="M 12 2 C 6.4771525 2 2 6.4771525 2 12 C 2 17.522847 6.4771525 22 12 22 C 17.522847 22 22 17.522847 22 12 C 22 6.4771525 17.522847 2 12 2 z M 12 4 C 16.418278 4 20 7.581722 20 12 C 20 16.418278 16.418278 20 12 20 C 7.581722 20 4 16.418278 4 12 C 4 7.581722 7.581722 4 12 4 z M 10 6 L 10 10 L 6 10 L 6 14 L 10 14 L 10 18 L 14 18 L 14 14 L 18 14 L 18 10 L 14 10 L 14 6 L 10 6 z" transform="scale(.933)" fill="#c70000"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="hospital"
+   viewBox="0 0 22.4 22.4"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="hospital.svg"
+   style="fill:none;stroke:#e60202;stroke-width:3px">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="859"
+     inkscape:window-height="654"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="15.733333"
+     inkscape:cx="7.5"
+     inkscape:cy="11.25"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="hospital">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#c70000;fill-opacity:1;stroke:none"
+     d="M 12 2 C 6.4771525 2 2 6.4771525 2 12 C 2 17.522847 6.4771525 22 12 22 C 17.522847 22 22 17.522847 22 12 C 22 6.4771525 17.522847 2 12 2 z M 12 4 C 16.418278 4 20 7.581722 20 12 C 20 16.418278 16.418278 20 12 20 C 7.581722 20 4 16.418278 4 12 C 4 7.581722 7.581722 4 12 4 z M 10 6 L 10 10 L 6 10 L 6 14 L 10 14 L 10 18 L 14 18 L 14 14 L 18 14 L 18 10 L 14 10 L 14 6 L 10 6 z "
+     transform="scale(0.93333333,0.93333333)"
+     id="path2990" />
 </svg>
diff --git a/data/styles/symbols/hospital0.svg b/data/styles/symbols/hospital0.svg
index 707d133440..90d995f12e 100644
--- a/data/styles/symbols/hospital0.svg
+++ b/data/styles/symbols/hospital0.svg
@@ -1,3 +1,64 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="0 0 22.4 22.4" height="24" stroke="#e60202" stroke-width="3" fill="none">
-    <path d="m 9.3333333,5.6 0,3.7333333 -3.7333333,0 0,3.7333337 3.7333333,0 0,3.733333 3.7333337,0 0,-3.733333 3.733333,0 0,-3.7333337 -3.733333,0 0,-3.7333333 -3.7333337,0 z" fill="#c70000"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="hospital"
+   viewBox="0 0 22.4 22.4"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="hospital.svg"
+   style="fill:none;stroke:#e60202;stroke-width:3px">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="859"
+     inkscape:window-height="654"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="15.733333"
+     inkscape:cx="7.5"
+     inkscape:cy="11.25"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="hospital">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#c70000;fill-opacity:1;stroke:none"
+     d="m 9.3333333,5.6 0,3.7333333 -3.7333333,0 0,3.7333337 3.7333333,0 0,3.733333 3.7333337,0 0,-3.733333 3.733333,0 0,-3.7333337 -3.733333,0 0,-3.7333333 -3.7333337,0 z"
+     id="path2990" />
 </svg>
diff --git a/data/styles/symbols/hostel.svg b/data/styles/symbols/hostel.svg
index dc5c63437b..1f20c97e05 100644
--- a/data/styles/symbols/hostel.svg
+++ b/data/styles/symbols/hostel.svg
@@ -1,3 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="27.96" viewBox="0 0 12.5 12.5" fill="#00f" height="27.96">
-    <svg:path d="M 5.5,4 L 9,0 L 12.5,4 L 11.5,4 L 11.5,8 L 10,8 L 10,5 L 8,5 L 8,8 L 6.5,8 L 6.5,4 L 5.5,4 z M 0.5,3.5 C 2,2.5 2.3,1 2.5,0 C 2.7,1 3,2.5 4.5,3.5 L 3.3,3.5 C 3.3,4 4,5 5,6 L 3,6 L 3,8 L 2,8 L 2,6 L 0,6 C 1,5 1.7,4 1.7,3.5 L 0.5,3.5 z M 0,8 L 0,7.5 L 12.5,7.5 L 12.5,8 L 0,8 z"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="27.96" id="hostel" viewBox="0 0 12.5 12.5" fill="blue" fill-opacity="1" fill-rule="nonzero" stroke="none" height="27.96">
+   <svg:path d="M 5.5,4 L 9,0 L 12.5,4 L 11.5,4 L 11.5,8 L 10,8 L 10,5 L 8,5 L 8,8 L 6.5,8 L 6.5,4 L 5.5,4 z M 0.5,3.5 C 2,2.5 2.3,1 2.5,0 C 2.7,1 3,2.5 4.5,3.5 L 3.3,3.5 C 3.3,4 4,5 5,6 L 3,6 L 3,8 L 2,8 L 2,6 L 0,6 C 1,5 1.7,4 1.7,3.5 L 0.5,3.5 z M 0,8 L 0,7.5 L 12.5,7.5 L 12.5,8 L 0,8 z "/>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/hotel.svg b/data/styles/symbols/hotel.svg
index bd078b584c..99ab2f5104 100644
--- a/data/styles/symbols/hotel.svg
+++ b/data/styles/symbols/hotel.svg
@@ -1,13 +1,163 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="0 0 115.87983 115.87983" height="24" stroke="#000">
-    <title>
-        Hotel Map Icon
-    </title>
-    <rect width="2" height="12" x="2" y="8" transform="scale(4.828)" fill="#4d4d4d"/>
-    <path d="m 4,20 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" transform="scale(4.828)" fill="#4d4d4d"/>
-    <path d="M 4,8 A 1,1 0 1 1 2,8 1,1 0 1 1 4,8 z" transform="scale(4.828)" fill="#4d4d4d"/>
-    <rect y="57.94" x="96.567" height="38.627" width="9.657" fill="#4d4d4d"/>
-    <path transform="matrix(4.828 0 0 4.828 86.91 0)" d="m 4,20 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" fill="#4d4d4d"/>
-    <path transform="matrix(4.828 0 0 4.828 86.91 19.313)" d="M 4,8 A 1,1 0 1 1 2,8 1,1 0 1 1 4,8 z" fill="#4d4d4d"/>
-    <rect width="17" height="2" x="3" y="14" transform="scale(4.828)" fill="#4d4d4d"/>
-    <rect width="28.97" height="14.485" x="24.142" y="48.283" ry="4.828" fill="#4d4d4d"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="hotel"
+   viewBox="0 0 115.87983 115.87983"
+   stroke-miterlimit="4"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="hotel.svg"
+   style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-miterlimit:4">
+  <title
+     id="title3008">Hotel Map Icon</title>
+  <metadata
+     id="metadata9">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Hotel Map Icon</dc:title>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title></dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source></dc:source>
+        <dc:description>mapsforhumans.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="928"
+     inkscape:window-height="643"
+     id="namedview5"
+     showgrid="true"
+     inkscape:zoom="12.660945"
+     inkscape:cx="-4.4230507"
+     inkscape:cy="9.3199997"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="hotel">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <rect
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     id="rect2988"
+     width="2"
+     height="12"
+     x="2"
+     y="8"
+     transform="scale(4.8283262,4.8283262)" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     id="path2990"
+     sodipodi:cx="3"
+     sodipodi:cy="20"
+     sodipodi:rx="1"
+     sodipodi:ry="1"
+     d="m 4,20 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+     transform="scale(4.8283262,4.8283262)" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     id="path2992"
+     sodipodi:cx="3"
+     sodipodi:cy="8"
+     sodipodi:rx="1"
+     sodipodi:ry="1"
+     d="M 4,8 A 1,1 0 1 1 2,8 1,1 0 1 1 4,8 z"
+     transform="scale(4.8283262,4.8283262)" />
+  <rect
+     y="57.939915"
+     x="96.566528"
+     height="38.62661"
+     width="9.6566525"
+     id="rect2994"
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+  <path
+     transform="matrix(4.8283262,0,0,4.8283262,86.909873,0)"
+     d="m 4,20 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+     sodipodi:ry="1"
+     sodipodi:rx="1"
+     sodipodi:cy="20"
+     sodipodi:cx="3"
+     id="path2996"
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     sodipodi:type="arc" />
+  <path
+     transform="matrix(4.8283262,0,0,4.8283262,86.909873,19.313305)"
+     d="M 4,8 A 1,1 0 1 1 2,8 1,1 0 1 1 4,8 z"
+     sodipodi:ry="1"
+     sodipodi:rx="1"
+     sodipodi:cy="8"
+     sodipodi:cx="3"
+     id="path2998"
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     sodipodi:type="arc" />
+  <rect
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     id="rect3000"
+     width="17"
+     height="2"
+     x="3"
+     y="14"
+     transform="scale(4.8283262,4.8283262)" />
+  <rect
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     id="rect3006"
+     width="28.969957"
+     height="14.484979"
+     x="24.141632"
+     y="48.28326"
+     ry="4.8283262" />
 </svg>
diff --git a/data/styles/symbols/hotel_and_restaurant.svg b/data/styles/symbols/hotel_and_restaurant.svg
index 0df3d9f0b2..1a379ea8e3 100644
--- a/data/styles/symbols/hotel_and_restaurant.svg
+++ b/data/styles/symbols/hotel_and_restaurant.svg
@@ -1,8 +1,34 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="13.98" height="13.98" viewBox="0 0 115 115">
-    <path d="M 61.175133,-37.847215 L -18.558221,23.122331 L -0.15821111,23.122331 L -0.15821111,115.12234 L 116.37516,115.12234 L 116.37516,23.122331 L 134.77517,23.122331 L 61.175133,-37.847215 z"/>
-    <g fill="#fff">
-        <path d="M 94,4 C 90,0 74,18 67,26 C 65,28 62,32 68,38 C 15,89 5,96 12,103 C 19,110 26,100 76,46 C 82,52 87,49 89,47 C 97,40 114,24 110,20 C 106,16 91,40 87,37 C 83,24 106,16 102,12 C 98,8 81,33 77,29 C 73,25 98,8 94,4 z" transform="matrix(.52 0 0 .52 53.354 9.564)"/>
-        <path d="M 35,33 C 79,81 98,96 90,103 C 81,111 70,91 26,42 C 6,57 -9,16 1,6 C 11,-6 55,13 35,33 z" transform="matrix(.52 0 0 .52 53.354 9.564)"/>
-    </g>
-    <path d="M 6.9973827,85.556519 C 6.9973827,89.618914 15.122182,89.618914 15.122182,85.556519 L 15.122182,77.43172 L 35.434179,93.681314 L 35.434179,105.86851 C 35.434179,109.93091 43.558978,109.93091 43.558978,105.86851 L 43.558978,93.681314 L 67.933373,93.681314 L 67.933373,105.86851 C 67.933373,109.93091 76.058173,109.93091 76.058173,105.86851 L 76.058173,85.556519 L 39.496579,85.556519 L 11.059785,61.182122 C 14.309703,53.057323 43.558978,53.057323 47.621377,57.119723 L 47.621377,44.932525 C 47.621377,40.870128 39.496579,40.870128 39.496579,44.932525 L 39.496579,48.994924 L 15.122182,48.994924 L 15.122182,44.932525 C 15.122182,40.870128 6.9973827,40.870128 6.9973827,44.932525 C 6.9973827,44.932525 6.9973827,85.556519 6.9973827,85.556519 z M 15.122182,65.24452 C 19.184583,57.119723 43.558978,57.119723 51.683777,65.24452 L 76.058173,85.556519 C 67.933373,77.43172 39.496579,77.43172 39.496579,85.556519 L 15.122182,65.24452 z" fill="#fff"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="13.98"
+   height="13.98"
+   viewBox="0 0 115 115"
+   id="symbol-restaurant">
+  <defs
+     id="defs10" />
+  <path
+     d="M 61.175133,-37.847215 L -18.558221,23.122331 L -0.15821111,23.122331 L -0.15821111,115.12234 L 116.37516,115.12234 L 116.37516,23.122331 L 134.77517,23.122331 L 61.175133,-37.847215 z "
+     style="fill:black;stroke:none"
+     id="path1949" />
+  <g
+     transform="matrix(0.519844,0,0,0.519844,53.35435,9.564348)"
+     style="fill:white"
+     id="g3">
+    <path
+       d="M 94,4 C 90,0 74,18 67,26 C 65,28 62,32 68,38 C 15,89 5,96 12,103 C 19,110 26,100 76,46 C 82,52 87,49 89,47 C 97,40 114,24 110,20 C 106,16 91,40 87,37 C 83,24 106,16 102,12 C 98,8 81,33 77,29 C 73,25 98,8 94,4 z "
+       style="fill:white"
+       id="path5" />
+    <path
+       d="M 35,33 C 79,81 98,96 90,103 C 81,111 70,91 26,42 C 6,57 -9,16 1,6 C 11,-6 55,13 35,33 z "
+       style="fill:white"
+       id="path7" />
+  </g>
+  <path
+     d="M 6.9973827,85.556519 C 6.9973827,89.618914 15.122182,89.618914 15.122182,85.556519 L 15.122182,77.43172 L 35.434179,93.681314 L 35.434179,105.86851 C 35.434179,109.93091 43.558978,109.93091 43.558978,105.86851 L 43.558978,93.681314 L 67.933373,93.681314 L 67.933373,105.86851 C 67.933373,109.93091 76.058173,109.93091 76.058173,105.86851 L 76.058173,85.556519 L 39.496579,85.556519 L 11.059785,61.182122 C 14.309703,53.057323 43.558978,53.057323 47.621377,57.119723 L 47.621377,44.932525 C 47.621377,40.870128 39.496579,40.870128 39.496579,44.932525 L 39.496579,48.994924 L 15.122182,48.994924 L 15.122182,44.932525 C 15.122182,40.870128 6.9973827,40.870128 6.9973827,44.932525 C 6.9973827,44.932525 6.9973827,85.556519 6.9973827,85.556519 z M 15.122182,65.24452 C 19.184583,57.119723 43.558978,57.119723 51.683777,65.24452 L 76.058173,85.556519 C 67.933373,77.43172 39.496579,77.43172 39.496579,85.556519 L 15.122182,65.24452 z "
+     style="fill:white"
+     id="path1998" />
 </svg>
diff --git a/data/styles/symbols/housenumber.svg b/data/styles/symbols/housenumber.svg
index 0edb2327a9..9d71f5ac7f 100644
--- a/data/styles/symbols/housenumber.svg
+++ b/data/styles/symbols/housenumber.svg
@@ -1,3 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="18.64" viewBox="0 0 2 2" fill="#d3d3d3" height="18.64">
-    <svg:circle cx="1" cy="1" r=".8" class="housenumber-node"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="symbol-housenumber" viewBox="0 0 2 2" fill="lightgrey" height="18.64">
+   <svg:circle cx="1" cy="1" r="0.8px" class="housenumber-node"/>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/hunting_closed_high.svg b/data/styles/symbols/hunting_closed_high.svg
index a4a9a69d71..699783eaca 100644
--- a/data/styles/symbols/hunting_closed_high.svg
+++ b/data/styles/symbols/hunting_closed_high.svg
@@ -1,7 +1,79 @@
-<svg xmlns="http://www.w3.org/2000/svg" baseProfile="full" width="37.28" viewBox="0 0 12 12" height="37.28">
-    <path d="M 7.8651598,4.8651348 L 7.8651598,11.92638" stroke="#000" stroke-width=".295" fill="none"/>
-    <path d="M 7.7758948,5.0369192 L 4.2641612,5.0369192 L 7.7758948,5.0369192 z" stroke="#000" stroke-width=".242"/>
-    <path d="M 4.2977003,0.22677008 L 7.8969033,0.8353069 L 7.8969033,5.0345427 L 4.2977003,5.0345427 L 4.2977003,0.22677008 z" stroke="#000" stroke-width=".247"/>
-    <rect width="1.792" height="1.021" x="4.912" y="1.462" ry="0" fill="#fff"/>
-    <path d="M 4.3174604,4.8820757 L 4.3174604,11.943321" stroke="#000" stroke-width=".295" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   baseProfile="full"
+   width="37.28"
+   id="symbol-shelter"
+   viewBox="0 0 12 12"
+   height="37.28"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   sodipodi:docname="hunting_closed_high.svg"
+   sodipodi:docbase="/Users/sysadmin/Desktop/hunting">
+  <metadata
+     id="metadata38">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs36" />
+  <sodipodi:namedview
+     inkscape:window-height="863"
+     inkscape:window-width="1009"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="10.139485"
+     inkscape:cx="17.653756"
+     inkscape:cy="11.572202"
+     inkscape:window-x="0"
+     inkscape:window-y="22"
+     inkscape:current-layer="symbol-shelter" />
+  <path
+     sodipodi:nodetypes="cc"
+     id="path2172"
+     d="M 7.8651598,4.8651348 L 7.8651598,11.92638"
+     style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.29489905px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     sodipodi:nodetypes="ccc"
+     id="rect2194"
+     d="M 7.7758948,5.0369192 L 4.2641612,5.0369192 L 7.7758948,5.0369192 z "
+     style="fill:black;fill-opacity:1;stroke:black;stroke-width:0.24201851;stroke-opacity:1" />
+  <path
+     sodipodi:nodetypes="ccccc"
+     id="rect3187"
+     d="M 4.2977003,0.22677008 L 7.8969033,0.8353069 L 7.8969033,5.0345427 L 4.2977003,5.0345427 L 4.2977003,0.22677008 z "
+     style="fill:black;fill-opacity:1;stroke:black;stroke-width:0.24677479;stroke-opacity:1" />
+  <rect
+     style="fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect2162"
+     width="1.7919191"
+     height="1.0210305"
+     x="4.9117088"
+     y="1.4621806"
+     ry="0" />
+  <path
+     sodipodi:nodetypes="cc"
+     id="path2018"
+     d="M 4.3174604,4.8820757 L 4.3174604,11.943321"
+     style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.29489905px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/information-guidepost.svg b/data/styles/symbols/information-guidepost.svg
index 68272d23e0..a29b2e82dc 100644
--- a/data/styles/symbols/information-guidepost.svg
+++ b/data/styles/symbols/information-guidepost.svg
@@ -1,8 +1,105 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <rect ry="4.4" rx="4.4" y="1" x="1" height="22" width="22" fill="#f2f2f2"/>
-    <rect width="20" height="20" x="2" y="2" rx="4" ry="4" fill="#0044d8"/>
-    <rect width="3" height="9" x="10.5" y="10" fill="#fff"/>
-    <path d="m 13,8.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" transform="matrix(1.2 0 0 1.267 -1.8 -3.867)" fill="#fff"/>
-    <path d="m 9,10 4,0 0,1 -2,1 -2,-1 z" fill="#fff"/>
-    <path d="m 9,18 2,-1 2,0 2,1 0,1 -6,0 z" fill="#fff"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   id="symbol-parking"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="information.svg">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="894"
+     inkscape:window-height="612"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="0.67716277"
+     inkscape:cx="11.200531"
+     inkscape:cy="9.5781699"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-parking">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <rect
+     ry="4.3999996"
+     rx="4.3999996"
+     y="1"
+     x="1"
+     height="22"
+     width="22"
+     id="rect2987"
+     style="fill:#f2f2f2;fill-opacity:1;stroke:none" />
+  <rect
+     style="fill:#0044d8;fill-opacity:1;stroke:none"
+     id="rect2985"
+     width="20"
+     height="20"
+     x="2"
+     y="2"
+     rx="4"
+     ry="4" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     id="rect2996"
+     width="3"
+     height="9"
+     x="10.5"
+     y="10" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     id="path3090"
+     sodipodi:cx="11.5"
+     sodipodi:cy="8.5"
+     sodipodi:rx="1.5"
+     sodipodi:ry="1.5"
+     d="m 13,8.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
+     transform="matrix(1.2,0,0,1.2666667,-1.8,-3.866667)" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 9,10 4,0 0,1 -2,1 -2,-1 z"
+     id="rect2988"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccc" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 9,18 2,-1 2,0 2,1 0,1 -6,0 z"
+     id="rect2990"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
 </svg>
diff --git a/data/styles/symbols/information-office.svg b/data/styles/symbols/information-office.svg
index 68272d23e0..9be6d36f03 100644
--- a/data/styles/symbols/information-office.svg
+++ b/data/styles/symbols/information-office.svg
@@ -1,8 +1,105 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <rect ry="4.4" rx="4.4" y="1" x="1" height="22" width="22" fill="#f2f2f2"/>
-    <rect width="20" height="20" x="2" y="2" rx="4" ry="4" fill="#0044d8"/>
-    <rect width="3" height="9" x="10.5" y="10" fill="#fff"/>
-    <path d="m 13,8.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" transform="matrix(1.2 0 0 1.267 -1.8 -3.867)" fill="#fff"/>
-    <path d="m 9,10 4,0 0,1 -2,1 -2,-1 z" fill="#fff"/>
-    <path d="m 9,18 2,-1 2,0 2,1 0,1 -6,0 z" fill="#fff"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   id="symbol-parking"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="information-guidepost.svg">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="894"
+     inkscape:window-height="612"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="0.67716277"
+     inkscape:cx="11.200531"
+     inkscape:cy="9.5781699"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-parking">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <rect
+     ry="4.3999996"
+     rx="4.3999996"
+     y="1"
+     x="1"
+     height="22"
+     width="22"
+     id="rect2987"
+     style="fill:#f2f2f2;fill-opacity:1;stroke:none" />
+  <rect
+     style="fill:#0044d8;fill-opacity:1;stroke:none"
+     id="rect2985"
+     width="20"
+     height="20"
+     x="2"
+     y="2"
+     rx="4"
+     ry="4" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     id="rect2996"
+     width="3"
+     height="9"
+     x="10.5"
+     y="10" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     id="path3090"
+     sodipodi:cx="11.5"
+     sodipodi:cy="8.5"
+     sodipodi:rx="1.5"
+     sodipodi:ry="1.5"
+     d="m 13,8.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
+     transform="matrix(1.2,0,0,1.2666667,-1.8,-3.866667)" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 9,10 4,0 0,1 -2,1 -2,-1 z"
+     id="rect2988"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccc" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 9,18 2,-1 2,0 2,1 0,1 -6,0 z"
+     id="rect2990"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
 </svg>
diff --git a/data/styles/symbols/information.svg b/data/styles/symbols/information.svg
index 68272d23e0..11f19f5747 100644
--- a/data/styles/symbols/information.svg
+++ b/data/styles/symbols/information.svg
@@ -1,8 +1,105 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <rect ry="4.4" rx="4.4" y="1" x="1" height="22" width="22" fill="#f2f2f2"/>
-    <rect width="20" height="20" x="2" y="2" rx="4" ry="4" fill="#0044d8"/>
-    <rect width="3" height="9" x="10.5" y="10" fill="#fff"/>
-    <path d="m 13,8.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" transform="matrix(1.2 0 0 1.267 -1.8 -3.867)" fill="#fff"/>
-    <path d="m 9,10 4,0 0,1 -2,1 -2,-1 z" fill="#fff"/>
-    <path d="m 9,18 2,-1 2,0 2,1 0,1 -6,0 z" fill="#fff"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   id="symbol-parking"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="information.svg">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="894"
+     inkscape:window-height="612"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="0.67716277"
+     inkscape:cx="11.200531"
+     inkscape:cy="9.5781699"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-parking">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <rect
+     ry="4.3999996"
+     rx="4.3999996"
+     y="1"
+     x="1"
+     height="22"
+     width="22"
+     id="rect2987"
+     style="fill:#f2f2f2;fill-opacity:1;stroke:none" />
+  <rect
+     style="fill:#0044d8;fill-opacity:1;stroke:none"
+     id="rect2985"
+     width="20"
+     height="20"
+     x="2"
+     y="2"
+     rx="4"
+     ry="4" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     id="rect2996"
+     width="3"
+     height="9"
+     x="10.5"
+     y="10" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     id="path3090"
+     sodipodi:cx="11.5"
+     sodipodi:cy="8.5"
+     sodipodi:rx="1.5"
+     sodipodi:ry="1.5"
+     d="m 13,8.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
+     transform="matrix(1.2,0,0,1.2666667,-1.8,-3.866667)" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 9,10 4,0 0,1 -2,1 -2,-1 z"
+     id="rect2988"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccc" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 9,18 2,-1 2,0 2,1 0,1 -6,0 z"
+     id="rect2990"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
 </svg>
diff --git a/data/styles/symbols/khanda.svg b/data/styles/symbols/khanda.svg
index 6b025186e6..daaaa3be80 100644
--- a/data/styles/symbols/khanda.svg
+++ b/data/styles/symbols/khanda.svg
@@ -1,5 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="22.368" viewBox="0 0 800 800" height="22.368">
-    <svg:g transform="translate(100)">
-        <svg:path d="M 286.03178,798.44826 C 274.47686,795.1959 263.17182,785.6738 257.90389,774.7565 C 252.29932,763.14127 252.36888,747.04142 258.07461,735.21664 C 260.5981,729.98693 269.51042,720.03068 274.5261,716.8382 L 277.07851,715.21364 L 276.76949,675.53951 L 276.46034,635.86538 L 253.24066,651.77989 L 230.02096,667.69436 L 232.4758,672.32314 C 234.44224,676.03096 234.93332,678.8551 234.9441,686.51734 C 234.9561,695.01629 234.58908,696.75012 231.65258,702.06831 C 227.9575,708.76054 223.18242,713.40624 216.13794,717.16251 C 212.30051,719.20884 209.59295,719.68801 201.86754,719.68801 C 194.1421,719.68801 191.43455,719.20884 187.5971,717.16251 C 176.24401,711.10866 169.44392,701.24622 168.51299,689.48412 C 167.82042,680.73371 169.38643,674.96231 174.61433,666.99802 C 178.35155,661.30468 183.14155,657.56444 222.73106,629.42653 C 246.9125,612.23974 266.48801,597.83269 266.23205,597.41087 C 265.97618,596.98903 260.44958,592.85755 253.9507,588.22983 L 242.13473,579.81577 L 208.53318,604.47029 C 190.05229,618.03027 174.68262,629.12479 174.37835,629.12479 C 174.07408,629.12479 172.95881,616.20877 168.69736,609.43128 C 164.546,602.82887 149.56374,586.07399 111.53631,548.10002 C 69.396819,506.01978 57.592167,492.99258 44.090693,473.66939 C 20.774574,440.29955 6.6120613,403.50731 1.126918,362.05548 C -0.3756399,350.70054 -0.3756399,315.61806 1.126918,304.26311 C 7.337956,257.32562 24.583085,216.61804 53.523135,180.58044 C 69.431809,160.77015 80.676009,152.23236 105.25771,141.298 C 122.62658,133.57202 156.11806,122.5857 157.64172,124.11432 C 157.85197,124.32525 153.37683,127.51604 147.69699,131.20496 C 133.52067,140.41211 108.34195,165.54821 98.759684,180.05939 C 85.566883,200.03829 76.853504,220.64866 71.54464,244.43298 C 69.248935,254.71802 68.94644,259.02112 68.94644,281.39347 C 68.94644,311.30842 70.078051,317.8443 80.711788,349.34715 C 93.570705,387.44222 107.26937,409.01541 144.14125,449.23843 C 178.2262,486.42123 193.32553,499.46384 245.18911,536.5223 L 277.02119,559.26755 L 277.02119,538.02075 L 277.02119,516.77395 L 272.81484,514.19456 C 270.50133,512.77591 264.06559,508.03191 258.51319,503.65237 C 252.96079,499.27283 243.37029,492.4623 237.20095,488.51784 C 231.03161,484.57339 225.84096,481.24105 225.6661,481.11265 C 225.49121,480.98424 226.8717,473.10672 228.73382,463.60703 C 230.59595,454.10736 231.7485,446.02843 231.29511,445.65386 C 230.84171,445.2793 227.08672,443.56864 222.95047,441.85242 C 204.67956,434.27125 185.22141,421.09346 168.9346,405.27082 C 142.46582,379.55638 125.76996,349.66515 117.028,312.34043 C 114.03024,299.54119 113.86515,297.4559 113.86515,272.39071 C 113.86515,247.32552 114.03024,245.24024 117.028,232.44101 C 125.76996,195.11628 142.46582,165.22505 168.9346,139.51062 C 185.3309,123.58162 205.36952,110.05651 223.44434,102.71917 C 228.73651,100.57088 231.00817,99.05611 231.01782,97.669121 C 231.02544,96.579426 230.01177,91.094405 228.76534,85.480173 L 226.49895,75.272474 L 229.40471,71.80799 C 231.00278,69.902516 242.24421,58.613021 254.38547,46.720212 C 266.52659,34.827407 281.49239,19.450119 287.64254,12.548463 L 298.82474,-1.578948e-007 L 335.96762,37.251274 L 373.11058,74.502537 L 370.36714,86.292121 C 368.85834,92.776384 367.80731,98.203637 368.03166,98.352658 C 368.25599,98.501689 375.25392,102.01749 383.58252,106.1655 C 391.91112,110.31354 403.51194,117.12784 409.36205,121.30836 C 423.04361,131.0852 442.64886,150.77682 452.24206,164.3772 C 498.10623,229.39939 498.10623,315.38204 452.24206,380.40424 C 442.64459,394.01067 423.03744,413.70196 409.36205,423.46831 C 399.26308,430.68053 371.50656,445.69371 368.27158,445.69371 C 366.23941,445.69371 366.36571,447.1322 369.98128,465.16303 L 373.09555,480.69367 L 364.03741,486.66249 C 359.05538,489.94532 348.81823,497.38909 341.28815,503.20416 C 333.7581,509.01923 326.31283,514.68688 324.74312,515.79891 L 321.88919,517.8208 L 321.88919,538.02447 C 321.88919,549.13648 322.10165,558.22811 322.36131,558.22811 C 323.07651,558.22811 384.85094,514.03483 388.06931,511.22076 C 389.61167,509.87218 395.16406,505.37407 400.40798,501.22492 C 416.05084,488.8479 432.27058,473.28491 450.65911,453.00844 C 460.20151,442.48648 468.59932,433.37119 469.32102,432.75225 C 470.04272,432.13331 474.70539,426.30966 479.68247,419.8108 C 499.57745,393.83312 508.68192,376.73911 518.66683,346.61646 C 528.37253,317.33627 529.8487,308.72583 529.8487,281.39347 C 529.8487,261.6814 529.47999,256.60422 527.31522,246.5078 C 516.74312,197.1994 489.7958,157.40616 448.70008,130.41627 C 442.2548,126.18329 437.75209,122.71994 438.69398,122.71994 C 441.96507,122.71994 468.33022,130.44062 478.75808,134.45218 C 512.30624,147.35805 528.16289,158.30041 546.49826,181.19828 C 601.53063,249.92465 615.17282,341.9247 582.46514,423.74951 C 575.77601,440.48357 568.05033,454.75628 556.57649,471.57662 C 541.12758,494.22444 535.94949,500.01311 485.10464,551.47606 C 458.50415,578.39991 442.74913,593.68551 434.58351,604.64856 C 426.41791,615.6116 424.52448,629.89631 424.52448,629.89631 L 393.11695,606.93959 C 375.84282,594.31341 360.65706,583.07503 359.37092,581.96538 C 357.07974,579.98874 356.77723,580.12983 344.43183,588.92974 C 337.50153,593.86978 332.24425,598.30113 332.74913,598.77723 C 333.25389,599.25331 352.34327,612.90979 375.16981,629.12501 C 397.99633,645.34019 418.07562,659.93204 419.79047,661.5513 C 421.50531,663.17056 424.40771,667.50563 426.24022,671.18474 C 430.68786,680.11424 430.95079,691.99371 426.89091,700.58414 C 423.65695,707.42702 417.27797,713.74507 410.50326,716.81534 C 403.09367,720.17327 390.4822,720.01132 383.02169,716.46244 C 376.20097,713.21808 369.90332,706.81828 366.84299,700.02148 C 363.70606,693.05433 363.69394,679.99893 366.81811,673.08997 C 368.64568,669.04838 368.80058,667.84338 367.63481,666.73518 C 365.66701,664.86468 323.27201,635.87687 322.50411,635.87687 C 322.16592,635.87687 321.88919,653.81111 321.88919,675.73073 L 321.88919,715.58455 L 327.24058,719.52573 C 346.00108,733.34204 350.2199,762.23368 336.31366,781.66083 C 326.04777,796.00221 303.76839,803.44051 286.03178,798.44826 z M 383.58252,398.63546 C 389.11978,394.97722 398.30986,387.1266 405.50374,379.90937 C 423.59369,361.76059 434.60943,344.03382 442.4852,320.39804 C 447.88515,304.19225 449.76266,291.80749 449.76266,272.39071 C 449.76266,239.89652 442.0372,214.07926 424.17035,186.86456 C 416.01911,174.44865 395.99523,154.35179 383.58252,146.12872 C 373.7199,139.59506 361.56463,133.15981 360.74051,134.03572 C 358.96913,135.91849 352.88033,189.74496 350.9545,220.54628 C 349.21924,248.30043 350.25523,329.6087 352.65453,353.97817 C 354.52193,372.94452 358.57609,405.1389 359.62869,409.36108 L 360.24989,411.85282 L 367.14899,408.39365 C 370.94348,406.49111 378.3386,402.09991 383.58252,398.63546 z M 239.91904,402.08663 C 249.59514,337.58176 251.51975,256.97754 244.9908,189.67792 C 243.37051,172.97559 239.39051,141.40174 238.28753,136.50065 L 237.71671,133.96385 L 230.72864,137.50164 C 198.17949,153.98009 170.51275,185.76004 157.79447,221.27895 C 151.74051,238.18619 149.70984,251.02416 149.70984,272.39071 C 149.70984,288.91611 150.13061,293.9704 152.32546,303.80896 C 161.03307,342.8415 182.83702,375.62062 214.767,397.68099 C 221.13993,402.084 236.3875,410.71466 237.90593,410.77843 C 238.29359,410.79472 239.19959,406.8834 239.91904,402.08663 z" fill="#000"/>
-    </svg:g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="22.368" id="khanda" viewBox="0 0 800 800" height="22.368">
+   <svg:g transform="translate(100,0)">
+            <svg:path id="path1317" style="fill:#000000" d="M 286.03178,798.44826 C 274.47686,795.1959 263.17182,785.6738 257.90389,774.7565 C 252.29932,763.14127 252.36888,747.04142 258.07461,735.21664 C 260.5981,729.98693 269.51042,720.03068 274.5261,716.8382 L 277.07851,715.21364 L 276.76949,675.53951 L 276.46034,635.86538 L 253.24066,651.77989 L 230.02096,667.69436 L 232.4758,672.32314 C 234.44224,676.03096 234.93332,678.8551 234.9441,686.51734 C 234.9561,695.01629 234.58908,696.75012 231.65258,702.06831 C 227.9575,708.76054 223.18242,713.40624 216.13794,717.16251 C 212.30051,719.20884 209.59295,719.68801 201.86754,719.68801 C 194.1421,719.68801 191.43455,719.20884 187.5971,717.16251 C 176.24401,711.10866 169.44392,701.24622 168.51299,689.48412 C 167.82042,680.73371 169.38643,674.96231 174.61433,666.99802 C 178.35155,661.30468 183.14155,657.56444 222.73106,629.42653 C 246.9125,612.23974 266.48801,597.83269 266.23205,597.41087 C 265.97618,596.98903 260.44958,592.85755 253.9507,588.22983 L 242.13473,579.81577 L 208.53318,604.47029 C 190.05229,618.03027 174.68262,629.12479 174.37835,629.12479 C 174.07408,629.12479 172.95881,616.20877 168.69736,609.43128 C 164.546,602.82887 149.56374,586.07399 111.53631,548.10002 C 69.396819,506.01978 57.592167,492.99258 44.090693,473.66939 C 20.774574,440.29955 6.6120613,403.50731 1.126918,362.05548 C -0.3756399,350.70054 -0.3756399,315.61806 1.126918,304.26311 C 7.337956,257.32562 24.583085,216.61804 53.523135,180.58044 C 69.431809,160.77015 80.676009,152.23236 105.25771,141.298 C 122.62658,133.57202 156.11806,122.5857 157.64172,124.11432 C 157.85197,124.32525 153.37683,127.51604 147.69699,131.20496 C 133.52067,140.41211 108.34195,165.54821 98.759684,180.05939 C 85.566883,200.03829 76.853504,220.64866 71.54464,244.43298 C 69.248935,254.71802 68.94644,259.02112 68.94644,281.39347 C 68.94644,311.30842 70.078051,317.8443 80.711788,349.34715 C 93.570705,387.44222 107.26937,409.01541 144.14125,449.23843 C 178.2262,486.42123 193.32553,499.46384 245.18911,536.5223 L 277.02119,559.26755 L 277.02119,538.02075 L 277.02119,516.77395 L 272.81484,514.19456 C 270.50133,512.77591 264.06559,508.03191 258.51319,503.65237 C 252.96079,499.27283 243.37029,492.4623 237.20095,488.51784 C 231.03161,484.57339 225.84096,481.24105 225.6661,481.11265 C 225.49121,480.98424 226.8717,473.10672 228.73382,463.60703 C 230.59595,454.10736 231.7485,446.02843 231.29511,445.65386 C 230.84171,445.2793 227.08672,443.56864 222.95047,441.85242 C 204.67956,434.27125 185.22141,421.09346 168.9346,405.27082 C 142.46582,379.55638 125.76996,349.66515 117.028,312.34043 C 114.03024,299.54119 113.86515,297.4559 113.86515,272.39071 C 113.86515,247.32552 114.03024,245.24024 117.028,232.44101 C 125.76996,195.11628 142.46582,165.22505 168.9346,139.51062 C 185.3309,123.58162 205.36952,110.05651 223.44434,102.71917 C 228.73651,100.57088 231.00817,99.05611 231.01782,97.669121 C 231.02544,96.579426 230.01177,91.094405 228.76534,85.480173 L 226.49895,75.272474 L 229.40471,71.80799 C 231.00278,69.902516 242.24421,58.613021 254.38547,46.720212 C 266.52659,34.827407 281.49239,19.450119 287.64254,12.548463 L 298.82474,-1.578948e-007 L 335.96762,37.251274 L 373.11058,74.502537 L 370.36714,86.292121 C 368.85834,92.776384 367.80731,98.203637 368.03166,98.352658 C 368.25599,98.501689 375.25392,102.01749 383.58252,106.1655 C 391.91112,110.31354 403.51194,117.12784 409.36205,121.30836 C 423.04361,131.0852 442.64886,150.77682 452.24206,164.3772 C 498.10623,229.39939 498.10623,315.38204 452.24206,380.40424 C 442.64459,394.01067 423.03744,413.70196 409.36205,423.46831 C 399.26308,430.68053 371.50656,445.69371 368.27158,445.69371 C 366.23941,445.69371 366.36571,447.1322 369.98128,465.16303 L 373.09555,480.69367 L 364.03741,486.66249 C 359.05538,489.94532 348.81823,497.38909 341.28815,503.20416 C 333.7581,509.01923 326.31283,514.68688 324.74312,515.79891 L 321.88919,517.8208 L 321.88919,538.02447 C 321.88919,549.13648 322.10165,558.22811 322.36131,558.22811 C 323.07651,558.22811 384.85094,514.03483 388.06931,511.22076 C 389.61167,509.87218 395.16406,505.37407 400.40798,501.22492 C 416.05084,488.8479 432.27058,473.28491 450.65911,453.00844 C 460.20151,442.48648 468.59932,433.37119 469.32102,432.75225 C 470.04272,432.13331 474.70539,426.30966 479.68247,419.8108 C 499.57745,393.83312 508.68192,376.73911 518.66683,346.61646 C 528.37253,317.33627 529.8487,308.72583 529.8487,281.39347 C 529.8487,261.6814 529.47999,256.60422 527.31522,246.5078 C 516.74312,197.1994 489.7958,157.40616 448.70008,130.41627 C 442.2548,126.18329 437.75209,122.71994 438.69398,122.71994 C 441.96507,122.71994 468.33022,130.44062 478.75808,134.45218 C 512.30624,147.35805 528.16289,158.30041 546.49826,181.19828 C 601.53063,249.92465 615.17282,341.9247 582.46514,423.74951 C 575.77601,440.48357 568.05033,454.75628 556.57649,471.57662 C 541.12758,494.22444 535.94949,500.01311 485.10464,551.47606 C 458.50415,578.39991 442.74913,593.68551 434.58351,604.64856 C 426.41791,615.6116 424.52448,629.89631 424.52448,629.89631 L 393.11695,606.93959 C 375.84282,594.31341 360.65706,583.07503 359.37092,581.96538 C 357.07974,579.98874 356.77723,580.12983 344.43183,588.92974 C 337.50153,593.86978 332.24425,598.30113 332.74913,598.77723 C 333.25389,599.25331 352.34327,612.90979 375.16981,629.12501 C 397.99633,645.34019 418.07562,659.93204 419.79047,661.5513 C 421.50531,663.17056 424.40771,667.50563 426.24022,671.18474 C 430.68786,680.11424 430.95079,691.99371 426.89091,700.58414 C 423.65695,707.42702 417.27797,713.74507 410.50326,716.81534 C 403.09367,720.17327 390.4822,720.01132 383.02169,716.46244 C 376.20097,713.21808 369.90332,706.81828 366.84299,700.02148 C 363.70606,693.05433 363.69394,679.99893 366.81811,673.08997 C 368.64568,669.04838 368.80058,667.84338 367.63481,666.73518 C 365.66701,664.86468 323.27201,635.87687 322.50411,635.87687 C 322.16592,635.87687 321.88919,653.81111 321.88919,675.73073 L 321.88919,715.58455 L 327.24058,719.52573 C 346.00108,733.34204 350.2199,762.23368 336.31366,781.66083 C 326.04777,796.00221 303.76839,803.44051 286.03178,798.44826 z M 383.58252,398.63546 C 389.11978,394.97722 398.30986,387.1266 405.50374,379.90937 C 423.59369,361.76059 434.60943,344.03382 442.4852,320.39804 C 447.88515,304.19225 449.76266,291.80749 449.76266,272.39071 C 449.76266,239.89652 442.0372,214.07926 424.17035,186.86456 C 416.01911,174.44865 395.99523,154.35179 383.58252,146.12872 C 373.7199,139.59506 361.56463,133.15981 360.74051,134.03572 C 358.96913,135.91849 352.88033,189.74496 350.9545,220.54628 C 349.21924,248.30043 350.25523,329.6087 352.65453,353.97817 C 354.52193,372.94452 358.57609,405.1389 359.62869,409.36108 L 360.24989,411.85282 L 367.14899,408.39365 C 370.94348,406.49111 378.3386,402.09991 383.58252,398.63546 z M 239.91904,402.08663 C 249.59514,337.58176 251.51975,256.97754 244.9908,189.67792 C 243.37051,172.97559 239.39051,141.40174 238.28753,136.50065 L 237.71671,133.96385 L 230.72864,137.50164 C 198.17949,153.98009 170.51275,185.76004 157.79447,221.27895 C 151.74051,238.18619 149.70984,251.02416 149.70984,272.39071 C 149.70984,288.91611 150.13061,293.9704 152.32546,303.80896 C 161.03307,342.8415 182.83702,375.62062 214.767,397.68099 C 221.13993,402.084 236.3875,410.71466 237.90593,410.77843 C 238.29359,410.79472 239.19959,406.8834 239.91904,402.08663 z "/>
+          </svg:g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/kindergarten.svg b/data/styles/symbols/kindergarten.svg
index 060b39b1ed..a5550608ed 100644
--- a/data/styles/symbols/kindergarten.svg
+++ b/data/styles/symbols/kindergarten.svg
@@ -1,6 +1,77 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24" viewBox="0 0 566.52362 566.52362">
-    <title>
-        Kindergarden Map Icon
-    </title>
-    <path d="m 480.66539,91.999044 c -27.65516,-27.655146 -94.91194,-5.23621 -150.22227,50.074106 -16.69136,16.69136 -27.27648,59.18106 -33.38272,66.76545 16.69137,-83.45682 -75.26202,-100.77184 -95.37529,-80.65856 -22.63114,22.63113 -48.01983,49.30339 39.35532,136.67854 l -33.66554,29.02457 c -36.09118,-11.25153 -76.57868,-4.0416 -106.41745,23.37981 -44.562984,40.95281 -47.489624,110.27705 -6.536837,154.84006 40.952807,44.56299 110.277067,47.48964 154.840077,6.53683 29.83873,-27.4214 40.43538,-67.15716 32.26581,-104.06826 l 26.27939,-42.94758 c 78.53025,78.53026 121.61853,69.55761 144.24967,46.92646 20.11325,-20.11325 -4.77289,-119.6378 -88.2297,-102.94643 7.58436,-6.10621 59.47794,-26.09521 66.76545,-33.3827 55.31031,-55.31032 77.72924,-122.56713 50.07409,-150.222296 z m -33.38273,33.382736 c 9.21839,9.21839 -2.45506,35.8378 -39.3286,72.71135 -36.87354,36.87353 -57.54707,42.6011 -66.76546,33.38271 -9.21839,-9.21839 -3.49081,-29.89191 33.38273,-66.76545 36.87353,-36.87353 63.49295,-48.54699 72.71133,-39.32861 z m -195.52344,19.48961 c 9.21838,9.21838 9.21838,24.16434 -1e-5,33.38272 -9.2184,9.21839 -24.16436,9.21839 -33.38273,0 -9.21839,-9.21839 -9.21839,-24.16432 0,-33.38272 9.21839,-9.2184 24.16434,-9.2184 33.38274,0 z m 183.60497,183.60498 c 9.21839,9.2184 9.21839,24.16436 0,33.38275 -9.21839,9.21839 -24.16434,9.21839 -33.38272,0 -9.21838,-9.2184 -9.21839,-24.16435 -10e-6,-33.38273 9.21839,-9.21839 24.16435,-9.21838 33.38273,-2e-5 z m -187.85627,-36.70257 16.16976,17.21298 -28.05229,33.35092 c -28.60884,9.35744 -64.16988,-15.44512 -97.59214,15.26949 -33.42224,30.71461 -20.66649,98.97651 -23.44054,95.95792 -30.714593,-33.42224 -28.519607,-85.41545 4.90265,-116.13005 21.51853,-19.77524 53.08615,-27.78963 80.28146,-21.45357 14.76781,2.74704 30.98557,-5.03156 41.47185,-17.94844 z" fill="#505050"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="24"
+   height="24"
+   viewBox="0 0 566.52362 566.52362"
+   id="symbol-kindergarten"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="kindergarten.svg">
+  <title
+     id="title3798">Kindergarden Map Icon</title>
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Kindergarden Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1105"
+     inkscape:window-height="761"
+     id="namedview12"
+     showgrid="true"
+     inkscape:zoom="18.694831"
+     inkscape:cx="12.886667"
+     inkscape:cy="11.002651"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-kindergarten">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2991"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs24" />
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="m 480.66539,91.999044 c -27.65516,-27.655146 -94.91194,-5.23621 -150.22227,50.074106 -16.69136,16.69136 -27.27648,59.18106 -33.38272,66.76545 16.69137,-83.45682 -75.26202,-100.77184 -95.37529,-80.65856 -22.63114,22.63113 -48.01983,49.30339 39.35532,136.67854 l -33.66554,29.02457 c -36.09118,-11.25153 -76.57868,-4.0416 -106.41745,23.37981 -44.562984,40.95281 -47.489624,110.27705 -6.536837,154.84006 40.952807,44.56299 110.277067,47.48964 154.840077,6.53683 29.83873,-27.4214 40.43538,-67.15716 32.26581,-104.06826 l 26.27939,-42.94758 c 78.53025,78.53026 121.61853,69.55761 144.24967,46.92646 20.11325,-20.11325 -4.77289,-119.6378 -88.2297,-102.94643 7.58436,-6.10621 59.47794,-26.09521 66.76545,-33.3827 55.31031,-55.31032 77.72924,-122.56713 50.07409,-150.222296 z m -33.38273,33.382736 c 9.21839,9.21839 -2.45506,35.8378 -39.3286,72.71135 -36.87354,36.87353 -57.54707,42.6011 -66.76546,33.38271 -9.21839,-9.21839 -3.49081,-29.89191 33.38273,-66.76545 36.87353,-36.87353 63.49295,-48.54699 72.71133,-39.32861 z m -195.52344,19.48961 c 9.21838,9.21838 9.21838,24.16434 -1e-5,33.38272 -9.2184,9.21839 -24.16436,9.21839 -33.38273,0 -9.21839,-9.21839 -9.21839,-24.16432 0,-33.38272 9.21839,-9.2184 24.16434,-9.2184 33.38274,0 z m 183.60497,183.60498 c 9.21839,9.2184 9.21839,24.16436 0,33.38275 -9.21839,9.21839 -24.16434,9.21839 -33.38272,0 -9.21838,-9.2184 -9.21839,-24.16435 -10e-6,-33.38273 9.21839,-9.21839 24.16435,-9.21838 33.38273,-2e-5 z m -187.85627,-36.70257 16.16976,17.21298 -28.05229,33.35092 c -28.60884,9.35744 -64.16988,-15.44512 -97.59214,15.26949 -33.42224,30.71461 -20.66649,98.97651 -23.44054,95.95792 -30.714593,-33.42224 -28.519607,-85.41545 4.90265,-116.13005 21.51853,-19.77524 53.08615,-27.78963 80.28146,-21.45357 14.76781,2.74704 30.98557,-5.03156 41.47185,-17.94844 z"
+     id="path3005"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="sscsccsssccscssssssssssssssssscccsssccc"
+     inkscape:transform-center-y="-0.094689217"
+     inkscape:transform-center-x="0.21766293" />
 </svg>
diff --git a/data/styles/symbols/kindergarten2.svg b/data/styles/symbols/kindergarten2.svg
index 00fccdddcc..1872d92db8 100644
--- a/data/styles/symbols/kindergarten2.svg
+++ b/data/styles/symbols/kindergarten2.svg
@@ -1,19 +1,122 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24" viewBox="0 0 566.52362 566.52362">
-    <title>
-        Kindergarden Map Icon
-    </title>
-    <path d="m 283.26181,259.65666 0,259.65666 -212.446357,-94.4206 0,-259.65666 z" fill="#505050"/>
-    <path d="m 306.86696,259.65666 0,259.65666 212.44636,-94.42061 0,-259.65666 z" fill="#505050"/>
-    <path d="M 519.31332,141.63091 295.06439,47.210302 70.815453,141.63091 295.06439,236.05151 z" fill="#505050"/>
-    <text style="line-height:125%" x="220.761" y="33.008" transform="matrix(.878 .553 -.865 .595 0 0)" font-size="708.36" letter-spacing="0" word-spacing="0" fill="#fff" font-family="Sans">
-        <tspan x="220.761" y="33.008" font-size="247.926" fill="#fff">
-            c
-        </tspan>
-    </text>
-    <text style="line-height:125%" x="100.66" y="338.925" transform="matrix(.938 .397 0 1.066 0 0)" font-size="885.684" letter-spacing="0" word-spacing="0" fill="#fff" font-family="Sans">
-        <tspan x="100.66" y="338.925" font-size="265.705" fill="#fff">
-            A
-        </tspan>
-    </text>
-    <path d="m 457.42993,590.66651 c -1.1e-4,-15.12493 -3.12942,-26.97161 -9.38794,-35.54005 -6.18421,-8.64276 -14.7153,-12.96418 -25.5933,-12.96429 -10.87815,1.1e-4 -19.4465,4.32153 -25.70507,12.96429 -6.18416,8.56844 -9.27621,20.41512 -9.27617,35.54005 -4e-5,15.12505 3.09201,27.00898 9.27617,35.6518 6.25857,8.56838 14.82692,12.85255 25.70507,12.85254 10.878,10e-6 19.40909,-4.28416 25.5933,-12.85254 6.25852,-8.64282 9.38783,-20.52675 9.38794,-35.6518 m -53.64536,-60.23926 c 6.6311,-3.65074 14.52888,-5.47617 23.69337,-5.4763 15.19942,1.3e-4 27.53039,6.03522 36.99294,18.10531 9.53682,12.0703 14.3053,27.94037 14.30543,47.61025 -1.3e-4,19.67 -4.76861,35.54007 -14.30543,47.61025 -9.46255,12.07021 -21.79352,18.1053 -36.99294,18.1053 -9.16449,0 -17.06227,-1.78818 -23.69337,-5.36453 -6.5567,-3.65086 -7.32526,-6.88115 -11.64664,-14.3319 l 0,17.10912 -25.3463,-0.65376 2.27936,-204.05433 23.06694,11.46072 0,72.46776" transform="matrix(1.023 -.486 0 .977 0 0)" style="line-height:125%" font-size="228.887" letter-spacing="0" word-spacing="0" fill="#fff" font-family="Sans"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="24"
+   height="24"
+   viewBox="0 0 566.52362 566.52362"
+   id="symbol-kindergarten"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="kindergarten2.svg">
+  <title
+     id="title3798">Kindergarden Map Icon</title>
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Kindergarden Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1105"
+     inkscape:window-height="761"
+     id="namedview12"
+     showgrid="true"
+     inkscape:zoom="18.694831"
+     inkscape:cx="12.886667"
+     inkscape:cy="11.475199"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-kindergarten">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2991"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs24" />
+  <path
+     style="fill:#505050;stroke:none;fill-opacity:1"
+     d="m 283.26181,259.65666 0,259.65666 -212.446357,-94.4206 0,-259.65666 z"
+     id="path2984"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+  <path
+     sodipodi:nodetypes="ccccc"
+     inkscape:connector-curvature="0"
+     id="path2986"
+     d="m 306.86696,259.65666 0,259.65666 212.44636,-94.42061 0,-259.65666 z"
+     style="fill:#505050;stroke:none;fill-opacity:1" />
+  <path
+     style="fill:#505050;stroke:none;fill-opacity:1"
+     d="M 519.31332,141.63091 295.06439,47.210302 70.815453,141.63091 295.06439,236.05151 z"
+     id="path2990"
+     inkscape:connector-curvature="0" />
+  <text
+     xml:space="preserve"
+     style="font-size:708.35974121px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+     x="220.76079"
+     y="33.008404"
+     id="text3760"
+     sodipodi:linespacing="125%"
+     transform="matrix(0.87780892,0.55264251,-0.86492336,0.59466994,0,0)"><tspan
+       sodipodi:role="line"
+       id="tspan3762"
+       x="220.76079"
+       y="33.008404"
+       style="font-size:247.92590332px;fill:#ffffff">c</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-size:885.68365478999999141px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+     x="100.65954"
+     y="338.92499"
+     id="text3787"
+     sodipodi:linespacing="125%"
+     transform="matrix(0.93801943,0.39705894,0,1.066076,0,0)"><tspan
+       sodipodi:role="line"
+       id="tspan3789"
+       x="100.65954"
+       y="338.92499"
+       style="font-size:265.70507811999999603px;fill:#ffffff">A</tspan></text>
+  <g
+     transform="matrix(1.0233327,-0.48551779,0,0.97719935,0,0)"
+     style="font-size:228.88684082px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+     id="text3791">
+    <path
+       d="m 457.42993,590.66651 c -1.1e-4,-15.12493 -3.12942,-26.97161 -9.38794,-35.54005 -6.18421,-8.64276 -14.7153,-12.96418 -25.5933,-12.96429 -10.87815,1.1e-4 -19.4465,4.32153 -25.70507,12.96429 -6.18416,8.56844 -9.27621,20.41512 -9.27617,35.54005 -4e-5,15.12505 3.09201,27.00898 9.27617,35.6518 6.25857,8.56838 14.82692,12.85255 25.70507,12.85254 10.878,10e-6 19.40909,-4.28416 25.5933,-12.85254 6.25852,-8.64282 9.38783,-20.52675 9.38794,-35.6518 m -53.64536,-60.23926 c 6.6311,-3.65074 14.52888,-5.47617 23.69337,-5.4763 15.19942,1.3e-4 27.53039,6.03522 36.99294,18.10531 9.53682,12.0703 14.3053,27.94037 14.30543,47.61025 -1.3e-4,19.67 -4.76861,35.54007 -14.30543,47.61025 -9.46255,12.07021 -21.79352,18.1053 -36.99294,18.1053 -9.16449,0 -17.06227,-1.78818 -23.69337,-5.36453 -6.5567,-3.65086 -7.32526,-6.88115 -11.64664,-14.3319 l 0,17.10912 -25.3463,-0.65376 2.27936,-204.05433 23.06694,11.46072 0,72.46776"
+       id="path2993"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccscscccccccsccccccc" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/kiosk.svg b/data/styles/symbols/kiosk.svg
index 42234ddd15..a1264f9439 100755
--- a/data/styles/symbols/kiosk.svg
+++ b/data/styles/symbols/kiosk.svg
@@ -1,16 +1,125 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 83.800004 83.800006" enable-background="new 0 0 510.24 283.46">
-    <g transform="translate(0 -5.343)">
-        <rect height="28.5" width="5.114" y="28.633" x="14.113" fill="#594a42"/>
-        <rect height="28.5" width="5.125" y="31.133" x="64.547" fill="#594a42"/>
-        <path d="m 23.226999,15.965997 h -12.227 L 4.9999995,34.904996 c 0,0 3.2,2.497 7.0329995,2.497 3.833,0 7.194,-2.497 7.194,-2.497 l 4,-18.938999 z" fill="#da1c5c"/>
-        <path d="m 48.156999,15.965997 h -12.25 l -1,18.938999 c 0,0 3.124,2.497 7.291,2.497 4.167,0 6.959,-2.497 6.959,-2.497 l -1,-18.938999 z" fill="#da1c5c"/>
-        <path d="m 72.795999,15.965997 h -12.249 l 4,18.938999 c 0,0 2.318,2.497 6.485,2.497 4.167,0 7.764,-2.497 7.764,-2.497 l -6,-18.938999 z" fill="#da1c5c"/>
-        <path d="m 23.226999,15.965997 h 12.681 l -1,18.938999 c 0,0 -3.543,2.497 -7.876,2.497 -4.333,0 -7.805,-2.497 -7.805,-2.497 l 4,-18.938999 z" fill="#8dc63f"/>
-        <path d="m 48.156999,15.965997 h 12.389 l 4,18.938999 c 0,0 -3.682,2.497 -7.848,2.497 -4.166,0 -7.541,-2.497 -7.541,-2.497 l -1,-18.938999 z" fill="#8dc63f"/>
-        <rect height="25.667" width="55.558" y="53.133" x="14.113" fill="#594a42"/>
-        <path d="m 70.835999,50.845996 c 0,-0.829 -0.525,-1.502 -1.172,-1.502 h -55.542 c -0.647,0 -1.172,0.673 -1.172,1.502 v 4.785 c 0,0.829 0.525,1.502 1.172,1.502 h 55.542 c 0.647,0 1.172,-0.673 1.172,-1.502 v -4.785 z"/>
-        <path d="m 37.197999,45.078996 c 0,-0.934 -0.518,-1.692 -1.156,-1.692 h -13.611 c -0.638,0 -1.155,0.758 -1.155,1.692 v 2.574 c 0,0.934 0.518,1.692 1.155,1.692 h 13.611 c 0.638,0 1.156,-0.758 1.156,-1.692 v -2.574 z" fill="#27aae1"/>
-        <path d="m 51.197999,47.704996 c 0,1.024 -0.694,1.855 -1.55,1.855 h -9.719 c -0.855,0 -1.55,-0.831 -1.55,-1.855 v -0.413 c 0,-1.024 0.694,-1.855 1.55,-1.855 h 9.719 c 0.855,0 1.55,0.831 1.55,1.855 v 0.413 z" fill="#be1e2d"/>
-        <path d="m 62.197999,43.640996 c 0,-0.664 -0.582,-1.202 -1.299,-1.202 h -6.638 c -0.717,0 -1.299,0.539 -1.299,1.202 v 4.501 c 0,0.664 0.582,1.202 1.299,1.202 h 6.638 c 0.717,0 1.299,-0.539 1.299,-1.202 v -4.501 z" fill="#f7941e"/>
-    </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="83.800003"
+   height="83.800003"
+   viewBox="0 0 83.800004 83.800006"
+   enable-background="new 0 0 510.24 283.46"
+   xml:space="preserve"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="kiosk.svg"><metadata
+   id="metadata33"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs31" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="640"
+   inkscape:window-height="484"
+   id="namedview29"
+   showgrid="false"
+   fit-margin-top="5"
+   fit-margin-left="5"
+   fit-margin-right="5"
+   fit-margin-bottom="5"
+   inkscape:zoom="0.74866731"
+   inkscape:cx="124.985"
+   inkscape:cy="18.936997"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1" />
+<rect
+   x="-62.134998"
+   y="-18.867002"
+   display="none"
+   width="281"
+   height="176.334"
+   id="rect3"
+   style="fill:#c2b59b;display:none" />
+
+
+
+
+
+
+
+
+
+
+
+<g
+   id="g2994"
+   transform="translate(0,-5.3428273)"><rect
+     style="fill:#594a42"
+     id="rect5"
+     height="28.5"
+     width="5.1139998"
+     y="28.632998"
+     x="14.113" /><rect
+     style="fill:#594a42"
+     id="rect7"
+     height="28.5"
+     width="5.125"
+     y="31.132998"
+     x="64.547005" /><path
+     style="fill:#da1c5c"
+     inkscape:connector-curvature="0"
+     id="path9"
+     d="m 23.226999,15.965997 h -12.227 L 4.9999995,34.904996 c 0,0 3.2,2.497 7.0329995,2.497 3.833,0 7.194,-2.497 7.194,-2.497 l 4,-18.938999 z" /><path
+     style="fill:#da1c5c"
+     inkscape:connector-curvature="0"
+     id="path11"
+     d="m 48.156999,15.965997 h -12.25 l -1,18.938999 c 0,0 3.124,2.497 7.291,2.497 4.167,0 6.959,-2.497 6.959,-2.497 l -1,-18.938999 z" /><path
+     style="fill:#da1c5c"
+     inkscape:connector-curvature="0"
+     id="path13"
+     d="m 72.795999,15.965997 h -12.249 l 4,18.938999 c 0,0 2.318,2.497 6.485,2.497 4.167,0 7.764,-2.497 7.764,-2.497 l -6,-18.938999 z" /><path
+     style="fill:#8dc63f"
+     inkscape:connector-curvature="0"
+     id="path15"
+     d="m 23.226999,15.965997 h 12.681 l -1,18.938999 c 0,0 -3.543,2.497 -7.876,2.497 -4.333,0 -7.805,-2.497 -7.805,-2.497 l 4,-18.938999 z" /><path
+     style="fill:#8dc63f"
+     inkscape:connector-curvature="0"
+     id="path17"
+     d="m 48.156999,15.965997 h 12.389 l 4,18.938999 c 0,0 -3.682,2.497 -7.848,2.497 -4.166,0 -7.541,-2.497 -7.541,-2.497 l -1,-18.938999 z" /><rect
+     style="fill:#594a42"
+     id="rect19"
+     height="25.667"
+     width="55.557999"
+     y="53.132999"
+     x="14.113" /><path
+     inkscape:connector-curvature="0"
+     id="path21"
+     d="m 70.835999,50.845996 c 0,-0.829 -0.525,-1.502 -1.172,-1.502 h -55.542 c -0.647,0 -1.172,0.673 -1.172,1.502 v 4.785 c 0,0.829 0.525,1.502 1.172,1.502 h 55.542 c 0.647,0 1.172,-0.673 1.172,-1.502 v -4.785 z" /><path
+     style="fill:#27aae1"
+     inkscape:connector-curvature="0"
+     id="path23"
+     d="m 37.197999,45.078996 c 0,-0.934 -0.518,-1.692 -1.156,-1.692 h -13.611 c -0.638,0 -1.155,0.758 -1.155,1.692 v 2.574 c 0,0.934 0.518,1.692 1.155,1.692 h 13.611 c 0.638,0 1.156,-0.758 1.156,-1.692 v -2.574 z" /><path
+     style="fill:#be1e2d"
+     inkscape:connector-curvature="0"
+     id="path25"
+     d="m 51.197999,47.704996 c 0,1.024 -0.694,1.855 -1.55,1.855 h -9.719 c -0.855,0 -1.55,-0.831 -1.55,-1.855 v -0.413 c 0,-1.024 0.694,-1.855 1.55,-1.855 h 9.719 c 0.855,0 1.55,0.831 1.55,1.855 v 0.413 z" /><path
+     style="fill:#f7941e"
+     inkscape:connector-curvature="0"
+     id="path27"
+     d="m 62.197999,43.640996 c 0,-0.664 -0.582,-1.202 -1.299,-1.202 h -6.638 c -0.717,0 -1.299,0.539 -1.299,1.202 v 4.501 c 0,0.664 0.582,1.202 1.299,1.202 h 6.638 c 0.717,0 1.299,-0.539 1.299,-1.202 v -4.501 z" /></g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/library.svg b/data/styles/symbols/library.svg
index 7437c04bea..c983a0ff77 100644
--- a/data/styles/symbols/library.svg
+++ b/data/styles/symbols/library.svg
@@ -1,6 +1,72 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="0 0 824.03436 824.03436" height="24">
-    <title>
-        Library Map Icon
-    </title>
-    <path d="M 6.5 3.5 C 4.75 3.5 3 4 2 5 L 0 6 L 0 21 L 2 20 C 4 18 9 18 11 20 L 12 20 C 14 18 19 18 21 20 L 23 21 L 23 6 L 21 5 C 19 3 14 3 12 5 L 11 5 C 10 4 8.25 3.5 6.5 3.5 z M 2 6 L 2 18 C 4 16 9.0000003 16 11 18 L 11 6 L 12 6 L 12 18 C 14 16 19 16 21 18 L 21 6 L 22 6.6875 L 22 19.5625 L 21 19 C 19 17 14 17 12 19 L 11 19 C 9 17 4 17 2 19 L 1 19.5625 L 1 6.6875 L 2 6 z" transform="scale(34.335)" fill="#505050"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="symbol-library"
+   viewBox="0 0 824.03436 824.03436"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="library.svg">
+  <title
+     id="title3759">Library Map Icon</title>
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Library Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs21" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1066"
+     inkscape:window-height="687"
+     id="namedview19"
+     showgrid="true"
+     inkscape:zoom="22.071489"
+     inkscape:cx="11.463617"
+     inkscape:cy="11.749295"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-library">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3000"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="M 6.5 3.5 C 4.75 3.5 3 4 2 5 L 0 6 L 0 21 L 2 20 C 4 18 9 18 11 20 L 12 20 C 14 18 19 18 21 20 L 23 21 L 23 6 L 21 5 C 19 3 14 3 12 5 L 11 5 C 10 4 8.25 3.5 6.5 3.5 z M 2 6 L 2 18 C 4 16 9.0000003 16 11 18 L 11 6 L 12 6 L 12 18 C 14 16 19 16 21 18 L 21 6 L 22 6.6875 L 22 19.5625 L 21 19 C 19 17 14 17 12 19 L 11 19 C 9 17 4 17 2 19 L 1 19.5625 L 1 6.6875 L 2 6 z "
+     transform="scale(34.334765,34.334765)"
+     id="rect3002" />
 </svg>
diff --git a/data/styles/symbols/lighthouse.svg b/data/styles/symbols/lighthouse.svg
index 8ce27c96ce..e0dbfda151 100644
--- a/data/styles/symbols/lighthouse.svg
+++ b/data/styles/symbols/lighthouse.svg
@@ -1,24 +1,104 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1" width="16" height="16">
-    <defs>
-        <linearGradient id="a">
-            <stop offset="0" stop-color="#fffd2d"/>
-            <stop offset="1" stop-color="#fff" stop-opacity="0"/>
-        </linearGradient>
-        <linearGradient x1="-55.104" y1="1.569" x2="176.37" y2="99.852" xlink:href="#a" gradientUnits="userSpaceOnUse"/>
-        <linearGradient x1="59.917" y1="30.272" x2="262.248" y2="88" xlink:href="#a" gradientUnits="userSpaceOnUse"/>
-    </defs>
-    <g transform="matrix(.081 0 0 .081 -.114 -.501)" stroke="#000">
-        <g transform="translate(60.173 3.896)">
-            <path d="M 13.8,149.5 L 10,185 L 70,185 L 66.2,149.5 L 13.8,149.5 z" fill="none"/>
-            <path d="M 17.55,114.5 L 13.8,149.5 L 66.2,149.5 L 62.45,114.5 L 17.55,114.5 z" fill-rule="evenodd"/>
-            <path d="M 21.3,79.5 L 17.55,114.5 L 62.45,114.5 L 58.7,79.5 L 21.3,79.5 z" fill="none"/>
-            <path d="M 25,45 L 21.3,79.5 L 58.7,79.5 L 55,45 L 25,45 z" fill-rule="evenodd"/>
-            <rect width="72" height="12" rx="1.928" ry="1.639" x="4" y="184" stroke-linejoin="round"/>
-            <rect width="40" height="5" rx=".511" ry=".529" x="20" y="40" stroke-linejoin="round"/>
-            <rect width="32.008" height="20" rx="0" ry="0" x="23.992" y="19.994" stroke-width="1.033" stroke-linejoin="round" fill="none"/>
-            <path d="M 40,5 L 20,20 L 60,20 L 40,5 z" fill-rule="evenodd" stroke-linejoin="round"/>
-        </g>
-        <path d="M 123.37662,34.199134 L 197.83549,58.008658 L 197.40259,6.9264069 L 123.37662,34.199134 z" fill-rule="evenodd"/>
-        <path d="M 76.623378,34.199135 L 2.1645041,58.008661 L 2.5974041,6.9264067 L 76.623378,34.199135 z" fill-rule="evenodd"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.0"
+   width="16"
+   height="16"
+   id="symbol-lighthouse">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient7998">
+      <stop
+         id="stop8000"
+         style="stop-color:#fffd2d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop8002"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-55.103962"
+       y1="1.5694619"
+       x2="176.36978"
+       y2="99.851913"
+       id="linearGradient8004"
+       xlink:href="#linearGradient7998"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="59.917046"
+       y1="30.271528"
+       x2="262.24768"
+       y2="88"
+       id="linearGradient12871"
+       xlink:href="#linearGradient7998"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     transform="matrix(8.1354145e-2,0,0,8.1354145e-2,-0.1135914,-0.5009919)"
+     id="g3249">
+    <g
+       transform="translate(60.173159,3.8961039)"
+       id="g3205">
+      <path
+         d="M 13.8,149.5 L 10,185 L 70,185 L 66.2,149.5 L 13.8,149.5 z"
+         id="path10923"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         d="M 17.55,114.5 L 13.8,149.5 L 66.2,149.5 L 62.45,114.5 L 17.55,114.5 z"
+         id="path10921"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         d="M 21.3,79.5 L 17.55,114.5 L 62.45,114.5 L 58.7,79.5 L 21.3,79.5 z"
+         id="path10919"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         d="M 25,45 L 21.3,79.5 L 58.7,79.5 L 55,45 L 25,45 z"
+         id="path10917"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <rect
+         width="72"
+         height="12"
+         rx="1.9279137"
+         ry="1.6392574"
+         x="4"
+         y="184"
+         id="rect2166"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         width="40"
+         height="5"
+         rx="0.51127112"
+         ry="0.52888519"
+         x="20"
+         y="40"
+         id="rect3139"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         width="32.00779"
+         height="20.000082"
+         rx="0"
+         ry="0"
+         x="23.992144"
+         y="19.993521"
+         id="rect3141"
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.03292346;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         d="M 40,5 L 20,20 L 60,20 L 40,5 z"
+         id="path3143"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
     </g>
+    <path
+       d="M 123.37662,34.199134 L 197.83549,58.008658 L 197.40259,6.9264069 L 123.37662,34.199134 z"
+       id="path3221"
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 76.623378,34.199135 L 2.1645041,58.008661 L 2.5974041,6.9264067 L 76.623378,34.199135 z"
+       id="path3223"
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/maki/LICENSE.txt b/data/styles/symbols/maki/LICENSE.txt
deleted file mode 100644
index 793dca9fb7..0000000000
--- a/data/styles/symbols/maki/LICENSE.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-BSD License
-
-Copyright© 2012, MapBox, LLC. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-
-* Neither the name of the Development Seed, Inc. nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/data/styles/symbols/maki/README.markdown b/data/styles/symbols/maki/README.markdown
deleted file mode 100644
index 6fc467374d..0000000000
--- a/data/styles/symbols/maki/README.markdown
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maki 
-
-Maki is a point of interest icon set made especially for use with MapBox maps. For more information on how to use Maki with MapBox, see documentation at http://mapbox.com/tilemill/docs/guides/using-maki-icons/.
-
-## src
-
-Maki's source [SVG][] files are in the `src` subdirectory. To create pixel-perfect icons at different sizes, each icon is designed 3 times for 12, 18, and 24 pixels wide/tall. 
-
-Maki is designed using [Inkscape][]. For information on contributing to Maki see CONTRIBUTING.md.
-
-## renders
-
-PNG renders of all of the SVGs are in the `renders` directory. High-resolution (aka Retina) versions of each icon are present as well, named using the common `@2x` convention.
-
-## ArcGIS
-
-Style files for ArcGIS 10.1+ are in the `ArcGIS` subdirectory and are maintained by @williamscraigm. Both Desktop (.style) and Server (.ServerStyle) versions are provided.
-
-Currently only PNG based picture marker symbols are contained in these styles. In addition to keeping up to date with maki symbols, the following roadmap is planned:
-
-- vector versions created from SVG source
-- vector versions created from SVG source with added white outline
-- representation marker versions of the two above vector versions
-
-## render.sh
-
-You can use the SVGs and PNGs in this repository as they are without building anything, however a render script is included to assist designers/developers who want to modify or create Maki icons. It will render SVGs to PNGs at 100% and 200% resolution, create sprites used for the Maki website, and generate corresponding CSS styles for the sprites.
-
-The script requires [Bash][], [Inkscape][], and [ImageMagick][] to function correctly. Each icon must have an appropriate entry in `www/maki.json` to be rendered correctly.
-
-[SVG]: http://en.wikipedia.org/wiki/Scalable_Vector_Graphics
-[Inkscape]: http://inkscape.org
-[Bash]: http://www.gnu.org/software/bash/bash.html
-[ImageMagick]: http://www.imagemagick.org/
-
-## Versioning
-
-Maki uses a semantic versioning scheme.
-
-* 0.0.z: bugfixes, modifications
-* 0.y.0: icons added
-* x.0.0: icons removed, sprite scheme changed, or major features added
diff --git a/data/styles/symbols/maki/airfield-12.svg b/data/styles/symbols/maki/airfield-12.svg
deleted file mode 100644
index 18197d7cdc..0000000000
--- a/data/styles/symbols/maki/airfield-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-126 -250)">
-        <g>
-            <path d="m 131.25,1292.8622 c -0.1385,0 -0.25,0.1115 -0.25,0.25 0,0.1385 0.1115,0.25 0.25,0.25 l 2,0 -0.25,1 0,1 -4,1 0,1 4,0 0,2 -1,0.5 0,0.5 3,0 0,-0.5 -1,-0.5 0,-2 4,0 0,-1 -4,-1 0,-1 -0.25,-1 2,0 c 0.1385,0 0.25,-0.1115 0.25,-0.25 0,-0.1385 -0.1115,-0.25 -0.25,-0.25 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            <path d="m 131.25,1292.8622 c -0.1385,0 -0.25,0.1115 -0.25,0.25 0,0.1385 0.1115,0.25 0.25,0.25 l 2,0 -0.25,1 0,1 -4,1 0,1 4,0 0,2 -1,0.5 0,0.5 3,0 0,-0.5 -1,-0.5 0,-2 4,0 0,-1 -4,-1 0,-1 -0.25,-1 2,0 c 0.1385,0 0.25,-0.1115 0.25,-0.25 0,-0.1385 -0.1115,-0.25 -0.25,-0.25 z" fill="#444" transform="translate(-1 -1)"/>
-        </g>
-        <rect width="12" height="12" x="126" y="1290.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/airfield-18.svg b/data/styles/symbols/maki/airfield-18.svg
deleted file mode 100644
index 2ce225fafb..0000000000
--- a/data/styles/symbols/maki/airfield-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-108 -256)">
-        <g>
-            <path d="m 113.32353,1292.3622 c -0.21182,0 -0.38235,0.1705 -0.38235,0.3824 0,0.2118 0.17053,0.3823 0.38235,0.3823 l 3.05882,0 -0.38235,2.2353 0,0.9411 -5,1.5294 0,1.5295 5,0 0,3.4118 -2,0.8235 0,0.7647 7,0 0,-0.7647 -2,-0.8235 0,-3.4118 5,0 0,-1.5295 -5,-1.5294 0,-0.9411 -0.38235,-2.2353 3.05882,0 c 0.21182,0 0.38235,-0.1705 0.38235,-0.3823 0,-0.2119 -0.17053,-0.3824 -0.38235,-0.3824 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 1)"/>
-            <path d="m 113.32353,1292.3622 c -0.21182,0 -0.38235,0.1705 -0.38235,0.3824 0,0.2118 0.17053,0.3823 0.38235,0.3823 l 3.05882,0 -0.38235,2.2353 0,0.9411 -5,1.5294 0,1.5295 5,0 0,3.4118 -2,0.8235 0,0.7647 7,0 0,-0.7647 -2,-0.8235 0,-3.4118 5,0 0,-1.5295 -5,-1.5294 0,-0.9411 -0.38235,-2.2353 3.05882,0 c 0.21182,0 0.38235,-0.1705 0.38235,-0.3823 0,-0.2119 -0.17053,-0.3824 -0.38235,-0.3824 z" fill="#444" transform="translate(0 1)"/>
-        </g>
-        <rect y="1290.362" x="108" height="18" width="18" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/airfield-24.svg b/data/styles/symbols/maki/airfield-24.svg
deleted file mode 100644
index be75ee3d2f..0000000000
--- a/data/styles/symbols/maki/airfield-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-84 -262)">
-        <g>
-            <path d="m 91.5,1294.3622 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.277 0.223,0.5 0.5,0.5 l 4,0 -0.5,3 0,1 -7,2 0,2 7,0 0,4 -2.5,1 0,1 8,0 0,-1 -2.5,-1 0,-1.9687 0,-2.0313 7,0 0,-2 -7,-2 0,-1 -0.5,-3 4,0 c 0.277,0 0.5,-0.223 0.5,-0.5 0,-0.277 -0.223,-0.5 -0.5,-0.5 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 91.5,1294.3622 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.277 0.223,0.5 0.5,0.5 l 4,0 -0.5,3 0,1 -7,2 0,2 7,0 0,4 -2.5,1 0,1 8,0 0,-1 -2.5,-1 0,-1.9687 0,-2.0313 7,0 0,-2 -7,-2 0,-1 -0.5,-3 4,0 c 0.277,0 0.5,-0.223 0.5,-0.5 0,-0.277 -0.223,-0.5 -0.5,-0.5 z" fill="#444"/>
-        </g>
-        <rect y="1290.362" x="84" height="24" width="24" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/airport-12.svg b/data/styles/symbols/maki/airport-12.svg
deleted file mode 100644
index 58717d0418..0000000000
--- a/data/styles/symbols/maki/airport-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-126 -10)">
-        <g>
-            <path d="m 137,1057.7908 0,0.5714 -3,-0.5 0,2 1,1.0556 0,0.4444 -3,0 0,-0.4444 1,-1.0556 0,-2 -3,0.5 0,-0.5714 3,-1.4286 c 0,0 0,-1.2592 0,-2 0,-0.4444 0.0556,-1 0.5,-1 0.44444,0 0.5,0.5556 0.5,1 0,0.7408 0,2 0,2 z" opacity=".3" color="#000" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1 -1)"/>
-            <path d="m 137,1057.7908 0,0.5714 -3,-0.5 0,2 1,1.0556 0,0.4444 -3,0 0,-0.4444 1,-1.0556 0,-2 -3,0.5 0,-0.5714 3,-1.4286 c 0,0 0,-1.2592 0,-2 0,-0.4444 0.0556,-1 0.5,-1 0.44444,0 0.5,0.5556 0.5,1 0,0.7408 0,2 0,2 z" fill="#444" transform="translate(-1 -1)"/>
-        </g>
-        <rect width="12" height="12" x="126" y="1050.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/airport-18.svg b/data/styles/symbols/maki/airport-18.svg
deleted file mode 100644
index be31d85216..0000000000
--- a/data/styles/symbols/maki/airport-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-108 -16)">
-        <g>
-            <path d="m 124.5,1060.3622 0,1 -5.5,-1 0,3 2,1.2222 0,0.7778 -6,0 0,-0.7778 2,-1.2222 0,-3 -5.5,1 0,-1 5.5,-3 c 0,0 0,-1.7036 0,-3 0,-0.7777 0.22222,-2 1,-2 0.77777,0 1,1.2223 1,2 0,1.2964 0,3 0,3 z" opacity=".3" color="#000" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 124.5,1060.3622 0,1 -5.5,-1 0,3 2,1.2222 0,0.7778 -6,0 0,-0.7778 2,-1.2222 0,-3 -5.5,1 0,-1 5.5,-3 c 0,0 0,-1.7036 0,-3 0,-0.7777 0.22222,-2 1,-2 0.77777,0 1,1.2223 1,2 0,1.2964 0,3 0,3 z" fill="#444"/>
-        </g>
-        <rect y="1050.362" x="108" height="18" width="18" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/airport-24.svg b/data/styles/symbols/maki/airport-24.svg
deleted file mode 100644
index b06ac2fc43..0000000000
--- a/data/styles/symbols/maki/airport-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-84 -22)">
-        <g transform="translate(84 -2)">
-            <path d="m 21,1065.3622 0,1 -7,-1 0,0.031 0,3.9688 2,2.0002 c 0,0.5 -0.5,1 -1,1 -2,0 -5,0 -5,0 -0.5,0 -1,-0.5 -1,-1 l 2,-2.0002 0,-4 -7,1 0,-1 7,-4 c 0,0 0,-0.3333 0,-2 0,-1 0.5,-4 1.5,-4 1,0 1.5,3 1.5,4 0,1.6667 0,2 0,2 z" opacity=".3" color="#000" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 21,1065.8622 0,0.5 -7,-1 0,3.9998 2,2.0002 c 0,0.5 -0.5,1 -1,1 -2,0 -5,0 -5,0 -0.5,0 -1,-0.5 -1,-1 l 2,-2.0002 0,-4 -7,1 0,-0.4998 c 0,-0.5 0.3056731,-0.6379 0.5,-0.75 l 6.5,-3.7502 c 0,0 0,-0.3333 0,-2 0,-1 0.5,-4 1.5,-4 1,0 1.5,3 1.5,4 0,1.6667 0,2 0,2 l 6.5,3.7502 c 0.27841,0.1606 0.5,0.2411 0.5,0.75 z" fill="#444"/>
-        </g>
-        <rect width="24" height="24" x="84" y="1050.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/alcohol-shop-12.svg b/data/styles/symbols/maki/alcohol-shop-12.svg
deleted file mode 100644
index fdbbe9aa8e..0000000000
--- a/data/styles/symbols/maki/alcohol-shop-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-594 -34)" color="#000">
-        <path d="m 718,25 0,2 -2,2 0,5.40625 0.59375,0.59375 4.03125,0 0.375,-0.5 0,-5.5 -2,-2 0,-2 -1,0 z m 4,4 0,2 1,1 0,2 -1,1 3,0 -1,-1 0,-2 1,-1 0,-2 -3,0 z" transform="translate(-120 1050.362)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <rect width="12" height="12" x="594" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 598,1075.3622 0,2 -2,2 0,5.4063 0.59375,0.5937 4.03125,0 0.375,-0.5 0,-5.5 -2,-2 0,-2 -1,0 z m 4,4 0,2 1,1 0,2 -1,1 3,0 -1,-1 0,-2 1,-1 0,-2 -3,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/alcohol-shop-18.svg b/data/styles/symbols/maki/alcohol-shop-18.svg
deleted file mode 100644
index ff3f1f0847..0000000000
--- a/data/styles/symbols/maki/alcohol-shop-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-576 -40)" color="#000">
-        <path d="m 702.5,26 -0.5,0.5 0,3 -2,2.5 0,8 6,0 0,-8 -2,-2.5 0,-3 -0.5,-0.5 -1,0 z m 4.5,6 0,3 c 0,0 0,1 1,1 l 1,0 0,3 -1.5,0.5 -0.5,0.5 5,0 -0.5,-0.5 -1.5,-0.5 0,-3 1,0 c 1,0 1,-1 1,-1 l 0,-3 -5,0 z" transform="translate(-120 1050.362)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <rect y="1074.362" x="576" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 582.5,1076.3622 -0.5,0.5 0,3 -2,2.5 0,8 6,0 0,-8 -2,-2.5 0,-3 -0.5,-0.5 -1,0 z m 4.5,6 0,3 c 0,0 0,1 1,1 l 1,0 0,3 -1.5,0.5 -0.5,0.5 5,0 -0.5,-0.5 -1.5,-0.5 0,-3 1,0 c 1,0 1,-1 1,-1 l 0,-3 -5,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/alcohol-shop-24.svg b/data/styles/symbols/maki/alcohol-shop-24.svg
deleted file mode 100644
index 77db58d7d7..0000000000
--- a/data/styles/symbols/maki/alcohol-shop-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-552 -46)" color="#000">
-        <path d="m 680,27 c -0.55401,0 -0.5,0.6273 -0.5,1 l 0,2.5 c 0,0.5 -0.49764,1.2488 -1,1.5 -1,0.5 -1.5,1 -1.5,2 l 0,9 c 0,0.554 0.44599,1 1,1 l 5,0 c 0.55401,0 1,-0.446 1,-1 l 0,-9 c 0,-1 -0.5,-1.5 -1.5,-2 -0.49864,-0.2493 -1,-1 -1,-1.5 l 0,-2.5 c 0,-0.5 0.054,-1 -0.5,-1 z m 6,7 0,3 c 0,1 1,2 2,2 l 1,0 0,2.5 c 0,0.5 -1,1.5 -2,1.5 -1,0 -1,1 -1,1 l 7,0 c 0,0 0,-1 -1,-1 -1,0 -2,-1 -2,-1.5 l 0,-2.5 1,0 c 1,0 2,-1 2,-2 l 0,-3 z" transform="translate(-120 1050.362)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <rect width="24" height="24" x="552" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 560,1077.3622 c -0.55401,0 -0.5,0.6273 -0.5,1 l 0,2.5 c 0,0.5 -0.49764,1.2488 -1,1.5 -1,0.5 -1.5,1 -1.5,2 l 0,9 c 0,0.554 0.44599,1 1,1 l 5,0 c 0.55401,0 1,-0.446 1,-1 l 0,-9 c 0,-1 -0.5,-1.5 -1.5,-2 -0.49864,-0.2493 -1,-1 -1,-1.5 l 0,-2.5 c 0,-0.5 0.054,-1 -0.5,-1 z m 6,7 0,3 c 0,1 1,2 2,2 l 1,0 0,2.5 c 0,0.5 -1,1.5 -2,1.5 -1,0 -1,1 -1,1 l 7,0 c 0,0 0,-1 -1,-1 -1,0 -2,-1 -2,-1.5 l 0,-2.5 1,0 c 1,0 2,-1 2,-2 l 0,-3 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/america-football-12.svg b/data/styles/symbols/maki/america-football-12.svg
deleted file mode 100644
index 0881795156..0000000000
--- a/data/styles/symbols/maki/america-football-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-516 -58)" color="#000">
-        <g>
-            <path d="m 522.5,1101.3622 c -3.25,0 -4.5,3 -4.5,3 0,0 1.25,3 4.5,3 3.25,0 4.5,-3 4.5,-3 0,0 -1.25,-3 -4.5,-3 z m -1,2.5 1,0 0.5,0 1,0 0.5,0 0.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 0,0.1385 -0.1115,0.25 -0.25,0.25 l -0.5,0 -0.5,0 -1,0 -0.5,0 -1,0 -0.5,0 -0.75,0 c -0.1385,0 -0.25,-0.1115 -0.25,-0.25 0,-0.1385 0.1115,-0.25 0.25,-0.25 l 0.75,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 522.5,1101.3622 c -3.25,0 -4.5,3 -4.5,3 0,0 1.25,3 4.5,3 3.25,0 4.5,-3 4.5,-3 0,0 -1.25,-3 -4.5,-3 z m -1,2.5 1,0 0.5,0 1,0 0.5,0 0.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 0,0.1385 -0.1115,0.25 -0.25,0.25 l -0.5,0 -0.5,0 -1,0 -0.5,0 -1,0 -0.5,0 -0.75,0 c -0.1385,0 -0.25,-0.1115 -0.25,-0.25 0,-0.1385 0.1115,-0.25 0.25,-0.25 l 0.75,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="12" height="12" x="516" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/america-football-18.svg b/data/styles/symbols/maki/america-football-18.svg
deleted file mode 100644
index 2c71c71a06..0000000000
--- a/data/styles/symbols/maki/america-football-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-498 -64)" color="#000">
-        <g>
-            <path d="m 507.5,1102.3622 c -4.78947,0 -6.5,4.5 -6.5,4.5 0,0 1.71053,4.5 6.5,4.5 4.78947,0 6.5,-4.5 6.5,-4.5 0,0 -1.71053,-4.5 -6.5,-4.5 z m -2.25,3 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,0.75 1.75,0 0,-0.75 c 0,-0.1385 0.1115,-0.25 0.25,-0.25 0.1385,0 0.25,0.1115 0.25,0.25 l 0,0.75 1.75,0 0,-0.75 c 0,-0.1385 0.1115,-0.25 0.25,-0.25 0.1385,0 0.28359,0.1156 0.25,0.25 l 0,0.75 0.5625,0 c 0.24622,0 0.4375,0.223 0.4375,0.5 0,0.277 -0.19128,0.5 -0.4375,0.5 l -0.5625,0 0,0.75 c 0,0.1385 -0.1115,0.25 -0.25,0.25 -0.1385,0 -0.21641,-0.1156 -0.25,-0.25 l 0,-0.75 -1.75,0 0,0.75 c 0,0.1385 -0.1115,0.25 -0.25,0.25 -0.1385,0 -0.25,-0.1115 -0.25,-0.25 l 0,-0.75 -1.75,0 0,0.75 c 0,0.1385 -0.1115,0.25 -0.25,0.25 -0.1385,0 -0.25,-0.1115 -0.25,-0.25 l 0,-0.75 -0.5625,0 c -0.24622,0 -0.4375,-0.223 -0.4375,-0.5 0,-0.277 0.19128,-0.5 0.4375,-0.5 l 0.5625,0 0,-0.75 c 0,-0.1385 0.1115,-0.25 0.25,-0.25 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-            <path d="m 507.5,1102.3622 c -4.78947,0 -6.5,4.5 -6.5,4.5 0,0 1.71053,4.5 6.5,4.5 4.78947,0 6.5,-4.5 6.5,-4.5 0,0 -1.71053,-4.5 -6.5,-4.5 z m -2.25,3 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,0.75 1.75,0 0,-0.75 c 0,-0.1385 0.1115,-0.25 0.25,-0.25 0.1385,0 0.25,0.1115 0.25,0.25 l 0,0.75 1.75,0 0,-0.75 c 0,-0.1385 0.1115,-0.25 0.25,-0.25 0.1385,0 0.28359,0.1156 0.25,0.25 l 0,0.75 0.5625,0 c 0.24622,0 0.4375,0.223 0.4375,0.5 0,0.277 -0.19128,0.5 -0.4375,0.5 l -0.5625,0 0,0.75 c 0,0.1385 -0.1115,0.25 -0.25,0.25 -0.1385,0 -0.21641,-0.1156 -0.25,-0.25 l 0,-0.75 -1.75,0 0,0.75 c 0,0.1385 -0.1115,0.25 -0.25,0.25 -0.1385,0 -0.25,-0.1115 -0.25,-0.25 l 0,-0.75 -1.75,0 0,0.75 c 0,0.1385 -0.1115,0.25 -0.25,0.25 -0.1385,0 -0.25,-0.1115 -0.25,-0.25 l 0,-0.75 -0.5625,0 c -0.24622,0 -0.4375,-0.223 -0.4375,-0.5 0,-0.277 0.19128,-0.5 0.4375,-0.5 l 0.5625,0 0,-0.75 c 0,-0.1385 0.1115,-0.25 0.25,-0.25 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1098.362" x="498" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/america-football-24.svg b/data/styles/symbols/maki/america-football-24.svg
deleted file mode 100644
index 291e0ad469..0000000000
--- a/data/styles/symbols/maki/america-football-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-474 -70)" color="#000">
-        <g>
-            <path transform="translate(474 94) translate(-360 956.362)" d="m 372.5,53 c -6.5,0 -9.5,6.5 -9.5,6.5 0,0 3,6.5 9.5,6.5 6.5,0 9.5,-6.5 9.5,-6.5 0,0 -3,-6.5 -9.5,-6.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-            <path d="m 372.5,53 c -6.5,0 -9.5,6.5 -9.5,6.5 0,0 3,6.5 9.5,6.5 6.5,0 9.5,-6.5 9.5,-6.5 0,0 -3,-6.5 -9.5,-6.5 z m -3,5 c 0.277,0 0.5,0.223 0.5,0.5 l 0,0.5 2,0 0,-0.5 c 0,-0.277 0.223,-0.5 0.5,-0.5 0.277,0 0.5,0.223 0.5,0.5 l 0,0.5 2,0 0,-0.5 c 0,-0.277 0.223,-0.5 0.5,-0.5 0.277,0 0.5,0.223 0.5,0.5 l 0,0.5 1.5,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 l -1.5,0 0,0.5 c 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 l 0,-0.5 -2,0 0,0.5 c 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 l 0,-0.5 -2,0 0,0.5 c 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 l 0,-0.5 -1.5,0 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 l 1.5,0 0,-0.5 c 0,-0.277 0.223,-0.5 0.5,-0.5 z" transform="translate(474 94) translate(-360 956.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="474" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/art-gallery-12.svg b/data/styles/symbols/maki/art-gallery-12.svg
deleted file mode 100644
index 1d38f04f0e..0000000000
--- a/data/styles/symbols/maki/art-gallery-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-360 -250)" color="#000">
-        <rect transform="translate(-120 1050.362)" y="240" x="480" height="12" width="12" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 366,1292.3622 c -2.5,0 -4,1.5 -4,3 0,1 0.5,2 2,2 1,0 1,0.25 1,1 0,1.5 1.5,2 2.5,2 2.5,0 3.5,-2.25 3.5,-4 0,-3.5 -2.51472,-4 -5,-4 z m -0.625,1 c 0.34517,0 0.625,0.2798 0.625,0.625 0,0.3452 -0.27983,0.625 -0.625,0.625 -0.34517,0 -0.625,-0.2798 -0.625,-0.625 0,-0.3452 0.27983,-0.625 0.625,-0.625 z m 2,0 c 0.34517,0 0.625,0.2798 0.625,0.625 0,0.3452 -0.27983,0.625 -0.625,0.625 -0.34517,0 -0.625,-0.2798 -0.625,-0.625 0,-0.3452 0.27983,-0.625 0.625,-0.625 z m -3.75,0.75 c 0.34517,0 0.625,0.2798 0.625,0.625 0,0.3452 -0.27983,0.625 -0.625,0.625 -0.34517,0 -0.625,-0.2798 -0.625,-0.625 0,-0.3452 0.27983,-0.625 0.625,-0.625 z m 5.75,0.25 c 0.34517,0 0.625,0.2798 0.625,0.625 0,0.3452 -0.27983,0.625 -0.625,0.625 -0.34517,0 -0.625,-0.2798 -0.625,-0.625 0,-0.3452 0.27983,-0.625 0.625,-0.625 z m -2.375,2.5 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 366,1292.3622 c -2.5,0 -4,1.5 -4,3 0,1 0.5,2 2,2 1,0 1,0.25 1,1 0,1.5 1.5,2 2.5,2 2.5,0 3.5,-2.25 3.5,-4 0,-3.5 -2.51472,-4 -5,-4 z m -0.625,1 c 0.34517,0 0.625,0.2798 0.625,0.625 0,0.3452 -0.27983,0.625 -0.625,0.625 -0.34517,0 -0.625,-0.2798 -0.625,-0.625 0,-0.3452 0.27983,-0.625 0.625,-0.625 z m 2,0 c 0.34517,0 0.625,0.2798 0.625,0.625 0,0.3452 -0.27983,0.625 -0.625,0.625 -0.34517,0 -0.625,-0.2798 -0.625,-0.625 0,-0.3452 0.27983,-0.625 0.625,-0.625 z m -3.75,0.75 c 0.34517,0 0.625,0.2798 0.625,0.625 0,0.3452 -0.27983,0.625 -0.625,0.625 -0.34517,0 -0.625,-0.2798 -0.625,-0.625 0,-0.3452 0.27983,-0.625 0.625,-0.625 z m 5.75,0.25 c 0.34517,0 0.625,0.2798 0.625,0.625 0,0.3452 -0.27983,0.625 -0.625,0.625 -0.34517,0 -0.625,-0.2798 -0.625,-0.625 0,-0.3452 0.27983,-0.625 0.625,-0.625 z m -2.375,2.5 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/art-gallery-18.svg b/data/styles/symbols/maki/art-gallery-18.svg
deleted file mode 100644
index 95d90d1ccb..0000000000
--- a/data/styles/symbols/maki/art-gallery-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-342 -256)" color="#000">
-        <g>
-            <path d="m 470.5,243 c -3.88889,0 -6.5,3.44444 -6.5,5 0,1.5 0.99999,2.5 2.5,2.5 1.55556,0 3,0.33333 3,1.5 0,1.55556 1.44444,2.5 3,2.5 4.5,0 6.5,-2.77778 6.5,-5.5 0,-5.5 -4.634,-6 -8.5,-6 z m -1.5,1.5 c 0.55228,0 1,0.44772 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 3,0 c 0.55227,0 1,0.44773 1,1 0,0.55227 -0.44773,1 -1,1 -0.55227,0 -1,-0.44773 -1,-1 0,-0.55227 0.44773,-1 1,-1 z m 3,1.5 c 0.54462,0 0.96875,0.45538 0.96875,1 0,0.54462 -0.42413,0.96875 -0.96875,0.96875 -0.54462,0 -1,-0.42413 -1,-0.96875 0,-0.54462 0.45538,-1 1,-1 z m -8,1 c 0.55229,0 1,0.44771 1,1 0,0.55229 -0.44771,1 -1,1 -0.55229,0 -1,-0.44771 -1,-1 0,-0.55229 0.44771,-1 1,-1 z" transform="matrix(1.001 0 0 1.001 -120.061 1050.581)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path transform="matrix(1.001 0 0 1.001 -120.061 1050.581)" d="m 470.5,243 c -3.88889,0 -6.5,3.44444 -6.5,5 0,1.5 0.99999,2.5 2.5,2.5 1.55556,0 3,0.33333 3,1.5 0,1.55556 1.44444,2.5 3,2.5 4.5,0 6.5,-2.77778 6.5,-5.5 0,-5.5 -4.634,-6 -8.5,-6 z m -1.5,1.5 c 0.55228,0 1,0.44772 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 3,0 c 0.55227,0 1,0.44773 1,1 0,0.55227 -0.44773,1 -1,1 -0.55227,0 -1,-0.44773 -1,-1 0,-0.55227 0.44773,-1 1,-1 z m 3,1.5 c 0.54462,0 0.96875,0.45538 0.96875,1 0,0.54462 -0.42413,0.96875 -0.96875,0.96875 -0.54462,0 -1,-0.42413 -1,-0.96875 0,-0.54462 0.45538,-1 1,-1 z m -8,1 c 0.55229,0 1,0.44771 1,1 0,0.55229 -0.44771,1 -1,1 -0.55229,0 -1,-0.44771 -1,-1 0,-0.55229 0.44771,-1 1,-1 z m 5.25,3.5 c 0.69035,0 1.25,0.55965 1.25,1.25 0,0.69035 -0.55965,1.25 -1.25,1.25 -0.69035,0 -1.25,-0.55965 -1.25,-1.25 0,-0.69035 0.55965,-1.25 1.25,-1.25 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect transform="translate(-120 1050.362)" y="240" x="462" height="18" width="18" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/art-gallery-24.svg b/data/styles/symbols/maki/art-gallery-24.svg
deleted file mode 100644
index 5f8ab5bb82..0000000000
--- a/data/styles/symbols/maki/art-gallery-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-318 -262)" color="#000">
-        <g>
-            <path d="m 449,244 c -5,0 -8,4 -8,6 0,2 1,3.5 3,3.5 2,0 3,0.5 3,2 0,2 1.5,3.5 3.5,3.5 6.5,0 9.5,-3.5 9.5,-7 0,-6 -5,-8 -11,-8 z" transform="translate(-120 1050.362)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path transform="translate(-120 1050.362)" d="m 449,244 c -5,0 -8,4 -8,6 0,2 1,3.5 3,3.5 2,0 3,0.5 3,2 0,2 1.5,3.5 3.5,3.5 6.5,0 9.5,-3.5 9.5,-7 0,-6 -5,-8 -11,-8 z m -1.25,2 c 0.69034,0 1.25,0.55966 1.25,1.25 0,0.69034 -0.55966,1.25 -1.25,1.25 -0.69034,0 -1.25,-0.55966 -1.25,-1.25 0,-0.69034 0.55966,-1.25 1.25,-1.25 z m 4,0 c 0.69033,0 1.25,0.55967 1.25,1.25 0,0.69033 -0.55967,1.25 -1.25,1.25 -0.69033,0 -1.25,-0.55967 -1.25,-1.25 0,-0.69033 0.55967,-1.25 1.25,-1.25 z m 4,2 c 0.69034,0 1.25,0.55966 1.25,1.25 0,0.69034 -0.55966,1.25 -1.25,1.25 -0.69034,0 -1.25,-0.55966 -1.25,-1.25 0,-0.69034 0.55966,-1.25 1.25,-1.25 z m -11.5,1 c 0.69034,0 1.25,0.55966 1.25,1.25 0,0.69034 -0.55966,1.25 -1.25,1.25 -0.69034,0 -1.25,-0.55966 -1.25,-1.25 0,-0.69034 0.55966,-1.25 1.25,-1.25 z m 6.25,5 c 0.82843,0 1.5,0.67157 1.5,1.5 0,0.82843 -0.67157,1.5 -1.5,1.5 -0.82843,0 -1.5,-0.67157 -1.5,-1.5 0,-0.82843 0.67157,-1.5 1.5,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect transform="translate(-120 1050.362)" y="240" x="438" height="24" width="24" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/bakery-12.svg b/data/styles/symbols/maki/bakery-12.svg
deleted file mode 100644
index daf3d72591..0000000000
--- a/data/styles/symbols/maki/bakery-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g color="#000" transform="translate(0 -1040.362)">
-        <path d="m 5.9999999,1043.8622 -0.9999998,0.5 0.9999998,4 1,0 1.0000003,-4 -0.9999999,-0.5 z m -1.9999999,1 -0.5,0.5 -1.5,2.5 0,0.5 0.5,0.5 0.5,0 1,-0.5 1,0 z m 5.0000002,0 -1.0000004,3.5 1.0000004,0 0.9999998,0.5 0.5,0 0.5,-0.5 0,-1 -1.4999999,-2 z" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".5" fill="none"/>
-        <path d="m 6,1043.8622 -1,0.5 1,4 1,0 1,-4 -1,-0.5 z m -2,1 -0.5,0.5 -1.5,2.5 0,0.5 0.5,0.5 0.5,0 1,-0.5 1,0 z m 5,0 -1,3.5 1,0 1,0.5 0.5,0 0.5,-0.5 0,-1 -1.5,-2 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect transform="translate(0 1040.362)" height="12" width="12" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/bakery-18.svg b/data/styles/symbols/maki/bakery-18.svg
deleted file mode 100644
index 4f6fe5c44d..0000000000
--- a/data/styles/symbols/maki/bakery-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g color="#000" transform="translate(0 -1034.362)">
-        <path d="m 9.0000005,1040.3622 c -0.9999998,0 -1.5,0.5 -1.5,1.5 l 0.9999997,4 0.5000003,0.5 0.9999995,0 0.500001,-0.5 0.999999,-4 c 0,-1 -0.5,-1.5 -1.5,-1.5 z m -2.5000005,1.5 -1.9999998,1 1.4999997,3.5 1.0000003,0 0.4999995,-0.5 z m 6,0 -1,4 0.5,0.5 1,0 1.5,-3.5 z m -8.5,2 -0.5,0.5 -0.5000001,1.5 0,1.5 0.5000001,0 1.5,-1 z m 11,0 -1,2.5 1,1 1,0 0,-1.5 -0.5,-1.5 z" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 9.0000005,1040.3622 c -0.9999997,0 -1.5,0.5 -1.5,1.5 l 0.9999997,4 0.5000003,0.5 0.9999995,0 0.500001,-0.5 0.999999,-4 c 0,-1 -0.5,-1.5 -1.5,-1.5 z m -2.5000005,1.5 -1.9999997,1 1.4999997,3.5 1.0000002,0 0.4999996,-0.5 z m 6,0 -1,4 0.5,0.5 1,0 1.5,-3.5 z m -8.5,2 -0.5,0.5 -0.5,1.5 0,1.5 0.5,0 1.5,-1 z m 11,0 -1,2.5 1,1 1,0 0,-1.5 -0.5,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect y="1034.362" height="18" width="18" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/bakery-24.svg b/data/styles/symbols/maki/bakery-24.svg
deleted file mode 100644
index f5713407d0..0000000000
--- a/data/styles/symbols/maki/bakery-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g>
-        <path d="M 12.5,9 C 11,9 9.736126,9.5359367 10.0625,11 L 11.5,17.5 c 0.05129,0.230055 0.189587,0.5 0.5,0.5 l 1,0 1,0 c 0.310413,0 0.44871,-0.269945 0.5,-0.5 L 15.9375,11 C 16.263874,9.5359367 15,9 13.5,9 L 13,9 z M 7,12 c -1,0 -1.950694,0.598612 -1.5,1.5 l 2,4 C 7.666667,17.833333 8,18 8.5,18 l 1,0 c 0,0 0.615152,0.01818 0.5,-0.5 L 9,13 C 8.888197,12.496885 8.5,12 8,12 z m 11,0 c -0.5,0 -0.888197,0.496885 -1,1 l -1,4.5 c -0.115152,0.518184 0.5,0.5 0.5,0.5 l 1,0 c 0.5,0 0.833333,-0.166667 1,-0.5 l 2,-4 C 20.950694,12.598612 20,12 19,12 z M 4.4375,15.125 C 4.244284,15.123984 4.081496,15.243372 4,15.5 l -0.957701,2.994476 c -0.11889,0.374376 -0.03751,0.56596 0.46875,0.46875 L 6,18.5 C 6.491034,18.40572 6.57236,18.233874 6.4375,18 L 5,15.5 C 4.854362,15.247434 4.630716,15.126016 4.4375,15.125 z m 17.125,0 C 21.369284,15.126016 21.145638,15.247434 21,15.5 L 19.5625,18 C 19.42764,18.233874 19.50897,18.405718 20,18.5 l 2.453795,0.474274 c 0.506263,0.09721 0.61889,-0.09437 0.5,-0.46875 L 22,15.5 c -0.0815,-0.256628 -0.244284,-0.376016 -0.4375,-0.375 z" color="#000" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".5" fill="none"/>
-        <path d="M 12.5,9 C 11,9 9.736126,9.5359367 10.0625,11 L 11.5,17.5 c 0.05129,0.230055 0.189587,0.5 0.5,0.5 l 1,0 1,0 c 0.310413,0 0.44871,-0.269945 0.5,-0.5 L 15.9375,11 C 16.263874,9.5359367 15,9 13.5,9 L 13,9 z M 7,12 c -1,0 -1.950694,0.598612 -1.5,1.5 l 2,4 C 7.666667,17.833333 8,18 8.5,18 l 1,0 c 0,0 0.615152,0.01818 0.5,-0.5 L 9,13 C 8.888197,12.496885 8.5,12 8,12 z m 11,0 c -0.5,0 -0.888197,0.496885 -1,1 l -1,4.5 c -0.115152,0.518184 0.5,0.5 0.5,0.5 l 1,0 c 0.5,0 0.833333,-0.166667 1,-0.5 l 2,-4 C 20.950694,12.598612 20,12 19,12 z M 4.4375,15.125 C 4.244284,15.123984 4.081496,15.243372 4,15.5 l -0.957701,2.994476 c -0.11889,0.374376 -0.03751,0.56596 0.46875,0.46875 L 6,18.5 C 6.491034,18.40572 6.57236,18.233874 6.4375,18 L 5,15.5 C 4.854362,15.247434 4.630716,15.126016 4.4375,15.125 z m 17.125,0 C 21.369284,15.126016 21.145638,15.247434 21,15.5 L 19.5625,18 C 19.42764,18.233874 19.50897,18.405718 20,18.5 l 2.453795,0.474274 c 0.506263,0.09721 0.61889,-0.09437 0.5,-0.46875 L 22,15.5 c -0.0815,-0.256628 -0.244284,-0.376016 -0.4375,-0.375 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect width="24" height="24" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/bank-12.svg b/data/styles/symbols/maki/bank-12.svg
deleted file mode 100644
index 607605bde5..0000000000
--- a/data/styles/symbols/maki/bank-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-360 -130)" color="#000">
-        <g fill="#444">
-            <path d="m 363.5,1175.3622 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,5 c 0,0.277 0.223,0.5 0.5,0.5 l 8,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 0,1 8,0 0,1 -8,0 z m 0,3 1.5,0 0,1 -1.5,0 z m 4.5,0.5 3,0 0,0.5 -3,0 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" transform="translate(-1 -2)"/>
-            <path d="m 363.5,1175.3622 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,5 c 0,0.277 0.223,0.5 0.5,0.5 l 8,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 0,1 8,0 0,1 -8,0 z m 0,3 1.5,0 0,1 -1.5,0 z m 4.5,0.5 3,0 0,0.5 -3,0 z" overflow="visible" enable-background="accumulate" transform="translate(-1 -2)"/>
-        </g>
-        <rect y="1170.362" x="360" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/bank-18.svg b/data/styles/symbols/maki/bank-18.svg
deleted file mode 100644
index ed71c9a213..0000000000
--- a/data/styles/symbols/maki/bank-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-342 -136)" color="#000">
-        <g fill="#444">
-            <path d="m 346.72222,1177.3622 c -0.40011,0 -0.72222,0.3221 -0.72222,0.7223 l 0,6.5555 c 0,0.4001 0.32211,0.7222 0.72222,0.7222 l 11.55556,0 c 0.40011,0 0.72222,-0.3221 0.72222,-0.7222 l 0,-6.5555 c 0,-0.4002 -0.32211,-0.7223 -0.72222,-0.7223 z m -0.22222,1.5 12,0 0,1.5 -12,0 z m 0.5,4 2,0 0,1.5 -2,0 z m 6,0.7777 5,0 0,0.7223 -5,0 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" transform="translate(-1 -2)"/>
-            <path d="m 346.72222,1177.3622 c -0.40011,0 -0.72222,0.3221 -0.72222,0.7223 l 0,6.5555 c 0,0.4001 0.32211,0.7222 0.72222,0.7222 l 11.55556,0 c 0.40011,0 0.72222,-0.3221 0.72222,-0.7222 l 0,-6.5555 c 0,-0.4002 -0.32211,-0.7223 -0.72222,-0.7223 z m -0.22222,1.5 12,0 0,1.5 -12,0 z m 0.5,4 2,0 0,1.5 -2,0 z m 6,0.7777 5,0 0,0.7223 -5,0 z" overflow="visible" enable-background="accumulate" transform="translate(-1 -2)"/>
-        </g>
-        <rect width="18" height="18" x="342" y="1170.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/bank-24.svg b/data/styles/symbols/maki/bank-24.svg
deleted file mode 100644
index cda6be9974..0000000000
--- a/data/styles/symbols/maki/bank-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-318 -142)" color="#000">
-        <g fill="#444">
-            <path transform="translate(318 167) translate(0 1004.362)" d="M 4,5 C 3.446,5 3,5.446 3,6 l 0,10 c 0,0.554 0.446,1 1,1 l 17,0 c 0.554,0 1,-0.446 1,-1 L 22,6 C 22,5.446 21.554,5 21,5 z m -0.5,2 18,0 0,2 -18,0 z m 0.5,6 3,0 0,2 -3,0 z m 9,1 7,0 0,1 -7,0 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-            <path d="M 4,5 C 3.446,5 3,5.446 3,6 l 0,10 c 0,0.554 0.446,1 1,1 l 17,0 c 0.554,0 1,-0.446 1,-1 L 22,6 C 22,5.446 21.554,5 21,5 z m -0.5,2 18,0 0,2 -18,0 z m 0.5,6 3,0 0,2 -3,0 z m 9,1 7,0 0,1 -7,0 z" transform="translate(318 167) translate(0 1004.362)" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1170.362" x="318" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/bar-12.svg b/data/styles/symbols/maki/bar-12.svg
deleted file mode 100644
index df8a69e68a..0000000000
--- a/data/styles/symbols/maki/bar-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-360 -106)" color="#000">
-        <g>
-            <path d="m 363.5,1149.3622 c -0.28125,0 -0.5,3e-4 -0.5,0.1406 0,0.141 0.19283,0.3082 0.28125,0.4219 l 3.71875,4.4375 0,2.5 c -1,0.5 -2.5,1 -2.5,1.5 l 6,0 c 0,-0.5 -1.5,-1 -2.5,-1.5 l 0,-2.5 3.71875,-4.4375 c 0.0884,-0.1137 0.28125,-0.2809 0.28125,-0.4219 0,-0.1403 -0.21875,-0.1406 -0.5,-0.1406 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1 -1)"/>
-            <path d="m 363.5,1149.3622 c -0.28125,0 -0.5,3e-4 -0.5,0.1406 0,0.141 0.19283,0.3082 0.28125,0.4219 l 3.71875,4.4375 0,2.5 c -1,0.5 -2.5,1 -2.5,1.5 l 6,0 c 0,-0.5 -1.5,-1 -2.5,-1.5 l 0,-2.5 3.71875,-4.4375 c 0.0884,-0.1137 0.28125,-0.2809 0.28125,-0.4219 0,-0.1403 -0.21875,-0.1406 -0.5,-0.1406 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-        </g>
-        <rect y="1146.362" x="360" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/bar-18.svg b/data/styles/symbols/maki/bar-18.svg
deleted file mode 100644
index 4de0adba95..0000000000
--- a/data/styles/symbols/maki/bar-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-342 -112)" color="#000">
-        <g>
-            <path d="m 346,1149.3622 c -0.40625,0 -1,0.047 -1,0.25 0,0.2036 0.37228,0.5858 0.5,0.75 l 5.5,6 0,4 -2.8125,1.1875 c -0.40625,0.1354 -0.6875,0.3125 -0.6875,0.8125 l 8,0 c 0,-0.5 -0.40625,-0.6771 -0.8125,-0.8125 l -2.6875,-1.1875 0,-4 5.5,-6 c 0.12772,-0.1642 0.5,-0.5464 0.5,-0.75 0,-0.2026 -0.59375,-0.25 -1,-0.25 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 346,1149.3622 c -0.40625,0 -1,0.047 -1,0.25 0,0.2036 0.37228,0.5858 0.5,0.75 l 5.5,6 0,4 -2.8125,1.1875 c -0.40625,0.1354 -0.6875,0.3125 -0.6875,0.8125 l 8,0 c 0,-0.5 -0.40625,-0.6771 -0.8125,-0.8125 l -2.6875,-1.1875 0,-4 5.5,-6 c 0.12772,-0.1642 0.5,-0.5464 0.5,-0.75 0,-0.2026 -0.59375,-0.25 -1,-0.25 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="18" height="18" x="342" y="1146.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/bar-24.svg b/data/styles/symbols/maki/bar-24.svg
deleted file mode 100644
index 537357bdcf..0000000000
--- a/data/styles/symbols/maki/bar-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-318 -118)" color="#000">
-        <g>
-            <path d="m 324,1150.3622 c -0.5,0 -1,6e-4 -1,0.25 0,0.2506 0.34281,0.5479 0.5,0.75 l 7.5,7.8125 0,6.1875 -4,1 c -0.5,0.1667 -1,0.5 -1,1 l 11,0 c 0,-0.5 -0.5,-0.8333 -1,-1 l -4,-1 0,-6.1875 7.5,-7.8125 c 0.15719,-0.2021 0.5,-0.4994 0.5,-0.75 0,-0.2494 -0.5,-0.25 -1,-0.25 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1)"/>
-            <path d="m 324,1150.3622 c -0.5,0 -1,6e-4 -1,0.25 0,0.2506 0.34281,0.5479 0.5,0.75 l 7.5,7.8125 0,6.1875 -4,1 c -0.5,0.1667 -1,0.5 -1,1 l 11,0 c 0,-0.5 -0.5,-0.8333 -1,-1 l -4,-1 0,-6.1875 7.5,-7.8125 c 0.15719,-0.2021 0.5,-0.4994 0.5,-0.75 0,-0.2494 -0.5,-0.25 -1,-0.25 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-        </g>
-        <rect y="1146.362" x="318" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/baseball-12.svg b/data/styles/symbols/maki/baseball-12.svg
deleted file mode 100644
index eed0288f7a..0000000000
--- a/data/styles/symbols/maki/baseball-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-516 -130)" color="#000">
-        <g>
-            <path d="m 518,1171.8622 0,1.5 c 1.5,2 4.58739,3.5874 6.5,5.5 l 1,1 0,1 1,0 0.5,-0.5 0,-1 -1,0 -1,-1 c -1.78431,-1.7843 -3.5,-5 -5.5,-6.5 z m 2,5.5 c -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 518,1171.8622 0,1.5 c 1.5,2 4.58739,3.5874 6.5,5.5 l 1,1 0,1 1,0 0.5,-0.5 0,-1 -1,0 -1,-1 c -1.78431,-1.7843 -3.5,-5 -5.5,-6.5 z m 2,5.5 c -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1170.362" x="516" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/baseball-18.svg b/data/styles/symbols/maki/baseball-18.svg
deleted file mode 100644
index 0b281918af..0000000000
--- a/data/styles/symbols/maki/baseball-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-498 -136)" color="#000">
-        <g>
-            <path d="m 503,1172.3622 c 0,0 -1,0 -1.5,0.5 -0.5,0.5 -0.5,1.5 -0.5,1.5 2.5,3.5 7.07972,6.1418 8,7 l 2.59375,2.4063 -0.59375,0.5937 0,1 1,0 1,-1 1,-1 0,-1 -1,0 -0.59375,0.5938 L 510,1180.3622 c -2.36211,-2.5328 -3.5,-5.5 -7,-8 z m 1.75,9 c -0.69036,0 -1.25,0.5596 -1.25,1.25 0,0.6904 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.5596 1.25,-1.25 0,-0.6904 -0.55964,-1.25 -1.25,-1.25 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 503,1172.3622 c 0,0 -1,0 -1.5,0.5 -0.5,0.5 -0.5,1.5 -0.5,1.5 2.5,3.5 7.07972,6.1418 8,7 l 2.59375,2.4063 -0.59375,0.5937 0,1 1,0 1,-1 1,-1 0,-1 -1,0 -0.59375,0.5938 L 510,1180.3622 c -2.36211,-2.5328 -3.5,-5.5 -7,-8 z m 1.75,9 c -0.69036,0 -1.25,0.5596 -1.25,1.25 0,0.6904 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.5596 1.25,-1.25 0,-0.6904 -0.55964,-1.25 -1.25,-1.25 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="18" height="18" x="498" y="1170.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/baseball-24.svg b/data/styles/symbols/maki/baseball-24.svg
deleted file mode 100644
index 237022b447..0000000000
--- a/data/styles/symbols/maki/baseball-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-474 -142)" color="#000">
-        <g>
-            <path d="m 480,1173.3622 c -1.25235,0 -2,0.7534 -2,2 0,1 2,2.5 3,3.5 1.99995,2 5.30187,3.8019 8.5,7 l 3,3 -0.5,0.5 c 0,0.5 0.5,1 1,1 l 1,-1 1,-1 c 0,-0.5 -0.5,-1 -1,-1 l -0.5,0.5 -3,-3 c -2.86335,-2.8633 -5.00005,-6.5 -7,-8.5 -1,-1 -2.5,-3 -3.5,-3 z m 3.5,10 c -0.82843,0 -1.5,0.6716 -1.5,1.5 0,0.8284 0.67157,1.5 1.5,1.5 0.82843,0 1.5,-0.6716 1.5,-1.5 0,-0.8284 -0.67157,-1.5 -1.5,-1.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 480,1173.3622 c -1.25235,0 -2,0.7534 -2,2 0,1 2,2.5 3,3.5 1.99995,2 5.30187,3.8019 8.5,7 l 3,3 -0.5,0.5 c 0,0.5 0.5,1 1,1 l 1,-1 1,-1 c 0,-0.5 -0.5,-1 -1,-1 l -0.5,0.5 -3,-3 c -2.86335,-2.8633 -5.00005,-6.5 -7,-8.5 -1,-1 -2.5,-3 -3.5,-3 z m 3.5,10 c -0.82843,0 -1.5,0.6716 -1.5,1.5 0,0.8284 0.67157,1.5 1.5,1.5 0.82843,0 1.5,-0.6716 1.5,-1.5 0,-0.8284 -0.67157,-1.5 -1.5,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1170.362" x="474" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/basketball-12.svg b/data/styles/symbols/maki/basketball-12.svg
deleted file mode 100644
index 36190bc35a..0000000000
--- a/data/styles/symbols/maki/basketball-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-516 -106)" color="#000">
-        <g>
-            <path d="m 521,1148.3622 -2,2 0,4.5 c 0,0.25 0.25,0.5 0.5,0.5 l 1.5,0 1,1 1,1 1,0 1,-1 1,-1 1.5,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-4.5 -2,-2 -5,0 z m 0,2 5,0 0,3 -5,0 0,-3 z m 0.6875,0.6875 0,1.625 3.625,0 0,-1.625 -3.625,0 z m 0.3125,3.3125 1,0 0,1 1,0 0,-1 1,0 0,1 -1,1 -1,0 -1,-1 0,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            <path d="m 521,1148.3622 -2,2 0,4.5 c 0,0.25 0.25,0.5 0.5,0.5 l 1.5,0 1,1 1,1 1,0 1,-1 1,-1 1.5,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-4.5 -2,-2 -5,0 z m 0,2 5,0 0,3 -5,0 0,-3 z m 0.6875,0.6875 0,1.625 3.625,0 0,-1.625 -3.625,0 z m 0.3125,3.3125 1,0 0,1 1,0 0,-1 1,0 0,1 -1,1 -1,0 -1,-1 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-        </g>
-        <rect y="1146.362" x="516" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/basketball-18.svg b/data/styles/symbols/maki/basketball-18.svg
deleted file mode 100644
index 18ce0c7598..0000000000
--- a/data/styles/symbols/maki/basketball-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-498 -112)" color="#000">
-        <g>
-            <path d="m 505,1149.3622 -3,2 0,7 c 0,0.5 0.5,1 1,1 l 2.5,0 2,3 1,0 1,0 2,-3 2.5,0 c 0.5,0 1,-0.5 1,-1 l 0,-6.5 -3,-2.5 -7,0 z m 0,3 7,0 0,5 -7,0 0,-5 z m 1,1 0,3 5,0 0,-3 -5,0 z m 0.5,6 1.5,0 0,1 1,0 0,-1 1.5,0 -0.6875,1 -0.8125,0 0,1 -1,0 0,-1 -0.8125,0 -0.6875,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            <path d="m 505,1149.3622 -3,2 0,7 c 0,0.5 0.5,1 1,1 l 2.5,0 2,3 1,0 1,0 2,-3 2.5,0 c 0.5,0 1,-0.5 1,-1 l 0,-6.5 -3,-2.5 -7,0 z m 0,3 7,0 0,5 -7,0 0,-5 z m 1,1 0,3 5,0 0,-3 -5,0 z m 0.5,6 1.5,0 0,1 1,0 0,-1 1.5,0 -0.6875,1 -0.8125,0 0,1 -1,0 0,-1 -0.8125,0 -0.6875,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-        </g>
-        <rect width="18" height="18" x="498" y="1146.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/basketball-24.svg b/data/styles/symbols/maki/basketball-24.svg
deleted file mode 100644
index 0c5a9e2f9d..0000000000
--- a/data/styles/symbols/maki/basketball-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-474 -118)" color="#000">
-        <g>
-            <path d="m 484.5,1149.3622 -4.5,4 0,8 c 0,0.5 0.5,1 1,1 l 3.5625,0 1.9375,3.5 c 0.27778,0.5 0.5,0.5 1,0.5 l 2,0 c 0.5,0 0.72222,0 1,-0.5 l 1.9375,-3.5 3.5625,0 c 0.5,0 1,-0.5 1,-1 l 0,-8 -4.5,-4 -8,0 z m -0.5,4 9,0 0,6 -9,0 0,-6 z m 1,1 0,4 7,0 0,-4 -7,0 z m 0.5625,8 1.4375,0 0,1 1,0 0,-1 1,0 0,1 1,0 0,-1 1.4375,0 -0.5625,1 -0.875,0 0,1 0.34375,0 -0.34375,0.625 0,-0.625 -1,0 0,1 -1,0 0,-1 -1,0 0,0.625 -0.34375,-0.625 0.34375,0 0,-1 -0.875,0 -0.5625,-1 z m 2.4375,2 1,0 0,-1 -1,0 0,1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-2)"/>
-            <path d="m 484.5,1149.3622 -4.5,4 0,8 c 0,0.5 0.5,1 1,1 l 3.5625,0 1.9375,3.5 c 0.27778,0.5 0.5,0.5 1,0.5 l 2,0 c 0.5,0 0.72222,0 1,-0.5 l 1.9375,-3.5 3.5625,0 c 0.5,0 1,-0.5 1,-1 l 0,-8 -4.5,-4 -8,0 z m -0.5,4 9,0 0,6 -9,0 0,-6 z m 1,1 0,4 7,0 0,-4 -7,0 z m 0.5625,8 1.4375,0 0,1 1,0 0,-1 1,0 0,1 1,0 0,-1 1.4375,0 -0.5625,1 -0.875,0 0,1 0.34375,0 -0.34375,0.625 0,-0.625 -1,0 0,1 -1,0 0,-1 -1,0 0,0.625 -0.34375,-0.625 0.34375,0 0,-1 -0.875,0 -0.5625,-1 z m 2.4375,2 1,0 0,-1 -1,0 0,1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-2)"/>
-        </g>
-        <rect y="1146.362" x="474" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/beer-12.svg b/data/styles/symbols/maki/beer-12.svg
deleted file mode 100644
index 83b9c081ab..0000000000
--- a/data/styles/symbols/maki/beer-12.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g color="#000" transform="translate(0 -1040.362)">
-        <path d="m 363,1243.3622 1,8.5 c 0.0357,0.2857 0.21428,0.5 0.5,0.5 l 4,0 c 0.28572,0 0.44996,-0.2165 0.5,-0.5 l 1,-8.5 z m 1.5,1 4,0 -0.25,2 -3.5,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-360 -202)"/>
-        <path d="m 363,1243.3622 1,8.5 c 0.0357,0.2857 0.21428,0.5 0.5,0.5 l 4,0 c 0.28572,0 0.44996,-0.2165 0.5,-0.5 l 1,-8.5 z m 1.5,1 4,0 -0.25,2 -3.5,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-360 -202)"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/beer-18.svg b/data/styles/symbols/maki/beer-18.svg
deleted file mode 100644
index 2bab19d085..0000000000
--- a/data/styles/symbols/maki/beer-18.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g color="#000" transform="translate(0 -1034.362)">
-        <path d="m 346,1244.3622 1.5,13 c 0.0577,0.5 0.5,1 1,1 l 6,0 c 0.5,0 0.94231,-0.5 1,-1 l 1.5,-13 z m 2,2 7,0 -0.4,3 -6.2,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-342 -208)"/>
-        <path d="m 346,1244.3622 1.5,13 c 0.0577,0.5 0.5,1 1,1 l 6,0 c 0.5,0 0.94231,-0.5 1,-1 l 1.5,-13 z m 2,2 7,0 -0.4,3 -6.2,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-342 -208)"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/beer-24.svg b/data/styles/symbols/maki/beer-24.svg
deleted file mode 100644
index e3746da928..0000000000
--- a/data/styles/symbols/maki/beer-24.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g color="#000" transform="translate(0 -1028.362) translate(-318 -214)">
-        <path d="m 443,195 2,16 c 0.0625,0.5 0.5,1 1,1 l 9,0 c 0.5,0 0.9375,-0.5 1,-1 l 2,-16 z m 2.25,2 10.5,0 -0.46875,4 -9.5625,0 z" transform="translate(-71 -1) translate(-49 1051.362)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path transform="translate(-71 -1) translate(-49 1051.362)" d="m 443,195 2,16 c 0.0625,0.5 0.5,1 1,1 l 9,0 c 0.5,0 0.9375,-0.5 1,-1 l 2,-16 z m 2.25,2 10.5,0 -0.46875,4 -9.5625,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/bicycle-12.svg b/data/styles/symbols/maki/bicycle-12.svg
deleted file mode 100644
index d48c1707e0..0000000000
--- a/data/styles/symbols/maki/bicycle-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-126 -346)" color="#000">
-        <path d="m 133,1388.3622 0,1 1,0 0,1 -2,0 0,-1 -1,0 0,1 -0.5,0.5 -0.5,0.5 -1,0 -1,2 1,2 1,0 1,0 1,-2 1.5,-2 1,0 0,0 -1.50005,1.9995 1.00005,2.0005 -5e-5,-5e-4 1,0 1,0 5e-5,5e-4 0.99995,-2.0005 -0.99995,-1.9995 -5e-5,-5e-4 -0.5,0 -0.5,-1 0,-1 -1,-1 -1,0 z m -2,3 1,0 0,1 -1,0 0,1 0,1 -2,0 0,-1 0,-1 2,0 z m 3,1 2,0 0,1 0,1 -2,0 0,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 133,1388.3622 0,1 1,0 0,1 -2,0 0,-1 -1,0 0,1 -0.5,0.5 -0.5,0.5 -1,0 -1,2 1,2 1,0 1,0 1,-2 1.5,-2 1,0 0,0 -1.50005,1.9995 1.00005,2.0005 -5e-5,-5e-4 1,0 1,0 5e-5,5e-4 0.99995,-2.0005 -0.99995,-1.9995 -5e-5,-5e-4 -0.5,0 -0.5,-1 0,-1 -1,-1 -1,0 z m -2,3 1,0 0,1 -1,0 0,1 0,1 -2,0 0,-1 0,-1 2,0 z m 3,1 2,0 0,1 0,1 -2,0 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect width="12" height="12" x="126" y="1386.362" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/bicycle-18.svg b/data/styles/symbols/maki/bicycle-18.svg
deleted file mode 100644
index ae8ba0d1a8..0000000000
--- a/data/styles/symbols/maki/bicycle-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-108 -352)" color="#000">
-        <path transform="translate(-120 1050.362)" d="m 240,339 0,1 1,0.5 0,1.5 -5,0 0,-1 1,0 0,-0.5 -1,-0.5 -2,0 0,1 1,0 0,1 -1.25,2.125 C 233.50461,344.06012 233.26579,344 233,344 c -1.65686,0 -3,1.34314 -3,3 0,1.65686 1.34314,3 3,3 1.65686,0 3,-1.34314 3,-3 l 1,0 2.5,-4 1.5,0 0.53125,1.0625 C 240.10342,344.29297 239,345.50713 239,347 c 0,1.65685 1.34315,3 3,3 1.65685,0 3,-1.34315 3,-3 0,-1.43939 -1.02256,-2.64661 -2.375,-2.9375 L 242,342.5 242,340 241.5,339.5 240,339 z m -4.5,4 3,0 -2,3 -0.6875,0 c -0.21207,-0.59119 -0.58733,-1.11568 -1.09375,-1.46875 L 235.5,343 z m -2.5,2 c 1.10456,0 2,0.89544 2,2 0,1.10456 -0.89544,2 -2,2 -1.10456,0 -2,-0.89544 -2,-2 0,-1.10456 0.89544,-2 2,-2 z m 9,0 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 240,339 0,1 1,0.5 0,1.5 -5,0 0,-1 1,0 0,-0.5 -1,-0.5 -2,0 0,1 1,0 0,1 -1.25,2.125 C 233.50461,344.06012 233.26579,344 233,344 c -1.65686,0 -3,1.34314 -3,3 0,1.65686 1.34314,3 3,3 1.65686,0 3,-1.34314 3,-3 l 1,0 2.5,-4 1.5,0 0.53125,1.0625 C 240.10342,344.29297 239,345.50713 239,347 c 0,1.65685 1.34315,3 3,3 1.65685,0 3,-1.34315 3,-3 0,-1.43939 -1.02256,-2.64661 -2.375,-2.9375 L 242,342.5 242,340 241.5,339.5 240,339 z m -4.5,4 3,0 -2,3 -0.6875,0 c -0.21207,-0.59119 -0.58733,-1.11568 -1.09375,-1.46875 L 235.5,343 z m -2.5,2.25 c 0.9665,0 1.75,0.7835 1.75,1.75 0,0.9665 -0.7835,1.75 -1.75,1.75 -0.9665,0 -1.75,-0.7835 -1.75,-1.75 0,-0.9665 0.7835,-1.75 1.75,-1.75 z m 9,0 c 0.9665,0 1.75,0.7835 1.75,1.75 0,0.9665 -0.7835,1.75 -1.75,1.75 -0.9665,0 -1.75,-0.7835 -1.75,-1.75 0,-0.9665 0.7835,-1.75 1.75,-1.75 z" transform="translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect width="18" height="18" x="108" y="1386.362" rx="0" ry="0" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/bicycle-24.svg b/data/styles/symbols/maki/bicycle-24.svg
deleted file mode 100644
index 6f6c3e5977..0000000000
--- a/data/styles/symbols/maki/bicycle-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-84 -358)" color="#000">
-        <path d="m 98.875,1390.3622 c -0.56154,0.076 -0.63714,1.0579 -0.09375,1.2188 l 2.21875,0.875 0,1.9062 -7,0 0,-1 1.375,0 c 0.33019,0 0.625,-0.2948 0.625,-0.625 0,-0.3302 -0.29481,-0.6297 -0.625,-0.625 l -3.875,0 c -0.062,-0.01 -0.12547,-0.01 -0.1875,0 -0.32727,0.049 -0.58034,0.3915 -0.53125,0.7188 0.0491,0.3272 0.39149,0.5803 0.71875,0.5312 l 1.5,0 0,1 -1.0625,3.125 c -0.29968,-0.072 -0.61585,-0.125 -0.9375,-0.125 -2.20914,0 -4,1.7909 -4,4 0,2.2091 1.79086,4 4,4 2.20914,0 4,-1.7909 4,-4 0,-0.3004 -0.06221,-0.5935 -0.125,-0.875 l 1.125,0 c 0.19854,-0.01 0.39085,-0.1152 0.5,-0.2812 l 3.375,-4.8438 0.125,0 1,0 0.6875,2.0313 c -2.06189,0.1606 -3.6875,1.8656 -3.6875,3.9687 0,2.2091 1.79086,4 4,4 2.20914,0 4,-1.7909 4,-4 0,-1.8282 -1.23109,-3.3352 -2.90625,-3.8125 L 102,1394.3622 l 0,-2.3437 c 0,-0.1049 -0.0423,-0.211 -0.0937,-0.3125 -0.004,-0.01 0.004,-0.024 0,-0.031 -0.0149,-0.032 -0.0429,-0.064 -0.0625,-0.094 -0.032,-0.045 -0.0546,-0.086 -0.0937,-0.125 -0.0169,-0.016 -0.044,-0.017 -0.0625,-0.031 -0.0183,-0.015 -0.0433,-0.018 -0.0625,-0.031 -0.0324,-0.019 -0.0577,-0.05 -0.0937,-0.062 l -0.0312,-0.031 -0.4375,-0.1562 -1.84375,-0.75 c -0.06501,-0.025 -0.14929,-0.028 -0.21875,-0.031 -0.047,0 -0.0788,-0.011 -0.125,0 z m -4.875,5 4.40625,0 -2.71875,3.875 -1.3125,0 c -0.30967,-0.4941 -0.69912,-0.9009 -1.1875,-1.2187 L 94,1395.3622 z m -3,3.5 c 1.38071,0 2.5,1.1193 2.5,2.5 0,1.3807 -1.11929,2.5 -2.5,2.5 -1.38071,0 -2.5,-1.1193 -2.5,-2.5 0,-1.3807 1.11929,-2.5 2.5,-2.5 z m 11,0 c 1.38071,0 2.5,1.1193 2.5,2.5 0,1.3807 -1.11929,2.5 -2.5,2.5 -1.38071,0 -2.5,-1.1193 -2.5,-2.5 0,-0.1726 0.0292,-0.3373 0.0625,-0.5 0.23312,-1.1392 1.22938,-2 2.4375,-2 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 98.875,1390.3622 c -0.56154,0.076 -0.63714,1.0579 -0.09375,1.2188 l 2.21875,0.875 0,1.9062 -7,0 0,-1 1.375,0 c 0.33019,0 0.625,-0.2948 0.625,-0.625 0,-0.3302 -0.29481,-0.6297 -0.625,-0.625 l -3.875,0 c -0.062,-0.01 -0.12547,-0.01 -0.1875,0 -0.32727,0.049 -0.58034,0.3915 -0.53125,0.7188 0.0491,0.3272 0.39149,0.5803 0.71875,0.5312 l 1.5,0 0,1 -1.0625,3.125 c -0.29968,-0.072 -0.61585,-0.125 -0.9375,-0.125 -2.20914,0 -4,1.7909 -4,4 0,2.2091 1.79086,4 4,4 2.20914,0 4,-1.7909 4,-4 0,-0.3004 -0.06221,-0.5935 -0.125,-0.875 l 1.125,0 c 0.19854,-0.01 0.39085,-0.1152 0.5,-0.2812 l 3.375,-4.8438 0.125,0 1,0 0.6875,2.0313 c -2.06189,0.1606 -3.6875,1.8656 -3.6875,3.9687 0,2.2091 1.79086,4 4,4 2.20914,0 4,-1.7909 4,-4 0,-1.8282 -1.23109,-3.3352 -2.90625,-3.8125 L 102,1394.3622 l 0,-2.3437 c 0,-0.1049 -0.0423,-0.211 -0.0937,-0.3125 -0.004,-0.01 0.004,-0.024 0,-0.031 -0.0149,-0.032 -0.0429,-0.064 -0.0625,-0.094 -0.032,-0.045 -0.0546,-0.086 -0.0937,-0.125 -0.0169,-0.016 -0.044,-0.017 -0.0625,-0.031 -0.0183,-0.015 -0.0433,-0.018 -0.0625,-0.031 -0.0324,-0.019 -0.0577,-0.05 -0.0937,-0.062 l -0.0312,-0.031 -0.4375,-0.1562 -1.84375,-0.75 c -0.06501,-0.025 -0.14929,-0.028 -0.21875,-0.031 -0.047,0 -0.0788,-0.011 -0.125,0 z m -4.875,5 4.40625,0 -2.71875,3.875 -1.3125,0 c -0.30967,-0.4941 -0.69912,-0.9009 -1.1875,-1.2187 L 94,1395.3622 z m -3,3.5 c 1.38071,0 2.5,1.1193 2.5,2.5 0,1.3807 -1.11929,2.5 -2.5,2.5 -1.38071,0 -2.5,-1.1193 -2.5,-2.5 0,-1.3807 1.11929,-2.5 2.5,-2.5 z m 11,0 c 1.38071,0 2.5,1.1193 2.5,2.5 0,1.3807 -1.11929,2.5 -2.5,2.5 -1.38071,0 -2.5,-1.1193 -2.5,-2.5 0,-0.1726 0.0292,-0.3373 0.0625,-0.5 0.23312,-1.1392 1.22938,-2 2.4375,-2 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect width="24" height="24" x="84" y="1386.362" rx="0" ry="0" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/building-12.svg b/data/styles/symbols/maki/building-12.svg
deleted file mode 100644
index 4d2e76bb97..0000000000
--- a/data/styles/symbols/maki/building-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-672 -82)">
-        <path d="m 679,1124.3622 -1,0 -4,3.3076 0,0.6924 1,0 0,4 7,0 0,-4 1,0 0,-0.6924 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <g transform="translate(78 -48)">
-            <rect y="1170.362" x="594" height="12" width="12" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <path d="m 679,1124.3622 -1,0 -4,3.3076 0,0.6924 1,0 0,4 7,0 0,-4 1,0 0,-0.6924 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/building-18.svg b/data/styles/symbols/maki/building-18.svg
deleted file mode 100644
index 031e81eb99..0000000000
--- a/data/styles/symbols/maki/building-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-654 -88)" color="#000">
-        <path d="m 664,1125.3622 -1,0 -6,5 0,1 1,0 0,6 11,0 0,-6 1,0 0,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 664,1125.3622 -1,0 -6,5 0,1 1,0 0,6 11,0 0,-6 1,0 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect y="1122.362" x="654" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/building-24.svg b/data/styles/symbols/maki/building-24.svg
deleted file mode 100644
index 499c310175..0000000000
--- a/data/styles/symbols/maki/building-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-630 -46)" color="#000">
-        <path d="m 641,1077.3622 -7.5,6.5 c -0.3561,0.3086 -0.5,0.5 -0.5,0.75 0,0.4959 0.5,0.75 1,0.75 l 1,0 0,8 c 0,0.554 0.446,1 1,1 l 6.5,0 6.5,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 1,0 c 0.5,0 1,-0.2541 1,-0.75 0,-0.25 -0.13799,-0.4483 -0.5,-0.75 l -7.5,-6.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <rect y="1074.362" x="630" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 641,1077.3622 -7.5,6.5 c -0.3561,0.3086 -0.5,0.5 -0.5,0.75 0,0.4959 0.5,0.75 1,0.75 l 1,0 0,8 c 0,0.554 0.446,1 1,1 l 6.5,0 6.5,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 1,0 c 0.5,0 1,-0.2541 1,-0.75 0,-0.25 -0.13799,-0.4483 -0.5,-0.75 l -7.5,-6.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/bus-12.svg b/data/styles/symbols/maki/bus-12.svg
deleted file mode 100644
index aa15a91e4a..0000000000
--- a/data/styles/symbols/maki/bus-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-126 -106)" color="#000">
-        <g>
-            <path d="m 131,1147.3622 0,1 -1.5,0 c -0.25,0 -0.5,0.25 -0.5,0.5 l 0,3 0,2.5 0,0.5 0,0.5 1,0 0,1 1,0 0,-1 3,0 0,1 1,0 0,-1 1,0 0,-0.5 0,-0.5 0,-2.5 0,-3 c 0,-0.25 -0.25,-0.5 -0.5,-0.5 l -1.5,0 0,-1 -3,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 131,1147.3622 0,1 -1.5,0 c -0.25,0 -0.5,0.25 -0.5,0.5 l 0,3 0,2.5 0,0.5 0,0.5 1,0 0,1 1,0 0,-1 3,0 0,1 1,0 0,-1 1,0 0,-0.5 0,-0.5 0,-2.5 0,-3 c 0,-0.25 -0.25,-0.5 -0.5,-0.5 l -1.5,0 0,-1 z m -1,2 5,0 0,3 -5,0 z m 0.5,4 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1146.362" x="126" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/bus-18.svg b/data/styles/symbols/maki/bus-18.svg
deleted file mode 100644
index afd91f2e4b..0000000000
--- a/data/styles/symbols/maki/bus-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-108 -112)" color="#000">
-        <g>
-            <path d="m 114.5,1148.3622 0,1 -1.5,0 c -0.5,0 -1,0.5 -1,1 l 0,10 1,0 0,1 2,0 0,-1 5,0 0,1 2,0 0,-1 1,0 0,-10 c 0,-0.5 -0.5,-1 -1,-1 l -1.5,0 0,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 234.5,122 0,1 -1.5,0 c -0.5,0 -1,0.5 -1,1 l 0,10 1,0 0,1 2,0 0,-1 5,0 0,1 2,0 0,-1 1,0 0,-10 c 0,-0.5 -0.5,-1 -1,-1 l -1.5,0 0,-1 -6,0 z m -0.5,2 7,0 0,4 -7,0 0,-4 z m 0.75,6.5 c 0.41421,0 0.75,0.33579 0.75,0.75 0,0.41421 -0.33579,0.75 -0.75,0.75 -0.41421,0 -0.75,-0.33579 -0.75,-0.75 0,-0.41421 0.33579,-0.75 0.75,-0.75 z m 5.5,0 c 0.41421,0 0.75,0.33579 0.75,0.75 0,0.41421 -0.33579,0.75 -0.75,0.75 -0.41421,0 -0.75,-0.33579 -0.75,-0.75 0,-0.41421 0.33579,-0.75 0.75,-0.75 z" transform="translate(-120 1026.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="18" height="18" x="108" y="1146.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/bus-24.svg b/data/styles/symbols/maki/bus-24.svg
deleted file mode 100644
index 03797d8d74..0000000000
--- a/data/styles/symbols/maki/bus-24.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-84 -118)">
-        <g>
-            <path d="m 93,1149.3622 0,1 -2,0 c -0.5,0 -1,0.5 -1,1 l 0,6 0,5 0,1 0,1 1,0 0,2 2,0 0,-2 7,0 0,2 2,0 0,-2 1,0 0,-1 0,-1 0,-5 0,-6 c 0,-0.5 -0.5,-1 -1,-1 l -2,0 0,-1 -7,0 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <g transform="translate(-1 2)">
-                <path d="m 10,1008.3622 0,1 -2,0 c -0.5,0 -1,0.5 -1,1 l 0,6 0,5 0,1 0,1 1,0 0,2 2,0 0,-2 7,0 0,2 2,0 0,-2 1,0 0,-1 0,-1 0,-5 0,-6 c 0,-0.5 -0.5,-1 -1,-1 l -2,0 0,-1 z m -1,3 9,0 0,3 0,2 -9,0 0,-2 z m 1,8 c 0.554,0 1,0.446 1,1 0,0.554 -0.446,1 -1,1 -0.554,0 -1,-0.446 -1,-1 0,-0.554 0.446,-1 1,-1 z m 7,0 c 0.554,0 1,0.446 1,1 0,0.554 -0.446,1 -1,1 -0.554,0 -1,-0.446 -1,-1 0,-0.554 0.446,-1 1,-1 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(84 139)"/>
-            </g>
-        </g>
-        <rect y="1146.362" x="84" height="24" width="24" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/cafe-12.svg b/data/styles/symbols/maki/cafe-12.svg
deleted file mode 100644
index 556f8f2ed1..0000000000
--- a/data/styles/symbols/maki/cafe-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-360 -34)" color="#000">
-        <g>
-            <path d="m 363.5,1076.3622 c -0.27701,0 -0.5,0.223 -0.5,0.5 l 0,4.5 c 0,0.277 0.22299,0.5 0.5,0.5 l 5,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-0.5 0.25,0 c 0.25,0 0.25,-0.25 0.25,-0.25 l 0,-0.25 0.5,0 c 0.5,0 1,-0.5 1,-1 l 0,-0.5 0,-1 c 0,-0.25 -0.25,-0.5 -0.5,-0.5 l -1.5,0 0,-0.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 5.5,1.5 1.25,0 c 0.25,0 0.25,0.25 0.25,0.25 l 0,1.25 c 0,0.25 -0.25,0.5 -0.5,0.5 l -0.5,0 -0.5,0 z m -7,4.5 1.5,1.5 5,0 1.5,-1.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 363.5,1076.3622 c -0.27701,0 -0.5,0.223 -0.5,0.5 l 0,4.5 c 0,0.277 0.22299,0.5 0.5,0.5 l 5,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-0.5 0.25,0 c 0.25,0 0.25,-0.25 0.25,-0.25 l 0,-0.25 0.5,0 c 0.5,0 1,-0.5 1,-1 l 0,-0.5 0,-1 c 0,-0.25 -0.25,-0.5 -0.5,-0.5 l -1.5,0 0,-0.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 5.5,1.5 1.25,0 c 0.25,0 0.25,0.25 0.25,0.25 l 0,1.25 c 0,0.25 -0.25,0.5 -0.5,0.5 l -0.5,0 -0.5,0 z m -7,4.5 2,1 4,0 2,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="12" height="12" x="360" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/cafe-18.svg b/data/styles/symbols/maki/cafe-18.svg
deleted file mode 100644
index 72a8f22de2..0000000000
--- a/data/styles/symbols/maki/cafe-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-342 -40)" color="#000">
-        <g>
-            <path d="m 347,1077.3622 c -0.5,0 -1,0.5 -1,1 l 0,6 c 0,0.5 0.5,1 1,1 l 7,0 c 0.40011,0 1,-0.5 1,-1 l 0,-0.4444 0.36111,0 c 0.36111,0 0.36111,-0.3611 0.36111,-0.3611 l 0,-0.3611 0.44445,0 c 0.72222,0 1.83333,-0.3334 1.83333,-1.4444 l 0,-1.889 c 0,-0.5 -0.25,-1 -0.75,-1 l -2.25,0 0,-0.5 c 0,-0.5 -0.5,-1 -1,-1 z m 8,2.2223 1.88889,0 c 0.36111,0 0.36111,0.2777 0.36111,0.2777 l 0,1.889 c 0,0.572 -0.72225,0.6064 -1.08333,0.611 l -0.44445,0 -0.72222,0 z m -10,6.7777 2,2 7,0 2,-2 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 347,1077.3622 c -0.5,0 -1,0.5 -1,1 l 0,6 c 0,0.5 0.5,1 1,1 l 7,0 c 0.40011,0 1,-0.5 1,-1 l 0,-0.4444 0.36111,0 c 0.36111,0 0.36111,-0.3611 0.36111,-0.3611 l 0,-0.3611 0.44445,0 c 0.72222,0 1.83333,-0.3334 1.83333,-1.4444 l 0,-1.889 c 0,-0.5 -0.25,-1 -0.75,-1 l -2.25,0 0,-0.5 c 0,-0.5 -0.5,-1 -1,-1 z m 8,2.2223 1.88889,0 c 0.36111,0 0.36111,0.2777 0.36111,0.2777 l 0,1.889 c 0,0.572 -0.72225,0.6064 -1.08333,0.611 l -0.44445,0 -0.72222,0 z m -10,6.7777 2,2 7,0 2,-2 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1074.362" x="342" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/cafe-24.svg b/data/styles/symbols/maki/cafe-24.svg
deleted file mode 100644
index 3d585bef83..0000000000
--- a/data/styles/symbols/maki/cafe-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-318 -46)" color="#000">
-        <g>
-            <path d="m 324,1079.3622 c -0.55401,0 -1,0.446 -1,1 l 0,9 c 0,0.554 0.44599,1 1,1 l 11,0 c 0.55401,0 1,-0.446 1,-1 l 0,-1 0.5,0 c 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-0.5 1,0 c 1,0 2,-1 2,-2 l 0,-1 0,-2 c 0,-0.5 -0.5,-1 -1,-1 l -3,0 0,-1 c 0,-0.554 -0.44599,-1 -1,-1 z m 12,3 2.5,0 c 0.5,0 0.5,0.5 0.5,0.5 l 0,2.5 c 0,0.5 -0.5,1 -1,1 l -1,0 -1,0 z m -15,9 1,1 1,1 13,0 1,-1 1,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 324,1079.3622 c -0.55401,0 -1,0.446 -1,1 l 0,9 c 0,0.554 0.44599,1 1,1 l 11,0 c 0.55401,0 1,-0.446 1,-1 l 0,-1 0.5,0 c 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-0.5 1,0 c 1,0 2,-1 2,-2 l 0,-1 0,-2 c 0,-0.5 -0.5,-1 -1,-1 l -3,0 0,-1 c 0,-0.554 -0.44599,-1 -1,-1 z m 12,3 2.5,0 c 0.5,0 0.5,0.5 0.5,0.5 l 0,2.5 c 0,0.5 -0.5,1 -1,1 l -1,0 -1,0 z m -15,9 1,1 1,1 13,0 1,-1 1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="318" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/campsite-12.svg b/data/styles/symbols/maki/campsite-12.svg
deleted file mode 100644
index 367b7e7e79..0000000000
--- a/data/styles/symbols/maki/campsite-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-204 -178)" color="#000">
-        <g font-family="Sans">
-            <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m 211.53125,1221.3622 c -0.25,0 -0.36305,0.1197 -0.4375,0.25 l -2.85938,5.75 -0.73437,0 c -0.29329,0 -0.5,0.223 -0.5,0.5 0,0.277 0.20671,0.5 0.5,0.5 l 1.03125,0 6,0 0.9375,0 c 0.29329,0 0.53125,-0.223 0.53125,-0.5 0,-0.277 -0.23796,-0.5 -0.53125,-0.5 l -0.64063,0 -2.85937,-5.75 c -0.0745,-0.1303 -0.1875,-0.25 -0.4375,-0.25 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            <path d="m 211.53125,1221.3622 c -0.25,0 -0.36305,0.1197 -0.4375,0.25 l -2.85938,5.75 -0.73437,0 c -0.29329,0 -0.5,0.223 -0.5,0.5 0,0.277 0.20671,0.5 0.5,0.5 l 1.03125,0 6,0 0.9375,0 c 0.29329,0 0.53125,-0.223 0.53125,-0.5 0,-0.277 -0.23796,-0.5 -0.53125,-0.5 l -0.64063,0 -2.85937,-5.75 c -0.0745,-0.1303 -0.1875,-0.25 -0.4375,-0.25 z m 0,2.5 1.5,3.5 -3,0 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-        </g>
-        <rect width="12" height="12" x="204" y="1218.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/campsite-18.svg b/data/styles/symbols/maki/campsite-18.svg
deleted file mode 100644
index d0fd4b21e9..0000000000
--- a/data/styles/symbols/maki/campsite-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-186 -184)" color="#000">
-        <g font-family="Sans">
-            <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m 196.5,1225.3626 c -0.36111,-10e-5 -0.5244,0.1729 -0.63194,0.3611 l -3.86806,8.1385 -1.5,0 c -0.5,0 -0.5,0.7778 -0.5,0.7778 0,0 0,0.7222 0.5,0.7222 l 12,0 c 0.5,0 0.5,-0.7222 0.5,-0.7222 0,0 0,-0.7777 -0.5,-0.7778 l -1.5,-4e-4 -3.86806,-8.1385 c -0.10754,-0.1882 -0.27083,-0.3612 -0.63194,-0.3611 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1 -3)"/>
-            <path d="m 196.5,1225.3626 c -0.36111,-10e-5 -0.5244,0.1729 -0.63194,0.3611 l -3.86806,8.1385 -1.5,0 c -0.5,0 -0.5,0.7778 -0.5,0.7778 0,0 0,0.7222 0.5,0.7222 l 12,0 c 0.5,0 0.5,-0.7222 0.5,-0.7222 0,0 0,-0.7777 -0.5,-0.7778 l -1.5,-4e-4 -3.86806,-8.1385 c -0.10754,-0.1882 -0.27083,-0.3612 -0.63194,-0.3611 z m 0,2.9996 2.5,5.5 -5,0 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -3)"/>
-        </g>
-        <rect y="1218.362" x="186" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/campsite-24.svg b/data/styles/symbols/maki/campsite-24.svg
deleted file mode 100644
index 01ed41c5df..0000000000
--- a/data/styles/symbols/maki/campsite-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-162 -190)" color="#000">
-        <g font-family="Sans">
-            <path transform="translate(162 213) translate(0 1004.362)" d="M 12.5,5 C 12,4.9999 11.773906,5.2394 11.625,5.5 L 5.40625,17 4.0625,17 C 3.4759168,17 3,17.446005 3,18 c 0,0.553995 0.4759168,1 1.0625,1 L 6,19 l 13,0 1.9375,0 C 21.524083,19 22,18.553995 22,18 22,17.446005 21.524083,17 20.9375,17 L 19.59375,17 13.375,5.5 C 13.226094,5.2394 13,4.9999 12.5,5 z m 0,5 3.5,7 -7,0 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="M 12.5,5 C 12,4.9999 11.773906,5.2394 11.625,5.5 L 5.40625,17 4.0625,17 C 3.4759168,17 3,17.446005 3,18 c 0,0.553995 0.4759168,1 1.0625,1 L 6,19 l 13,0 1.9375,0 C 21.524083,19 22,18.553995 22,18 22,17.446005 21.524083,17 20.9375,17 L 19.59375,17 13.375,5.5 C 13.226094,5.2394 13,4.9999 12.5,5 z m 0,5 3.5,7 -7,0 z" transform="translate(162 213) translate(0 1004.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="162" y="1218.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/cemetery-12.svg b/data/styles/symbols/maki/cemetery-12.svg
deleted file mode 100644
index 87822e1bd4..0000000000
--- a/data/styles/symbols/maki/cemetery-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-48 -82)" color="#000">
-        <g>
-            <path d="m 54.5,1124.3622 c -1.865079,0 -2.5,1.2857 -2.5,2.7857 l 0,3.7143 c -0.5,0 -1,0.5 -1,1 l 0,0.5 7,0 0,-0.5 c 0,-0.5 -0.5,-1 -1,-1 l 0,-3.5 c 0,-1.7143 -0.634922,-3 -2.5,-3 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 54.5,1124.3622 c -1.865079,0 -2.5,1.2857 -2.5,2.7857 l 0,3.7143 c -0.5,0 -1,0.5 -1,1 l 0,0.5 7,0 0,-0.5 c 0,-0.5 -0.5,-1 -1,-1 l 0,-3.5 c 0,-1.7143 -0.634922,-3 -2.5,-3 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="12" height="12" x="48" y="1122.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/cemetery-18.svg b/data/styles/symbols/maki/cemetery-18.svg
deleted file mode 100644
index bdf0d1626a..0000000000
--- a/data/styles/symbols/maki/cemetery-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-30 -88)" color="#000">
-        <g>
-            <path d="m 39.5,1124.3622 c -2.61111,0 -3.5,1.875 -3.5,4.5 l 0,6.5 c -0.43519,0 -1,0.6875 -1,1.125 l 0,0.875 9,0 0,-0.875 c 0,-0.4375 -0.56481,-1.125 -1,-1.125 l 0,-4.9936 0,-1.5064 c 0,-2.625 -0.88889,-4.5 -3.5,-4.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 39.5,1124.3622 c -2.61111,0 -3.5,1.875 -3.5,4.5 l 0,6.5 c -0.43519,0 -1,0.6875 -1,1.125 l 0,0.875 9,0 0,-0.875 c 0,-0.4375 -0.56481,-1.125 -1,-1.125 l 0,-6.5 c 0,-2.625 -0.88889,-4.5 -3.5,-4.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1122.362" x="30" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/cemetery-24.svg b/data/styles/symbols/maki/cemetery-24.svg
deleted file mode 100644
index 1bcb233ee3..0000000000
--- a/data/styles/symbols/maki/cemetery-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-6 -94)" color="#000">
-        <g>
-            <path d="m 18.5,1126.3622 c -3.073646,0 -4.5,2 -4.5,5 l 0,5 0,4 c -0.5,0 -1,0.5 -1,1 l 0,1 1,0 9,0 1,0 0,-1 c 0,-0.5 -0.5,-1 -1,-1 l 0,-9 c 0,-3 -1.5,-5 -4.5,-5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 18.5,1126.3622 c -3.073646,0 -4.5,2 -4.5,5 l 0,5 0,4 c -0.5,0 -1,0.5 -1,1 l 0,1 11,0 0,-1 c 0,-0.5 -0.5,-1 -1,-1 l 0,-9 c 0,-3 -1.5,-5 -4.5,-5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="6" y="1122.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/cinema-12.svg b/data/styles/symbols/maki/cinema-12.svg
deleted file mode 100644
index 4cbc07526f..0000000000
--- a/data/styles/symbols/maki/cinema-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-282 -130)" color="#000">
-        <g>
-            <path d="m 291.5,1171.8622 -7,2 0.5,1.5 7,-2 -0.5,-1.5 z m -6.5,3.5 0,4.5 c 0,0.3077 0.19231,0.5 0.5,0.5 l 6,0 c 0.30769,0 0.5,-0.1923 0.5,-0.5 l 0,-4.5 -7,0 z m 1,1 5,0 0,1 -5,0 0,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 291.5,1171.8622 -7,2 0.5,1.5 7,-2 -0.5,-1.5 z m -6.5,3.5 0,4.5 c 0,0.3077 0.19231,0.5 0.5,0.5 l 6,0 c 0.30769,0 0.5,-0.1923 0.5,-0.5 l 0,-4.5 -7,0 z m 1,1 5,0 0,1 -5,0 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="12" height="12" x="282" y="1170.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/cinema-18.svg b/data/styles/symbols/maki/cinema-18.svg
deleted file mode 100644
index 5a9b6f3233..0000000000
--- a/data/styles/symbols/maki/cinema-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-264 -136)" color="#000">
-        <g>
-            <path d="m 278.23529,1172.0111 -1.72059,0.5018 0.8364,2.2703 1.6489,-0.478 z m -2.77206,0.7886 -2.24632,0.6452 0.86029,2.2702 2.24633,-0.6452 z m -3.2739,0.932 -1.98345,0.5735 0.86029,2.2702 1.98346,-0.5735 z m -3.01102,0.8603 -2.17831,0.7702 1,2 2.0147,-0.5 z m -1.17831,2.7702 0,7 c 0,0.5 0.5,1 1,1 l 10,0 c 0.5,0 1,-0.5 1,-1 l 0,-7 z m 2,2 8,0 0,2 -8,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 278.23529,1172.0111 -1.72059,0.5018 0.8364,2.2703 1.6489,-0.478 z m -2.77206,0.7886 -2.24632,0.6452 0.86029,2.2702 2.24633,-0.6452 z m -3.2739,0.932 -1.98345,0.5735 0.86029,2.2702 1.98346,-0.5735 z m -3.01102,0.8603 -2.17831,0.7702 1,2 2.0147,-0.5 z m -1.17831,2.7702 0,7 c 0,0.5 0.5,1 1,1 l 10,0 c 0.5,0 1,-0.5 1,-1 l 0,-7 z m 2,2 8,0 0,2 -8,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1170.362" x="264" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/cinema-24.svg b/data/styles/symbols/maki/cinema-24.svg
deleted file mode 100644
index 31a0d01c81..0000000000
--- a/data/styles/symbols/maki/cinema-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-240 -142)" color="#000">
-        <g>
-            <path d="m 258,1173.3622 -2.25,0.6563 1.09375,2.9687 2.15625,-0.625 z m -3.625,1.0313 -2.9375,0.8437 0.0625,0.125 0.5625,1.5313 0.5,1.3125 2.9375,-0.8438 z m -4.28125,1.2187 -2.59375,0.75 1.125,2.9688 2.59375,-0.75 -0.65625,-1.6875 z m -3.9375,1.125 -2.15625,0.625 1,3 2.25,-0.6562 z m -1.15625,3.625 0,9 c 0,0.554 0.44599,1 1,1 l 13,0 c 0.55401,0 1,-0.446 1,-1 l 0,-9 z m 2,2 11,0 0,3 -11,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 258,1173.3622 -2.25,0.6563 1.09375,2.9687 2.15625,-0.625 z m -3.625,1.0313 -2.9375,0.8437 0.0625,0.125 0.5625,1.5313 0.5,1.3125 2.9375,-0.8438 z m -4.28125,1.2187 -2.59375,0.75 1.125,2.9688 2.59375,-0.75 -0.65625,-1.6875 z m -3.9375,1.125 -2.15625,0.625 1,3 2.25,-0.6562 z m -1.15625,3.625 0,9 c 0,0.554 0.44599,1 1,1 l 13,0 c 0.55401,0 1,-0.446 1,-1 l 0,-9 z m 2,2 11,0 0,3 -11,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="240" y="1170.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/circle-12.svg b/data/styles/symbols/maki/circle-12.svg
deleted file mode 100644
index dea59171d6..0000000000
--- a/data/styles/symbols/maki/circle-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(30 -34)" color="#000">
-        <g>
-            <path d="m 20.5,12.25 c 0,4.556349 -3.693651,8.25 -8.25,8.25 C 7.6936508,20.5 4,16.806349 4,12.25 4,7.6936508 7.6936508,4 12.25,4 c 4.556349,0 8.25,3.6936508 8.25,8.25 z" transform="matrix(-.545 0 0 .545 -16.818 1073.18)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="3.667" overflow="visible" enable-background="accumulate"/>
-            <path transform="matrix(-.545 0 0 .545 -16.818 1073.18)" d="m 20.5,12.25 c 0,4.556349 -3.693651,8.25 -8.25,8.25 C 7.6936508,20.5 4,16.806349 4,12.25 4,7.6936508 7.6936508,4 12.25,4 c 4.556349,0 8.25,3.6936508 8.25,8.25 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="12" height="12" x="-30" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/circle-18.svg b/data/styles/symbols/maki/circle-18.svg
deleted file mode 100644
index f57397dc81..0000000000
--- a/data/styles/symbols/maki/circle-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(48 -40)" color="#000">
-        <g>
-            <path d="m 20.5,12.25 c 0,4.556349 -3.693651,8.25 -8.25,8.25 C 7.6936508,20.5 4,16.806349 4,12.25 4,7.6936508 7.6936508,4 12.25,4 c 4.556349,0 8.25,3.6936508 8.25,8.25 z" transform="matrix(-.788 0 0 .788 -28.848 1073.211)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2.538" overflow="visible" enable-background="accumulate"/>
-            <path transform="matrix(-.788 0 0 .788 -28.848 1073.211)" d="m 20.5,12.25 c 0,4.556349 -3.693651,8.25 -8.25,8.25 C 7.6936508,20.5 4,16.806349 4,12.25 4,7.6936508 7.6936508,4 12.25,4 c 4.556349,0 8.25,3.6936508 8.25,8.25 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1074.362" x="-48" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/circle-24.svg b/data/styles/symbols/maki/circle-24.svg
deleted file mode 100644
index c669e943a2..0000000000
--- a/data/styles/symbols/maki/circle-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(72 -46)" color="#000">
-        <g>
-            <path transform="matrix(-1.03 0 0 1.03 -46.879 1073.241)" d="m 20.5,12.25 c 0,4.556349 -3.693651,8.25 -8.25,8.25 C 7.6936508,20.5 4,16.806349 4,12.25 4,7.6936508 7.6936508,4 12.25,4 c 4.556349,0 8.25,3.6936508 8.25,8.25 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="1.941" overflow="visible" enable-background="accumulate"/>
-            <path d="m 20.5,12.25 c 0,4.556349 -3.693651,8.25 -8.25,8.25 C 7.6936508,20.5 4,16.806349 4,12.25 4,7.6936508 7.6936508,4 12.25,4 c 4.556349,0 8.25,3.6936508 8.25,8.25 z" transform="matrix(-1.03 0 0 1.03 -46.879 1073.241)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="-72" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/circle-stroked-12.svg b/data/styles/symbols/maki/circle-stroked-12.svg
deleted file mode 100644
index 1e58350c1c..0000000000
--- a/data/styles/symbols/maki/circle-stroked-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(30 -10)" color="#000">
-        <rect y="1050.362" x="-30" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <g>
-            <path d="m -23.5,1052.3622 c 2.485295,0 4.5,2.0147 4.5,4.5 0,2.4853 -2.014705,4.5 -4.5,4.5 -2.485295,0 -4.5,-2.0147 -4.5,-4.5 0,-2.4853 2.014705,-4.5 4.5,-4.5 z m 0,1 c -1.93301,0 -3.5,1.567 -3.5,3.5 0,1.933 1.56699,3.5 3.5,3.5 1.93301,0 3.5,-1.567 3.5,-3.5 0,-1.933 -1.56699,-3.5 -3.5,-3.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-            <path d="m -23.5,1052.3622 c 2.485295,0 4.5,2.0147 4.5,4.5 0,2.4853 -2.014705,4.5 -4.5,4.5 -2.485295,0 -4.5,-2.0147 -4.5,-4.5 0,-2.4853 2.014705,-4.5 4.5,-4.5 z m 0,1 c -1.93301,0 -3.5,1.567 -3.5,3.5 0,1.933 1.56699,3.5 3.5,3.5 1.93301,0 3.5,-1.567 3.5,-3.5 0,-1.933 -1.56699,-3.5 -3.5,-3.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-        </g>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/circle-stroked-18.svg b/data/styles/symbols/maki/circle-stroked-18.svg
deleted file mode 100644
index 52a65f79ac..0000000000
--- a/data/styles/symbols/maki/circle-stroked-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(48 -16)" color="#000">
-        <rect width="18" height="18" x="-48" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <g>
-            <path d="m -38.5,1052.3622 c 3.589871,0 6.5,2.9101 6.5,6.5 0,3.5899 -2.910129,6.5 -6.5,6.5 -3.589871,0 -6.5,-2.9101 -6.5,-6.5 0,-3.5899 2.910129,-6.5 6.5,-6.5 z m 0,1.4444 c -2.792126,0 -5.055556,2.2635 -5.055556,5.0556 0,2.7921 2.26343,5.0556 5.055556,5.0556 2.792126,0 5.055556,-2.2635 5.055556,-5.0556 0,-2.7921 -2.26343,-5.0556 -5.055556,-5.0556 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-            <path d="m -38.5,1052.3622 c 3.589871,0 6.5,2.9101 6.5,6.5 0,3.5899 -2.910129,6.5 -6.5,6.5 -3.589871,0 -6.5,-2.9101 -6.5,-6.5 0,-3.5899 2.910129,-6.5 6.5,-6.5 z m 0,1.4444 c -2.792126,0 -5.055556,2.2635 -5.055556,5.0556 0,2.7921 2.26343,5.0556 5.055556,5.0556 2.792126,0 5.055556,-2.2635 5.055556,-5.0556 0,-2.7921 -2.26343,-5.0556 -5.055556,-5.0556 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/circle-stroked-24.svg b/data/styles/symbols/maki/circle-stroked-24.svg
deleted file mode 100644
index 21fab1a1af..0000000000
--- a/data/styles/symbols/maki/circle-stroked-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(72 -22)" color="#000">
-        <rect y="1050.362" x="-72" height="24" width="24" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m -59.5,1053.3622 c -4.69442,0 -8.5,3.8056 -8.5,8.5 0,4.6944 3.80558,8.5 8.5,8.5 4.69442,0 8.5,-3.8056 8.5,-8.5 0,-4.6944 -3.80558,-8.5 -8.5,-8.5 z m 0,2 c 3.589851,0 6.5,2.9101 6.5,6.5 0,3.5899 -2.910149,6.5 -6.5,6.5 -3.589851,0 -6.5,-2.9101 -6.5,-6.5 0,-3.5899 2.910149,-6.5 6.5,-6.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-        <path d="m -59.5,1053.3622 c -4.69442,0 -8.5,3.8056 -8.5,8.5 0,4.6944 3.80558,8.5 8.5,8.5 4.69442,0 8.5,-3.8056 8.5,-8.5 0,-4.6944 -3.80558,-8.5 -8.5,-8.5 z m 0,2 c 3.589851,0 6.5,2.9101 6.5,6.5 0,3.5899 -2.910149,6.5 -6.5,6.5 -3.589851,0 -6.5,-2.9101 -6.5,-6.5 0,-3.5899 2.910149,-6.5 6.5,-6.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/city-12.svg b/data/styles/symbols/maki/city-12.svg
deleted file mode 100644
index 790d43c533..0000000000
--- a/data/styles/symbols/maki/city-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-672 -226)" color="#000">
-        <path d="m 675,1267.3622 0,1 -1,0 0,8 4,0 0,-8 -1,0 0,-1 -2,0 z m 5,1 0,2 -1,0 0,7 4,0 0,-7 -1,0 0,-2 -0.5,0 0,2 -1,0 0,-2 -0.5,0 z m -5,1 2,0 0,0.5 -2,0 0,-0.5 z m 0,2 2,0 0,0.5 -2,0 0,-0.5 z m 5,0 2,0 0,0.5 -2,0 0,-0.5 z m -5,2 2,0 0,0.5 -2,0 0,-0.5 z m 5,0 2,0 0,0.5 -2,0 0,-0.5 z m 0,2 2,0 0,0.5 -2,0 0,-0.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <rect width="12" height="12" x="672" y="1266.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 675,1267.3622 0,1 -1,0 0,8 4,0 0,-8 -1,0 0,-1 -2,0 z m 5,1 0,2 -1,0 0,7 4,0 0,-7 -1,0 0,-2 -0.5,0 0,2 -1,0 0,-2 -0.5,0 z m -5,1 2,0 0,0.5 -2,0 0,-0.5 z m 0,2 2,0 0,0.5 -2,0 0,-0.5 z m 5,0 2,0 0,0.5 -2,0 0,-0.5 z m -5,2 2,0 0,0.5 -2,0 0,-0.5 z m 5,0 2,0 0,0.5 -2,0 0,-0.5 z m 0,2 2,0 0,0.5 -2,0 0,-0.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/city-18.svg b/data/styles/symbols/maki/city-18.svg
deleted file mode 100644
index 0958863982..0000000000
--- a/data/styles/symbols/maki/city-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-654 -232)" color="#000">
-        <path d="m 658,1268.3622 0,2 -1,0 0,10 6,0 0,-10 -1,0 0,-2 -4,0 z m 7,2 0,3 -1,0 0,9 6,0 0,-9 -1,0 0,-3 -1,0 0,3 -2,0 0,-3 -1,0 z m -7,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m -3,2 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m 4,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m -10,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m 4,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m -10,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m 4,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m -3,2 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 658,1268.3622 0,2 -1,0 0,10 6,0 0,-10 -1,0 0,-2 -4,0 z m 7,2 0,3 -1,0 0,9 6,0 0,-9 -1,0 0,-3 -1,0 0,3 -2,0 0,-3 -1,0 z m -7,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m -3,2 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m 4,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m -10,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m 4,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m -10,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m 4,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m -3,2 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect y="1266.362" x="654" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/city-24.svg b/data/styles/symbols/maki/city-24.svg
deleted file mode 100644
index 789bd48b8f..0000000000
--- a/data/styles/symbols/maki/city-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-630 -238)" color="#000">
-        <path d="m 636,1269.3622 0,2 -2,0 0,13 8,0 0,-13 -2,0 0,-2 -4,0 z m 9,2 0,3 -2,0 0,12 8,0 0,-12 -2,0 0,-3 -1,0 0,3 -2,0 0,-3 -1,0 z m -10,2 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -4,2 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m 5,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -13,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m 5,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -13,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m 5,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -13,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m 5,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <rect width="24" height="24" x="630" y="1266.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 636,1269.3622 0,2 -2,0 0,13 8,0 0,-13 -2,0 0,-2 -4,0 z m 9,2 0,3 -2,0 0,12 8,0 0,-12 -2,0 0,-3 -1,0 0,3 -2,0 0,-3 -1,0 z m -10,2 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -4,2 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m 5,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -13,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m 5,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -13,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m 5,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -13,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m 5,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/college-12.svg b/data/styles/symbols/maki/college-12.svg
deleted file mode 100644
index 417a2de073..0000000000
--- a/data/styles/symbols/maki/college-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-282 -34)" color="#000">
-        <g>
-            <path d="m 289.5,1077.3622 -4.5,2.5 4.5,2.5 2.5,-1.5 0,1.25 -2.5,1.25 -2.5,-1.25 0,1.25 2.5,1.5 2.5,-1.5 c 0,0.5 1,0.5 1,0.5 l 0,-0.5 c 0,0 -0.5,-0.029 -0.5,-0.5 l 0,-2 1.5,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1 -1)"/>
-            <path d="m 289.5,1077.3622 -4.5,2.5 4.5,2.5 2.5,-1.5 0,1.25 -2.5,1.25 -2.5,-1.25 0,1.25 2.5,1.5 2.5,-1.5 c 0,0.5 1,0.5 1,0.5 l 0,-0.5 c 0,0 -0.5,-0.029 -0.5,-0.5 l 0,-2 1.5,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-        </g>
-        <rect width="12" height="12" x="282" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/college-18.svg b/data/styles/symbols/maki/college-18.svg
deleted file mode 100644
index 3b7a5c8d11..0000000000
--- a/data/styles/symbols/maki/college-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-264 -40)" color="#000">
-        <g>
-            <path d="m 274.5,1078.3622 -6.5,3.5 6.5,3.5 4.5,-2.3437 0,3.5625 c 0,1.7812 1.5,1.5312 1.5,1.5312 l 0,-0.75 c 0,0 -0.78125,0 -0.78125,-0.7812 l 0,-3.9688 1.28125,-0.75 z m -3.5,6.5 0,1.4375 c 0,0.3588 0.51257,0.8187 1,1.0625 l 2.5,1 2.5,-1 c 0.48743,-0.2438 1,-0.7037 1,-1.0625 l 0,-1.4375 -3.5,1.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1)"/>
-            <path d="m 274.5,1078.3622 -6.5,3.5 6.5,3.5 4.5,-2.3437 0,3.5625 c 0,1.7812 1.5,1.5312 1.5,1.5312 l 0,-0.75 c 0,0 -0.78125,0 -0.78125,-0.7812 l 0,-3.9688 1.28125,-0.75 z m -3.5,6.5 0,1.4375 c 0,0.3588 0.51257,0.8187 1,1.0625 l 2.5,1 2.5,-1 c 0.48743,-0.2438 1,-0.7037 1,-1.0625 l 0,-1.4375 -3.5,1.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-        </g>
-        <rect y="1074.362" x="264" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/college-24.svg b/data/styles/symbols/maki/college-24.svg
deleted file mode 100644
index 075e0e1a08..0000000000
--- a/data/styles/symbols/maki/college-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-240 -46)">
-        <g color="#000">
-            <path d="M 12.5,7 3,12 12.5,17 18,14.21875 c 0,0 0,2.520833 0,3.78125 0,2 2,2 2,2 l 0,-1 c 0,0 -1,-0.05719 -1,-1 0,-1.5 0,-4.34375 0,-4.34375 L 22,12 z M 8,16 8,18 c 0,0.4967 0.3250891,1.1625 1,1.5 l 3.5,1.5 3,-1.5 C 16.174911,19.1625 17.047132,18.494459 17,18 l 0,-2 -4.5,2.1875 z" transform="translate(240 68) translate(0 1004.362)" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path transform="translate(240 68) translate(0 1004.362)" d="M 12.5,7 3,12 12.5,17 18,14.21875 c 0,0 0,2.520833 0,3.78125 0,2 2,2 2,2 l 0,-1 c 0,0 -1,-0.05719 -1,-1 0,-1.5 0,-4.34375 0,-4.34375 L 22,12 z M 8,16 8,18 c 0,0.4967 0.3250891,1.1625 1,1.5 l 3.5,1.5 3,-1.5 C 16.174911,19.1625 17.047132,18.494459 17,18 l 0,-2 -4.5,2.1875 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="240" y="1074.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/commercial-12.svg b/data/styles/symbols/maki/commercial-12.svg
deleted file mode 100644
index fcf933b140..0000000000
--- a/data/styles/symbols/maki/commercial-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-672 -58)" color="#000">
-        <path d="m 675.5,1099.3622 -0.5,0.5 0,9.5 3,0 0,-2 1,0 0,2 3,0 0,-9.5 -0.5,-0.5 -6,0 z m 0.5,2 2,0 0,0.5 -2,0 0,-0.5 z m 3,0 2,0 0,0.5 -2,0 0,-0.5 z m -3,2 2,0 0,0.5 -2,0 0,-0.5 z m 3,0 2,0 0,0.5 -2,0 0,-0.5 z m -3,2 2,0 0,0.5 -2,0 0,-0.5 z m 3,0 2,0 0,0.5 -2,0 0,-0.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 795.5,49 -0.5,0.5 0,9.5 3,0 0,-2 1,0 0,2 3,0 0,-9.5 -0.5,-0.5 z m 0.5,2 2,0 0,1 -2,0 z m 3,0 2,0 0,1 -2,0 z m -3,2 2,0 0,1 -2,0 z m 3,0 2,0 0,1 -2,0 z m -3,2 2,0 0,1 -2,0 z m 3,0 2,0 0,1 -2,0 z" transform="translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect y="1098.362" x="672" height="12" width="12" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/commercial-18.svg b/data/styles/symbols/maki/commercial-18.svg
deleted file mode 100644
index d4e47502e3..0000000000
--- a/data/styles/symbols/maki/commercial-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-654 -64)" color="#000">
-        <path d="m 658.78125,1100.3622 -0.78125,0.7813 0,13.2187 11,0 0,-13.2187 -0.78125,-0.7813 z m 1.21875,2.5 2,0 0,0.5 -2,0 z m 5,0 2,0 0,0.5 -2,0 z m -5,2 2,0 0,0.5 -2,0 z m 5,0 2,0 0,0.5 -2,0 z m -5,2 2,0 0,0.5 -2,0 z m 5,0 2,0 0,0.5 -2,0 z m -5,2 2,0 0,0.5 -2,0 z m 5,0 2,0 0,0.5 -2,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="M 778.78125,50 778,50.78125 778,64 l 4,0 0,-3 3,0 0,3 4,0 0,-13.21875 L 788.21875,50 l -9.4375,0 z M 780,52 l 2,0 0,1 -2,0 0,-1 z m 5,0 2,0 0,1 -2,0 0,-1 z m -5,2 2,0 0,1 -2,0 0,-1 z m 5,0 2,0 0,1 -2,0 0,-1 z m -5,2 2,0 0,1 -2,0 0,-1 z m 5,0 2,0 0,1 -2,0 0,-1 z m -5,2 2,0 0,1 -2,0 0,-1 z m 5,0 2,0 0,1 -2,0 0,-1 z" transform="translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect width="18" height="18" x="654" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/commercial-24.svg b/data/styles/symbols/maki/commercial-24.svg
deleted file mode 100644
index 071dfabeb1..0000000000
--- a/data/styles/symbols/maki/commercial-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-630 -70)" color="#000">
-        <path transform="translate(-120 1050.362)" d="m 756,50 c -0.5,0 -1,0.5 -1,1 l 0,18 6.5,0 0,-3 2,0 0,3 6.5,0 0,-18 c 0,-0.5 -0.5,-1 -1,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 636,1100.3622 c -0.5,0 -1,0.5 -1,1 l 0,18 6,0 0,-3 3,0 0,3 6,0 0,-18 c 0,-0.5 -0.5,-1 -1,-1 z m 2,3 3,0 0,1 -3,0 z m 6,0 3,0 0,1 -3,0 z m -6,3 3,0 0,1 -3,0 z m 6,0 3,0 0,1 -3,0 z m -6,3 3,0 0,1 -3,0 z m 6,0 3,0 0,1 -3,0 z m -6,3 3,0 0,1 -3,0 z m 6,0 3,0 0,1 -3,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect width="24" height="24" x="630" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/cricket-12.svg b/data/styles/symbols/maki/cricket-12.svg
deleted file mode 100644
index ea21a2e833..0000000000
--- a/data/styles/symbols/maki/cricket-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-516 -202)" color="#000">
-        <path d="m 520,1243.6122 c 0,0 -0.5,0.25 -1,0.75 -0.5,0.5 -0.75,1 -0.75,1 l 5,5 1.25,0 2,2 0.5,0 0,-0.5 -2,-1.9995 0,-1.25 -5,-5 z m -1,5.25 c -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 520,1243.6122 c 0,0 -0.5,0.25 -1,0.75 -0.5,0.5 -0.75,1 -0.75,1 l 5,5 1.25,0 2,2 0.5,0 0,-0.5 -2,-1.9995 0,-1.25 -5,-5 z m -1,5.25 c -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect width="12" height="12" x="516" y="1242.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/cricket-18.svg b/data/styles/symbols/maki/cricket-18.svg
deleted file mode 100644
index c63f458d97..0000000000
--- a/data/styles/symbols/maki/cricket-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-498 -208)" color="#000">
-        <g>
-            <path d="m 504.4375,1245.331 c 0,0 -0.8125,0 -1.625,0.8125 -0.8125,0.8125 -0.8125,1.625 -0.8125,1.625 l 8.125,8.125 1.21875,-0.4062 2.4375,2.4375 c 0.25698,0.2569 0.425,0.4062 0.75,0.4062 0.10156,0 0.21679,0 0.34375,-0.125 0.12699,-0.127 0.125,-0.2421 0.125,-0.3437 0,-0.325 -0.17703,-0.5208 -0.40625,-0.75 l -2.4375,-2.4375 0.40625,-1.2188 -8.125,-8.125 z m 2.3125,10.0313 c -0.69036,0 -1.25,0.5596 -1.25,1.25 0,0.6903 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.5597 1.25,-1.25 0,-0.6904 -0.55964,-1.25 -1.25,-1.25 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1 -1)"/>
-            <path d="m 504.4375,1245.331 c 0,0 -0.8125,0 -1.625,0.8125 -0.8125,0.8125 -0.8125,1.625 -0.8125,1.625 l 8.125,8.125 1.21875,-0.4063 2.4375,2.4375 c 0.25698,0.2569 0.425,0.4063 0.75,0.4063 0.10156,0 0.21679,0 0.34375,-0.125 0.12699,-0.127 0.125,-0.2422 0.125,-0.3438 0,-0.325 -0.17703,-0.5208 -0.40625,-0.75 l -2.4375,-2.4375 0.40625,-1.2187 -8.125,-8.125 z m 2.3125,10.0312 c -0.69036,0 -1.25,0.5596 -1.25,1.25 0,0.6904 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.5596 1.25,-1.25 0,-0.6904 -0.55964,-1.25 -1.25,-1.25 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-        </g>
-        <rect y="1242.362" x="498" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/cricket-24.svg b/data/styles/symbols/maki/cricket-24.svg
deleted file mode 100644
index 5815ff57ac..0000000000
--- a/data/styles/symbols/maki/cricket-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-474 -214)" color="#000">
-        <g>
-            <path d="m 479,1246.3623 c -1,1 -1,2 -1,2 l 10,10 1.5,-0.5 4,4 c 0.31628,0.3163 0.50625,0.5 0.90625,0.5 0.125,0 0.28125,0 0.4375,-0.1562 0.1563,-0.1563 0.15625,-0.3125 0.15625,-0.4375 0,-0.4 -0.21788,-0.6242 -0.5,-0.9063 l -4,-4 0.5,-1.5 -10,-10 c 0,0 -1,0 -2,1 z m 3.5,9 c -0.82843,0 -1.5,0.6716 -1.5,1.5 0,0.8284 0.67157,1.5 1.5,1.5 0.82843,0 1.5,-0.6716 1.5,-1.5 0,-0.8284 -0.67157,-1.5 -1.5,-1.5 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 479,1246.3623 c -1,1 -1,2 -1,2 l 10,10 1.5,-0.5 4,4 c 0.31628,0.3163 0.50625,0.5 0.90625,0.5 0.125,0 0.28125,0 0.4375,-0.1562 0.1563,-0.1563 0.15625,-0.3125 0.15625,-0.4375 0,-0.4 -0.21788,-0.6242 -0.5,-0.9063 l -4,-4 0.5,-1.5 -10,-10 c 0,0 -1,0 -2,1 z m 3.5,9 c -0.82843,0 -1.5,0.6716 -1.5,1.5 0,0.8284 0.67157,1.5 1.5,1.5 0.82843,0 1.5,-0.6716 1.5,-1.5 0,-0.8284 -0.67157,-1.5 -1.5,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="474" y="1242.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/cross-12.svg b/data/styles/symbols/maki/cross-12.svg
deleted file mode 100644
index 857b9557f2..0000000000
--- a/data/styles/symbols/maki/cross-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(30 -202)" color="#000">
-        <g font-family="Sans">
-            <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m -27.5,1243.3622 c -0.25,0 -0.5,0.2502 -0.5,0.5 0,0.1245 0.0407,0.2438 0.140625,0.3438 l 3.65625,3.6562 -3.65625,3.6563 c -0.09995,0.1 -0.140625,0.2193 -0.140625,0.3437 0,0.2498 0.25,0.5 0.5,0.5 0.125,0 0.25,-0.031 0.359375,-0.1406 l 3.640625,-3.6406 3.640625,3.6406 c 0.109375,0.1096 0.234375,0.1406 0.359375,0.1406 0.25,0 0.5,-0.2502 0.5,-0.5 0,-0.1244 -0.0407,-0.2438 -0.140625,-0.3437 l -3.65625,-3.6563 3.65625,-3.6562 c 0.09995,-0.1 0.140625,-0.2193 0.140625,-0.3438 0,-0.2498 -0.25,-0.5 -0.5,-0.5 -0.125,0 -0.25,0.031 -0.359375,0.1407 l -3.640625,3.6406 -3.640625,-3.6406 C -27.25,1243.3932 -27.375,1243.3622 -27.5,1243.3622 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m -27.5,1243.3622 c -0.25,0 -0.5,0.2502 -0.5,0.5 0,0.1245 0.0407,0.2438 0.140625,0.3438 l 3.65625,3.6562 -3.65625,3.6563 c -0.09995,0.1 -0.140625,0.2193 -0.140625,0.3437 0,0.2498 0.25,0.5 0.5,0.5 0.125,0 0.25,-0.031 0.359375,-0.1406 l 3.640625,-3.6406 3.640625,3.6406 c 0.109375,0.1096 0.234375,0.1406 0.359375,0.1406 0.25,0 0.5,-0.2502 0.5,-0.5 0,-0.1244 -0.0407,-0.2438 -0.140625,-0.3437 l -3.65625,-3.6563 3.65625,-3.6562 c 0.09995,-0.1 0.140625,-0.2193 0.140625,-0.3438 0,-0.2498 -0.25,-0.5 -0.5,-0.5 -0.125,0 -0.25,0.031 -0.359375,0.1407 l -3.640625,3.6406 -3.640625,-3.6406 C -27.25,1243.3932 -27.375,1243.3622 -27.5,1243.3622 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="12" height="12" x="-30" y="1242.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/cross-18.svg b/data/styles/symbols/maki/cross-18.svg
deleted file mode 100644
index b7304a8a74..0000000000
--- a/data/styles/symbols/maki/cross-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(48 -208)" color="#000">
-        <g font-family="Sans">
-            <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m -43.916667,1244.3622 c -0.541666,0 -1.083333,0.5421 -1.083333,1.0833 0,0.2697 0.08818,0.5283 0.304688,0.7448 l 4.671875,4.6719 -4.671875,4.6719 c -0.216559,0.2165 -0.304688,0.4751 -0.304688,0.7448 0,0.5412 0.541667,1.0833 1.083333,1.0833 0.270834,0 0.541667,-0.067 0.778646,-0.3046 l 4.638021,-4.6381 4.638021,4.6381 c 0.236979,0.2374 0.507812,0.3046 0.778646,0.3046 0.541666,0 1.083333,-0.5421 1.083333,-1.0833 0,-0.2697 -0.08818,-0.5283 -0.304687,-0.7448 l -4.671875,-4.6719 4.671875,-4.6719 c 0.216558,-0.2165 0.304687,-0.4751 0.304687,-0.7448 0,-0.5412 -0.541667,-1.0833 -1.083333,-1.0833 -0.270834,0 -0.541667,0.067 -0.778646,0.3047 l -4.638021,4.638 -4.638021,-4.638 c -0.236979,-0.2375 -0.507812,-0.3047 -0.778646,-0.3047 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m -43.916667,1244.3622 c -0.541666,0 -1.083333,0.5421 -1.083333,1.0833 0,0.2697 0.08818,0.5283 0.304688,0.7448 l 4.671875,4.6719 -4.671875,4.6719 c -0.216559,0.2165 -0.304688,0.4751 -0.304688,0.7448 0,0.5412 0.541667,1.0833 1.083333,1.0833 0.270834,0 0.541667,-0.067 0.778646,-0.3046 l 4.638021,-4.6381 4.638021,4.6381 c 0.236979,0.2374 0.507812,0.3046 0.778646,0.3046 0.541666,0 1.083333,-0.5421 1.083333,-1.0833 0,-0.2697 -0.08818,-0.5283 -0.304687,-0.7448 l -4.671875,-4.6719 4.671875,-4.6719 c 0.216558,-0.2165 0.304687,-0.4751 0.304687,-0.7448 0,-0.5412 -0.541667,-1.0833 -1.083333,-1.0833 -0.270834,0 -0.541667,0.067 -0.778646,0.3047 l -4.638021,4.638 -4.638021,-4.638 c -0.236979,-0.2375 -0.507812,-0.3047 -0.778646,-0.3047 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1242.362" x="-48" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/cross-24.svg b/data/styles/symbols/maki/cross-24.svg
deleted file mode 100644
index 4ea88aee80..0000000000
--- a/data/styles/symbols/maki/cross-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(72 -214)" color="#000">
-        <path d="m -66.91667,1245.3622 c -0.54166,0 -1.08333,0.5421 -1.08333,1.0833 0,0.2697 0.0882,0.5283 0.30469,0.7448 l 6.67187,6.6719 -6.67187,6.6719 c -0.21656,0.2165 -0.30469,0.4751 -0.30469,0.7448 0,0.5412 0.54167,1.0833 1.08333,1.0833 0.27084,0 0.54167,-0.067 0.77865,-0.3046 l 6.63802,-6.6381 6.63802,6.6381 c 0.23698,0.2374 0.50781,0.3046 0.77865,0.3046 0.54166,0 1.08333,-0.5421 1.08333,-1.0833 0,-0.2697 -0.0882,-0.5283 -0.30469,-0.7448 l -6.67187,-6.6719 6.67187,-6.6719 c 0.21656,-0.2165 0.30469,-0.4751 0.30469,-0.7448 0,-0.5412 -0.54167,-1.0833 -1.08333,-1.0833 -0.27084,0 -0.54167,0.067 -0.77865,0.3047 l -6.63802,6.638 -6.63802,-6.638 c -0.23698,-0.2375 -0.50781,-0.3047 -0.77865,-0.3047 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" font-family="Sans"/>
-        <rect width="24" height="24" x="-72" y="1242.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m -66.91667,1245.3622 c -0.54166,0 -1.08333,0.5421 -1.08333,1.0833 0,0.2697 0.0882,0.5283 0.30469,0.7448 l 6.67187,6.6719 -6.67187,6.6719 c -0.21656,0.2165 -0.30469,0.4751 -0.30469,0.7448 0,0.5412 0.54167,1.0833 1.08333,1.0833 0.27084,0 0.54167,-0.067 0.77865,-0.3046 l 6.63802,-6.6381 6.63802,6.6381 c 0.23698,0.2374 0.50781,0.3046 0.77865,0.3046 0.54166,0 1.08333,-0.5421 1.08333,-1.0833 0,-0.2697 -0.0882,-0.5283 -0.30469,-0.7448 l -6.67187,-6.6719 6.67187,-6.6719 c 0.21656,-0.2165 0.30469,-0.4751 0.30469,-0.7448 0,-0.5412 -0.54167,-1.0833 -1.08333,-1.0833 -0.27084,0 -0.54167,0.067 -0.77865,0.3047 l -6.63802,6.638 -6.63802,-6.638 c -0.23698,-0.2375 -0.50781,-0.3047 -0.77865,-0.3047 z" fill="#444" overflow="visible" enable-background="accumulate" font-family="Sans"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/dam-12.svg b/data/styles/symbols/maki/dam-12.svg
deleted file mode 100644
index 5a250fc236..0000000000
--- a/data/styles/symbols/maki/dam-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-518 -274)" color="#000">
-        <g>
-            <path d="m 518,1316.3622 0,9 4,0 -3,-9 z m 4.5,5.5 -0.59375,0.1875 0.28125,0.9063 0.3125,-0.094 1.5,0.5 1.5,-0.5 1.5,0.5 0,-1.0313 -1.5,-0.4687 -1.5,0.4687 z m 0,2 0.375,1.125 1.125,0.375 1.5,-0.5 1.5,0.5 0,-1.0312 -1.5,-0.4688 -1.5,0.4688 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(2 -1)"/>
-            <path d="m 518,1316.3622 0,9 4,0 -3,-9 z m 4.5,5.5 -0.59375,0.1875 0.28125,0.9063 0.3125,-0.094 1.5,0.5 1.5,-0.5 1.5,0.5 0,-1.0313 -1.5,-0.4687 -1.5,0.4687 z m 0,2 0.375,1.125 1.125,0.375 1.5,-0.5 1.5,0.5 0,-1.0312 -1.5,-0.4688 -1.5,0.4688 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(2 -1)"/>
-        </g>
-        <rect width="12" height="12" x="518" y="1314.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/dam-18.svg b/data/styles/symbols/maki/dam-18.svg
deleted file mode 100644
index b9018f158b..0000000000
--- a/data/styles/symbols/maki/dam-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-500 -280)" color="#000">
-        <g>
-            <path d="m 501,1316.3622 0,12 5,0 -3,-12 z m 6.5,6.5 -1.21875,0.625 0.34375,1.3125 0.875,-0.4375 2,1 2.5,-0.8437 2,0.8437 0,-1.5 -2,-1 -2.5,1 z m 0,3 -0.5625,0.2813 0.34375,1.3437 0.21875,-0.125 2,1 2.5,-0.8437 2,0.8437 0,-1.5 -2,-1 -2.5,1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(2)"/>
-            <path d="m 501,1316.3622 0,12 5,0 -3,-12 z m 6.5,6.5 -1.21875,0.625 0.34375,1.3125 0.875,-0.4375 2,1 2.5,-0.8437 2,0.8437 0,-1.5 -2,-1 -2.5,1 z m 0,3 -0.5625,0.2813 0.34375,1.3437 0.21875,-0.125 2,1 2.5,-0.8437 2,0.8437 0,-1.5 -2,-1 -2.5,1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(2)"/>
-        </g>
-        <rect y="1314.362" x="500" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/dam-24.svg b/data/styles/symbols/maki/dam-24.svg
deleted file mode 100644
index ff729dc0ec..0000000000
--- a/data/styles/symbols/maki/dam-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-476 -286)" color="#000">
-        <g>
-            <path d="m 478,1320.3622 c 0,2.2083 0,6.625 0,6.625 l 0,2.0313 0,1.9687 0,1.375 c 0,0.5 0.5,1 1,1 l 5,0 -4,-14 c 0,0 -0.66667,0 -1,0 -0.5,0 -1,0.5 -1,1 z m 8.5,6 c -0.10553,0 -0.21675,0.033 -0.3125,0.062 l -2.4375,0.8438 0.53125,1.875 2.21875,-0.7813 2.6875,0.9375 c 0.10312,0.034 0.20717,0.062 0.3125,0.062 0.10533,0 0.21434,-0.032 0.3125,-0.062 l 3.1875,-0.9375 2,0.6563 0,-2.0313 -1.6875,-0.5625 c -0.0994,-0.033 -0.20697,-0.062 -0.3125,-0.062 -0.10553,0 -0.21062,0.029 -0.3125,0.062 l -3.1875,0.9375 -2.6875,-0.9375 c -0.10552,-0.035 -0.20697,-0.062 -0.3125,-0.062 z m 0,4 c -0.10553,0 -0.21675,0.033 -0.3125,0.062 l -1.375,0.4688 0.53125,1.875 1.15625,-0.4063 2.6875,0.9375 c 0.10312,0.034 0.20717,0.062 0.3125,0.062 0.10533,0 0.21434,-0.032 0.3125,-0.062 l 3.1875,-0.9375 2,0.6563 0,-2.0313 -1.6875,-0.5625 c -0.0994,-0.033 -0.20697,-0.062 -0.3125,-0.062 -0.10553,0 -0.21062,0.029 -0.3125,0.062 l -3.1875,0.9375 -2.6875,-0.9375 c -0.10552,-0.035 -0.20697,-0.062 -0.3125,-0.062 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(2)"/>
-            <path d="m 478,1320.3622 c 0,2.2083 0,6.625 0,6.625 l 0,2.0313 0,1.9687 0,1.375 c 0,0.5 0.5,1 1,1 l 5,0 -4,-14 c 0,0 -0.66667,0 -1,0 -0.5,0 -1,0.5 -1,1 z m 8.5,6 c -0.10553,0 -0.21675,0.033 -0.3125,0.062 l -2.4375,0.8438 0.53125,1.875 2.21875,-0.7813 2.6875,0.9375 c 0.10312,0.034 0.20717,0.062 0.3125,0.062 0.10533,0 0.21434,-0.032 0.3125,-0.062 l 3.1875,-0.9375 2,0.6563 0,-2.0313 -1.6875,-0.5625 c -0.0994,-0.033 -0.20697,-0.062 -0.3125,-0.062 -0.10553,0 -0.21062,0.029 -0.3125,0.062 l -3.1875,0.9375 -2.6875,-0.9375 c -0.10552,-0.035 -0.20697,-0.062 -0.3125,-0.062 z m 0,4 c -0.10553,0 -0.21675,0.033 -0.3125,0.062 l -1.375,0.4688 0.53125,1.875 1.15625,-0.4063 2.6875,0.9375 c 0.10312,0.034 0.20717,0.062 0.3125,0.062 0.10533,0 0.21434,-0.032 0.3125,-0.062 l 3.1875,-0.9375 2,0.6563 0,-2.0313 -1.6875,-0.5625 c -0.0994,-0.033 -0.20697,-0.062 -0.3125,-0.062 -0.10553,0 -0.21062,0.029 -0.3125,0.062 l -3.1875,0.9375 -2.6875,-0.9375 c -0.10552,-0.035 -0.20697,-0.062 -0.3125,-0.062 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(2)"/>
-        </g>
-        <rect width="24" height="24" x="476" y="1314.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/danger-12.svg b/data/styles/symbols/maki/danger-12.svg
deleted file mode 100644
index ec5e70efad..0000000000
--- a/data/styles/symbols/maki/danger-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-594 -10)" color="#000">
-        <path d="m 599.5,1051.3622 -1.5,1.5 c 0,0 0,1.3333 0,2 l 1,1 c 0,0.1667 0,0.5 0,0.5 l 1.5,1 1.5,-1 0,-0.5 1,-1 0,-2 -1.5,-1.5 z m -0.5,2 1,0 0,0.5 -1,0 z m 2,0 1,0 0,0.5 -1,0 z m -5,3 0,1 0.56039,0.2802 2.43961,1.2198 -3,1.5 0,1 0.5,0 5.5,-2.5 3,-1.5 0,-1 -0.5,0 -3,1.5 -0.5,0.5 -1,0 -0.5,-0.5 -3,-1.5 z m 7,3 -1.5,0.5 3,1.5 0.5,0 0,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 599.5,1051.3622 -1.5,1.5 c 0,0 0,1.3333 0,2 l 1,1 c 0,0.1667 0,0.5 0,0.5 l 1.5,1 1.5,-1 0,-0.5 1,-1 0,-2 -1.5,-1.5 z m -0.5,2 1,0 0,0.5 -1,0 z m 2,0 1,0 0,0.5 -1,0 z m -5,3 0,1 0.56039,0.2802 2.43961,1.2198 -3,1.5 0,1 0.5,0 5.5,-2.5 3,-1.5 0,-1 -0.5,0 -3,1.5 -0.5,0.5 -1,0 -0.5,-0.5 -3,-1.5 z m 7,3 -1.5,0.5 3,1.5 0.5,0 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect width="12" height="12" x="594" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/danger-18.svg b/data/styles/symbols/maki/danger-18.svg
deleted file mode 100644
index 66662a050c..0000000000
--- a/data/styles/symbols/maki/danger-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-576 -16)" color="#000">
-        <path d="m 584.5,1052.3622 -1.5,0.5 -1,1.5 0,2.5 1.5,1 0,1.5 2,1 2,-1 0,-1.5 1.5,-1 0,-2.5 -1,-1.5 -1.5,-0.5 z m -0.5,2.5 0.5,0 0.5,0.5 0,0.5 -0.5,0.5 -0.5,0 -0.5,-0.5 0,-0.5 z m 2.5,0 0.5,0 0.5,0.5 0,0.5 -0.5,0.5 -0.5,0 -0.5,-0.5 0,-0.5 z m -6.5,5 0,1 3.875,1.75 -3.875,1.75 0,1 1,0 10,-4.5 0,-1 -1,0 -4.5,2.0313 -4.5,-2.0313 z m 8.21875,3.25 -1.59375,0.7188 3.375,1.5312 1,0 0,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 584.5,1052.3622 -1.5,0.5 -1,1.5 0,2.5 1.5,1 0,1.5 2,1 2,-1 0,-1.5 1.5,-1 0,-2.5 -1,-1.5 -1.5,-0.5 z m -0.5,2.5 0.5,0 0.5,0.5 0,0.5 -0.5,0.5 -0.5,0 -0.5,-0.5 0,-0.5 z m 2.5,0 0.5,0 0.5,0.5 0,0.5 -0.5,0.5 -0.5,0 -0.5,-0.5 0,-0.5 z m -6.5,5 0,1 3.875,1.75 -3.875,1.75 0,1 1,0 10,-4.5 0,-1 -1,0 -4.5,2.0313 -4.5,-2.0313 z m 8.21875,3.25 -1.59375,0.7188 3.375,1.5312 1,0 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect y="1050.362" x="576" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/danger-24.svg b/data/styles/symbols/maki/danger-24.svg
deleted file mode 100644
index 9feca5d6cc..0000000000
--- a/data/styles/symbols/maki/danger-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-552 -22)" color="#000">
-        <path d="m 564.5,1054.3622 c -2.5,0 -4.5,2 -4.5,4 l 0,2 c 0,1 2,1 2,2 l 0,1 2.5,1 2.5,-1 0,-1 c 0,-1 2,-1 2,-2 l 0,-2 c 0,-2 -2,-4 -4.5,-4 z m -1.5,3 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m 3,0 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m -8,6 c -0.5,0 -1,0.5 -1,1 l 0,0.5 5.25,2.25 -5.25,2.25 0,0.5 c 0,0.5 0.5,1 1,1 l 14,-6 0,-0.5 c 0,-0.5 -0.5,-1 -1,-1 l -6.5,2.7813 -6.5,-2.7813 z m 10.5,4.5 -2.25,0.9688 4.75,2.0312 c 0.5,0 1,-0.5 1,-1 l 0,-0.5 -3.5,-1.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 564.5,1054.3622 c -2.5,0 -4.5,2 -4.5,4 l 0,2 c 0,1 2,1 2,2 l 0,1 2.5,1 2.5,-1 0,-1 c 0,-1 2,-1 2,-2 l 0,-2 c 0,-2 -2,-4 -4.5,-4 z m -1.5,3 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m 3,0 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m -8,6 c -0.5,0 -1,0.5 -1,1 l 0,0.5 5.25,2.25 -5.25,2.25 0,0.5 c 0,0.5 0.5,1 1,1 l 14,-6 0,-0.5 c 0,-0.5 -0.5,-1 -1,-1 l -6.5,2.7813 -6.5,-2.7813 z m 10.5,4.5 -2.25,0.9688 4.75,2.0312 c 0.5,0 1,-0.5 1,-1 l 0,-0.5 -3.5,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect y="1050.362" x="552" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/disability-12.svg b/data/styles/symbols/maki/disability-12.svg
deleted file mode 100644
index 53b00c5db4..0000000000
--- a/data/styles/symbols/maki/disability-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-360 -323)" color="#000">
-        <path d="m 365.5,1364.3622 c -0.82843,0 -1.5,0.6716 -1.5,1.5 0,0.8284 0.67157,1.5 1.5,1.5 0.82843,0 1.5,-0.6716 1.5,-1.5 0,-0.8284 -0.67157,-1.5 -1.5,-1.5 z m -0.5,3.5 0,3.5 3.25,0 1.75,2 1,0 0,-0.5 -2,-2.5 -1.65625,0 -0.84375,-2.5 -1.5,0 z m -1,0.5 c -1.16559,0.4117 -2,1.6935 -2,3 0,1.6569 1.34315,3 3,3 1.36817,0 2.51442,-0.7711 2.875,-2 l -1.03125,0 c -0.32327,0.6419 -0.90219,1 -1.71875,1 -1.17361,0 -2.125,-0.9514 -2.125,-2.125 0,-0.7588 0.40167,-1.499 1,-1.875 l 0,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 365.5,1364.3622 c -0.82843,0 -1.5,0.6716 -1.5,1.5 0,0.8284 0.67157,1.5 1.5,1.5 0.82843,0 1.5,-0.6716 1.5,-1.5 0,-0.8284 -0.67157,-1.5 -1.5,-1.5 z m -0.5,3.5 0,3.5 3.25,0 1.75,2 1,0 0,-0.5 -2,-2.5 -1.65625,0 -0.84375,-2.5 -1.5,0 z m -1,0.5 c -1.16559,0.4117 -2,1.6935 -2,3 0,1.6569 1.34315,3 3,3 1.36817,0 2.51442,-0.7711 2.875,-2 l -1.03125,0 c -0.32327,0.6419 -0.90219,1 -1.71875,1 -1.17361,0 -2.125,-0.9514 -2.125,-2.125 0,-0.7588 0.40167,-1.499 1,-1.875 l 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect y="1363.362" x="360" height="12" width="12" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/disability-18.svg b/data/styles/symbols/maki/disability-18.svg
deleted file mode 100644
index 22ead5e699..0000000000
--- a/data/styles/symbols/maki/disability-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-342 -329)" color="#000">
-        <rect width="18" height="18" x="342" y="1363.362" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 350.5,1364.3622 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m -0.5,5 -1,1 0,4 1,1 4.375,0 2.625,3 1,0 0,-1 -2.5,-3.125 -0.5,-0.375 -2,0 -1,-3.5 -1,-1 -1,0 z m -2,1.5 c -1.74838,0.6175 -3,2.5403 -3,4.5 0,2.4853 2.01472,4.5 4.5,4.5 2.23171,0 4.08276,-1.3689 4.4375,-3.5 l -1.4375,0 c -0.40358,1.2975 -1.38217,2 -2.8125,2 -1.76041,0 -3.1875,-1.4271 -3.1875,-3.1875 0,-1.1382 0.6025,-2.2486 1.5,-2.8125 l 0,-1.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 350.5,1364.3622 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m -0.5,5 -1,1 0,4 1,1 4.375,0 2.625,3 1,0 0,-1 -2.5,-3.125 -0.5,-0.375 -2,0 -1,-3.5 -1,-1 -1,0 z m -2,1.5 c -1.74838,0.6175 -3,2.5403 -3,4.5 0,2.4853 2.01472,4.5 4.5,4.5 2.23171,0 4.08276,-1.3689 4.4375,-3.5 l -1.4375,0 c -0.40358,1.2975 -1.38217,2 -2.8125,2 -1.76041,0 -3.1875,-1.4271 -3.1875,-3.1875 0,-1.1382 0.6025,-2.2486 1.5,-2.8125 l 0,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/disability-24.svg b/data/styles/symbols/maki/disability-24.svg
deleted file mode 100644
index fac5b7116a..0000000000
--- a/data/styles/symbols/maki/disability-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-318 -335)">
-        <path d="m 329.5,1365.3622 c -1.3807,0 -2.5,1.1193 -2.5,2.5 0,1.3808 1.1193,2.5 2.5,2.5 1.3807,0 2.5,-1.1192 2.5,-2.5 0,-1.3807 -1.1193,-2.5 -2.5,-2.5 z m -0.5,6 c -1,0 -2,1 -2,2 l 0,3.5 c 0,1.5 1,2.5 2.5,2.5 l 5,0 2.625,3.5 c 0.22625,0.3321 0.48443,0.5 0.875,0.5 0.50005,0 1.00005,-0.5 1,-1 0,-0.293 -0.16664,-0.5202 -0.28125,-0.7187 L 336,1377.8622 c -0.18118,-0.3138 -0.49995,-0.5001 -1,-0.5 l -2.5,0 -1,-4 c -0.24256,-0.9702 -0.5,-2 -1.5,-2 z m -3,2 c -2.33117,0.8233 -4,3.387 -4,6 0,3.3137 2.6863,6 6,6 2.97561,0 5.43327,-2.1586 5.90625,-5 l -1.90625,0 c -0.5381,1.73 -1.84289,3 -3.75,3 -2.34721,0 -4.25,-1.9028 -4.25,-4.25 0,-1.5176 0.80334,-2.9981 2,-3.75 z" opacity=".3" color="#000" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 329.5,1365.3622 c -1.3807,0 -2.5,1.1193 -2.5,2.5 0,1.3808 1.1193,2.5 2.5,2.5 1.3807,0 2.5,-1.1192 2.5,-2.5 0,-1.3807 -1.1193,-2.5 -2.5,-2.5 z m -0.5,6 c -1,0 -2,1 -2,2 l 0,3.5 c 0,1.5 1,2.5 2.5,2.5 l 5,0 2.625,3.5 c 0.22625,0.3321 0.48443,0.5 0.875,0.5 0.50005,0 1.00005,-0.5 1,-1 0,-0.293 -0.16664,-0.5202 -0.28125,-0.7187 L 336,1377.8622 c -0.18118,-0.3138 -0.49995,-0.5001 -1,-0.5 l -2.5,0 -1,-4 c -0.24256,-0.9702 -0.5,-2 -1.5,-2 z m -3,2 c -2.33117,0.8233 -4,3.387 -4,6 0,3.3137 2.6863,6 6,6 2.97561,0 5.43327,-2.1586 5.90625,-5 l -1.90625,0 c -0.5381,1.73 -1.84289,3 -3.75,3 -2.34721,0 -4.25,-1.9028 -4.25,-4.25 0,-1.5176 0.80334,-2.9981 2,-3.75 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect y="1314.362" x="320" height="24" width="24" color="#000" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-2 49)"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/embassy-12.svg b/data/styles/symbols/maki/embassy-12.svg
deleted file mode 100644
index 1f2f2b14e0..0000000000
--- a/data/styles/symbols/maki/embassy-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-360 -202)" color="#000">
-        <path d="m 365.5,1244.3622 -2.5,1 0,8 1,0 0,-5 1.5,-0.5 2.5,1.5 2,-1 0,-3.5 -2,1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <rect y="1242.362" x="360" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 365.5,1244.3622 -2.5,1 0,8 1,0 0,-5 1.5,-0.5 2.5,1.5 2,-1 0,-3.5 -2,1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/embassy-18.svg b/data/styles/symbols/maki/embassy-18.svg
deleted file mode 100644
index d85a3b82ba..0000000000
--- a/data/styles/symbols/maki/embassy-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-342 -208)" color="#000">
-        <path d="m 350,1244.3622 -3,1.5 0,12.5 1,0 0,-8 2,-1 3.5,2 2.5,-1 0,-5 -2.5,1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <rect width="18" height="18" x="342" y="1242.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 350,1244.3622 -3,1.5 0,12.5 1,0 0,-8 2,-1 3.5,2 2.5,-1 0,-5 -2.5,1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/embassy-24.svg b/data/styles/symbols/maki/embassy-24.svg
deleted file mode 100644
index f0a4d65d13..0000000000
--- a/data/styles/symbols/maki/embassy-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-396 -142)" color="#000">
-        <g>
-            <path d="m 11,1006.3622 -2,1 -2,1 0,15 c 0,0.5 0.5,1 1,1 0.5,0 1,-0.5 1,-1 l 0,-9 c 0,0 1.000008,-0.5 2.00008,-1 1.99992,-0.9999 4.211171,2.8943 6.00004,1.9999 2.00008,-1 3,-1.4999 3,-1.4999 l 0,-7 c 0,0 -1.00012,0.5 -3.00012,1.5 -1.788869,0.8944 -3.99984,-3 -6,-2 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(395 166)"/>
-            <path d="m 11,1006.3622 -2,1 -2,1 0,15 c 0,0.5 0.5,1 1,1 0.5,0 1,-0.5 1,-1 l 0,-9 c 0,0 1.000008,-0.5 2.00008,-1 1.99992,-0.9999 4.211171,2.8943 6.00004,1.9999 2.00008,-1 3,-1.4999 3,-1.4999 l 0,-7 c 0,0 -1.00012,0.5 -3.00012,1.5 -1.788869,0.8944 -3.99984,-3 -6,-2 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(395 166)"/>
-        </g>
-        <rect y="1170.362" x="396" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/emergency-telephone-12.svg b/data/styles/symbols/maki/emergency-telephone-12.svg
deleted file mode 100644
index 94f9ec75a5..0000000000
--- a/data/styles/symbols/maki/emergency-telephone-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-360 -298)">
-        <path transform="translate(-120 1050.362)" d="m 484,289.5 -2.5,2.5 2.5,0 0,-2.5 z m 3.5,0.5 -5.5,5.5 0,2 1,1 1,0 1,-1 0,-1 -1,-1 3.5,-3.5 1,1 1,0 1,-1 0,-1 -1,-1 -2,0 z" opacity=".3" color="#000" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <g transform="translate(0 23)">
-            <rect y="1314.362" x="320" height="24" width="24" color="#000" overflow="visible" enable-background="accumulate" fill="none" transform="matrix(.5 0 0 .5 200 658.18)"/>
-            <path transform="translate(-120 1027.362)" d="m 484,289.5 -2.5,2.5 2.5,0 0,-2.5 z m 3.5,0.5 -5.5,5.5 0,2 1,1 1,0 1,-1 0,-1 -1,-1 3.5,-3.5 1,1 1,0 1,-1 0,-1 -1,-1 -2,0 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/emergency-telephone-18.svg b/data/styles/symbols/maki/emergency-telephone-18.svg
deleted file mode 100644
index 1399b65432..0000000000
--- a/data/styles/symbols/maki/emergency-telephone-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="matrix(.75 0 0 .75 -240 -985.773)" color="#000">
-        <path d="m 327.99998,1316.3622 -4.66666,4.6667 4.66666,0 z m 7.33332,0.6667 -11.33331,11.3333 0,3.3333 1.75,1.75 3.99999,-4 -1.08333,-1.0833 6.66665,-6.6667 1.08334,1.0834 3.99999,-4 -1.75,-1.75 z m 5.58333,2.25 -3.99999,4 0.41666,0.4166 1.33333,0 2.66666,-2.6666 0,-1.3334 z m -10.66665,10.6666 -3.99999,4 0.41666,0.4167 1.33333,0 2.66667,-2.6667 0,-1.3333 z" opacity=".3" stroke="#fff" stroke-width="2.667" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 327.99998,1316.3622 -4.66665,4.6667 4.66665,0 z m 7.33333,0.6667 -11.33332,11.3333 0,3.3333 1.75,1.75 3.99999,-4 -1.08333,-1.0833 6.66666,-6.6667 1.08333,1.0834 3.99999,-4 -1.75,-1.75 z m 5.58332,2.25 -3.99999,4 0.41666,0.4166 1.33333,0 2.66667,-2.6666 0,-1.3334 z m -10.66665,10.6666 -3.99999,4 0.41666,0.4167 1.33333,0 2.66667,-2.6667 0,-1.3333 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect y="1314.362" x="320" height="24" width="24" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/emergency-telephone-24.svg b/data/styles/symbols/maki/emergency-telephone-24.svg
deleted file mode 100644
index 72d6262257..0000000000
--- a/data/styles/symbols/maki/emergency-telephone-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-320 -286)" color="#000">
-        <path d="m 329,1317.8622 -4.5,4.5 4.5,0 0,-4.5 z m 7,0.5 c -1,0 -1.32629,0.3263 -2,1 l -8,8 c -0.5,0.5 -1,1 -1,2 l 0,1.5 c 0,1 0.5,1.5 1,2 l 0.5625,0.5625 3.5,-3.5 -0.5625,-0.5625 c -0.50009,-0.5 0,-1 0,-1 l 5.5,-5.5 c 0,0 0.5,-0.5 1,0 l 0.5625,0.5625 3.5,-3.5 -0.5625,-0.5625 c -0.5,-0.5 -1,-1 -2,-1 l -1.5,0 z m 4.4375,1.9375 -3.5,3.5 0.5625,0.5625 c 0.35356,0.3535 1.14645,0.3536 1.5,0 l 2,-2 c 0.35359,-0.3537 0.35357,-1.1465 0,-1.5 l -0.5625,-0.5625 z m -10,10 -3.5,3.5 0.5625,0.5625 c 0.35362,0.3537 1.1464,0.3534 1.5,0 l 2,-2 c 0.35372,-0.3536 0.35352,-1.1466 0,-1.5 l -0.5625,-0.5625 z" fill="#444" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" opacity=".3"/>
-        <path d="m 447,291.5 -4.5,4.5 4.5,0 0,-4.5 z m 7,0.5 c -1,0 -1.32629,0.3263 -2,1 l -8,8 c -0.5,0.5 -1,1 -1,2 l 0,1.5 c 0,1 0.5,1.5 1,2 l 0.5625,0.5625 3.5,-3.5 L 447.5,303 c -0.50009,-0.5 0,-1 0,-1 l 5.5,-5.5 c 0,0 0.5,-0.5 1,0 l 0.5625,0.5625 3.5,-3.5 L 457.5,293 c -0.5,-0.5 -1,-1 -2,-1 l -1.5,0 z m 4.4375,1.9375 -3.5,3.5 L 455.5,298 c 0.35356,0.3535 1.14645,0.3536 1.5,0 l 2,-2 c 0.35359,-0.3537 0.35357,-1.1465 0,-1.5 l -0.5625,-0.5625 z m -10,10 -3.5,3.5 L 445.5,308 c 0.35362,0.3537 1.1464,0.3534 1.5,0 l 2,-2 c 0.35372,-0.3536 0.35352,-1.1466 0,-1.5 l -0.5625,-0.5625 z" transform="translate(-118 1026.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect width="24" height="24" x="320" y="1314.362" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/farm-12.svg b/data/styles/symbols/maki/farm-12.svg
deleted file mode 100644
index ff8dc91ec8..0000000000
--- a/data/styles/symbols/maki/farm-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-672 -298)" color="#000">
-        <path d="m 802,290 -1,1 0,6 2,0 0,-6 z m -6.5,2 -2,2 0.5,0 0,3 6,0 0,-3 0.5,0 -2,-2 z" transform="translate(-120 1050.362)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <rect y="1338.362" x="672" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path transform="translate(-120 1050.362)" d="m 802,290 -1,1 0,6 2,0 0,-6 z m -6.5,2 -2,2 0.5,0 0,3 3,0 0,-2 1,0 0,2 2,0 0,-3 0.5,0 -2,-2 z m 2,1 1,1 -2,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/farm-18.svg b/data/styles/symbols/maki/farm-18.svg
deleted file mode 100644
index 0f1dbd3b03..0000000000
--- a/data/styles/symbols/maki/farm-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-654 -304)" color="#000">
-        <path d="m 667,1344.3622 0,8 4,0 0,-8 -1,-2 -2,0 z m -9.5,0 -2.5,3 1,0 0,5 9,0 0,-5 1,0 -2,-3 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <rect width="18" height="18" x="654" y="1338.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 667,1344.3622 0,8 4,0 0,-8 -1,-2 -2,0 z m -9.5,0 -2.5,3 1,0 0,5 6,0 0,-2 1,0 0,2 2,0 0,-5 1,0 -2,-3 z m 5,2 1.5,1 0,1 -3,0 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/farm-24.svg b/data/styles/symbols/maki/farm-24.svg
deleted file mode 100644
index 52f0fd1a3d..0000000000
--- a/data/styles/symbols/maki/farm-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-630 -310)" color="#000">
-        <rect y="1338.362" x="630" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <g>
-            <path transform="translate(-120 1050.362)" d="m 767,295 0,10 5,0 0,-10 c 0,-1.5 -0.5,-3 -2.5,-3 -2,0 -2.5,1.5 -2.5,3 z m -11,0 c -0.5,0 -1,0.5 -1.5,1 l -2.5,3 1,0 0,6 12,0 0,-6 1,0 -2.5,-3 c -0.5,-0.5 -1,-1 -1.5,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 767,295 0,10 5,0 0,-10 c 0,-1.5 -0.5,-3 -2.5,-3 -2,0 -2.5,1.5 -2.5,3 z m -11,0 c -0.5,0 -1,0.5 -1.5,1 l -2.5,3 1,0 0,6 7,0 0,-3 2,0 0,3 3,0 0,-6 1,0 -2.5,-3 c -0.5,-0.5 -1,-1 -1.5,-1 z m 5,2 c 0,0 2,1.2546 2,2 l 0,1 -4,0 0,-1 c 0,-0.7454 2,-2 2,-2 z" transform="translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/fast-food-12.svg b/data/styles/symbols/maki/fast-food-12.svg
deleted file mode 100644
index 7c651a7a65..0000000000
--- a/data/styles/symbols/maki/fast-food-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-360 -82)" color="#000">
-        <g>
-            <path d="m 365.5,1125.3622 c -1.42105,0 -3.1488,0.8723 -3.05264,2.0526 l 0,1.1974 8.05264,0 0,-1.1974 c 0,-1.1842 -1.57895,-2.0526 -3,-2.0526 z m -3.5,4 0,1 9,0 0,-1 z m 0.49996,1.75 c 0,0.4737 0.52632,1.25 1,1.25 l 6,0 c 0.47368,0 1,-0.7763 1,-1.25 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 365.5,1125.3622 c -1.42105,0 -3.1488,0.8723 -3.05264,2.0526 l 0,1.1974 8.05264,0 0,-1.1974 c 0,-1.1842 -1.57895,-2.0526 -3,-2.0526 z m -3.5,4 0,1 9,0 0,-1 z m 0.49996,1.75 c 0,0.4737 0.52632,1.25 1,1.25 l 6,0 c 0.47368,0 1,-0.7763 1,-1.25 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1122.362" x="360" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/fast-food-18.svg b/data/styles/symbols/maki/fast-food-18.svg
deleted file mode 100644
index 47f7295125..0000000000
--- a/data/styles/symbols/maki/fast-food-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-342 -88)" color="#000">
-        <g>
-            <path d="m 350.5,1127.3622 c -2.05263,0 -3.5,0.7895 -3.5,2.5 l 0,1.5 11,0 0,-1.5 c 0,-1.7105 -1.44737,-2.5 -3.5,-2.5 l -4,0 z m 0,1.125 c 0.20711,0 0.375,0.1679 0.375,0.375 0,0.2071 -0.16789,0.375 -0.375,0.375 -0.20711,0 -0.375,-0.1679 -0.375,-0.375 0,-0.2071 0.16789,-0.375 0.375,-0.375 z m 4,0 c 0.20711,0 0.375,0.1679 0.375,0.375 0,0.2071 -0.16789,0.375 -0.375,0.375 -0.20711,0 -0.375,-0.1679 -0.375,-0.375 0,-0.2071 0.16789,-0.375 0.375,-0.375 z m -6,1 c 0.20711,0 0.375,0.1679 0.375,0.375 0,0.2071 -0.16789,0.375 -0.375,0.375 -0.20711,0 -0.375,-0.1679 -0.375,-0.375 0,-0.2071 0.16789,-0.375 0.375,-0.375 z m 4,0 c 0.20711,0 0.375,0.1679 0.375,0.375 0,0.2071 -0.16789,0.375 -0.375,0.375 -0.20711,0 -0.375,-0.1679 -0.375,-0.375 0,-0.2071 0.16789,-0.375 0.375,-0.375 z m 4,0 c 0.20711,0 0.375,0.1679 0.375,0.375 0,0.2071 -0.16789,0.375 -0.375,0.375 -0.20711,0 -0.375,-0.1679 -0.375,-0.375 0,-0.2071 0.16789,-0.375 0.375,-0.375 z m -9.5,2.875 c -0.34213,0 -0.50001,0.1579 -0.5,0.5 10e-6,0.3422 0.15787,0.5 0.5,0.5 l 11,0 c 0.34211,0 0.49999,-0.1578 0.5,-0.5 10e-6,-0.3421 -0.15789,-0.5 -0.5,-0.5 l -11,0 z m 0,2 0,0.625 c 0,0.6842 0.69079,1.375 1.375,1.375 l 8.25,0 c 0.68421,0 1.375,-0.6908 1.375,-1.375 l 0,-0.625 -11,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1 -1)"/>
-            <path d="m 350.5,1127.3622 c -2.05263,0 -3.5,0.7895 -3.5,2.5 l 0,1.5 11,0 0,-1.5 c 0,-1.7105 -1.44737,-2.5 -3.5,-2.5 l -4,0 z m 0,1.125 c 0.20711,0 0.375,0.1679 0.375,0.375 0,0.2071 -0.16789,0.375 -0.375,0.375 -0.20711,0 -0.375,-0.1679 -0.375,-0.375 0,-0.2071 0.16789,-0.375 0.375,-0.375 z m 4,0 c 0.20711,0 0.375,0.1679 0.375,0.375 0,0.2071 -0.16789,0.375 -0.375,0.375 -0.20711,0 -0.375,-0.1679 -0.375,-0.375 0,-0.2071 0.16789,-0.375 0.375,-0.375 z m -6,1 c 0.20711,0 0.375,0.1679 0.375,0.375 0,0.2071 -0.16789,0.375 -0.375,0.375 -0.20711,0 -0.375,-0.1679 -0.375,-0.375 0,-0.2071 0.16789,-0.375 0.375,-0.375 z m 4,0 c 0.20711,0 0.375,0.1679 0.375,0.375 0,0.2071 -0.16789,0.375 -0.375,0.375 -0.20711,0 -0.375,-0.1679 -0.375,-0.375 0,-0.2071 0.16789,-0.375 0.375,-0.375 z m 4,0 c 0.20711,0 0.375,0.1679 0.375,0.375 0,0.2071 -0.16789,0.375 -0.375,0.375 -0.20711,0 -0.375,-0.1679 -0.375,-0.375 0,-0.2071 0.16789,-0.375 0.375,-0.375 z m -9.5,2.875 c -0.34213,0 -0.50001,0.1579 -0.5,0.5 10e-6,0.3422 0.15787,0.5 0.5,0.5 l 11,0 c 0.34211,0 0.49999,-0.1578 0.5,-0.5 10e-6,-0.3421 -0.15789,-0.5 -0.5,-0.5 l -11,0 z m 0,2 0,0.625 c 0,0.6842 0.69079,1.375 1.375,1.375 l 8.25,0 c 0.68421,0 1.375,-0.6908 1.375,-1.375 l 0,-0.625 -11,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-        </g>
-        <rect width="18" height="18" x="342" y="1122.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/fast-food-24.svg b/data/styles/symbols/maki/fast-food-24.svg
deleted file mode 100644
index ef31d61705..0000000000
--- a/data/styles/symbols/maki/fast-food-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-318 -94)" color="#000">
-        <g>
-            <path d="m 328,1127.3622 c -3,0 -6,1.5 -6,4 l 0,2 17,0 0,-2 c -2e-5,-2.5 -3,-4 -6,-4 z m 0.5,1 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m -6,2 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m -12.5,4 c -0.50003,0 -1.00001,0.5 -1,1 10e-6,0.5 0.49997,1 1,1 l 17,0 c 0.50001,0 0.99999,-0.5 1,-1 2e-5,-0.5 -0.49999,-1 -1,-1 z m 0,3 0,1 c 0,1 1,2 2,2 l 13,0 c 1,0 2,-1 2,-2 l 0,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 328,1127.3622 c -3,0 -6,1.5 -6,4 l 0,2 17,0 0,-2 c -2e-5,-2.5 -3,-4 -6,-4 z m 0.5,1 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m -6,2 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m -12.5,4 c -0.50003,0 -1.00001,0.5 -1,1 10e-6,0.5 0.49997,1 1,1 l 17,0 c 0.50001,0 0.99999,-0.5 1,-1 0,-0.5 -0.5,-1 -1,-1 z m 0,3 0,1 c 0,1 1,2 2,2 l 13,0 c 1,0 2,-1 2,-2 l 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1122.362" x="318" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/ferry-12.svg b/data/styles/symbols/maki/ferry-12.svg
deleted file mode 100644
index afb217ea9f..0000000000
--- a/data/styles/symbols/maki/ferry-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-126 -298)" color="#000">
-        <g>
-            <path d="m 130.5,1339.3622 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,3.5 -1,0.5 1,2 0,1 2,0.5 1.5,-0.5 1.5,0.5 2,-0.5 0,-1 1,-2 -1,-0.4687 0,-3.5313 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -1,0 -4,0 z m 0.5,1 5,0 0,2.5625 -2.5,-1.5625 -2.5,1.5 z m -0.5,7.4995 -1.5,0.4688 0,1.0312 0.15625,-0.062 1.34375,-0.4375 1.5,0.5 1.5,-0.5 1.5,0.5 1.5,-0.5 1.5,0.5 0,-1.0312 -1.5,-0.4688 -1.5,0.4688 -1.5,-0.4688 -1.5,0.4688 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-            <path d="m 130.5,1339.3622 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,3.5 -1,0.5 1,2 0,1 2,0.5 1.5,-0.5 1.5,0.5 2,-0.5 0,-1 1,-2 -1,-0.4687 0,-3.5313 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -1,0 -4,0 z m 0.5,1 5,0 0,2.5625 -2.5,-1.5625 -2.5,1.5 z m -0.5,7.4995 -1.5,0.4688 0,1.0312 0.15625,-0.062 1.34375,-0.4375 1.5,0.5 1.5,-0.5 1.5,0.5 1.5,-0.5 1.5,0.5 0,-1.0312 -1.5,-0.4688 -1.5,0.4688 -1.5,-0.4688 -1.5,0.4688 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-        </g>
-        <rect width="12" height="12" x="126" y="1338.362" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/ferry-18.svg b/data/styles/symbols/maki/ferry-18.svg
deleted file mode 100644
index 0b90f912a7..0000000000
--- a/data/styles/symbols/maki/ferry-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-108 -304)" color="#000">
-        <path d="m 116,1339.3622 c -0.5,0 -1,0.5 -1,1 l -1.17646,0 c -0.45624,0 -0.85294,0.5438 -0.85294,1 l 0.0294,3.5 -2,1 2,3.5 0,1.5 2.5,1 2,-1 2,1 2.5,-1 0,-1.5 2,-3.5 -2,-1 0,-3.5 c 0,-0.4562 -0.36729,-1 -0.82353,-1 l -1.17647,0 c 0,-0.5 -0.5,-1 -1,-1 z m -2,2 7,0 0,3.0441 -3.5,-2.0441 -3.5,2.0441 z m -1,11 -2,1 0,1.5 2,-1 2.5,1 2,-1 2,1 2.5,-0.8534 2,0.8534 0,-1.5 -2,-1 -2.5,1 -2,-1 -2,1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 116,1339.3622 c -0.5,0 -1,0.5 -1,1 l -1.17646,0 c -0.45624,0 -0.85294,0.5438 -0.85294,1 l 0.0294,3.5 -2,1 2,3.5 0,1.5 2.5,1 2,-1 2,1 2.5,-1 0,-1.5 2,-3.5 -2,-1 0,-3.5 c 0,-0.4562 -0.36729,-1 -0.82353,-1 l -1.17647,0 c 0,-0.5 -0.5,-1 -1,-1 z m -2,2 7,0 0,3.0441 -3.5,-2.0441 -3.5,2.0441 z m -1,11 -2,1 0,1.5 2,-1 2.5,1 2,-1 2,1 2.5,-0.8534 2,0.8534 0,-1.5 -2,-1 -2.5,1 -2,-1 -2,1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect width="18" height="18" x="108" y="1338.362" rx="0" ry="0" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/ferry-24.svg b/data/styles/symbols/maki/ferry-24.svg
deleted file mode 100644
index 5c608d88b8..0000000000
--- a/data/styles/symbols/maki/ferry-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-84 -310)" color="#000">
-        <g>
-            <path transform="translate(-120 1050.362)" d="m 214,289 c -0.554,0 -1,0.446 -1,1 l -2,0 c -0.554,0 -1,0.446 -1,1 l 0,6.0625 -2,0.9375 2,4 0,2 c 1.5,0 2.5,1.0005 3.5,1 1,5e-4 1.5,-1 3,-1 1.5,0 2,0.9995 3,1 1,5e-4 2,-1 3.5,-1 l 0,-2 2,-4 -2,-0.9375 0,-6.0625 c 0,-0.554 -0.446,-1 -1,-1 l -2,0 c 0,-0.554 -0.446,-1 -1,-1 l -5,0 z m -2,3 9,0 0,4.125 -4.5,-2.125 -4.5,2.125 0,-4.125 z m -2,14 c -0.69406,0 -1.33976,0.4049 -2,0.625 l 0,2.03125 c 0,0 1,-0.65575 2,-0.65625 1,-5e-4 2,1 3.5,1 1.5,0 1.97352,-0.9653 3,-1 1,5e-4 1.5,1 3,1 1.5,0 2.5,-1 3.5,-1 0.70165,0 2,0.65625 2,0.65625 l 0,-2.03125 c -0.6416,-0.2468 -1.34343,-0.625 -2,-0.625 -1.5,0 -2.5,1.0005 -3.5,1 -1,-5e-4 -1.5,-1 -3,-1 -1.5,0 -2,1.0005 -3,1 -1,5e-4 -2,-1 -3.5,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 214,289 c -0.554,0 -1,0.446 -1,1 l -2,0 c -0.554,0 -1,0.446 -1,1 l 0,6.0625 -2,0.9375 2,4 0,2 c 1.5,0 2.5,1.0005 3.5,1 1,5e-4 1.5,-1 3,-1 1.5,0 2,0.9995 3,1 1,5e-4 2,-1 3.5,-1 l 0,-2 2,-4 -2,-0.9375 0,-6.0625 c 0,-0.554 -0.446,-1 -1,-1 l -2,0 c 0,-0.554 -0.446,-1 -1,-1 l -5,0 z m -2,3 9,0 0,4.125 -4.5,-2.125 -4.5,2.125 0,-4.125 z m -2,14 c -0.69406,0 -1.33976,0.4049 -2,0.625 l 0,2.03125 c 0,0 1,-0.65575 2,-0.65625 1,-5e-4 2,1 3.5,1 1.5,0 1.97352,-0.9653 3,-1 1,5e-4 1.5,1 3,1 1.5,0 2.5,-1 3.5,-1 0.70165,0 2,0.65625 2,0.65625 l 0,-2.03125 c -0.6416,-0.2468 -1.34343,-0.625 -2,-0.625 -1.5,0 -2.5,1.0005 -3.5,1 -1,-5e-4 -1.5,-1 -3,-1 -1.5,0 -2,1.0005 -3,1 -1,5e-4 -2,-1 -3.5,-1 z" transform="translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="84" y="1338.362" rx="0" ry="0" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/fire-station-12.svg b/data/styles/symbols/maki/fire-station-12.svg
deleted file mode 100644
index 651620ab84..0000000000
--- a/data/styles/symbols/maki/fire-station-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-438 -34)" color="#000">
-        <g>
-            <path d="m 445.5,1076.3622 -1.5,3 -1.5,-1.5 c -0.33139,0.5826 -1.5,2 -1.5,3.5 0,2.2092 2.29086,4 4.5,4 2.20914,0 4.5,-1.7908 4.5,-4 0,-1.5 -1.16861,-2.9174 -1.5,-3.5 l -1.5,1.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            <path d="m 445.5,1076.3622 -1.5,3 -1.5,-1.5 c -0.33139,0.5826 -1.5,2 -1.5,3.5 0,2.2092 2.29086,4 4.5,4 2.20914,0 4.5,-1.7908 4.5,-4 0,-1.5 -1.16861,-2.9174 -1.5,-3.5 l -1.5,1.5 z m 0,4.5 c 0,0 1.5,1.3423 1.5,2.5 0,0.5 -0.5,1 -1.5,1 -1,0 -1.5,-0.5 -1.5,-1 0,-1.118 1.5,-2.5 1.5,-2.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-        </g>
-        <rect width="12" height="12" x="438" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/fire-station-18.svg b/data/styles/symbols/maki/fire-station-18.svg
deleted file mode 100644
index e99dff9e50..0000000000
--- a/data/styles/symbols/maki/fire-station-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-420 -40)" color="#000">
-        <g>
-            <path d="m 429.5,1076.3622 -2.5,4 -1.5,-2 c -0.53852,0.9467 -2.5,3.0625 -2.5,5.5 0,3.5899 2.91015,6.5 6.5,6.5 3.58985,0 6.5,-2.9101 6.5,-6.5 0,-2.4375 -1.96148,-4.5533 -2.5,-5.5 l -1.5,2 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 429.5,1076.3622 -2.5,4 -1.5,-2 c -0.53852,0.9467 -2.5,3.0625 -2.5,5.5 0,3.5899 2.91015,6.5 6.5,6.5 3.58985,0 6.5,-2.9101 6.5,-6.5 0,-2.4375 -1.96148,-4.5533 -2.5,-5.5 l -1.5,2 z m 0,6.5 c 0,0 2.5,2.3687 2.5,4.25 0,0.8125 -0.875,1.75 -2.5,1.75 -1.625,0 -2.5,-0.9375 -2.5,-1.75 0,-1.8168 2.5,-4.25 2.5,-4.25 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1074.362" x="420" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/fire-station-24.svg b/data/styles/symbols/maki/fire-station-24.svg
deleted file mode 100644
index 1d5f36d974..0000000000
--- a/data/styles/symbols/maki/fire-station-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-396 -46)" color="#000">
-        <g>
-            <path d="m 152.5,74 -3.5,5 -2,-3 c -0.66279,1.165233 -3,4 -3,7 0,4.418278 4.08172,8 8.5,8 4.41828,0 8.5,-3.581722 8.5,-8 0,-3 -2.33721,-5.834767 -3,-7 l -2,3 z" transform="translate(396 70) translate(-140 933.362)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path transform="translate(396 70) translate(-140 933.362)" d="m 152.5,74 -3.5,5 -2,-3 c -0.66279,1.165233 -3,4 -3,7 0,4.418278 4.08172,8 8.5,8 4.41828,0 8.5,-3.581722 8.5,-8 0,-3 -2.33721,-5.834767 -3,-7 l -2,3 z m 0,8 c 0,0 3.5,2.684593 3.5,5 0,1 -1.5,2 -3.5,2 -2,0 -3.5,-1 -3.5,-2 0,-2.236068 3.5,-5 3.5,-5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="396" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/fuel-12.svg b/data/styles/symbols/maki/fuel-12.svg
deleted file mode 100644
index fb1ec6b916..0000000000
--- a/data/styles/symbols/maki/fuel-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-126 -130)" color="#000">
-        <g>
-            <path d="m 130.5,1171.3622 c -0.27701,0 -0.5,0.223 -0.5,0.5 l 0,8 c 0,0.25 0.25,0.5 0.5,0.5 l 4,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-0.5 1.25,0 c 0.5,0 0.75,-0.25 0.75,-0.75 l 0,-2.75 c 0,-0.5 -1,-1 -1,-1.5 l 0,-0.25 0,-0.75 -1,-1 0,-0.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -4,0 z m 0.5,1 3,0 0,2 -3,0 0,-2 z m 4,1.5 0.5,0 0,0.75 c 0,0.5 1,1 1,1.5 l 0,2.25 0,0.25 c 0,0.25 -0.25,0.25 -0.25,0.25 l -0.75,0 0,-1.5 -0.5,0 0,-3.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 130.5,1171.3622 c -0.27701,0 -0.5,0.223 -0.5,0.5 l 0,8 c 0,0.25 0.25,0.5 0.5,0.5 l 4,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-0.5 1.25,0 c 0.5,0 0.75,-0.25 0.75,-0.75 l 0,-2.75 c 0,-0.5 -1,-1 -1,-1.5 l 0,-0.25 0,-0.75 -1,-1 0,-0.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -4,0 z m 0.5,1 3,0 0,2 -3,0 0,-2 z m 4,1.5 0.5,0 0,0.75 c 0,0.5 1,1 1,1.5 l 0,2.25 0,0.25 c 0,0.25 -0.25,0.25 -0.25,0.25 l -0.75,0 0,-1.5 -0.5,0 0,-3.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="12" height="12" x="126" y="1170.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/fuel-18.svg b/data/styles/symbols/maki/fuel-18.svg
deleted file mode 100644
index a5a7371ed3..0000000000
--- a/data/styles/symbols/maki/fuel-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-664 -184)" color="#000">
-        <path d="m 670,1220.3623 c -0.5,0 -1,0.5 -1,1 l 0,11 c 0,0.5 0.5,1 1,1 l 6,0 c 0.5,0 1,-0.5 1,-1 l 0,-3 c 0.16385,0 0.25,0 0.25,0 0.13687,0 0.25,0.096 0.25,0.25 0,0.19 0,0.5724 0,0.75 0,0.5 0.5,1 1,1 0.12942,0 0.34431,0 0.5,0 0.5,0 1,-0.4072 1,-1 0,-0.8426 0,-2.7778 0,-3.5 0,-1 -1,-1 -1,-1.9998 l 0,-1.5 -1,0 -1,-1.0002 0,-0.9998 c 0,-0.5 -0.5,-1 -1,-1 z m 0,1.5 6,0 0,2.5 -6,0 z m 7,3.5 1,0 c 0,1 1,1 1,2 l 0,2.75 c 0,0.25 -0.24998,0.25 -0.24998,0.25 0,0 -0.25002,0 -0.25,-0.25 0,0 0,-0.4201 0,-0.75 0,-0.5906 -0.49938,-1.0014 -1,-1 l -0.50009,-2e-4 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 670,1220.3623 c -0.5,0 -1,0.5 -1,1 l 0,11 c 0,0.5 0.5,1 1,1 l 6,0 c 0.5,0 1,-0.5 1,-1 l 0,-3 c 0.16385,0 0.25,0 0.25,0 0.13687,0 0.25,0.096 0.25,0.25 0,0.19 0,0.5724 0,0.75 0,0.5 0.5,1 1,1 0.12942,0 0.34431,0 0.5,0 0.5,0 1,-0.4072 1,-1 0,-0.8426 0,-2.7778 0,-3.5 0,-1 -1,-1 -1,-1.9998 l 0,-1.5 -1,0 -1,-1.0002 0,-0.9998 c 0,-0.5 -0.5,-1 -1,-1 z m 0,1.5 6,0 0,2.5 -6,0 z m 7,3.5 1,0 c 0,1 1,1 1,2 l 0,2.75 c 0,0.25 -0.24998,0.25 -0.24998,0.25 0,0 -0.25002,0 -0.25,-0.25 0,0 0,-0.4201 0,-0.75 0,-0.5906 -0.49938,-1.0014 -1,-1 l -0.50009,-2e-4 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect width="18" height="18" x="664" y="1218.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/fuel-24.svg b/data/styles/symbols/maki/fuel-24.svg
deleted file mode 100644
index b1b85390e0..0000000000
--- a/data/styles/symbols/maki/fuel-24.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-84 -142)" color="#000">
-        <g transform="translate(0 4)">
-            <g>
-                <path d="m 9,1007.3622 c -0.5540096,0 -1,0.446 -1,1 l 0,16 c 0,0.5 0.5,1 1,1 l 9,0 c 0.5,0 1,-0.5 1,-1 l 0,-5 0.5,0 c 0.5,0 0.5,0.5 0.5,0.5 l 0,2 c 0,1 0.5,1.5 1.5,1.5 1,0 1.5,-0.5 1.5,-1.5 0,-1.1667 0,-4.5 0,-5.5 0,-1 -2,-2 -2,-3 l 0,-3 -1,0 -1,-1 0,-1 c 0,-0.554 -0.44599,-1 -1,-1 z m 1,2 7,0 0,4 -7,0 z m 9,3 1,0 c 0,0 0,0.8333 0,1.5 0,1 2,2 2,3 l 0,5 c 0,0.5 -0.5,0.5 -0.5,0.5 0,0 -0.5,0 -0.5,-0.5 0,0 0,-2 0,-2.5 0,-0.5 -0.5,-1 -1,-1 -0.333333,0 -1,0 -1,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(83 162)"/>
-                <path d="m 9,1007.3622 c -0.5540096,0 -1,0.446 -1,1 l 0,16 c 0,0.5 0.5,1 1,1 l 9,0 c 0.5,0 1,-0.5 1,-1 l 0,-5 0.5,0 c 0.5,0 0.5,0.5 0.5,0.5 l 0,2 c 0,1 0.5,1.5 1.5,1.5 1,0 1.5,-0.5 1.5,-1.5 0,-1.1667 0,-4.5 0,-5.5 0,-1 -2,-2 -2,-3 l 0,-3 -1,0 -1,-1 0,-1 c 0,-0.554 -0.44599,-1 -1,-1 z m 1,2 7,0 0,4 -7,0 z m 9,3 1,0 c 0,0 0,0.8333 0,1.5 0,1 2,2 2,3 l 0,5 c 0,0.5 -0.5,0.5 -0.5,0.5 0,0 -0.5,0 -0.5,-0.5 0,0 0,-2 0,-2.5 0,-0.5 -0.5,-1 -1,-1 -0.333333,0 -1,0 -1,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(83 162)"/>
-            </g>
-        </g>
-        <rect width="24" height="24" x="84" y="1170.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/garden-12.svg b/data/styles/symbols/maki/garden-12.svg
deleted file mode 100644
index 4a8b3e2c09..0000000000
--- a/data/styles/symbols/maki/garden-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-204 -154)" color="#000">
-        <g fill="#444">
-            <path d="m 208,1195.3622 0,2 c 0,0.8671 0.9353,1.7536 2,1.9688 l 0,4.0312 c -0.5,-1 -1.5,-2 -3,-1 0,0 1,2 3.5,2 2.5,0 3.5,-2 3.5,-2 -1.5,-1 -2.5,0 -3,1 l 0,-4.0312 c 1.0647,-0.2152 2,-1.1017 2,-1.9688 l 0,-2 -1.5625,1.25 -0.9375,-1.25 -0.9375,1.25 -1.5625,-1.25 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 328,145 0,2 c 0,0.86708 0.9353,1.75357 2,1.96875 L 330,153 c -0.5,-1 -1.5,-2 -3,-1 0,0 1,2 3.5,2 2.5,0 3.5,-2 3.5,-2 -1.5,-1 -2.5,0 -3,1 l 0,-4.03125 c 1.0647,-0.21518 2,-1.10167 2,-1.96875 l 0,-2 -1.5625,1.25 L 330.5,145 329.5625,146.25 328,145 z" transform="translate(-120 1050.362)" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="12" height="12" x="204" y="1194.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/garden-18.svg b/data/styles/symbols/maki/garden-18.svg
deleted file mode 100644
index 7a4e75ed51..0000000000
--- a/data/styles/symbols/maki/garden-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-186 -160)">
-        <path d="m 192,1196.3622 0,2.5 c 0,1.6504 1.375,2.5508 3,2.5 l 0,6.5 c -0.8125,-1.625 -2.5,-3.5 -5,-2.5 0,0 1.5,4 5.5,4 4,0 5.5,-4 5.5,-4 -2.5,-1 -4.1875,0.875 -5,2.5 l 0,-6.5 c 1.625,0.051 3,-0.8496 3,-2.5 l 0,-2.5 -2,2 -1.5,-2 -1.5,2 z" opacity=".3" color="#000" fill="#444" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <g transform="translate(-123.493 910.972)">
-            <path d="m 315.49314,285.3903 0,2.5 c 0,1.65038 1.375,2.55078 3,2.5 l 0,6.5 c -0.8125,-1.625 -2.5,-3.5 -5,-2.5 0,0 1.5,4 5.5,4 4,0 5.5,-4 5.5,-4 -2.5,-1 -4.1875,0.875 -5,2.5 l 0,-6.5 c 1.625,0.0508 3,-0.84962 3,-2.5 l 0,-2.49999 -2,1.99999 -1.5,-2 -1.5,2 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1194.362" x="186" height="18" width="18" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/garden-24.svg b/data/styles/symbols/maki/garden-24.svg
deleted file mode 100644
index 8cbf645506..0000000000
--- a/data/styles/symbols/maki/garden-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-162 -166)" color="#000">
-        <path d="m 170.3,1198.3622 c -0.253,0 -0.3,0.5596 -0.3,1 l 0,2 c 0,2.0312 2,3.0625 4,3 l 0,8 c -1,-2 -4,-5 -7,-4 0,0 2.5,6 7.5,6 5,0 7.5,-6 7.5,-6 -3,-1 -6,2 -7,4 l 0,-8 c 2,0.062 4,-0.9688 4,-3 l 0,-2 c 0,-0.4404 -0.0468,-1 -0.3,-1 -0.19292,0 -0.42562,0.2256 -0.7,0.5 l -1.5,1.5 -1.5,-1.6875 c -0.15657,-0.1761 -0.24696,-0.3125 -0.5,-0.3125 -0.25305,0 -0.34343,0.1364 -0.5,0.3125 l -1.5,1.6875 -1.5,-1.5 c -0.27438,-0.2744 -0.50708,-0.5 -0.7,-0.5 z" opacity=".3" fill="#444" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 170.3,1198.3622 c -0.253,0 -0.3,0.5596 -0.3,1 l 0,2 c 0,2.0312 2,3.0625 4,3 l 0,8 c -1,-2 -4,-5 -7,-4 0,0 2.5,6 7.5,6 5,0 7.5,-6 7.5,-6 -3,-1 -6,2 -7,4 l 0,-8 c 2,0.062 4,-0.9688 4,-3 l 0,-2 c 0,-0.4404 -0.0468,-1 -0.3,-1 -0.19292,0 -0.42562,0.2256 -0.7,0.5 l -1.5,1.5 -1.5,-1.6875 c -0.15657,-0.1761 -0.24696,-0.3125 -0.5,-0.3125 -0.25305,0 -0.34343,0.1364 -0.5,0.3125 l -1.5,1.6875 -1.5,-1.5 c -0.27438,-0.2744 -0.50708,-0.5 -0.7,-0.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect width="24" height="24" x="162" y="1194.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/golf-12.svg b/data/styles/symbols/maki/golf-12.svg
deleted file mode 100644
index 542e61529f..0000000000
--- a/data/styles/symbols/maki/golf-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-516 -154)" color="#000">
-        <g>
-            <path d="m 521,1195.3622 c -0.19513,0 -0.5,0.2143 -0.5,0.5 l 0,7.75 c -1.14286,0.035 -1.5,0.8929 -1.5,1.4643 0,0.2857 0.28571,0.2857 0.28571,0.2857 l 6.42858,0 c 0,0 0.28571,0 0.28571,-0.2857 0,-1.4286 -0.64286,-2.5714 -1.5,-2.5714 -0.89848,0 -1.18177,1.5887 -2.07143,1.7142 -0.39012,0.055 -1.05279,-0.1973 -1.42857,-0.3928 l 0,-4.9643 4,-1.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 521,1195.3622 c -0.19513,0 -0.5,0.2143 -0.5,0.5 l 0,7.75 c -1.14286,0.035 -1.5,0.8929 -1.5,1.4643 0,0.2857 0.28571,0.2857 0.28571,0.2857 l 6.42858,0 c 0,0 0.28571,0 0.28571,-0.2857 0,-1.4286 -0.64286,-2.5714 -1.5,-2.5714 -0.89848,0 -1.18177,1.5887 -2.07143,1.7142 -0.39012,0.055 -1.05279,-0.1973 -1.42857,-0.3928 l 0,-4.9643 4,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1194.362" x="516" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/golf-18.svg b/data/styles/symbols/maki/golf-18.svg
deleted file mode 100644
index 0603bc86ad..0000000000
--- a/data/styles/symbols/maki/golf-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-498 -160)" color="#000">
-        <g>
-            <path d="m 505.38235,1196.3622 c -0.26113,0 -0.38235,0 -0.38235,0.3823 l 0,10.2758 c -1.52942,0.047 -2,1.0772 -2,1.8419 0,0.3823 0.5,0.5 0.5,0.5 l 8,0 c 0,0 0.5,-0.1177 0.5,-0.5 0,-1.9118 -0.85294,-3.5 -2,-3.5 -1.20237,0 -1.51531,2.3025 -2.70589,2.4706 -0.52207,0.074 -1.02653,-0.2641 -1.52941,-0.5257 l 0,-6.3567 5.35295,-2.2941 -4.96935,-2.1297 c -0.28787,-0.1234 -0.57468,-0.1644 -0.76595,-0.1644 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 505.38235,1196.3622 c -0.26113,0 -0.38235,0 -0.38235,0.3823 l 0,10.2758 c -1.52942,0.047 -2,1.0772 -2,1.8419 0,0.3823 0.5,0.5 0.5,0.5 l 8,0 c 0,0 0.5,-0.1177 0.5,-0.5 0,-1.9118 -0.85294,-3.5 -2,-3.5 -1.20237,0 -1.51531,2.3025 -2.70589,2.4706 -0.52207,0.074 -1.02653,-0.2641 -1.52941,-0.5257 l 0,-6.3567 5.35295,-2.2941 -4.96935,-2.1297 c -0.28787,-0.1234 -0.57468,-0.1644 -0.76595,-0.1644 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="18" height="18" x="498" y="1194.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/golf-24.svg b/data/styles/symbols/maki/golf-24.svg
deleted file mode 100644
index 1ad859c533..0000000000
--- a/data/styles/symbols/maki/golf-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-474 -166)" color="#000">
-        <g>
-            <path d="m 483.5,1196.3623 c -0.34148,0 -0.5,0 -0.5,0.5 l 0,14.4375 c -2,0.062 -3,1.5625 -3,2.5625 0,0.5 0.5,0.5 0.5,0.5 l 12,0 c 0,0 0.5,0 0.5,-0.5 0,-2.5 -1.5,-4.5 -3,-4.5 -1.57233,0 -2.44309,2.7803 -4,3 -0.68271,0.096 -1.3424,-0.3453 -2,-0.6875 l 0,-9.3125 7,-3 -6.49838,-2.785 c -0.37647,-0.1613 -0.7515,-0.215 -1.00162,-0.215 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 483.5,1196.3623 c -0.34148,0 -0.5,0 -0.5,0.5 l 0,14.4375 c -2,0.062 -3,1.5625 -3,2.5625 0,0.5 0.5,0.5 0.5,0.5 l 12,0 c 0,0 0.5,0 0.5,-0.5 0,-2.5 -1.5,-4.5 -3,-4.5 -1.57233,0 -2.44309,2.7803 -4,3 -0.68271,0.096 -1.3424,-0.3453 -2,-0.6875 l 0,-9.3125 7,-3 -6.49838,-2.785 c -0.37647,-0.1613 -0.7515,-0.215 -1.00162,-0.215 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1194.362" x="474" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/grocery-12.svg b/data/styles/symbols/maki/grocery-12.svg
deleted file mode 100644
index 001f12fec7..0000000000
--- a/data/styles/symbols/maki/grocery-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-360 -154)" color="#000">
-        <g>
-            <path d="m 371.5,1196.3622 c -0.29166,0 -0.55045,0.082 -0.73438,0.2657 -0.18392,0.1839 -0.26562,0.4427 -0.26562,0.7343 l -7.5,0 1,4 6.5,0 0,1 -6.13258,0 c -0.5,0 -0.5,0.5 0,0.5 l 0.88258,0 4.5,0 0.75,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-0.5 0,-4 0,-0.5 c 0,0 0.0433,-0.3245 0.10937,-0.3906 0.0661,-0.066 0.18229,-0.1094 0.39063,-0.1094 0.0555,0 0.5,0 0.5,0 l 0,-0.5 c 0,0 -0.4314,0 -0.5,0 z m -1.75,6.5 c -0.41422,0 -0.75,0.3358 -0.75,0.75 0,0.4142 0.33578,0.75 0.75,0.75 0.41422,0 0.75,-0.3358 0.75,-0.75 0,-0.4142 -0.33578,-0.75 -0.75,-0.75 z m -4.5,0 c -0.41422,0 -0.75,0.3358 -0.75,0.75 0,0.4142 0.33578,0.75 0.75,0.75 0.41422,0 0.75,-0.3358 0.75,-0.75 0,-0.4142 -0.33578,-0.75 -0.75,-0.75 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-            <path d="m 371.5,1196.3622 c -0.29166,0 -0.55045,0.082 -0.73438,0.2657 -0.18392,0.1839 -0.26562,0.4427 -0.26562,0.7343 l -7.5,0 1,4 6.5,0 0,1 -6.13258,0 c -0.5,0 -0.5,0.5 0,0.5 l 0.88258,0 4.5,0 0.75,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-0.5 0,-4 0,-0.5 c 0,0 0.0433,-0.3245 0.10937,-0.3906 0.0661,-0.066 0.18229,-0.1094 0.39063,-0.1094 0.0555,0 0.5,0 0.5,0 l 0,-0.5 c 0,0 -0.4314,0 -0.5,0 z m -1.75,6.5 c -0.41422,0 -0.75,0.3358 -0.75,0.75 0,0.4142 0.33578,0.75 0.75,0.75 0.41422,0 0.75,-0.3358 0.75,-0.75 0,-0.4142 -0.33578,-0.75 -0.75,-0.75 z m -4.5,0 c -0.41422,0 -0.75,0.3358 -0.75,0.75 0,0.4142 0.33578,0.75 0.75,0.75 0.41422,0 0.75,-0.3358 0.75,-0.75 0,-0.4142 -0.33578,-0.75 -0.75,-0.75 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-        </g>
-        <rect y="1194.362" x="360" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/grocery-18.svg b/data/styles/symbols/maki/grocery-18.svg
deleted file mode 100644
index 9c4ca873c4..0000000000
--- a/data/styles/symbols/maki/grocery-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-342 -160)" color="#000">
-        <g>
-            <path d="m 357.5,1198.8622 c -1,0 -1.5,0.5 -1.5,1.5 l -10,0 1.05882,6 9.17647,0 0,1 -8.41176,0 c -0.76471,0 -0.76435,0.7411 0,0.7647 l 1.14706,0 6.11764,0 1.14706,0 c 0.38236,0 0.76471,-0.3824 0.76471,-0.7647 l 0,-1 0,-4.9412 0,-1.0588 c 0,-0.5 0.23836,-0.7353 0.7647,-0.7353 l 1.2353,0 0,-0.7647 z m -2.5,9.2059 c -0.6335,0 -1.14706,0.5136 -1.14706,1.147 0,0.6335 0.51356,1.1471 1.14706,1.1471 0.63351,0 1.14706,-0.5136 1.14706,-1.1471 0,-0.6334 -0.51355,-1.147 -1.14706,-1.147 z m -6,0 c -0.63351,0 -1.14706,0.5136 -1.14706,1.147 0,0.6335 0.51355,1.1471 1.14706,1.1471 0.6335,0 1.14706,-0.5136 1.14706,-1.1471 0,-0.6334 -0.51356,-1.147 -1.14706,-1.147 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            <path d="m 357.5,1198.8622 c -1,0 -1.5,0.5 -1.5,1.5 l -10,0 1.05882,6 9.17647,0 0,1 -8.41176,0 c -0.76471,0 -0.76435,0.7411 0,0.7647 l 1.14706,0 6.11764,0 1.14706,0 c 0.38236,0 0.76471,-0.3824 0.76471,-0.7647 l 0,-1 0,-4.9412 0,-1.0588 c 0,-0.5 0.23836,-0.7353 0.7647,-0.7353 l 1.2353,0 0,-0.7647 z m -2.5,9.2059 c -0.6335,0 -1.14706,0.5136 -1.14706,1.147 0,0.6335 0.51356,1.1471 1.14706,1.1471 0.63351,0 1.14706,-0.5136 1.14706,-1.1471 0,-0.6334 -0.51355,-1.147 -1.14706,-1.147 z m -6,0 c -0.63351,0 -1.14706,0.5136 -1.14706,1.147 0,0.6335 0.51355,1.1471 1.14706,1.1471 0.6335,0 1.14706,-0.5136 1.14706,-1.1471 0,-0.6334 -0.51356,-1.147 -1.14706,-1.147 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-        </g>
-        <rect width="18" height="18" x="342" y="1194.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/grocery-24.svg b/data/styles/symbols/maki/grocery-24.svg
deleted file mode 100644
index 0297f09be5..0000000000
--- a/data/styles/symbols/maki/grocery-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-318 -166)" color="#000">
-        <g>
-            <path d="m 21,-19.000017 c -0.583333,0 -1.100899,0.163399 -1.46875,0.53125 C 19.163399,-18.100916 19,-17.58335 19,-17.000017 l -14,0 2,9 12,0 0,1 -11,0 c -1,0 -1,1 0,1 l 1.5,0 8,0 1.5,0 c 0.5,0 1,-0.5 1,-1 l 0,-1 0,-8 0,-1 c 0,0 0.0866,-0.649101 0.21875,-0.78125 0.132149,-0.132149 0.364583,-0.21875 0.78125,-0.21875 0.111026,0 0.292249,0 0.4,0 0.5,0 0.6,-0.248673 0.6,-0.5 0,-0.247421 -0.1,-0.5 -0.6,-0.5 -0.130972,0 -0.262788,0 -0.4,0 z m -3.5,13 c -0.828427,0 -1.5,0.671573 -1.5,1.5 0,0.828427 0.671573,1.5 1.5,1.5 0.828427,0 1.5,-0.671573 1.5,-1.5 0,-0.828427 -0.671573,-1.5 -1.5,-1.5 z m -8,0 c -0.8284271,0 -1.5,0.671573 -1.5,1.5 0,0.828427 0.6715729,1.5 1.5,1.5 0.828427,0 1.5,-0.671573 1.5,-1.5 0,-0.828427 -0.671573,-1.5 -1.5,-1.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(317 1217.362)"/>
-            <path d="m 21,-19.000017 c -0.583333,0 -1.100899,0.163399 -1.46875,0.53125 C 19.163399,-18.100916 19,-17.58335 19,-17.000017 l -14,0 2,9 12,0 0,1 -11,0 c -1,0 -1,1 0,1 l 1.5,0 8,0 1.5,0 c 0.5,0 1,-0.5 1,-1 l 0,-1 0,-8 0,-1 c 0,0 0.0866,-0.649101 0.21875,-0.78125 0.132149,-0.132149 0.364583,-0.21875 0.78125,-0.21875 0.111026,0 0.292249,0 0.4,0 0.5,0 0.6,-0.248673 0.6,-0.5 0,-0.247421 -0.1,-0.5 -0.6,-0.5 -0.130972,0 -0.262788,0 -0.4,0 z m -3.5,13 c -0.828427,0 -1.5,0.671573 -1.5,1.5 0,0.828427 0.671573,1.5 1.5,1.5 0.828427,0 1.5,-0.671573 1.5,-1.5 0,-0.828427 -0.671573,-1.5 -1.5,-1.5 z m -8,0 c -0.8284271,0 -1.5,0.671573 -1.5,1.5 0,0.828427 0.6715729,1.5 1.5,1.5 0.828427,0 1.5,-0.671573 1.5,-1.5 0,-0.828427 -0.671573,-1.5 -1.5,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(317 1217.362)"/>
-        </g>
-        <rect y="1194.362" x="318" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/harbor-12.svg b/data/styles/symbols/maki/harbor-12.svg
deleted file mode 100644
index a31017a92b..0000000000
--- a/data/styles/symbols/maki/harbor-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-126 -322)" color="#000">
-        <path d="m 134,1363.3622 -1,1 0,1.9375 -3.40625,3.4063 C 129.24756,1369.2512 129,1368.8622 129,1368.3622 l 0,-1 1,0.5 0,-2.5 -2,1.5 0,1.5 0,4 5.5,0 1.5,-2 -2.5,0 0.5,1 -1,0 c -0.5,0 -0.88892,-0.2476 -1.34375,-0.5937 l 3.40625,-3.4063 1.9375,0 1,-1 0,-2 -1,-1 z m 0.5,1 1,0 0.5,0.5 0,1 -0.5,0.5 -1.00016,0.015 -0.49984,-0.5155 0,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 134,1363.3622 -1,1 0,1.9375 -3.40625,3.4063 C 129.24756,1369.2512 129,1368.8622 129,1368.3622 l 0,-1 1,0.5 0,-2.5 -2,1.5 0,1.5 0,4 5.5,0 1.5,-2 -2.5,0 0.5,1 -1,0 c -0.5,0 -0.88892,-0.2476 -1.34375,-0.5937 l 3.40625,-3.4063 1.9375,0 1,-1 0,-2 -1,-1 z m 0.5,1 1,0 0.5,0.5 0,1 -0.5,0.5 -1.00016,0.015 -0.49984,-0.5155 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect y="1362.362" x="126" height="12" width="12" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/harbor-18.svg b/data/styles/symbols/maki/harbor-18.svg
deleted file mode 100644
index 36cb2e84f3..0000000000
--- a/data/styles/symbols/maki/harbor-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-108 -328)" color="#000">
-        <path d="m 121,1364.3622 -1,0.5 -0.5,0.5 -0.5,1 0,1 0.0937,0.4063 -6.3437,6.3437 c -0.75,-0.75 -0.75,-2.75 0.25,-3.75 l 1,1 0,-4 -1.5,1.5 c -1,1 -1.5,1.5 -1.5,3 l 0,1.5 0,4 4,0 1.5,0 c 1,0 2,-0.5 3,-1.5 l 0.5,-0.5 1,-1 -1,0 -3,0 1,1 c -1,1 -3,1 -3.75,0.25 l 6.34375,-6.3437 0.40625,0.094 1,0 1,-0.5 0.5,-0.5 0.5,-1 0,-1 -0.5,-1 -0.5,-0.5 -1,-0.5 -1,0 z m 0,1.5 0.5,0 0.5,0 0.5,0.5 0,0.5 0,0.5 -0.5,0.5 -0.5,0 -0.5,0 -0.5,-0.5 0,-0.5 0,-0.5 0.5,-0.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 121,1364.3622 -1,0.5 -0.5,0.5 -0.5,1 0,1 0.0937,0.4063 -6.3437,6.3437 c -0.75,-0.75 -0.75,-2.75 0.25,-3.75 l 1,1 0,-4 -1.5,1.5 c -1,1 -1.5,1.5 -1.5,3 l 0,1.5 0,4 4,0 1.5,0 c 1,0 2,-0.5 3,-1.5 l 0.5,-0.5 1,-1 -1,0 -3,0 1,1 c -1,1 -3,1 -3.75,0.25 l 6.34375,-6.3437 0.40625,0.094 1,0 1,-0.5 0.5,-0.5 0.5,-1 0,-1 -0.5,-1 -0.5,-0.5 -1,-0.5 -1,0 z m 0,1.5 0.5,0 0.5,0 0.5,0.5 0,0.5 0,0.5 -0.5,0.5 -0.5,0 -0.5,0 -0.5,-0.5 0,-0.5 0,-0.5 0.5,-0.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect ry="0" rx="0" y="1362.362" x="108" height="18" width="18" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/harbor-24.svg b/data/styles/symbols/maki/harbor-24.svg
deleted file mode 100644
index d2d42ab4f9..0000000000
--- a/data/styles/symbols/maki/harbor-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-84 -334)" color="#000">
-        <path d="m 101.5,1365.3622 c -1.933,0 -3.5,1.567 -3.5,3.5 0,0.4384 0.10282,0.8633 0.25,1.25 l -8.25,8.25 c 0,-1 0,-3 0,-4 0,-1.5 1,-2 1,-2 l 1,1 c 0,0 0,-2.6667 0,-4 0,-1 -0.5,-0.5 -1,0 -3,3 -3,2.9724 -3,5 l 0,4 0,3 c 0,0.5 0.5,1 1,1 l 3,0 4,0 c 2.02759,0 3.66667,-1.6667 5,-3 0.5,-0.5 0.99992,-0.9874 0,-1 l -4,0 1,1 c 0,0 -0.5,1 -2,1 -1,0 -3,0 -4,0 l 8.25,-8.25 c 0.38672,0.1472 0.81162,0.25 1.25,0.25 1.933,0 3.5,-1.567 3.5,-3.5 0,-1.933 -1.567,-3.5 -3.5,-3.5 z m 0,2 c 0.82842,0 1.5,0.6716 1.5,1.5 0,0.8284 -0.67158,1.5 -1.5,1.5 -0.82842,0 -1.5,-0.6716 -1.5,-1.5 0,-0.8284 0.67158,-1.5 1.5,-1.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <rect ry="0" rx="0" y="1362.362" x="84" height="24" width="24" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 101.5,1365.3622 c -1.933,0 -3.5,1.567 -3.5,3.5 0,0.4384 0.10282,0.8633 0.25,1.25 l -8.25,8.25 c 0,-1 0,-3 0,-4 0,-1.5 1,-2 1,-2 l 1,1 c 0,0 0,-2.6667 0,-4 0,-1 -0.5,-0.5 -1,0 -3,3 -3,2.9724 -3,5 l 0,4 0,3 c 0,0.5 0.5,1 1,1 l 3,0 4,0 c 2.02759,0 3.66667,-1.6667 5,-3 0.5,-0.5 0.99992,-0.9874 0,-1 l -4,0 1,1 c 0,0 -0.5,1 -2,1 -1,0 -3,0 -4,0 l 8.25,-8.25 c 0.38672,0.1472 0.81162,0.25 1.25,0.25 1.933,0 3.5,-1.567 3.5,-3.5 0,-1.933 -1.567,-3.5 -3.5,-3.5 z m 0,2 c 0.82842,0 1.5,0.6716 1.5,1.5 0,0.8284 -0.67158,1.5 -1.5,1.5 -0.82842,0 -1.5,-0.6716 -1.5,-1.5 0,-0.8284 0.67158,-1.5 1.5,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/heliport-12.svg b/data/styles/symbols/maki/heliport-12.svg
deleted file mode 100644
index 980914b79b..0000000000
--- a/data/styles/symbols/maki/heliport-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-126 -34)" color="#000">
-        <g>
-            <path d="m 132.625,1084.3622 3.875,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-1.5 c 0,-0.5 -0.24038,-0.7404 -0.5,-1 0,0 -0.33334,-0.3333 -0.5,-0.5 -0.16666,-0.1666 -0.5,-0.5 -1,-0.5 l -1,0 0,-1 1.5,0 1,0 c 0.27699,0 0.5,-0.223 0.5,-0.5 0,-0.277 -0.22301,-0.5 -0.5,-0.5 l -1,0 -1.5,0 -0.5,0 -2,0 -0.5,0 -0.5,0 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.277 0.223,0.5 0.5,0.5 l 0.5,0 0.5,0 1.5,0 0,1 -1,0 -2.14062,0 c -0.17303,-0.2984 -0.48958,-0.5 -0.85938,-0.5 -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.28852,0 0.53623,-0.1326 0.71875,-0.3281 l 1.78125,1.8281 c 0.5,0.5132 0.875,1 1.125,1 z m -3.625,-4 c 0.27614,0 0.5,0.2238 0.5,0.5 0,0.2762 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.2238 -0.5,-0.5 0,-0.2762 0.22386,-0.5 0.5,-0.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(0 -1)"/>
-            <path d="m 132.625,1084.3622 3.875,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-1.5 c 0,-0.5 -0.24038,-0.7404 -0.5,-1 0,0 -0.33334,-0.3333 -0.5,-0.5 -0.16666,-0.1666 -0.5,-0.5 -1,-0.5 l -1,0 0,-1 1.5,0 1,0 c 0.27699,0 0.5,-0.223 0.5,-0.5 0,-0.277 -0.22301,-0.5 -0.5,-0.5 l -1,0 -1.5,0 -0.5,0 -2,0 -0.5,0 -0.5,0 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.277 0.223,0.5 0.5,0.5 l 0.5,0 0.5,0 1.5,0 0,1 -1,0 -2.14062,0 c -0.17303,-0.2984 -0.48958,-0.5 -0.85938,-0.5 -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.28852,0 0.53623,-0.1326 0.71875,-0.3281 l 1.78125,1.8281 c 0.5,0.5132 0.875,1 1.125,1 z m -3.625,-4 c 0.27614,0 0.5,0.2238 0.5,0.5 0,0.2762 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.2238 -0.5,-0.5 0,-0.2762 0.22386,-0.5 0.5,-0.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-        </g>
-        <rect width="12" height="12" x="126" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/heliport-18.svg b/data/styles/symbols/maki/heliport-18.svg
deleted file mode 100644
index f5646d9a90..0000000000
--- a/data/styles/symbols/maki/heliport-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-108 -40)" color="#000">
-        <g>
-            <path d="m 118.19444,1087.3622 5.02778,0 c 0.38889,0 0.77778,-0.3889 0.77778,-0.7778 l 0,-2.3333 c 0,-0.7778 -0.37392,-1.1517 -0.77778,-1.5556 0,0 -0.51852,-0.5185 -0.77778,-0.7777 -0.25925,-0.2593 -0.77777,-0.5556 -1.55555,-0.5556 l -1.88889,0 0,-2 3.22222,0 c 0.43088,0 0.77778,-0.1247 0.77778,-0.5556 0,-0.4308 -0.29135,-0.4444 -0.72223,-0.4444 l -7.33333,0 c -0.43089,0 -0.83333,0.014 -0.83333,0.4444 0,0.4309 0.34939,0.5092 0.77778,0.5556 l 3.11111,0 0,2 -0.77778,0 -3.32986,0 c -0.26914,-0.4643 -0.76156,-0.7778 -1.3368,-0.7778 -0.85911,0 -1.55556,0.6964 -1.55556,1.5556 0,0.8591 0.69645,1.5555 1.55556,1.5555 0.4488,0 0.83413,-0.2063 1.11805,-0.5104 l 2.77083,2.6215 c 0.80962,0.766 1.36112,1.5556 1.75,1.5556 z m -5.63888,-6 c 0.42955,0 0.77777,0.3482 0.77777,0.7778 0,0.4295 -0.34822,0.7777 -0.77777,0.7777 -0.42956,0 -0.77778,-0.3482 -0.77778,-0.7777 0,-0.4296 0.34822,-0.7778 0.77778,-0.7778 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 118.19444,1087.3622 5.02778,0 c 0.38889,0 0.77778,-0.3889 0.77778,-0.7778 l 0,-2.3333 c 0,-0.7778 -0.37392,-1.1517 -0.77778,-1.5556 0,0 -0.51852,-0.5185 -0.77778,-0.7777 -0.25925,-0.2593 -0.77777,-0.5556 -1.55555,-0.5556 l -1.88889,0 0,-2 3.22222,0 c 0.43088,0 0.77778,-0.1247 0.77778,-0.5556 0,-0.4308 -0.29135,-0.4444 -0.72223,-0.4444 l -7.33333,0 c -0.43089,0 -0.83333,0.014 -0.83333,0.4444 0,0.4309 0.34939,0.5092 0.77778,0.5556 l 3.11111,0 0,2 -0.77778,0 -3.32986,0 c -0.26914,-0.4643 -0.76156,-0.7778 -1.3368,-0.7778 -0.85911,0 -1.55556,0.6964 -1.55556,1.5556 0,0.8591 0.69645,1.5555 1.55556,1.5555 0.4488,0 0.83413,-0.2063 1.11805,-0.5104 l 2.77083,2.6215 c 0.80962,0.766 1.36112,1.5556 1.75,1.5556 z m -5.63888,-6 c 0.42955,0 0.77777,0.3482 0.77777,0.7778 0,0.4295 -0.34822,0.7777 -0.77777,0.7777 -0.42956,0 -0.77778,-0.3482 -0.77778,-0.7777 0,-0.4296 0.34822,-0.7778 0.77778,-0.7778 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1074.362" x="108" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/heliport-24.svg b/data/styles/symbols/maki/heliport-24.svg
deleted file mode 100644
index 9f8b92a66c..0000000000
--- a/data/styles/symbols/maki/heliport-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-84 -46)" color="#000">
-        <g>
-            <path d="m 96.25,1091.3622 8.75,0 c 0.5,0 1,-0.5 1,-1 l 0,-3 c 0,-1 -0.48076,-1.4808 -1,-2 0,0 -0.66667,-0.6667 -1,-1 -0.33333,-0.3333 -1,-1 -2,-1 l -3,0 0,-2 4,0 2,0 c 0.55399,0 1,-0.446 1,-1 0,-0.554 -0.44601,-1 -1,-1 l -2,0 -3.5,0 -1,0 -4.5,0 -1,0 -1,0 c -0.553995,0 -1,0.446 -1,1 0,0.554 0.446005,1 1,1 l 1,0 1,0 4,0 0,2 -3,0 -4.28125,0 c -0.346043,-0.5969 -0.979146,-1 -1.71875,-1 -1.104569,0 -2,0.8954 -2,2 0,1.1046 0.895431,2 2,2 0.577042,0 1.072461,-0.2653 1.4375,-0.6562 L 94,1089.3622 c 1,1.0263 1.75,2 2.25,2 z m -7.25,-8 c 0.552285,0 1,0.4477 1,1 0,0.5523 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477 -1,-1 0,-0.5523 0.447715,-1 1,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 1)"/>
-            <path d="m 96.25,1091.3622 8.75,0 c 0.5,0 1,-0.5 1,-1 l 0,-3 c 0,-1 -0.48076,-1.4808 -1,-2 0,0 -0.66667,-0.6667 -1,-1 -0.33333,-0.3333 -1,-1 -2,-1 l -3,0 0,-2 4,0 2,0 c 0.55399,0 1,-0.446 1,-1 0,-0.554 -0.44601,-1 -1,-1 l -2,0 -3.5,0 -1,0 -4.5,0 -1,0 -1,0 c -0.553995,0 -1,0.446 -1,1 0,0.554 0.446005,1 1,1 l 1,0 1,0 4,0 0,2 -3,0 -4.28125,0 c -0.346043,-0.5969 -0.979146,-1 -1.71875,-1 -1.104569,0 -2,0.8954 -2,2 0,1.1046 0.895431,2 2,2 0.577042,0 1.072461,-0.2653 1.4375,-0.6562 L 94,1089.3622 c 1,1.0263 1.75,2 2.25,2 z m -7.25,-8 c 0.552285,0 1,0.4477 1,1 0,0.5523 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477 -1,-1 0,-0.5523 0.447715,-1 1,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 1)"/>
-        </g>
-        <rect width="24" height="24" x="84" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/hospital-12.svg b/data/styles/symbols/maki/hospital-12.svg
deleted file mode 100644
index 2552ed343a..0000000000
--- a/data/styles/symbols/maki/hospital-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-282 -82)">
-        <path d="m 284,1128.3622 c 0,-0.554 0.446,-1 1,-1 l 2,0 0,-2 c 0,-0.554 0.446,-1 1,-1 l 1,0 c 0.554,0 1,0.446 1,1 l 0,2 2,0 c 0.554,0 1,0.446 1,1 l 0,1 c 0,0.554 -0.446,1 -1,1 l -2,0 0,2 c 0,0.554 -0.446,1 -1,1 l -1,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-2 -2,0 c -0.554,0 -1,-0.446 -1,-1 z" color="#000" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" fill="none" transform="translate(0 -1)" opacity=".3"/>
-        <path d="m 284,1128.3622 c 0,-0.554 0.446,-1 1,-1 l 2,0 0,-2 c 0,-0.554 0.446,-1 1,-1 l 1,0 c 0.554,0 1,0.446 1,1 l 0,2 2,0 c 0.554,0 1,0.446 1,1 l 0,1 c 0,0.554 -0.446,1 -1,1 l -2,0 0,2 c 0,0.554 -0.446,1 -1,1 l -1,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-2 -2,0 c -0.554,0 -1,-0.446 -1,-1 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-        <rect y="1122.362" x="282" height="12" width="12" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/hospital-18.svg b/data/styles/symbols/maki/hospital-18.svg
deleted file mode 100644
index 4a9da7ed54..0000000000
--- a/data/styles/symbols/maki/hospital-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-264 -88)" color="#000">
-        <g>
-            <path d="m 11,1009.3622 c -0.554,0 -1,0.446 -1,1 l 0,3 -3,0 c -0.554,0 -1,0.446 -1,1 l 0,3 c 0,0.554 0.474429,1.1752 1,1 l 3,0 0,3 c 0,0.554 0.446,1 1,1 l 3,0 c 0.554,0 1,-0.446 1,-1 l 0,-3 3,0 c 0.554,0 1,-0.446 1,-1 l 0,-3 c 0,-0.554 -0.446,-1 -1,-1 l -3,0 0,-3 c 0,-0.554 -0.446,-1 -1,-1 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" fill="none" transform="translate(261 115)"/>
-            <path d="m 11,1009.3622 c -0.554,0 -1,0.446 -1,1 l 0,3 -3,0 c -0.554,0 -1,0.446 -1,1 l 0,3 c 0,0.554 0.474429,1.1752 1,1 l 3,0 0,3 c 0,0.554 0.446,1 1,1 l 3,0 c 0.554,0 1,-0.446 1,-1 l 0,-3 3,0 c 0.554,0 1,-0.446 1,-1 l 0,-3 c 0,-0.554 -0.446,-1 -1,-1 l -3,0 0,-3 c 0,-0.554 -0.446,-1 -1,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(261 115)"/>
-        </g>
-        <rect width="18" height="18" x="264" y="1122.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/hospital-24.svg b/data/styles/symbols/maki/hospital-24.svg
deleted file mode 100644
index 1830e21784..0000000000
--- a/data/styles/symbols/maki/hospital-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-240 -94)" color="#000">
-        <g>
-            <path d="M 11,4 C 10.446,4 10,4.446 10,5 L 10,9 6,9 C 5.446,9 5,9.446 5,10 l 0,3 c 0,0.554 0.446,1 1,1 l 4,0 0,4 c 0,0.554 0.446,1 1,1 l 3,0 c 0.554,0 1.068715,-0.450278 1,-1 l 0,-4 4,0 c 0.554,0 1,-0.446 1,-1 l 0,-3 C 20,9.446 19.554,9 19,9 L 15,9 15,5 C 15,4.446 14.554,4 14,4 z" transform="translate(240 118) translate(0 1004.362)" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path transform="translate(240 118) translate(-72 884.362)" d="m 83,124 c -0.554,0 -1,0.446 -1,1 l 0,4 -4,0 c -0.554,0 -1,0.446 -1,1 l 0,3 c 0,0.554 0.446,1 1,1 l 4,0 0,4 c 0,0.554 0.446,1 1,1 l 3,0 c 0.554,0 1,-0.446 1,-1 l 0,-4 4,0 c 0.554,0 1,-0.446 1,-1 l 0,-3 c 0,-0.554 -0.446,-1 -1,-1 l -4,0 0,-4 c 0,-0.554 -0.446,-1 -1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1122.362" x="240" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/industrial-12.svg b/data/styles/symbols/maki/industrial-12.svg
deleted file mode 100644
index 5df17843f9..0000000000
--- a/data/styles/symbols/maki/industrial-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-672 -58)" color="#000">
-        <path d="m 681,1099.3622 0,4 -1,0 0,-2 -3,2 0,-2 -3,2 0,0.8572 0,3.5714 c 0,0.3165 0.25485,0.5714 0.57143,0.5714 l 7.85714,0 c 0.31657,0 0.57143,-0.2549 0.57143,-0.5714 l 0,-3.8571 c 0,-0.3166 -0.25486,-0.5715 -0.57143,-0.5715 l -0.42857,0 0,-4 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 681,1099.3622 0,4 -1,0 0,-2 -3,2 0,-2 -3,2 0,0.8572 0,3.5714 c 0,0.3165 0.25485,0.5714 0.57143,0.5714 l 7.85714,0 c 0.31657,0 0.57143,-0.2549 0.57143,-0.5714 l 0,-3.8571 c 0,-0.3166 -0.25486,-0.5715 -0.57143,-0.5715 l -0.42857,0 0,-4 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect width="12" height="12" x="672" y="1098.362" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/industrial-18.svg b/data/styles/symbols/maki/industrial-18.svg
deleted file mode 100644
index 3f6330c493..0000000000
--- a/data/styles/symbols/maki/industrial-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-654 -64)" color="#000">
-        <path d="m 666,1101.3622 c 0,1.6667 0,4 0,4 l -2,0 0,-2.4706 -3,2.4706 0,-2.4706 -3.17647,2.4706 C 657.46338,1105.6423 657,1105.774 657,1106.5975 l 0,5.9412 c 0,0.4562 0.36729,0.8235 0.82353,0.8235 l 11.35294,0 c 0.45624,0 0.82353,-0.3673 0.82353,-0.8235 l 0,-6.3529 c 0,-0.4563 -0.36729,-0.8236 -0.82353,-0.8236 l -1.17647,0 c 0,0 0,-2.3333 0,-4 l -1,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 666,1101.3622 c 0,1.6667 0,4 0,4 l -2,0 0,-2.4706 -3,2.4706 0,-2.4706 -3.17647,2.4706 C 657.46338,1105.6423 657,1105.774 657,1106.5975 l 0,5.9412 c 0,0.4562 0.36729,0.8235 0.82353,0.8235 l 11.35294,0 c 0.45624,0 0.82353,-0.3673 0.82353,-0.8235 l 0,-6.3529 c 0,-0.4563 -0.36729,-0.8236 -0.82353,-0.8236 l -1.17647,0 c 0,0 0,-2.3333 0,-4 l -1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect y="1098.362" x="654" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/industrial-24.svg b/data/styles/symbols/maki/industrial-24.svg
deleted file mode 100644
index b813362f29..0000000000
--- a/data/styles/symbols/maki/industrial-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-630 -70)" color="#000">
-        <path d="m 646,1102.3622 c 0,1.3333 0,4 0,4 l -3,0 0,-3 -4,3 0,-3 -4,3 c -0.44321,0.3324 -1,0.5 -1,1.5 l 0,8.5 c 0,0.554 0.44599,1 1,1 l 15,0 c 0.55401,0 1,-0.446 1,-1 l 0,-9 c 0,-0.554 -0.44599,-1 -1,-1 l -2,0 c 0,0 0,-2.6667 0,-4 0,-0.5 -0.5286,-1 -1,-1 -0.4714,0 -1,0.5 -1,1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 646,1102.3622 c 0,1.3333 0,4 0,4 l -3,0 0,-3 -4,3 0,-3 -4,3 c -0.44321,0.3324 -1,0.5 -1,1.5 l 0,8.5 c 0,0.554 0.44599,1 1,1 l 15,0 c 0.55401,0 1,-0.446 1,-1 l 0,-9 c 0,-0.554 -0.44599,-1 -1,-1 l -2,0 c 0,0 0,-2.6667 0,-4 0,-0.5 -0.5286,-1 -1,-1 -0.4714,0 -1,0.5 -1,1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect y="1098.362" x="630" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/land-use-12.svg b/data/styles/symbols/maki/land-use-12.svg
deleted file mode 100644
index 2f7698c0e0..0000000000
--- a/data/styles/symbols/maki/land-use-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-672 -202)" color="#000">
-        <g>
-            <path d="m 633.69998,1246.3622 -3.4,3.4 1.7,0 0,3.4 5.1,0 0,-3.4 1.7,0 -3.4,-3.4 z m 10.2,0 0,1.7 -2.23125,0 -1.16875,1.275 0,3.825 5.1,0 0,-6.8 z m -10.2,10.2 -1.7,0 0,6.8 1.7,0 0,-1.7 1.7,0 0,1.7 1.7,0 0,-6.8 -1.7,0 z m 9.35,-1.7 -3.4,4.25 1.7,0 -1.7,2.55 2.55,0 0,1.7 1.7,0 0,-1.7 2.55,0 -1.7,-2.55 1.7,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="3.4" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="matrix(.588 0 0 .588 302.235 510.208)"/>
-            <path d="m 633.69998,1246.3622 -3.4,3.4 1.7,0 0,3.4 5.1,0 0,-3.4 1.7,0 -3.4,-3.4 z m 10.2,0 0,1.7 -2.23125,0 -1.16875,1.275 0,3.825 5.1,0 0,-6.8 z m -10.2,10.2 -1.7,0 0,6.8 1.7,0 0,-1.7 1.7,0 0,1.7 1.7,0 0,-6.8 -1.7,0 z m 9.35,-1.7 -3.4,4.25 1.7,0 -1.7,2.55 2.55,0 0,1.7 1.7,0 0,-1.7 2.55,0 -1.7,-2.55 1.7,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="matrix(.588 0 0 .588 302.235 510.208)"/>
-        </g>
-        <rect y="1242.362" x="672" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/land-use-18.svg b/data/styles/symbols/maki/land-use-18.svg
deleted file mode 100644
index cb3aea57eb..0000000000
--- a/data/styles/symbols/maki/land-use-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-654 -208)" color="#000">
-        <path d="m 657.99999,1244.3622 -2,3 1,0 0,3 5,0 0,-3 1,0 -2,-3 z m 11,0 0,2 -3,0 -1,1 0,3 5,0 0,-6 z m -11.99999,8 -10e-6,1 0,5 1,0 0,-2 1,0 0,2 3,0 0,-5 0,-1 z m 10.49999,-1 -2.5,4 1.5,0 -1.5,2 2,0 0,1 1,0 0,-1 2,0 -1.5,-2 1.5,0 z m -9.5,3 1,0 0,1 -1,0 z m 2,0 1,0 0,1 -1,0 z m 0,2 1,0 0,1 -1,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 657.99999,1244.3622 -2,3 1,0 0,3 5,0 0,-3 1,0 -2,-3 z m 11,0 0,2 -3,0 -1,1 0,3 5,0 0,-6 z m -11.99999,8 -10e-6,1 0,5 1,0 0,-2 1,0 0,2 3,0 0,-5 0,-1 z m 10.49999,-1 -2.5,4 1.5,0 -1.5,2 2,0 0,1 1,0 0,-1 2,0 -1.5,-2 1.5,0 z m -9.5,3 1,0 0,1 -1,0 z m 2,0 1,0 0,1 -1,0 z m 0,2 1,0 0,1 -1,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect width="18" height="18" x="654" y="1242.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/land-use-24.svg b/data/styles/symbols/maki/land-use-24.svg
deleted file mode 100644
index 06296d5e87..0000000000
--- a/data/styles/symbols/maki/land-use-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-630 -214)" color="#000">
-        <path d="m 637.5,1245.3622 c -0.5,0 -0.78339,0.1967 -1,0.5 l -2.5,3.5 2,0 0,3 5,0 0,-3 2,0 -2.5,-3.5 c -0.21661,-0.3033 -0.5,-0.5 -1,-0.5 z m 12.5,0 0,2 -4,0 c -0.5,0 -1,0.5 -1,1 l 0,4 6,0 0,-7 z m -14,9 c -0.5,0 -1,0.5 -1,1 l 0,7 2,0 0,-2 1,0 0,2 4,0 0,-7 c 0,-0.5 -0.5,-1 -1,-1 z m 12,-1 -3,4 1.5,0 -1.5,3 2,0 0,2 2,0 0,-2 2,0 -1.5,-3 1.5,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 757.5,195 c -0.5,0 -0.78339,0.1967 -1,0.5 l -2.5,3.5 2,0 0,3 5,0 0,-3 2,0 -2.5,-3.5 c -0.21661,-0.3033 -0.5,-0.5 -1,-0.5 l -2,0 z m 12.5,0 0,2 -4,0 c -0.5,0 -1,0.5 -1,1 l 0,4 6,0 0,-7 -1,0 z m -2,8 -3,4 1.5,0 -1.5,3 2,0 0,2 2,0 0,-2 2,0 -1.5,-3 1.5,0 -3,-4 z m -12,1 c -0.5,0 -1,0.5 -1,1 l 0,7 2,0 0,-2 1,0 0,2 4,0 0,-7 c 0,-0.5 -0.5,-1 -1,-1 l -5,0 z m 1,2 1,0 0,1 -1,0 0,-1 z m 2,0 1,0 0,1 -1,0 0,-1 z m -2,2 1,0 0,1 -1,0 0,-1 z m 2,0 1,0 0,1 -1,0 0,-1 z m 0,2 1,0 0,1 -1,0 0,-1 z" transform="translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect y="1242.362" x="630" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/library-12.svg b/data/styles/symbols/maki/library-12.svg
deleted file mode 100644
index 050243dbcc..0000000000
--- a/data/styles/symbols/maki/library-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-282 -58)" color="#000">
-        <g>
-            <path d="m 285,1100.3622 0,6 c 1.5,1.5 3.75,1 3.75,2 l 0.5,0 0,-5.5 c 0,-1.5 -2.75,-1.5 -4.25,-2.5 z m 9,0 c -1.5,1 -4.25,1 -4.25,2.5 l 0,5.5 0.5,0 c 0,-1 2.25,-0.5 3.75,-2 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1)"/>
-            <path d="m 285,1100.3622 0,6 c 1.5,1.5 3.75,1 3.75,2 l 0.5,0 0,-5.5 c 0,-1.5 -2.75,-1.5 -4.25,-2.5 z m 9,0 c -1.5,1 -4.25,1 -4.25,2.5 l 0,5.5 0.5,0 c 0,-1 2.25,-0.5 3.75,-2 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-        </g>
-        <rect width="12" height="12" x="282" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/library-18.svg b/data/styles/symbols/maki/library-18.svg
deleted file mode 100644
index 91a8a1cc7b..0000000000
--- a/data/styles/symbols/maki/library-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-264 -64)" color="#000">
-        <g>
-            <path d="m 266,1103.7151 0,7.6471 c 2,2.5 5,1.4706 5,3 l 1,0 0,-6.8824 c 0,-2.2941 -3,-1.6176 -6,-3.7647 z m 13,0 c -3,2.1471 -6,1.4706 -6,3.7647 l 0,6.8824 1,0 c 0,-1.5294 3,-0.5 5,-3 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(1 -1)"/>
-            <path d="m 266,1103.7151 0,7.6471 c 2,2.5 5,1.4706 5,3 l 1,0 0,-6.8824 c 0,-2.2941 -3,-1.6176 -6,-3.7647 z m 13,0 c -3,2.1471 -6,1.4706 -6,3.7647 l 0,6.8824 1,0 c 0,-1.5294 3,-0.5 5,-3 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(1 -1)"/>
-        </g>
-        <rect y="1098.362" x="264" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/library-24.svg b/data/styles/symbols/maki/library-24.svg
deleted file mode 100644
index bf222b56f8..0000000000
--- a/data/styles/symbols/maki/library-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-240 -70)">
-        <g>
-            <path d="m 244,1101.3622 0,10 c 3,3 7,2 7,4 l 1,0 0,-9 c 0,-3 -5,-3 -8,-5 z m 17,0 c -3,2 -8,2 -8,5 l 0,9 1,0 c 0,-2 4,-1 7,-4 z" opacity=".3" color="#000" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(0 2)"/>
-            <path d="m 244,1102.3622 0,10 c 3,3 7,2 7,4 l 1,0 0,-9 c 0,-3 -5,-3 -8,-5 z m 17,0 c -3,2 -8,2 -8,5 l 0,9 1,0 c 0,-2 4,-1 7,-4 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 2) translate(0 -1)"/>
-        </g>
-        <rect width="24" height="24" x="240" y="1098.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/lodging-12.svg b/data/styles/symbols/maki/lodging-12.svg
deleted file mode 100644
index bcc0e48faa..0000000000
--- a/data/styles/symbols/maki/lodging-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-204 -58)" color="#000">
-        <g>
-            <path d="m 207,1100.3622 c -0.55229,0 -1,0.4477 -1,1 0,0.5523 0.44771,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z m 2,1 c 0,1 -0.5,2 -2,2 l -0.75,0 c -0.1263,0 -0.25065,0 -0.25,0.25 1.7e-4,0.068 0,0.3079 0,0.5 0,0.25 0.19428,0.25 0.25,0.25 l 8.75,0 0,-1.5 c 0,-0.5 0,-1.5 -2.5,-1.5 z m -2.5,4 c -0.25,0 -0.5,0.25 -0.5,0.5 -1.2e-4,0.4954 0,0.5723 0,1 0,0.25 0.25,0.5 0.5,0.5 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-0.5 7,0 0,0.5 c 0,0.25 0.25,0.5 0.5,0.5 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-1 c 0,-0.25 -0.25,-0.5 -0.5,-0.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 207,1100.3622 c -0.55229,0 -1,0.4477 -1,1 0,0.5523 0.44771,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z m 2,1 c 0,1 -0.5,2 -2,2 l -0.75,0 c -0.1263,0 -0.25065,0 -0.25,0.25 1.7e-4,0.068 0,0.3079 0,0.5 0,0.25 0.19428,0.25 0.25,0.25 l 8.75,0 0,-1.5 c 0,-0.5 0,-1.5 -2.5,-1.5 z m -2.5,4 c -0.25,0 -0.5,0.25 -0.5,0.5 -1.2e-4,0.4954 0,0.5723 0,1 0,0.25 0.25,0.5 0.5,0.5 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-0.5 7,0 0,0.5 c 0,0.25 0.25,0.5 0.5,0.5 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-1 c 0,-0.25 -0.25,-0.5 -0.5,-0.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1098.362" x="204" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/lodging-18.svg b/data/styles/symbols/maki/lodging-18.svg
deleted file mode 100644
index 9a2d9274ea..0000000000
--- a/data/styles/symbols/maki/lodging-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-186 -64)" color="#000">
-        <g>
-            <path d="m 190.49999,1102.1123 c -0.82842,0 -1.49999,0.6715 -1.49999,1.5 0,0.8284 0.67157,1.4999 1.49999,1.4999 0.82843,0 1.49999,-0.6715 1.49999,-1.4999 0,-0.8285 -0.67156,-1.5 -1.49999,-1.5 z M 193,1103.3622 c 0,2 -1,3 -2.5,3 l -1,0 c -0.5,0 -0.5,0.5 -0.5,0.5 0,0 0,0.5 0.5,0.5 l 12.5,0 0,-1.7501 c 0,-0.75 0,-2.2499 -3.74997,-2.2499 z m -3.25001,5 c -0.375,0 -0.75,0.375 -0.75,0.75 -1.8e-4,0.743 0,0.8584 0,1.5 0,0.375 0.375,0.75 0.75,0.75 0.375,0 0.74999,-0.375 0.74999,-0.75 l 2e-5,-1.25 10.00002,0 -2e-5,1.25 c -1e-5,0.375 0.375,0.75 0.75,0.75 0.375,0 0.74999,-0.375 0.74999,-0.75 l 0,-1.5 c 0,-0.375 -0.37499,-0.75 -0.74999,-0.75 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 190.49999,1102.1123 c -0.82842,0 -1.49999,0.6715 -1.49999,1.5 0,0.8284 0.67157,1.4999 1.49999,1.4999 0.82843,0 1.49999,-0.6715 1.49999,-1.4999 0,-0.8285 -0.67156,-1.5 -1.49999,-1.5 z M 193,1103.3622 c 0,2 -1,3 -2.5,3 l -1,0 c -0.5,0 -0.5,0.5 -0.5,0.5 0,0 0,0.5 0.5,0.5 l 12.5,0 0,-1.7501 c 0,-0.75 0,-2.2499 -3.74997,-2.2499 z m -3.25001,5 c -0.375,0 -0.75,0.375 -0.75,0.75 -1.8e-4,0.743 0,0.8584 0,1.5 0,0.375 0.375,0.75 0.75,0.75 0.375,0 0.74999,-0.375 0.74999,-0.75 l 2e-5,-1.25 10.00002,0 -2e-5,1.25 c -1e-5,0.375 0.375,0.75 0.75,0.75 0.375,0 0.74999,-0.375 0.74999,-0.75 l 0,-1.5 c 0,-0.375 -0.37499,-0.75 -0.74999,-0.75 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="18" height="18" x="186" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/lodging-24.svg b/data/styles/symbols/maki/lodging-24.svg
deleted file mode 100644
index 07fbf79897..0000000000
--- a/data/styles/symbols/maki/lodging-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-162 -70)" color="#000">
-        <g>
-            <path d="m 6,1010.3622 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m 3,2 c 0,1.6569 -1.34314,3 -3,3 l -1.5,0 c -0.25259,0 -0.5013,0 -0.5,0.5 3.5e-4,0.136 0,0.6157 0,1 0,0.5 0.38857,0.5 0.5,0.5 l 16.5,0 0,-2 c 0,-1 0,-3 -5,-3 z m -4,6 c -0.5,0 -1,0.5 -1,1 -2.4e-4,0.9907 0,2.1445 0,3 0,0.5 0.5,1 1,1 0.5,0 1,-0.5 1,-1 l 0,-2 13,0 0,2 c 0,0.5 0.5,1 1,1 0.5,0 1,-0.5 1,-1 l 0,-3 c 0,-0.5 -0.5,-1 -1,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(162 94)"/>
-            <path d="m 6,1010.3622 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m 3,2 c 0,1.6569 -1.34314,3 -3,3 l -1.5,0 c -0.25259,0 -0.5013,0 -0.5,0.5 3.5e-4,0.136 0,0.6157 0,1 0,0.5 0.38857,0.5 0.5,0.5 l 16.5,0 0,-2 c 0,-1 0,-3 -5,-3 z m -4,6 c -0.5,0 -1,0.5 -1,1 -2.4e-4,0.9907 0,2.1445 0,3 0,0.5 0.5,1 1,1 0.5,0 1,-0.5 1,-1 l 0,-2 13,0 0,2 c 0,0.5 0.5,1 1,1 0.5,0 1,-0.5 1,-1 l 0,-3 c 0,-0.5 -0.5,-1 -1,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(162 94)"/>
-        </g>
-        <rect y="1098.362" x="162" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/logging-12.svg b/data/styles/symbols/maki/logging-12.svg
deleted file mode 100644
index 83b742f6ac..0000000000
--- a/data/styles/symbols/maki/logging-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-518 -202)" color="#000">
-        <g>
-            <path d="m 525.5,1245.8622 -4,4 1.5,1.5 4,-4 0,-1 -0.5,-0.5 z m -6,3 -1.5,1.5 0,0.5 0.5,0 0.5,-0.5 0.5,0.5 -1.5,1.5 0,1.5 1.5,1.5 1.5,0 2.5,-2.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(2 -2)"/>
-            <path d="m 525.5,1245.8622 -4,4 1.5,1.5 4,-4 0,-1 -0.5,-0.5 z m -6,3 -1.5,1.5 0,0.5 0.5,0 0.5,-0.5 0.5,0.5 -1.5,1.5 0,1.5 1.5,1.5 1.5,0 2.5,-2.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(2 -2)"/>
-        </g>
-        <rect y="1242.362" x="518" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/logging-18.svg b/data/styles/symbols/maki/logging-18.svg
deleted file mode 100644
index 7f8f4f3e79..0000000000
--- a/data/styles/symbols/maki/logging-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-500 -208)" color="#000">
-        <g>
-            <path transform="translate(2 -2) translate(-276 1150.362)" d="m 787.5,95.5 -5.75,5.75 1,1 5.25,-5.25 0.5,0.5 -5.25,5.25 1,1 5.75,-5.75 0,-1.5 -1,-1 z m -8.25,4.25 -2.25,2.25 0,0.5 0.5,0 1,-1 1,1 -2.5,2.5 0,1.5 2.5,2.5 1.5,0 3.75,-3.75 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 787.5,95.5 -5.75,5.75 1,1 5.25,-5.25 0.5,0.5 -5.25,5.25 1,1 5.75,-5.75 0,-1.5 -1,-1 z m -8.25,4.25 -2.25,2.25 0,0.5 0.5,0 1,-1 1,1 -2.5,2.5 0,1.5 2.5,2.5 1.5,0 3.75,-3.75 z" transform="translate(2 -2) translate(-276 1150.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="18" height="18" x="500" y="1242.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/logging-24.svg b/data/styles/symbols/maki/logging-24.svg
deleted file mode 100644
index 665550372d..0000000000
--- a/data/styles/symbols/maki/logging-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-476 -214)" color="#000">
-        <g>
-            <path transform="translate(2) translate(-276 1148.362)" d="m 768,97 -7.5,7.5 1.25,1.25 7.25,-7.25 0.5,0.5 -7.25,7.25 1.25,1.25 7.5,-7.5 0,-2 -1,-1 z m -11.5,5.5 -2.5,2.5 0.5,0.5 1,0 1,-1 1,1 -3.5,3.5 0,2 3,3 2,0 4.5,-4.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 768,97 -7.5,7.5 1.25,1.25 7.25,-7.25 0.5,0.5 -7.25,7.25 1.25,1.25 7.5,-7.5 0,-2 -1,-1 z m -11.5,5.5 -2.5,2.5 0.5,0.5 1,0 1,-1 1,1 -3.5,3.5 0,2 3,3 2,0 4.5,-4.5 z" transform="translate(2) translate(-276 1148.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1242.362" x="476" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/london-underground-12.svg b/data/styles/symbols/maki/london-underground-12.svg
deleted file mode 100644
index 81b5d2ed85..0000000000
--- a/data/styles/symbols/maki/london-underground-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-126 -228)" color="#000">
-        <path d="m 132.5,1270.3622 c -1.76528,0 -3.22866,1.301 -3.46875,3 l -1.03125,0 0,1 1.03125,0 c 0.24009,1.699 1.70347,3 3.46875,3 1.76528,0 3.22866,-1.301 3.46875,-3 l 1.03125,0 0,-1 -1.03125,0 c -0.24009,-1.699 -1.70347,-3 -3.46875,-3 z m 0,1.5 c 0.93197,0 1.71554,0.6373 1.9375,1.5 l -3.875,0 c 0.22196,-0.8627 1.00553,-1.5 1.9375,-1.5 z m -1.9375,2.5 3.875,0 c -0.22196,0.8627 -1.00553,1.5 -1.9375,1.5 -0.93197,0 -1.71554,-0.6373 -1.9375,-1.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <rect y="1268.362" x="126" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 132.5,1270.3622 c -1.76528,0 -3.22866,1.301 -3.46875,3 l -1.03125,0 0,1 1.03125,0 c 0.24009,1.699 1.70347,3 3.46875,3 1.76528,0 3.22866,-1.301 3.46875,-3 l 1.03125,0 0,-1 -1.03125,0 c -0.24009,-1.699 -1.70347,-3 -3.46875,-3 z m 0,1.5 c 0.93197,0 1.71554,0.6373 1.9375,1.5 l -3.875,0 c 0.22196,-0.8627 1.00553,-1.5 1.9375,-1.5 z m -1.9375,2.5 3.875,0 c -0.22196,0.8627 -1.00553,1.5 -1.9375,1.5 -0.93197,0 -1.71554,-0.6373 -1.9375,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/london-underground-18.svg b/data/styles/symbols/maki/london-underground-18.svg
deleted file mode 100644
index 2784fb2b27..0000000000
--- a/data/styles/symbols/maki/london-underground-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-108 -232)">
-        <path transform="translate(-120 1050.362)" d="m 237.5,219 c -2.97562,0 -5.43327,2.15859 -5.90625,5 L 230.5,224 c -0.27701,0 -0.5,0.22299 -0.5,0.5 l 0,1 c 0,0.27701 0.22299,0.5 0.5,0.5 l 1.09375,0 c 0.47298,2.84141 2.93063,5 5.90625,5 2.97562,0 5.43327,-2.15859 5.90625,-5 l 1.09375,0 c 0.27701,0 0.5,-0.22299 0.5,-0.5 l 0,-1 c 0,-0.27701 -0.22299,-0.5 -0.5,-0.5 l -1.09375,0 c -0.47298,-2.84141 -2.93063,-5 -5.90625,-5 z m 0,2 c 1.86319,0 3.39908,1.27569 3.84375,3 l -7.6875,0 c 0.44467,-1.72431 1.98056,-3 3.84375,-3 z m -3.84375,5 7.6875,0 c -0.44467,1.72431 -1.98056,3 -3.84375,3 -1.86319,0 -3.39908,-1.27569 -3.84375,-3 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 237.5,219 c -2.97562,0 -5.43327,2.15859 -5.90625,5 L 230.5,224 c -0.27701,0 -0.5,0.22299 -0.5,0.5 l 0,1 c 0,0.27701 0.22299,0.5 0.5,0.5 l 1.09375,0 c 0.47298,2.84141 2.93063,5 5.90625,5 2.97562,0 5.43327,-2.15859 5.90625,-5 l 1.09375,0 c 0.27701,0 0.5,-0.22299 0.5,-0.5 l 0,-1 c 0,-0.27701 -0.22299,-0.5 -0.5,-0.5 l -1.09375,0 c -0.47298,-2.84141 -2.93063,-5 -5.90625,-5 z m 0,2 c 1.86319,0 3.39908,1.27569 3.84375,3 l -7.6875,0 c 0.44467,-1.72431 1.98056,-3 3.84375,-3 z m -3.84375,5 7.6875,0 c -0.44467,1.72431 -1.98056,3 -3.84375,3 -1.86319,0 -3.39908,-1.27569 -3.84375,-3 z" transform="translate(-120 1050.362)" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect width="18" height="18" x="108" y="1266.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/london-underground-24.svg b/data/styles/symbols/maki/london-underground-24.svg
deleted file mode 100644
index dad483bae7..0000000000
--- a/data/styles/symbols/maki/london-underground-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-84 -238)" color="#000">
-        <rect y="1266.362" x="84" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <g>
-            <path d="m 96.5,1270.3622 c -3.62438,0 -6.64441,2.5824 -7.34375,6 l -1.15625,0 c -0.5,0 -1,0.5 -1,1 l 0,1 c 0,0.5 0.5,1 1,1 l 1.15625,0 c 0.69934,3.4177 3.71937,6 7.34375,6 3.62438,0 6.64441,-2.5823 7.34375,-6 l 1.15625,0 c 0.5,0 1,-0.5 1,-1 l 0,-1 c 0,-0.5 -0.5,-1 -1,-1 l -1.15625,0 c -0.69934,-3.4176 -3.71937,-6 -7.34375,-6 z m 0,2.5 c 2.05647,0 3.86839,1.6577 4.5,3.5 l -9,0 c 0.63161,-1.8423 2.44353,-3.5 4.5,-3.5 z m -4.5,6.5 9,0 c -0.63161,1.8423 -2.44353,3.5 -4.5,3.5 -2.05647,0 -3.86839,-1.6577 -4.5,-3.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 96.5,1270.3622 c -3.62438,0 -6.64441,2.5824 -7.34375,6 l -1.15625,0 c -0.5,0 -1,0.5 -1,1 l 0,1 c 0,0.5 0.5,1 1,1 l 1.15625,0 c 0.69934,3.4177 3.71937,6 7.34375,6 3.62438,0 6.64441,-2.5823 7.34375,-6 l 1.15625,0 c 0.5,0 1,-0.5 1,-1 l 0,-1 c 0,-0.5 -0.5,-1 -1,-1 l -1.15625,0 c -0.69934,-3.4176 -3.71937,-6 -7.34375,-6 z m 0,2.5 c 2.05647,0 3.86839,1.6577 4.5,3.5 l -9,0 c 0.63161,-1.8423 2.44353,-3.5 4.5,-3.5 z m -4.5,6.5 9,0 c -0.63161,1.8423 -2.44353,3.5 -4.5,3.5 -2.05647,0 -3.86839,-1.6577 -4.5,-3.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/maki-12-base.svg b/data/styles/symbols/maki/maki-12-base.svg
deleted file mode 100644
index 561f1bdf09..0000000000
--- a/data/styles/symbols/maki/maki-12-base.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"/>
diff --git a/data/styles/symbols/maki/maki-18-base.svg b/data/styles/symbols/maki/maki-18-base.svg
deleted file mode 100644
index ac87cfe285..0000000000
--- a/data/styles/symbols/maki/maki-18-base.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18"/>
diff --git a/data/styles/symbols/maki/maki-24-base.svg b/data/styles/symbols/maki/maki-24-base.svg
deleted file mode 100644
index d3c38085f7..0000000000
--- a/data/styles/symbols/maki/maki-24-base.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"/>
diff --git a/data/styles/symbols/maki/maki-icons.svg b/data/styles/symbols/maki/maki-icons.svg
deleted file mode 100644
index 3e82c2ab5d..0000000000
--- a/data/styles/symbols/maki/maki-icons.svg
+++ /dev/null
@@ -1,1797 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(120 -1050.362)">
-        <g transform="translate(0 -24)" color="#000">
-            <path d="m 134,1363.3622 -1,1 0,1.9375 -3.40625,3.4063 C 129.24756,1369.2512 129,1368.8622 129,1368.3622 l 0,-1 1,0.5 0,-2.5 -2,1.5 0,1.5 0,4 5.5,0 1.5,-2 -2.5,0 0.5,1 -1,0 c -0.5,0 -0.88892,-0.2476 -1.34375,-0.5937 l 3.40625,-3.4063 1.9375,0 1,-1 0,-2 -1,-1 z m 0.5,1 1,0 0.5,0.5 0,1 -0.5,0.5 -1.00016,0.015 -0.49984,-0.5155 0,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 134,1363.3622 -1,1 0,1.9375 -3.40625,3.4063 C 129.24756,1369.2512 129,1368.8622 129,1368.3622 l 0,-1 1,0.5 0,-2.5 -2,1.5 0,1.5 0,4 5.5,0 1.5,-2 -2.5,0 0.5,1 -1,0 c -0.5,0 -0.88892,-0.2476 -1.34375,-0.5937 l 3.40625,-3.4063 1.9375,0 1,-1 0,-2 -1,-1 z m 0.5,1 1,0 0.5,0.5 0,1 -0.5,0.5 -1.00016,0.015 -0.49984,-0.5155 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect y="1362.362" x="126" height="12" width="12" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-156 -24)" color="#000">
-            <path d="m 323,1269.3622 c -0.4714,0 -1,0.5 -1,1 l 0,7 c 0,2.216 1,5 5,5 0.35868,0 0.68618,-0.017 1,-0.062 l 0,-2.9375 -4,0 c 0,0 0.5,-2 3,-2 0.5,0 0.69653,0.074 1,0.1875 l 0,-2.1875 c 0,-0.9167 0.36529,-1.6826 1,-2 1,-0.5 1.40372,-0.2981 2,0 1,0.5 1,0.5 1,0.5 l 0,-3.5 c 0,-0.5 -0.5286,-1 -1,-1 -1,0 -2,1 -4,1 -2,0 -3,-1 -4,-1 z m 7,5 c -0.4714,0 -1,0.5 -1,1 l 0,7 c 0,2.216 1,5 5,5 4,0 5,-2.784 5,-5 l 0,-7 c 0,-0.5 -0.5286,-1 -1,-1 -1,0 -2,1 -4,1 -2,0 -3,-1 -4,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <rect y="1266.362" x="318" height="24" width="24" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 323,1269.3622 c -0.4714,0 -1,0.5 -1,1 l 0,7 c 0,2.216 1,5 5,5 0.35868,0 0.68618,-0.017 1,-0.062 l 0,-2.9375 -4,0 c 0,0 0.5,-2 3,-2 0.5,0 0.69653,0.074 1,0.1875 l 0,-2.1875 c 0,-0.9167 0.36529,-1.6826 1,-2 1,-0.5 1.40372,-0.2981 2,0 1,0.5 1,0.5 1,0.5 l 0,-3.5 c 0,-0.5 -0.5286,-1 -1,-1 -1,0 -2,1 -4,1 -2,0 -3,-1 -4,-1 z m 1.75,3.5 c 0.69036,0 1.25,0.5596 1.25,1.25 0,0.6904 -0.55964,1.25 -1.25,1.25 -0.69036,0 -1.25,-0.5596 -1.25,-1.25 0,-0.6904 0.55964,-1.25 1.25,-1.25 z m 5.25,1.5 c -0.4714,0 -1,0.5 -1,1 l 0,7 c 0,2.216 1,5 5,5 4,0 5,-2.784 5,-5 l 0,-7 c 0,-0.5 -0.5286,-1 -1,-1 -1,0 -2,1 -4,1 -2,0 -3,-1 -4,-1 z m 1.75,3.5 c 0.69036,0 1.25,0.5596 1.25,1.25 0,0.6904 -0.55964,1.25 -1.25,1.25 -0.69036,0 -1.25,-0.5596 -1.25,-1.25 0,-0.6904 0.55964,-1.25 1.25,-1.25 z m 4.5,0 c 0.69036,0 1.25,0.5596 1.25,1.25 0,0.6904 -0.55964,1.25 -1.25,1.25 -0.69036,0 -1.25,-0.5596 -1.25,-1.25 0,-0.6904 0.55964,-1.25 1.25,-1.25 z m -5.25,5.5 6,0 c 0,0 -0.5,2 -3,2 -2.5,0 -3,-2 -3,-2 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g color="#000">
-            <rect y="1050.362" x="-30" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <g>
-                <path d="m -23.5,1052.3622 c 2.485295,0 4.5,2.0147 4.5,4.5 0,2.4853 -2.014705,4.5 -4.5,4.5 -2.485295,0 -4.5,-2.0147 -4.5,-4.5 0,-2.4853 2.014705,-4.5 4.5,-4.5 z m 0,1 c -1.93301,0 -3.5,1.567 -3.5,3.5 0,1.933 1.56699,3.5 3.5,3.5 1.93301,0 3.5,-1.567 3.5,-3.5 0,-1.933 -1.56699,-3.5 -3.5,-3.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-                <path d="m -23.5,1052.3622 c 2.485295,0 4.5,2.0147 4.5,4.5 0,2.4853 -2.014705,4.5 -4.5,4.5 -2.485295,0 -4.5,-2.0147 -4.5,-4.5 0,-2.4853 2.014705,-4.5 4.5,-4.5 z m 0,1 c -1.93301,0 -3.5,1.567 -3.5,3.5 0,1.933 1.56699,3.5 3.5,3.5 1.93301,0 3.5,-1.567 3.5,-3.5 0,-1.933 -1.56699,-3.5 -3.5,-3.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-            </g>
-        </g>
-        <g color="#000">
-            <rect width="18" height="18" x="-48" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <g>
-                <path d="m -38.5,1052.3622 c 3.589871,0 6.5,2.9101 6.5,6.5 0,3.5899 -2.910129,6.5 -6.5,6.5 -3.589871,0 -6.5,-2.9101 -6.5,-6.5 0,-3.5899 2.910129,-6.5 6.5,-6.5 z m 0,1.4444 c -2.792126,0 -5.055556,2.2635 -5.055556,5.0556 0,2.7921 2.26343,5.0556 5.055556,5.0556 2.792126,0 5.055556,-2.2635 5.055556,-5.0556 0,-2.7921 -2.26343,-5.0556 -5.055556,-5.0556 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-                <path d="m -38.5,1052.3622 c 3.589871,0 6.5,2.9101 6.5,6.5 0,3.5899 -2.910129,6.5 -6.5,6.5 -3.589871,0 -6.5,-2.9101 -6.5,-6.5 0,-3.5899 2.910129,-6.5 6.5,-6.5 z m 0,1.4444 c -2.792126,0 -5.055556,2.2635 -5.055556,5.0556 0,2.7921 2.26343,5.0556 5.055556,5.0556 2.792126,0 5.055556,-2.2635 5.055556,-5.0556 0,-2.7921 -2.26343,-5.0556 -5.055556,-5.0556 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-        </g>
-        <g color="#000">
-            <g>
-                <path transform="matrix(-1.03 0 0 1.03 -46.879 1073.241)" d="m 20.5,12.25 c 0,4.556349 -3.693651,8.25 -8.25,8.25 C 7.6936508,20.5 4,16.806349 4,12.25 4,7.6936508 7.6936508,4 12.25,4 c 4.556349,0 8.25,3.6936508 8.25,8.25 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="1.941" overflow="visible" enable-background="accumulate"/>
-                <path d="m 20.5,12.25 c 0,4.556349 -3.693651,8.25 -8.25,8.25 C 7.6936508,20.5 4,16.806349 4,12.25 4,7.6936508 7.6936508,4 12.25,4 c 4.556349,0 8.25,3.6936508 8.25,8.25 z" transform="matrix(-1.03 0 0 1.03 -46.879 1073.241)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="-72" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m 20.5,12.25 c 0,4.556349 -3.693651,8.25 -8.25,8.25 C 7.6936508,20.5 4,16.806349 4,12.25 4,7.6936508 7.6936508,4 12.25,4 c 4.556349,0 8.25,3.6936508 8.25,8.25 z" transform="matrix(-.788 0 0 .788 -28.848 1073.211)" fill="#fff" stroke="#fff" stroke-width="2.538" overflow="visible" enable-background="accumulate" opacity=".3"/>
-                <path transform="matrix(-.788 0 0 .788 -28.848 1073.211)" d="m 20.5,12.25 c 0,4.556349 -3.693651,8.25 -8.25,8.25 C 7.6936508,20.5 4,16.806349 4,12.25 4,7.6936508 7.6936508,4 12.25,4 c 4.556349,0 8.25,3.6936508 8.25,8.25 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1074.362" x="-48" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m 20.5,12.25 c 0,4.556349 -3.693651,8.25 -8.25,8.25 C 7.6936508,20.5 4,16.806349 4,12.25 4,7.6936508 7.6936508,4 12.25,4 c 4.556349,0 8.25,3.6936508 8.25,8.25 z" transform="matrix(-.545 0 0 .545 -16.818 1073.18)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="3.667" overflow="visible" enable-background="accumulate"/>
-                <path transform="matrix(-.545 0 0 .545 -16.818 1073.18)" d="m 20.5,12.25 c 0,4.556349 -3.693651,8.25 -8.25,8.25 C 7.6936508,20.5 4,16.806349 4,12.25 4,7.6936508 7.6936508,4 12.25,4 c 4.556349,0 8.25,3.6936508 8.25,8.25 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="12" height="12" x="-30" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path transform="translate(-72 94) translate(0 1004.362)" d="M 5,3 C 4.446,3 4,3.446 4,4 l 0,15 c 0,0.554 0.446,1 1,1 l 15,0 c 0.554,0 1,-0.446 1,-1 L 21,4 C 21,3.446 20.554,3 20,3 z m 1,2 13,0 0,13 -13,0 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="M 5,3 C 4.446,3 4,3.446 4,4 l 0,15 c 0,0.554 0.446,1 1,1 l 15,0 c 0.554,0 1,-0.446 1,-1 L 21,4 C 21,3.446 20.554,3 20,3 z m 1,2 13,0 0,13 -13,0 z" transform="translate(-72 94) translate(0 1004.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="-72" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m -44,1100.3622 c -0.55401,0 -1,0.446 -1,1 l 0,11 c 0,0.554 0.44599,1 1,1 l 11,0 c 0.55401,0 1,-0.446 1,-1 l 0,-11 c 0,-0.554 -0.44599,-1 -1,-1 l -11,0 z m 1.4375,2 8.125,0 c 0.249309,0 0.4375,0.1882 0.4375,0.4375 l 0,8.125 c 0,0.2493 -0.188191,0.4375 -0.4375,0.4375 l -8.125,0 c -0.249309,0 -0.4375,-0.1882 -0.4375,-0.4375 l 0,-8.125 c 0,-0.2493 0.188191,-0.4375 0.4375,-0.4375 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m -44,1100.3622 c -0.55401,0 -1,0.446 -1,1 l 0,11 c 0,0.554 0.44599,1 1,1 l 11,0 c 0.55401,0 1,-0.446 1,-1 l 0,-11 c 0,-0.554 -0.44599,-1 -1,-1 l -11,0 z m 1.4375,2 8.125,0 c 0.249309,0 0.4375,0.1882 0.4375,0.4375 l 0,8.125 c 0,0.2493 -0.188191,0.4375 -0.4375,0.4375 l -8.125,0 c -0.249309,0 -0.4375,-0.1882 -0.4375,-0.4375 l 0,-8.125 c 0,-0.2493 0.188191,-0.4375 0.4375,-0.4375 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1098.362" x="-48" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m -28.5,1099.3622 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,8 c 0,0.277 0.223,0.5 0.5,0.5 l 8,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-8 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 0.5,1 7,0 0,7 -7,0 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" fill="none" transform="translate(1)"/>
-                <path d="m -28.5,1099.3622 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,8 c 0,0.277 0.223,0.5 0.5,0.5 l 8,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-8 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 0.5,1 7,0 0,7 -7,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(1)"/>
-            </g>
-            <rect width="12" height="12" x="-30" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g transform="translate(-32 118)">
-                <rect width="17" height="17" x="-36" y="1007.362" rx="1.125" ry="1.125" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" fill="none"/>
-                <rect ry="1.125" rx="1.125" y="1007.362" x="-36" height="17" width="17" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1122.362" x="-72" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <rect ry="1" rx="1" y="1124.362" x="-45" height="13" width="13" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" fill="none"/>
-                <rect width="13" height="13" x="-45" y="1124.362" rx="1" ry="1" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="18" height="18" x="-48" y="1122.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m -28.5,1123.3622 7.875,0 c 0.311625,0 0.5625,0.2509 0.5625,0.5625 l 0,7.875 c 0,0.3116 -0.250875,0.5625 -0.5625,0.5625 l -7.875,0 c -0.311625,0 -0.5625,-0.2509 -0.5625,-0.5625 l 0,-7.875 c 0,-0.3116 0.250875,-0.5625 0.5625,-0.5625 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" fill="none" transform="translate(1)"/>
-                <path d="m -28.5,1123.3622 7.875,0 c 0.311625,0 0.5625,0.2509 0.5625,0.5625 l 0,7.875 c 0,0.3116 -0.250875,0.5625 -0.5625,0.5625 l -7.875,0 c -0.311625,0 -0.5625,-0.2509 -0.5625,-0.5625 l 0,-7.875 c 0,-0.3116 0.250875,-0.5625 0.5625,-0.5625 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(1)"/>
-            </g>
-            <rect y="1122.362" x="-30" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g fill="#444" font-family="Sans">
-                <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m -56.375,1161.8622 c -0.5,-10e-5 -0.72609,0.2394 -0.875,0.5 l -8.5,14 c -0.0881,0.1543 -0.125,0.3274 -0.125,0.5 0,0.75 0.5,1.0002 1,1 l 17,0 c 0.5,2e-4 1,-0.25 1,-1 0,-0.1726 -0.0369,-0.3457 -0.125,-0.5 l -8.5,-14 c -0.14891,-0.2606 -0.375,-0.5001 -0.875,-0.5 z m 0,3 6.78125,11 -13.5625,0 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" transform="translate(-3.125 -11.5)"/>
-                <path d="m -56.375,1161.8622 c -0.5,-10e-5 -0.72609,0.2394 -0.875,0.5 l -8.5,14 c -0.0881,0.1543 -0.125,0.3274 -0.125,0.5 0,0.75 0.5,1.0002 1,1 l 17,0 c 0.5,2e-4 1,-0.25 1,-1 0,-0.1726 -0.0369,-0.3457 -0.125,-0.5 l -8.5,-14 c -0.14891,-0.2606 -0.375,-0.5001 -0.875,-0.5 z m 0,3 6.78125,11 -13.5625,0 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" overflow="visible" enable-background="accumulate" transform="translate(-3.125 -11.5)"/>
-            </g>
-            <rect width="24" height="24" x="-72" y="1146.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g fill="#444" font-family="Sans">
-                <path d="m -38.5,1149.3622 c -0.36111,0 -0.51746,0.1869 -0.625,0.375 l -5.78125,10.5313 c -0.0636,0.1112 -0.09375,0.2503 -0.09375,0.375 0,0.5417 0.35764,0.7189 0.71875,0.7187 l 11.5625,0 c 0.36111,2e-4 0.71875,-0.177 0.71875,-0.7187 0,-0.1243 -0.03015,-0.2635 -0.09375,-0.375 l -5.78125,-10.5313 c -0.10761,-0.1881 -0.26389,-0.375 -0.625,-0.375 z m 0,2 4.5,8.5 -9,0 4.5,-8.5 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-                <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m -38.5,1149.3622 c -0.36111,0 -0.51746,0.1869 -0.625,0.375 l -5.78125,10.5313 c -0.0636,0.1112 -0.09375,0.2503 -0.09375,0.375 0,0.5417 0.35764,0.7189 0.71875,0.7187 l 11.5625,0 c 0.36111,2e-4 0.71875,-0.177 0.71875,-0.7187 0,-0.1243 -0.03015,-0.2635 -0.09375,-0.375 l -5.78125,-10.5313 c -0.10761,-0.1881 -0.26389,-0.375 -0.625,-0.375 z m 0,2 4.5,8.5 -9,0 4.5,-8.5 z" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1146.362" x="-48" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g fill="#444" font-family="Sans">
-                <path d="m -23.5,1148.3622 c -0.25,0 -0.363045,0.1197 -0.4375,0.25 l -4,7 c -0.04405,0.077 -0.0625,0.1637 -0.0625,0.25 0,0.375 0.25,0.5001 0.5,0.5 l 8,0 c 0.25,10e-5 0.5,-0.125 0.5,-0.5 0,-0.086 -0.01845,-0.1728 -0.0625,-0.25 l -4,-7 c -0.07446,-0.1303 -0.1875,-0.25 -0.4375,-0.25 z m 0,1.5 3,5.5 -6,0 3,-5.5 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-                <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m 96.5,98 c -0.25,0 -0.363045,0.1197 -0.4375,0.25 l -4,7 C 92.01845,105.327 92,105.4137 92,105.5 c 0,0.375 0.25,0.5001 0.5,0.5 l 8,0 c 0.25,1e-4 0.5,-0.125 0.5,-0.5 0,-0.086 -0.0185,-0.1728 -0.0625,-0.25 l -4,-7 C 96.86304,98.1197 96.75,98 96.5,98 z m 0,1.5 3,5.5 -6,0 3,-5.5 z" transform="translate(-120 1050.362)" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="12" height="12" x="-30" y="1146.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g fill="#444" font-family="Sans">
-                <path d="m -96.375,1161.8622 c -0.5,-10e-5 -0.726094,0.2394 -0.875,0.5 l -8.5,14 c -0.0881,0.1543 -0.125,0.3274 -0.125,0.5 0,0.75 0.5,1.0002 1,1 l 17,0 c 0.5,2e-4 1,-0.25 1,-1 0,-0.1726 -0.03685,-0.3457 -0.125,-0.5 l -8.5,-14 c -0.148906,-0.2606 -0.375,-0.5001 -0.875,-0.5 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" transform="translate(36.875 12.5)"/>
-                <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m -96.375,1161.8622 c -0.5,-10e-5 -0.726094,0.2394 -0.875,0.5 l -8.5,14 c -0.0881,0.1543 -0.125,0.3274 -0.125,0.5 0,0.75 0.5,1.0002 1,1 l 17,0 c 0.5,2e-4 1,-0.25 1,-1 0,-0.1726 -0.03685,-0.3457 -0.125,-0.5 l -8.5,-14 c -0.148906,-0.2606 -0.375,-0.5001 -0.875,-0.5 z" overflow="visible" enable-background="accumulate" transform="translate(36.875 12.5)"/>
-            </g>
-            <rect width="24" height="24" x="-72" y="1170.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g fill="#444" font-family="Sans">
-                <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m -38.49998,1173.3622 c -0.36111,0 -0.52441,0.1729 -0.63195,0.361 l -5.77777,10.5557 c -0.0636,0.1112 -0.0903,0.2364 -0.0903,0.3611 0,0.5417 0.36111,0.7224 0.72222,0.7222 l 11.55556,0 c 0.36111,2e-4 0.72222,-0.1805 0.72222,-0.7222 0,-0.1243 -0.0267,-0.2496 -0.0903,-0.3611 l -5.77778,-10.5557 c -0.10761,-0.1881 -0.27083,-0.361 -0.63194,-0.361 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-                <path d="m -38.49998,1173.3622 c -0.36111,0 -0.52441,0.1729 -0.63195,0.361 l -5.77777,10.5557 c -0.0636,0.1112 -0.0903,0.2364 -0.0903,0.3611 0,0.5417 0.36111,0.7224 0.72222,0.7222 l 11.55556,0 c 0.36111,2e-4 0.72222,-0.1805 0.72222,-0.7222 0,-0.1243 -0.0267,-0.2496 -0.0903,-0.3611 l -5.77778,-10.5557 c -0.10761,-0.1881 -0.27083,-0.361 -0.63194,-0.361 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1170.362" x="-48" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g fill="#444" font-family="Sans">
-                <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m -23.5,1172.3622 c -0.25,0 -0.363045,0.1197 -0.4375,0.25 l -4,7 c -0.04405,0.077 -0.0625,0.1637 -0.0625,0.25 0,0.375 0.25,0.5001 0.5,0.5 l 8,0 c 0.25,10e-5 0.5,-0.125 0.5,-0.5 0,-0.086 -0.01845,-0.1728 -0.0625,-0.25 l -4,-7 c -0.07446,-0.1303 -0.1875,-0.25 -0.4375,-0.25 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-                <path d="m -23.5,1172.3622 c -0.25,0 -0.363045,0.1197 -0.4375,0.25 l -4,7 c -0.04405,0.077 -0.0625,0.1637 -0.0625,0.25 0,0.375 0.25,0.5001 0.5,0.5 l 8,0 c 0.25,10e-5 0.5,-0.125 0.5,-0.5 0,-0.086 -0.01845,-0.1728 -0.0625,-0.25 l -4,-7 c -0.07446,-0.1303 -0.1875,-0.25 -0.4375,-0.25 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="12" height="12" x="-30" y="1170.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)">
-            <g color="#000" transform="translate(1)">
-                <path d="m 142.49314,204.36214 -2,6 -6.5,0 5,5 -2.5,7 6,-4 6,4 -2.5,-7 5,-5 -6,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-202.993 993)"/>
-                <path d="m 142.49314,204.36214 -2,6 -6.5,0 5,5 -2.5,7 6,-4 6,4 -2.5,-7 5,-5 -6,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-202.993 993)"/>
-            </g>
-            <rect y="1194.362" x="-72" height="24" width="24" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g>
-                <path d="m -38.5,1196.3622 -2.000003,4 -4.499997,0 3.499997,4 -1.694441,5 4.694444,-2.8889 4.694444,2.8889 -1.694447,-5 3.500003,-4 -4.500003,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m -38.5,1196.3622 -2.000003,4 -4.499997,0 3.499997,4 -1.694441,5 4.694444,-2.8889 4.694444,2.8889 -1.694447,-5 3.500003,-4 -4.500003,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="18" height="18" x="-48" y="1194.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g>
-                <path d="m -23.5,1196.3622 -1.25,3 -3.25,0 2.5,2.5 -1.25,3.5 3.25,-2 3.25,2 -1.25,-3.5 2.5,-2.5 -3.25,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-                <path d="m -23.5,1196.3622 -1.25,3 -3.25,0 2.5,2.5 -1.25,3.5 3.25,-2 3.25,2 -1.25,-3.5 2.5,-2.5 -3.25,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-            </g>
-            <rect y="1194.362" x="-30" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 -24)">
-            <g color="#000" transform="translate(-72 214)">
-                <path d="m 143.49314,204.36214 -2,6 -6.5,0 5,5 -2.5,7 6,-4 6,4 -2.5,-7 5,-5 -6.5,0 z m 0,4 1,3.5 4,0 -3.5,3.5 1.5,3.5 -3,-2.5 -3,2.5 1.5,-3.5 -3.5,-3.5 4,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-130.993 803)"/>
-                <path d="m 143.49314,204.36214 -2,6 -6.5,0 5,5 -2.5,7 6,-4 6,4 -2.5,-7 5,-5 -6.5,0 -2,-6 z m 0,4 1,3.5 4,0 -3.5,3.5 1.5,3.5 -3,-2.5 -3,2.5 1.5,-3.5 -3.5,-3.5 4,0 1,-3.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-130.993 803)"/>
-            </g>
-            <rect y="1218.362" x="-72" height="24" width="24" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 -24)" color="#000">
-            <g>
-                <path d="m -38.5,1220.3622 -2,4 -4.5,0 3.5,4 -1.6875,5 4.6875,-2.875 4.6875,2.875 -1.6875,-5 3.5,-4 -4.5,0 z m 0,2.5 1,2.5 3,0 -2.5,3 1.15625,2.5 -2.65625,-2 -2.65625,2 1.15625,-2.5 -2.5,-3 3,0 z" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linejoin="round"/>
-                <path d="m -38.5,1220.3622 -2,4 -4.5,0 3.5,4 -1.6875,5 4.6875,-2.875 4.6875,2.875 -1.6875,-5 3.5,-4 -4.5,0 z m 0,2.5 1,2.5 3,0 -2.5,3 1.15625,2.5 -2.65625,-2 -2.65625,2 1.15625,-2.5 -2.5,-3 3,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="18" height="18" x="-48" y="1218.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 -24)" color="#000">
-            <g>
-                <path d="m -23.5,1220.3622 -1.25,3 -3.25,0 2.5,2.5 -1.25,3.5 3.25,-2 3.25,2 -1.25,-3.5 2.5,-2.5 -3.25,0 -1.25,-3 z m 0,2 1,2 1.5,0 -1.5,1.5 0.5,1.5 -1.5,-1 -1.5,1 0.5,-1.5 -1.5,-1.5 1.5,0 0.5,-1 0.5,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-                <path d="m -23.5,1220.3622 -1.25,3 -3.25,0 2.5,2.5 -1.25,3.5 3.25,-2 3.25,2 -1.25,-3.5 2.5,-2.5 -3.25,0 -1.25,-3 z m 0,2 1,2 1.5,0 -1.5,1.5 0.5,1.5 -1.5,-1 -1.5,1 0.5,-1.5 -1.5,-1.5 1.5,0 0.5,-1 0.5,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-            </g>
-            <rect y="1218.362" x="-30" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g font-family="Sans">
-                <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m -43.916667,1244.3622 c -0.541666,0 -1.083333,0.5421 -1.083333,1.0833 0,0.2697 0.08818,0.5283 0.304688,0.7448 l 4.671875,4.6719 -4.671875,4.6719 c -0.216559,0.2165 -0.304688,0.4751 -0.304688,0.7448 0,0.5412 0.541667,1.0833 1.083333,1.0833 0.270834,0 0.541667,-0.067 0.778646,-0.3046 l 4.638021,-4.6381 4.638021,4.6381 c 0.236979,0.2374 0.507812,0.3046 0.778646,0.3046 0.541666,0 1.083333,-0.5421 1.083333,-1.0833 0,-0.2697 -0.08818,-0.5283 -0.304687,-0.7448 l -4.671875,-4.6719 4.671875,-4.6719 c 0.216558,-0.2165 0.304687,-0.4751 0.304687,-0.7448 0,-0.5412 -0.541667,-1.0833 -1.083333,-1.0833 -0.270834,0 -0.541667,0.067 -0.778646,0.3047 l -4.638021,4.638 -4.638021,-4.638 c -0.236979,-0.2375 -0.507812,-0.3047 -0.778646,-0.3047 z" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linejoin="round"/>
-                <path d="m -43.916667,1244.3622 c -0.541666,0 -1.083333,0.5421 -1.083333,1.0833 0,0.2697 0.08818,0.5283 0.304688,0.7448 l 4.671875,4.6719 -4.671875,4.6719 c -0.216559,0.2165 -0.304688,0.4751 -0.304688,0.7448 0,0.5412 0.541667,1.0833 1.083333,1.0833 0.270834,0 0.541667,-0.067 0.778646,-0.3046 l 4.638021,-4.6381 4.638021,4.6381 c 0.236979,0.2374 0.507812,0.3046 0.778646,0.3046 0.541666,0 1.083333,-0.5421 1.083333,-1.0833 0,-0.2697 -0.08818,-0.5283 -0.304687,-0.7448 l -4.671875,-4.6719 4.671875,-4.6719 c 0.216558,-0.2165 0.304687,-0.4751 0.304687,-0.7448 0,-0.5412 -0.541667,-1.0833 -1.083333,-1.0833 -0.270834,0 -0.541667,0.067 -0.778646,0.3047 l -4.638021,4.638 -4.638021,-4.638 c -0.236979,-0.2375 -0.507812,-0.3047 -0.778646,-0.3047 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1242.362" x="-48" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g font-family="Sans">
-                <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m -27.5,1243.3622 c -0.25,0 -0.5,0.2502 -0.5,0.5 0,0.1245 0.0407,0.2438 0.140625,0.3438 l 3.65625,3.6562 -3.65625,3.6563 c -0.09995,0.1 -0.140625,0.2193 -0.140625,0.3437 0,0.2498 0.25,0.5 0.5,0.5 0.125,0 0.25,-0.031 0.359375,-0.1406 l 3.640625,-3.6406 3.640625,3.6406 c 0.109375,0.1096 0.234375,0.1406 0.359375,0.1406 0.25,0 0.5,-0.2502 0.5,-0.5 0,-0.1244 -0.0407,-0.2438 -0.140625,-0.3437 l -3.65625,-3.6563 3.65625,-3.6562 c 0.09995,-0.1 0.140625,-0.2193 0.140625,-0.3438 0,-0.2498 -0.25,-0.5 -0.5,-0.5 -0.125,0 -0.25,0.031 -0.359375,0.1407 l -3.640625,3.6406 -3.640625,-3.6406 C -27.25,1243.3932 -27.375,1243.3622 -27.5,1243.3622 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m -27.5,1243.3622 c -0.25,0 -0.5,0.2502 -0.5,0.5 0,0.1245 0.0407,0.2438 0.140625,0.3438 l 3.65625,3.6562 -3.65625,3.6563 c -0.09995,0.1 -0.140625,0.2193 -0.140625,0.3437 0,0.2498 0.25,0.5 0.5,0.5 0.125,0 0.25,-0.031 0.359375,-0.1406 l 3.640625,-3.6406 3.640625,3.6406 c 0.109375,0.1096 0.234375,0.1406 0.359375,0.1406 0.25,0 0.5,-0.2502 0.5,-0.5 0,-0.1244 -0.0407,-0.2438 -0.140625,-0.3437 l -3.65625,-3.6563 3.65625,-3.6562 c 0.09995,-0.1 0.140625,-0.2193 0.140625,-0.3438 0,-0.2498 -0.25,-0.5 -0.5,-0.5 -0.125,0 -0.25,0.031 -0.359375,0.1407 l -3.640625,3.6406 -3.640625,-3.6406 C -27.25,1243.3932 -27.375,1243.3622 -27.5,1243.3622 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="12" height="12" x="-30" y="1242.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g>
-            <g color="#000" transform="translate(-72 262)">
-                <path d="m 114.49314,304.36219 c -3.22874,0 -6.5,3 -6.5,6.5 0,3.5 5,9.5 6.5,11.5 1.5,-2 6.5,-8 6.5,-11.5 0,-3.5 -3.27126,-6.5 -6.5,-6.5 z m 0,2 c 2.51124,0 4.5,1.77778 4.5,4.5 0,2.72222 -3.33334,6.94444 -4.5,8.5 -1.16666,-1.55556 -4.5,-5.77778 -4.5,-8.5 0,-2.72222 1.98876,-4.5 4.5,-4.5 z" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linejoin="round" transform="translate(-101.993 703)"/>
-                <path d="m 114.49314,304.36219 c -3.22874,0 -6.5,3 -6.5,6.5 0,3.5 5,9.5 6.5,11.5 1.5,-2 6.5,-8 6.5,-11.5 0,-3.5 -3.27126,-6.5 -6.5,-6.5 z m 0,2 c 2.51124,0 4.5,1.77778 4.5,4.5 0,2.72222 -3.33334,6.94444 -4.5,8.5 -1.16666,-1.55556 -4.5,-5.77778 -4.5,-8.5 0,-2.72222 1.98876,-4.5 4.5,-4.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-101.993 703)"/>
-            </g>
-            <rect width="24" height="24" x="-72" y="1266.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m -38.5,1268.3622 c -2.33186,0 -4.5,2 -4.5,4.5 0,2.5278 3.41667,7.0556 4.5,8.5 1.08334,-1.4444 4.5,-5.9722 4.5,-8.5 0,-2.5 -2.16813,-4.5 -4.5,-4.5 z m 0,1.5 c 1.5,0 3,1.2501 3,3 0,2 -2.249996,5 -3,6 -0.749998,-1 -3,-4 -3,-6 0,-1.7499 1.5,-3 3,-3 z" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linejoin="round"/>
-                <path d="m -38.5,1268.3622 c -2.33186,0 -4.5,2 -4.5,4.5 0,2.5278 3.41667,7.0556 4.5,8.5 1.08334,-1.4444 4.5,-5.9722 4.5,-8.5 0,-2.5 -2.16813,-4.5 -4.5,-4.5 z m 0,1.5 c 1.5,0 3,1.2501 3,3 0,2 -2.249996,5 -3,6 -0.749998,-1 -3,-4 -3,-6 0,-1.7499 1.5,-3 3,-3 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1266.362" x="-48" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path transform="translate(-120 1050.362)" d="m 96.5,217 c -1.61437,0 -3.5,1 -3.5,3.5 0,1.75 2.75,5.5 3.5,6.5 0.75,-1 3.5,-4.75 3.5,-6.5 0,-2.5 -1.88563,-3.5 -3.5,-3.5 z m 0,1 c 1.255621,0 2.5,1 2.5,2.5 0,1.3611 -1.916667,4.2222 -2.5,5 -0.583333,-0.7778 -2.5,-3.6389 -2.5,-5 0,-1.5 1.244379,-2.5 2.5,-2.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 96.5,217 c -1.61437,0 -3.5,1 -3.5,3.5 0,1.75 2.75,5.5 3.5,6.5 0.75,-1 3.5,-4.75 3.5,-6.5 0,-2.5 -1.88563,-3.5 -3.5,-3.5 z m 0,1 c 1.255621,0 2.5,1 2.5,2.5 0,1.3611 -1.916667,4.2222 -2.5,5 -0.583333,-0.7778 -2.5,-3.6389 -2.5,-5 0,-1.5 1.244379,-2.5 2.5,-2.5 z" transform="translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="12" height="12" x="-30" y="1266.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g>
-            <g>
-                <path d="m -53,1266.8622 c 0,3.5 -5,9.5 -6.5,11.5 -1.5,-2 -6.5,-8 -6.5,-11.5 0,-3.5 3.27126,-6.5 6.5,-6.5 3.22874,0 6.5,3 6.5,6.5 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 33)"/>
-                <path d="m 120.99314,310.86219 c 0,3.5 -5,9.5 -6.5,11.5 -1.5,-2 -6.5,-8 -6.5,-11.5 0,-3.5 3.27126,-6.5 6.5,-6.5 3.22874,0 6.5,3 6.5,6.5 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 33) translate(-173.993 956)"/>
-            </g>
-            <rect width="24" height="24" x="-72" y="1290.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g>
-            <path d="m -38.5,1292.3622 c -2.33186,0 -4.5,2 -4.5,4.5 0,2.5278 3.41667,7.0556 4.5,8.5 1.08334,-1.4444 4.5,-5.9722 4.5,-8.5 0,-2.5 -2.16813,-4.5 -4.5,-4.5 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <rect y="1290.362" x="-48" height="18" width="18" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m -38.5,1292.3622 c -2.33186,0 -4.5,2 -4.5,4.5 0,2.5278 3.41667,7.0556 4.5,8.5 1.08334,-1.4444 4.5,-5.9722 4.5,-8.5 0,-2.5 -2.16813,-4.5 -4.5,-4.5 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g>
-                <path d="m 18.5,1053.3622 c -0.831,0 -1.5,0.669 -1.5,1.5 l 0,3.5 -5,0 0,3 5,0 0,10 1.5,0 1.5,0 0,-10 5,0 0,-3 -5,0 0,-3.5 c 0,-0.831 -0.669,-1.5 -1.5,-1.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 18.5,1053.3622 c -0.831,0 -1.5,0.669 -1.5,1.5 l 0,3.5 -5,0 0,3 5,0 0,10 1.5,0 1.5,0 0,-10 5,0 0,-3 -5,0 0,-3.5 c 0,-0.831 -0.669,-1.5 -1.5,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="6" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g>
-                <path d="m 38,1051.3622 c -0.738667,0 -1,0.7614 -1,1.5 l 0,2.5 -4,0 0,2 4,0 0,9 2,0 0,-9 4,0 0,-2 -4,0 0,-2.5 c 0,-0.7386 -0.261334,-1.5 -1,-1.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(1)"/>
-                <path d="m 38,1051.3622 c -0.738667,0 -1,0.7614 -1,1.5 l 0,2.5 -4,0 0,2 4,0 0,9 2,0 0,-9 4,0 0,-2 -4,0 0,-2.5 c 0,-0.7386 -0.261334,-1.5 -1,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(1)"/>
-            </g>
-            <rect y="1050.362" x="30" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g>
-                <path d="m 54.25,1051.3622 c -0.461667,0 -0.745042,0.3717 -0.75,0.8333 l 0,2.1667 -3,0 0,1.5 3,0 0,5.5 0.666667,0 0.833333,0 0,-5.5 3,0 0,-1.4996 -3,0 0,-2.1667 c 0,-0.4616 -0.288333,-0.8333 -0.75,-0.8333 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 54.25,1051.3622 c -0.461667,0 -0.745042,0.3717 -0.75,0.8333 l 0,2.1667 -3,0 0,1.5 3,0 0,5.5 0.666667,0 0.833333,0 0,-5.5 3,0 0,-1.4996 -3,0 0,-2.1667 c 0,-0.4616 -0.288333,-0.8333 -0.75,-0.8333 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="12" height="12" x="48" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g>
-                <path d="m 18.5,1077.3622 c -4.69442,0 -8.5,3.8056 -8.5,8.5 0,4.6944 3.80558,8.5 8.5,8.5 2.624764,0 4.972051,-1.1929 6.53125,-3.0625 -1.018799,0.6632 -2.225004,1.0625 -3.53125,1.0625 -3.589851,0 -6.5,-2.9101 -6.5,-6.5 0,-3.5899 2.910149,-6.5 6.5,-6.5 1.306246,0 2.512451,0.3993 3.53125,1.0625 -1.559199,-1.8696 -3.906486,-3.0625 -6.53125,-3.0625 z m 5,4 -1,3 -3.5,0 3,2 -1.5,3.5 3,-2 3,2 -1.5,-3.5 3,-2 -3.5,0 -1,-3 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 18.5,1077.3622 c -4.69442,0 -8.5,3.8056 -8.5,8.5 0,4.6944 3.80558,8.5 8.5,8.5 2.624764,0 4.972051,-1.1929 6.53125,-3.0625 -1.018799,0.6632 -2.225004,1.0625 -3.53125,1.0625 -3.589851,0 -6.5,-2.9101 -6.5,-6.5 0,-3.5899 2.910149,-6.5 6.5,-6.5 1.306246,0 2.512451,0.3993 3.53125,1.0625 -1.559199,-1.8696 -3.906486,-3.0625 -6.53125,-3.0625 z m 5,4 -1,3 -3.5,0 3,2 -1.5,3.5 3,-2 3,2 -1.5,-3.5 3,-2 -3.5,0 -1,-3 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="6" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g>
-                <path d="m 40,1077.3622 c -3.390415,0 -6,2.6096 -6,6 0,3.3904 2.609585,6 6,6 1.89566,0 3.873911,-0.6497 5,-2 -0.7358,0.479 -2.056598,1 -3,1 -2.59267,0 -4.527778,-2.5462 -4.527778,-5.1389 0,-2.5927 1.935108,-4.8611 4.527778,-4.8611 0.943402,0 2.2642,0.5211 3,1 -1.126089,-1.3502 -3.10434,-2 -5,-2 z m 3.611111,2.6111 -0.722222,2.3889 -2.888889,0 2.527778,1.2222 L 41,1086.3622 43.611111,1084.6678 46,1086.3622 44.694444,1083.5844 47,1082.3622 l -2.666667,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 40,1077.3622 c -3.390415,0 -6,2.6096 -6,6 0,3.3904 2.609585,6 6,6 1.89566,0 3.873911,-0.6497 5,-2 -0.7358,0.479 -2.056598,1 -3,1 -2.59267,0 -4.527778,-2.5462 -4.527778,-5.1389 0,-2.5927 1.935108,-4.8611 4.527778,-4.8611 0.943402,0 2.2642,0.5211 3,1 -1.126089,-1.3502 -3.10434,-2 -5,-2 z m 3.611111,2.6111 -0.722222,2.3889 -2.888889,0 2.527778,1.2222 L 41,1086.3622 43.611111,1084.6678 46,1086.3622 44.694444,1083.5844 47,1082.3622 l -2.666667,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1074.362" x="30" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g>
-                <path d="m 54,1076.3622 c -2.20914,0 -4,1.7909 -4,4 0,2.2091 1.79086,4 4,4 0.71498,0 1.38793,-0.2026 1.96875,-0.5312 -0.15181,0.02 -0.31145,0.031 -0.46875,0.031 -1.93297,0 -3.5,-1.567 -3.5,-3.5 0,-1.933 1.56703,-3.5 3.5,-3.5 0.1573,0 0.31694,0.011 0.46875,0.031 -0.656459,-0.3737 -1.214844,-0.5308 -1.96875,-0.5308 z m 3,1.5 -1,1.5 -1,0 1,1.5 -0.5,1.5 1.5,-1 1.5,1 -0.5,-1.5 1,-1.5 -1,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 54,1076.3622 c -2.20914,0 -4,1.7909 -4,4 0,2.2091 1.79086,4 4,4 0.71498,0 1.38793,-0.2026 1.96875,-0.5312 -0.15181,0.02 -0.31145,0.031 -0.46875,0.031 -1.93297,0 -3.5,-1.567 -3.5,-3.5 0,-1.933 1.56703,-3.5 3.5,-3.5 0.1573,0 0.31694,0.011 0.46875,0.031 -0.656459,-0.3737 -1.214844,-0.5308 -1.96875,-0.5308 z m 3,1.5 -1,1.5 -1,0 1,1.5 -0.5,1.5 1.5,-1 1.5,1 -0.5,-1.5 1,-1.5 -1,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="12" height="12" x="48" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 -48)">
-            <g>
-                <path d="m 18.5,1101.3622 -3,4 -5,0 3,5 -3,5 5,0 3,4 3,-4 5,0 -3,-5 3,-5 -5,0 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 18.5,1101.3622 -3,4 -5,0 3,5 -3,5 5,0 3,4 3,-4 5,0 -3,-5 3,-5 -5,0 z" fill="#444"/>
-            </g>
-            <rect y="1098.362" x="6" height="24" width="24" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 -48)">
-            <g>
-                <path d="m 39.5,1099.3622 -2.5,3 -4,0 2.5,4.5 -2.5,4.5 4,0 2.5,3 2.5,-3 4,0 -2.5,-4.5 2.5,-4.5 -4,0 -2.5,-3 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 39.5,1099.3622 -2.5,3 -4,0 2.5,4.5 -2.5,4.5 4,0 2.5,3 2.5,-3 4,0 -2.5,-4.5 2.5,-4.5 -4,0 -2.5,-3 z" fill="#444"/>
-            </g>
-            <rect width="18" height="18" x="30" y="1098.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 -48)">
-            <g>
-                <path d="m 54.5,1099.3622 -1.5,2 -3,0 2,2.5 -2,2.5 3,0 1.5,2 1.5,-2 3,0 -2,-2.5 2,-2.5 -3,0 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 54.5,1099.3622 -1.5,2 -3,0 2,2.5 -2,2.5 3,0 1.5,2 1.5,-2 3,0 -2,-2.5 2,-2.5 -3,0 z" fill="#444"/>
-            </g>
-            <rect y="1098.362" x="48" height="12" width="12" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m 18.5,1126.3622 c -3.073646,0 -4.5,2 -4.5,5 l 0,5 0,4 c -0.5,0 -1,0.5 -1,1 l 0,1 1,0 9,0 1,0 0,-1 c 0,-0.5 -0.5,-1 -1,-1 l 0,-9 c 0,-3 -1.5,-5 -4.5,-5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 18.5,1126.3622 c -3.073646,0 -4.5,2 -4.5,5 l 0,5 0,4 c -0.5,0 -1,0.5 -1,1 l 0,1 11,0 0,-1 c 0,-0.5 -0.5,-1 -1,-1 l 0,-9 c 0,-3 -1.5,-5 -4.5,-5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="6" y="1122.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m 39.5,1124.3622 c -2.61111,0 -3.5,1.875 -3.5,4.5 l 0,6.5 c -0.43519,0 -1,0.6875 -1,1.125 l 0,0.875 9,0 0,-0.875 c 0,-0.4375 -0.56481,-1.125 -1,-1.125 l 0,-4.9936 0,-1.5064 c 0,-2.625 -0.88889,-4.5 -3.5,-4.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 39.5,1124.3622 c -2.61111,0 -3.5,1.875 -3.5,4.5 l 0,6.5 c -0.43519,0 -1,0.6875 -1,1.125 l 0,0.875 9,0 0,-0.875 c 0,-0.4375 -0.56481,-1.125 -1,-1.125 l 0,-6.5 c 0,-2.625 -0.88889,-4.5 -3.5,-4.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1122.362" x="30" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m 54.5,1124.3622 c -1.865079,0 -2.5,1.2857 -2.5,2.7857 l 0,3.7143 c -0.5,0 -1,0.5 -1,1 l 0,0.5 7,0 0,-0.5 c 0,-0.5 -0.5,-1 -1,-1 l 0,-3.5 c 0,-1.7143 -0.634922,-3 -2.5,-3 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 54.5,1124.3622 c -1.865079,0 -2.5,1.2857 -2.5,2.7857 l 0,3.7143 c -0.5,0 -1,0.5 -1,1 l 0,0.5 7,0 0,-0.5 c 0,-0.5 -0.5,-1 -1,-1 l 0,-3.5 c 0,-1.7143 -0.634922,-3 -2.5,-3 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="12" height="12" x="48" y="1122.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g>
-            <g color="#000" transform="translate(162 23)">
-                <path d="m 12.5,1030.3622 -5.5,5 3,0 -4,4 3,0 -3,4 5,0 0,3 0,0.5 0,0.5 c 0,0.554 0.446,1 1,1 l 1,0 c 0.554,0 1,-0.446 1,-1 l 0,-0.5 0,-0.5 0,-3 5,0 -3,-4 3,0 -4,-4 3,0 -5.5,-5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 12.5,1030.3622 -5.5,5 3,0 -4,4 3,0 -3,4 5,0 0,3 0,0.5 0,0.5 c 0,0.554 0.446,1 1,1 l 1,0 c 0.554,0 1,-0.446 1,-1 l 0,-0.5 0,-0.5 0,-3 5,0 -3,-4 3,0 -1,-1 -3,-3 3,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="162" y="1050.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m 195.5,1052.3622 -4,4 2.5,0 -3,3 2.5,0 -2.5,3 4,0 0,3 1,0 0,-3 4,0 -2.5,-3 2.5,0 -3,-3 2.5,0 z" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-                <path d="m 195.5,1052.3622 -4,4 2.5,0 -3,3 2.5,0 -2.5,3 4,0 0,3 1,0 0,-3 4,0 -2.5,-3 2.5,0 -3,-3 2.5,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1050.362" x="186" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m 210.5,1053.3622 -3,3 1.71875,0 -2.21875,2 2,0 -2,2 3,0 0,2 1,0 0,-2 3,0 -2,-2 2,0 -2.21875,-2 1.71875,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(0 -2)"/>
-                <path d="m 210.5,1053.3622 -3,3 1.71875,0 -2.21875,2 2,0 -2,2 3,0 0,2 1,0 0,-2 3,0 -2,-2 2,0 -2.21875,-2 1.71875,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -2)"/>
-            </g>
-            <rect width="12" height="12" x="204" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m 52,1085.8622 c 0,-1.0701 -0.679778,-1.9871 -1.625,-2.3437 0.39454,-0.442 0.625,-1.0172 0.625,-1.6563 0,-1.3807 -1.119288,-2.5 -2.5,-2.5 -0.196751,0 -0.378848,0.019 -0.5625,0.062 -0.209307,-1.1692 -1.208135,-2.0625 -2.4375,-2.0622 -1.229365,2e-4 -2.228193,0.8935 -2.4375,2.0627 -0.183652,-0.043 -0.365749,-0.062 -0.5625,-0.062 -1.380712,0 -2.5,1.1193 -2.5,2.5 0,0.6391 0.23046,1.2143 0.625,1.6563 -0.945222,0.3566 -1.625,1.2731 -1.625,2.3432 0,1.3807 1,2.5005 2.5,2.5005 l 0.5,0 2,3.5 0,3.4995 3,0 0,-3.5 2,-3.4995 0.71875,-0.015 C 51,1088.3622 52,1087.1672 52,1085.8622 z m -8,2.5 3,0 -1,2 -1,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" transform="translate(129)"/>
-                <path d="m 52,1085.8622 c 0,-1.0701 -0.679778,-1.9871 -1.625,-2.3437 0.39454,-0.442 0.625,-1.0172 0.625,-1.6563 0,-1.3807 -1.119288,-2.5 -2.5,-2.5 -0.196751,0 -0.378848,0.019 -0.5625,0.062 -0.209307,-1.1692 -1.208135,-2.0625 -2.4375,-2.0622 -1.229365,2e-4 -2.228193,0.8935 -2.4375,2.0627 -0.183652,-0.043 -0.365749,-0.062 -0.5625,-0.062 -1.380712,0 -2.5,1.1193 -2.5,2.5 0,0.6391 0.23046,1.2143 0.625,1.6563 -0.945222,0.3566 -1.625,1.2731 -1.625,2.3432 0,1.3807 1,2.5005 2.5,2.5005 l 0.5,0 2,3.5 0,3.4995 3,0 0,-3.5 2,-3.4995 0.71875,-0.015 C 51,1088.3622 52,1087.1672 52,1085.8622 z m -8,2.5 3,0 -1,2 -1,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(129)"/>
-            </g>
-            <rect width="24" height="24" x="162" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m 200,1083.3622 c 0,-1 -1,-2 -1.5,-2 0.30686,-0.3437 0.61108,-1.0028 0.61108,-1.4999 0,-1.0738 -1.11108,-2.0001 -2.11108,-2.0001 0,-1 -0.5,-1.5 -1.5,-1.5 -1,0 -1.5,0.5 -1.5,1.5 -1,0 -2.11108,0.9266 -2.11108,2.0005 0,0.4971 0.30422,1.1558 0.61108,1.4995 -0.5,0 -1.5,1 -1.5,2 0,1 0.5,2.056 2.05557,2.056 l 0.38889,0 0.0555,0.944 1.5,1.5 -4e-5,2.5 1,0 4e-5,-2.5004 1.5,-1.4996 0.0555,-0.944 0.55902,-0.012 C 199.5,1085.3622 200,1084.3622 200,1083.3622 z m -5.5,2 2,0 0,0.5 -1,1 -1,-1 z" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-                <path d="m 200,1083.3622 c 0,-1 -1,-2 -1.5,-2 0.30686,-0.3437 0.61108,-1.0028 0.61108,-1.4999 0,-1.0738 -1.11108,-2.0001 -2.11108,-2.0001 0,-1 -0.5,-1.5 -1.5,-1.5 -1,0 -1.5,0.5 -1.5,1.5 -1,0 -2.11108,0.9266 -2.11108,2.0005 0,0.4971 0.30422,1.1558 0.61108,1.4995 -0.5,0 -1.5,1 -1.5,2 0,1 0.5,2.056 2.05557,2.056 l 0.38889,0 0.0555,0.944 1.5,1.5 -4e-5,2.5 1,0 4e-5,-2.5004 1.5,-1.4996 0.0555,-0.944 0.55902,-0.012 C 199.5,1085.3622 200,1084.3622 200,1083.3622 z m -5.5,2 2,0 0,0.5 -1,1 -1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1074.362" x="186" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m 210.84375,1076.3622 c -0.5625,0.047 -0.84375,0.75 -0.84375,1.5 -1,-0.5 -1.5,-0.25 -1.5,0.75 0,1 1,1.25 1,1.25 0,0 -1.5,-0.2461 -1.5,1.25 0,0.6903 0.80965,1.25 1.5,1.25 l 0,1 1.5,0 0,3 1,0 0,-3 1.5,0 0,-1 c 1,0 1.5,-0.5976 1.5,-1.25 0,-1.496 -1.5,-1.25 -1.5,-1.25 0,0 1,-0.25 1,-1.25 0,-1 -1,-1.25 -1.5,-0.75 0,-1 -0.5,-1.5 -1.5,-1.5 -0.25,0 -0.46875,-0.016 -0.65625,0 z m -0.34375,6 2,0 -0.5,1 -1,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1 -1)"/>
-                <path d="m 210.84375,1076.3622 c -0.5625,0.047 -0.84375,0.75 -0.84375,1.5 -1,-0.5 -1.5,-0.25 -1.5,0.75 0,1 1,1.25 1,1.25 0,0 -1.5,-0.2461 -1.5,1.25 0,0.6903 0.80965,1.25 1.5,1.25 l 0,1 1.5,0 0,3 1,0 0,-3 1.5,0 0,-1 c 1,0 1.5,-0.5976 1.5,-1.25 0,-1.496 -1.5,-1.25 -1.5,-1.25 0,0 1,-0.25 1,-1.25 0,-1 -1,-1.25 -1.5,-0.75 0,-1 -0.5,-1.5 -1.5,-1.5 -0.25,0 -0.46875,-0.016 -0.65625,0 z m -0.34375,6 2,0 -0.5,1 -1,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            </g>
-            <rect width="12" height="12" x="204" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g>
-                <path d="m 6,1010.3622 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m 3,2 c 0,1.6569 -1.34314,3 -3,3 l -1.5,0 c -0.25259,0 -0.5013,0 -0.5,0.5 3.5e-4,0.136 0,0.6157 0,1 0,0.5 0.38857,0.5 0.5,0.5 l 16.5,0 0,-2 c 0,-1 0,-3 -5,-3 z m -4,6 c -0.5,0 -1,0.5 -1,1 -2.4e-4,0.9907 0,2.1445 0,3 0,0.5 0.5,1 1,1 0.5,0 1,-0.5 1,-1 l 0,-2 13,0 0,2 c 0,0.5 0.5,1 1,1 0.5,0 1,-0.5 1,-1 l 0,-3 c 0,-0.5 -0.5,-1 -1,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(162 94)"/>
-                <path d="m 6,1010.3622 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m 3,2 c 0,1.6569 -1.34314,3 -3,3 l -1.5,0 c -0.25259,0 -0.5013,0 -0.5,0.5 3.5e-4,0.136 0,0.6157 0,1 0,0.5 0.38857,0.5 0.5,0.5 l 16.5,0 0,-2 c 0,-1 0,-3 -5,-3 z m -4,6 c -0.5,0 -1,0.5 -1,1 -2.4e-4,0.9907 0,2.1445 0,3 0,0.5 0.5,1 1,1 0.5,0 1,-0.5 1,-1 l 0,-2 13,0 0,2 c 0,0.5 0.5,1 1,1 0.5,0 1,-0.5 1,-1 l 0,-3 c 0,-0.5 -0.5,-1 -1,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(162 94)"/>
-            </g>
-            <rect y="1098.362" x="162" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g>
-                <path d="m 190.49999,1102.1123 c -0.82842,0 -1.49999,0.6715 -1.49999,1.5 0,0.8284 0.67157,1.4999 1.49999,1.4999 0.82843,0 1.49999,-0.6715 1.49999,-1.4999 0,-0.8285 -0.67156,-1.5 -1.49999,-1.5 z M 193,1103.3622 c 0,2 -1,3 -2.5,3 l -1,0 c -0.5,0 -0.5,0.5 -0.5,0.5 0,0 0,0.5 0.5,0.5 l 12.5,0 0,-1.7501 c 0,-0.75 0,-2.2499 -3.74997,-2.2499 z m -3.25001,5 c -0.375,0 -0.75,0.375 -0.75,0.75 -1.8e-4,0.743 0,0.8584 0,1.5 0,0.375 0.375,0.75 0.75,0.75 0.375,0 0.74999,-0.375 0.74999,-0.75 l 2e-5,-1.25 10.00002,0 -2e-5,1.25 c -1e-5,0.375 0.375,0.75 0.75,0.75 0.375,0 0.74999,-0.375 0.74999,-0.75 l 0,-1.5 c 0,-0.375 -0.37499,-0.75 -0.74999,-0.75 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 190.49999,1102.1123 c -0.82842,0 -1.49999,0.6715 -1.49999,1.5 0,0.8284 0.67157,1.4999 1.49999,1.4999 0.82843,0 1.49999,-0.6715 1.49999,-1.4999 0,-0.8285 -0.67156,-1.5 -1.49999,-1.5 z M 193,1103.3622 c 0,2 -1,3 -2.5,3 l -1,0 c -0.5,0 -0.5,0.5 -0.5,0.5 0,0 0,0.5 0.5,0.5 l 12.5,0 0,-1.7501 c 0,-0.75 0,-2.2499 -3.74997,-2.2499 z m -3.25001,5 c -0.375,0 -0.75,0.375 -0.75,0.75 -1.8e-4,0.743 0,0.8584 0,1.5 0,0.375 0.375,0.75 0.75,0.75 0.375,0 0.74999,-0.375 0.74999,-0.75 l 2e-5,-1.25 10.00002,0 -2e-5,1.25 c -1e-5,0.375 0.375,0.75 0.75,0.75 0.375,0 0.74999,-0.375 0.74999,-0.75 l 0,-1.5 c 0,-0.375 -0.37499,-0.75 -0.74999,-0.75 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="18" height="18" x="186" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g>
-                <path d="m 207,1100.3622 c -0.55229,0 -1,0.4477 -1,1 0,0.5523 0.44771,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z m 2,1 c 0,1 -0.5,2 -2,2 l -0.75,0 c -0.1263,0 -0.25065,0 -0.25,0.25 1.7e-4,0.068 0,0.3079 0,0.5 0,0.25 0.19428,0.25 0.25,0.25 l 8.75,0 0,-1.5 c 0,-0.5 0,-1.5 -2.5,-1.5 z m -2.5,4 c -0.25,0 -0.5,0.25 -0.5,0.5 -1.2e-4,0.4954 0,0.5723 0,1 0,0.25 0.25,0.5 0.5,0.5 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-0.5 7,0 0,0.5 c 0,0.25 0.25,0.5 0.5,0.5 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-1 c 0,-0.25 -0.25,-0.5 -0.5,-0.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 207,1100.3622 c -0.55229,0 -1,0.4477 -1,1 0,0.5523 0.44771,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z m 2,1 c 0,1 -0.5,2 -2,2 l -0.75,0 c -0.1263,0 -0.25065,0 -0.25,0.25 1.7e-4,0.068 0,0.3079 0,0.5 0,0.25 0.19428,0.25 0.25,0.25 l 8.75,0 0,-1.5 c 0,-0.5 0,-1.5 -2.5,-1.5 z m -2.5,4 c -0.25,0 -0.5,0.25 -0.5,0.5 -1.2e-4,0.4954 0,0.5723 0,1 0,0.25 0.25,0.5 0.5,0.5 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-0.5 7,0 0,0.5 c 0,0.25 0.25,0.5 0.5,0.5 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-1 c 0,-0.25 -0.25,-0.5 -0.5,-0.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1098.362" x="204" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 -24)" color="#000">
-            <g>
-                <path d="m 174.5,1126.3622 -6.5,5 13,0 z m -5.5,6 c -0.55401,0 -0.92165,0.4516 -1,1 l 0,7 -1.75,3 c -0.14833,0.2543 -0.25,0.3567 -0.25,0.5 0,0.5 0.63165,0.5 1,0.5 l 15,0 c 0.35499,0 1,0 1,-0.5 0,-0.1462 -0.0866,-0.2199 -0.25,-0.5 l -1.75,-3 0,-7 c 0,-0.554 -0.44599,-1 -1,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-                <path d="m 174.5,1126.3622 -6.5,5 13,0 z m -5.5,6 c -0.55401,0 -0.92165,0.4516 -1,1 l 0,7 -1.75,3 c -0.14833,0.2543 -0.25,0.3567 -0.25,0.5 0,0.5 0.63165,0.5 1,0.5 l 15,0 c 0.35499,0 1,0 1,-0.5 0,-0.1462 -0.0866,-0.2199 -0.25,-0.5 l -1.75,-3 0,-7 c 0,-0.554 -0.44599,-1 -1,-1 z m 2,2 c 0.5,0 1,0 1.5,0 0.5,0 1,1 1,1 l 1,2.5 1,-2.5 c 0.22318,-0.558 0.5,-1 1,-1 0.5,0 1,0 1.5,0 0.554,0 1,0.446 1,1 l 0,5 c 0,0.5 -0.5,1 -1,1 -0.5,0 -1,-0.5 -1,-1 l 0,-4 -1.5,3 c 0,0 -0.5,1 -1,1 -0.5,0 -1,-1 -1,-1 l -1.5,-3 0,4 c 0,0.5 -0.5,1 -1,1 -0.5,0 -1,-0.5 -1,-1 l 0,-1 0,-4 c 0,-0.554 0.446,-1 1,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-            </g>
-            <rect y="1122.362" x="162" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 -24)" color="#000">
-            <g>
-                <path d="m 201,1129.3622 -4.5,-3 -4.5,3 0,1.9445 0,5.0555 -1,1.5 c 0,0.3611 0.23397,0.5 0.5,0.5 l 10,0 c 0.25638,0 0.5,-0.1389 0.5,-0.5 l -1,-1.5 0,-5.0555 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-                <path d="m 196.5,1126.3622 -4.5,3 9,0 z m -3.5,4 c -0.5,0 -1,0.5 -1,0.9445 l 0,5.0555 -1,1.5 c 0,0.3611 0.23397,0.5 0.5,0.5 l 10,0 c 0.25638,0 0.5,-0.1389 0.5,-0.5 l -1,-1.5 0,-5.0555 c 0,-0.4445 -0.5,-0.9445 -1,-0.9445 z m 2,1.5 c 0.5,0 0.5,0 1,1 l 0.5,1 0.5,-1 c 0.5,-1 0.5,-1 1,-1 0.5,0 1,0.5 1,1 l 0,3.5 c 0,0.3611 -0.13889,0.5 -0.5,0.5 -0.36111,0 -0.5,-0.1389 -0.5,-0.5 l 0,-2.8889 -1,1.8889 c -0.2647,0.5 -0.7353,0.5 -1,0 l -1,-1.8889 0,2.8889 c 0,0.3611 -0.13889,0.5 -0.5,0.5 -0.36111,0 -0.50005,-0.1389 -0.50005,-0.5 l 0,-0.7222 5e-5,-2.7778 c 1e-5,-0.5 0.5,-1 1,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            </g>
-            <rect width="18" height="18" x="186" y="1122.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 -24)" color="#000">
-            <g>
-                <path d="m 213,1125.3622 -3.5,-2 -3.5,2 0,5 0,1 -1,1 9,0 -1,-1 0,-1 z m -5.5,2 c 0.25,0 0.5,0 0.75,0 0.25,0 0.5,0.5 0.5,0.5 l 0.75,1.5 0.75,-1.5 c 0.13438,-0.2687 0.25,-0.5 0.5,-0.5 0.25,0 0.5,0 0.75,0 0.277,0 0.5,0.223 0.5,0.5 l 0,2.5 c 0,0.25 -0.25,0.5 -0.5,0.5 -0.25,0 -0.5,-0.25 -0.5,-0.5 l 0,-2 -0.75,1.5 c -0.11941,0.2388 -0.25,0.5 -0.75,0.5 -0.5,0 -0.6306,-0.2612 -0.75,-0.5 l -0.75,-1.5 0,2 c 0,0.25 -0.25,0.5 -0.5,0.5 -0.25,0 -0.5,-0.25 -0.5,-0.5 l 0,-0.5 0,-2 c 0,-0.277 0.223,-0.5 0.5,-0.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(1)"/>
-                <path d="m 209.5,1123.3622 -3.5,2 7,0 z m -3,3 c -0.27701,0 -0.5,0.223 -0.5,0.5 l 0,3.5 0,1 -1,1 9,0 -1,-1 0,-1 0,-3.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 1,1 c 0.25,0 0.5,0 0.75,0 0.25,0 0.5,0.5 0.5,0.5 l 0.75,1.5 0.75,-1.5 c 0.13438,-0.2687 0.25,-0.5 0.5,-0.5 0.25,0 0.5,0 0.75,0 0.277,0 0.5,0.223 0.5,0.5 l 0,2.5 c 0,0.25 -0.25,0.5 -0.5,0.5 -0.25,0 -0.5,-0.25 -0.5,-0.5 l 0,-2 -0.75,1.5 c -0.11941,0.2388 -0.25,0.5 -0.75,0.5 -0.5,0 -0.6306,-0.2612 -0.75,-0.5 l -0.75,-1.5 0,2 c 0,0.25 -0.25,0.5 -0.5,0.5 -0.25,0 -0.5,-0.25 -0.5,-0.5 l 0,-0.5 0,-2 c 0,-0.277 0.223,-0.5 0.5,-0.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(1)"/>
-            </g>
-            <rect y="1122.362" x="204" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m 174.5,1147.3622 c 0,0 -2.59054,2.0041 -2.5,3 l 0,11 -2,0 c -0.55401,0 -1,0.446 -1,1 l 0,2 -1,0 c -0.55399,0 -1,0.446 -1,1 l 0,1 15,0 0,-1 c 0,-0.554 -0.44601,-1 -1,-1 l -1,0 0,-2 c 0,-0.554 -0.44599,-1 -1,-1 l -2,0 0,-11 c 0,-1 -2.5,-3 -2.5,-3 z" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linecap="round" stroke-linejoin="round" transform="translate(0 1)"/>
-                <path d="m 174.5,1147.3622 c 0,0 -2.59054,2.0041 -2.5,3 l 0,11 -2,0 c -0.55401,0 -1,0.446 -1,1 l 0,2 -1,0 c -0.55399,0 -1,0.446 -1,1 l 0,1 15,0 0,-1 c 0,-0.554 -0.44601,-1 -1,-1 l -1,0 0,-2 c 0,-0.554 -0.44599,-1 -1,-1 l -2,0 0,-11 c 0,-1 -2.5,-3 -2.5,-3 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 1)"/>
-            </g>
-            <rect y="1146.362" x="162" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m 195.44444,1148.3622 c 0,0 -1.44444,1.7223 -1.44444,2.5 l 0,7.5 -1,0 c -0.43092,0 -1,0.5136 -1,0.9445 l 0,1.5555 -1,0 c -0.5,0 -1,0.5 -1,1 l 0,0.5 11,0 0,-0.5 c 0,-0.5 -0.5,-1 -1,-1 l -1,0 0,-1.5 c 0,-0.5 -0.5,-1 -1,-1 l -1,0 0,-7.5 c 0,-0.7777 -1.55556,-2.5 -1.55556,-2.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 195.44444,1148.3622 c 0,0 -1.44444,1.7223 -1.44444,2.5 l 0,7.5 -1,0 c -0.43092,0 -1,0.5136 -1,0.9445 l 0,1.5555 -1,0 c -0.5,0 -1,0.5 -1,1 l 0,0.5 11,0 0,-0.5 c 0,-0.5 -0.5,-1 -1,-1 l -1,0 0,-1.5 c 0,-0.5 -0.5,-1 -1,-1 l -1,0 0,-7.5 c 0,-0.7777 -1.55556,-2.5 -1.55556,-2.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="18" height="18" x="186" y="1146.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m 210.5,1147.3622 c 0,0 -1.5,1.5 -1.5,2 l 0,4 -0.5,0 c -0.27701,0 -0.46371,0.2254 -0.5,0.5 l 0,1.5 -0.5,0 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,0.5 7,0 0,-0.5 c 0,-0.277 -0.22301,-0.5 -0.5,-0.5 l -0.5,0 0,-1.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -0.5,0 0,-4 c 0,-0.5 -1.5,-2 -1.5,-2 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 210.5,1147.3622 c 0,0 -1.5,1.5 -1.5,2 l 0,4 -0.5,0 c -0.27701,0 -0.46371,0.2254 -0.5,0.5 l 0,1.5 -0.5,0 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,0.5 7,0 0,-0.5 c 0,-0.277 -0.22301,-0.5 -0.5,-0.5 l -0.5,0 0,-1.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -0.5,0 0,-4 c 0,-0.5 -1.5,-2 -1.5,-2 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1146.362" x="204" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g>
-            <g>
-                <path d="m 16.99997,1007.3622 c -2,3 -3.784213,5.0052 -6,7 -2.116627,1.9055 -6,1.2513 -6,4 l 0,1 c 0,1 1,1.9515 1,3 l 0,1 c 0,1.5 -0.5,1.5 -1,3 l 1,0 2,-3 0,3 1,0 0,-1.5 0,-4.5 2,0 0,6 1,0 0,-3 0,-1.5 1,1.5 1,3 1,0 -1.53125,-6.2812 c 0.589496,-0.3597 0.53125,-1.0247 0.53125,-1.7188 0,-0.932 0,-2 0,-3 l 4,-5.5 1.4375,0.4453 c 0.299758,0.093 0.5625,0.055 0.5625,-0.1953 0,-0.5 -0.326623,-0.6113 -0.5,-0.75 z" opacity=".3" color="#000" fill="#444" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(162 165)"/>
-                <path transform="translate(159 1170.362)" d="m 20,2 c -2,3 -3.784213,5.0052 -6,7 -2.116627,1.9055 -6,1.2513 -6,4 l 0,1 c 0,1 1,1.9515 1,3 l 0,1 c 0,1.5 -0.5,1.5 -1,3 l 1,0 2,-3 0,3 1,0 0,-1.5 0,-4.5 2,0 0,6 1,0 0,-3 0,-1.5 1,1.5 1,3 1,0 -1.53125,-6.28125 C 17.058246,14.359058 17,13.694118 17,13 c 0,-0.932 0,-2 0,-3 l 4,-5.5 1.4375,0.4453125 C 22.737214,5.0381587 23,5 23,4.75 23,4.25 22.673378,4.1387024 22.5,4 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="162" y="1170.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g fill="#444">
-                <path d="m 199,1172.3622 c -1.33333,2 -1.52281,3.6701 -3,5 -1.41109,1.2703 -4,0.8342 -4,2.6667 l 0,0.6666 c 0,0.6667 0.66667,1.301 0.66667,2 l 0,0.6667 c 0,1 -0.33334,1 -0.66667,2 l 0.66667,0 1.33333,-2 0,2 1,0 0,-4 1,0 0,4 1,0 0,-3 1,3 0.66667,0 -1.02084,-4.1875 c 0.393,-0.2398 0.35417,-0.6831 0.35417,-1.1458 0,-0.6214 0,-1.3334 0,-2 l 1.5,-3.6667 1.5,0.5 c 0,-0.047 -5.2e-4,-0.462 0,-0.5 0,0 -0.24351,-0.2435 -0.33333,-0.3333 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 199,1172.3622 c -1.33333,2 -1.52281,3.6701 -3,5 -1.41109,1.2703 -4,0.8342 -4,2.6667 l 0,0.6666 c 0,0.6667 0.66667,1.301 0.66667,2 l 0,0.6667 c 0,1 -0.33334,1 -0.66667,2 l 0.66667,0 1.33333,-2 0,2 1,0 0,-4 1,0 0,4 1,0 0,-3 1,3 0.66667,0 -1.02084,-4.1875 c 0.393,-0.2398 0.35417,-0.6831 0.35417,-1.1458 0,-0.6214 0,-1.3334 0,-2 l 1.5,-3.6667 1.5,0.5 c 0,-0.047 -5.2e-4,-0.462 0,-0.5 0,0 -0.24351,-0.2435 -0.33333,-0.3333 z" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1170.362" x="186" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g>
-            <path d="m 212.5,1171.3622 c -1,1.5 -0.89211,3.0026 -2,4 -1.05832,0.9528 -3.5,0.6257 -3.5,2 l 0,0.5 c 0,0.5 0.5,0.9758 0.5,1.5 l 0,0.5 c 0,0.75 -0.25,0.75 -0.5,1.5 l 0.5,0 1,-1.5 0,1.5 0.5,0 0,-3 1,0 0,3 0.5,0 0,-2.5 1,0 0.5,2.5 0.5,0 -0.5,-4 c 0,-0.466 0,-1 0,-1.5 l 1,-3.5 1,0 c 0,-0.1667 0,-0.8333 0,-1 z" opacity=".3" color="#000" fill="#444" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 212.5,1171.3622 c -1,1.5 -0.89211,3.0026 -2,4 -1.05832,0.9528 -3.5,0.6257 -3.5,2 l 0,0.5 c 0,0.5 0.5,0.9758 0.5,1.5 l 0,0.5 c 0,0.75 -0.25,0.75 -0.5,1.5 l 0.5,0 1,-1.5 0,1.5 0.5,0 0,-3 1,0 0,3 0.5,0 0,-2.5 1,0 0.5,2.5 0.5,0 -0.5,-4 c 0,-0.466 0,-1 0,-1.5 l 1,-3.5 1,0 c 0,-0.1667 0,-0.8333 0,-1 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect width="12" height="12" x="204" y="1170.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <path d="m 170.3,1198.3622 c -0.253,0 -0.3,0.5596 -0.3,1 l 0,2 c 0,2.0312 2,3.0625 4,3 l 0,8 c -1,-2 -4,-5 -7,-4 0,0 2.5,6 7.5,6 5,0 7.5,-6 7.5,-6 -3,-1 -6,2 -7,4 l 0,-8 c 2,0.062 4,-0.9688 4,-3 l 0,-2 c 0,-0.4404 -0.0468,-1 -0.3,-1 -0.19292,0 -0.42562,0.2256 -0.7,0.5 l -1.5,1.5 -1.5,-1.6875 c -0.15657,-0.1761 -0.24696,-0.3125 -0.5,-0.3125 -0.25305,0 -0.34343,0.1364 -0.5,0.3125 l -1.5,1.6875 -1.5,-1.5 c -0.27438,-0.2744 -0.50708,-0.5 -0.7,-0.5 z" fill="#444" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linecap="round" stroke-linejoin="round"/>
-            <path d="m 170.3,1198.3622 c -0.253,0 -0.3,0.5596 -0.3,1 l 0,2 c 0,2.0312 2,3.0625 4,3 l 0,8 c -1,-2 -4,-5 -7,-4 0,0 2.5,6 7.5,6 5,0 7.5,-6 7.5,-6 -3,-1 -6,2 -7,4 l 0,-8 c 2,0.062 4,-0.9688 4,-3 l 0,-2 c 0,-0.4404 -0.0468,-1 -0.3,-1 -0.19292,0 -0.42562,0.2256 -0.7,0.5 l -1.5,1.5 -1.5,-1.6875 c -0.15657,-0.1761 -0.24696,-0.3125 -0.5,-0.3125 -0.25305,0 -0.34343,0.1364 -0.5,0.3125 l -1.5,1.6875 -1.5,-1.5 c -0.27438,-0.2744 -0.50708,-0.5 -0.7,-0.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect width="24" height="24" x="162" y="1194.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g>
-            <path d="m 192,1196.3622 0,2.5 c 0,1.6504 1.375,2.5508 3,2.5 l 0,6.5 c -0.8125,-1.625 -2.5,-3.5 -5,-2.5 0,0 1.5,4 5.5,4 4,0 5.5,-4 5.5,-4 -2.5,-1 -4.1875,0.875 -5,2.5 l 0,-6.5 c 1.625,0.051 3,-0.8496 3,-2.5 l 0,-2.5 -2,2 -1.5,-2 -1.5,2 z" opacity=".3" color="#000" fill="#444" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <g transform="translate(-123.493 910.972)">
-                <path d="m 315.49314,285.3903 0,2.5 c 0,1.65038 1.375,2.55078 3,2.5 l 0,6.5 c -0.8125,-1.625 -2.5,-3.5 -5,-2.5 0,0 1.5,4 5.5,4 4,0 5.5,-4 5.5,-4 -2.5,-1 -4.1875,0.875 -5,2.5 l 0,-6.5 c 1.625,0.0508 3,-0.84962 3,-2.5 l 0,-2.49999 -2,1.99999 -1.5,-2 -1.5,2 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1194.362" x="186" height="18" width="18" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g fill="#444">
-                <path d="m 208,1195.3622 0,2 c 0,0.8671 0.9353,1.7536 2,1.9688 l 0,4.0312 c -0.5,-1 -1.5,-2 -3,-1 0,0 1,2 3.5,2 2.5,0 3.5,-2 3.5,-2 -1.5,-1 -2.5,0 -3,1 l 0,-4.0312 c 1.0647,-0.2152 2,-1.1017 2,-1.9688 l 0,-2 -1.5625,1.25 -0.9375,-1.25 -0.9375,1.25 -1.5625,-1.25 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 328,145 0,2 c 0,0.86708 0.9353,1.75357 2,1.96875 L 330,153 c -0.5,-1 -1.5,-2 -3,-1 0,0 1,2 3.5,2 2.5,0 3.5,-2 3.5,-2 -1.5,-1 -2.5,0 -3,1 l 0,-4.03125 c 1.0647,-0.21518 2,-1.10167 2,-1.96875 l 0,-2 -1.5625,1.25 L 330.5,145 329.5625,146.25 328,145 z" transform="translate(-120 1050.362)" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="12" height="12" x="204" y="1194.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g font-family="Sans">
-                <path transform="translate(162 213) translate(0 1004.362)" d="M 12.5,5 C 12,4.9999 11.773906,5.2394 11.625,5.5 L 5.40625,17 4.0625,17 C 3.4759168,17 3,17.446005 3,18 c 0,0.553995 0.4759168,1 1.0625,1 L 6,19 l 13,0 1.9375,0 C 21.524083,19 22,18.553995 22,18 22,17.446005 21.524083,17 20.9375,17 L 19.59375,17 13.375,5.5 C 13.226094,5.2394 13,4.9999 12.5,5 z m 0,5 3.5,7 -7,0 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="M 12.5,5 C 12,4.9999 11.773906,5.2394 11.625,5.5 L 5.40625,17 4.0625,17 C 3.4759168,17 3,17.446005 3,18 c 0,0.553995 0.4759168,1 1.0625,1 L 6,19 l 13,0 1.9375,0 C 21.524083,19 22,18.553995 22,18 22,17.446005 21.524083,17 20.9375,17 L 19.59375,17 13.375,5.5 C 13.226094,5.2394 13,4.9999 12.5,5 z m 0,5 3.5,7 -7,0 z" transform="translate(162 213) translate(0 1004.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="162" y="1218.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g font-family="Sans">
-                <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m 196.5,1225.3626 c -0.36111,-10e-5 -0.5244,0.1729 -0.63194,0.3611 l -3.86806,8.1385 -1.5,0 c -0.5,0 -0.5,0.7778 -0.5,0.7778 0,0 0,0.7222 0.5,0.7222 l 12,0 c 0.5,0 0.5,-0.7222 0.5,-0.7222 0,0 0,-0.7777 -0.5,-0.7778 l -1.5,-4e-4 -3.86806,-8.1385 c -0.10754,-0.1882 -0.27083,-0.3612 -0.63194,-0.3611 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1 -3)"/>
-                <path d="m 196.5,1225.3626 c -0.36111,-10e-5 -0.5244,0.1729 -0.63194,0.3611 l -3.86806,8.1385 -1.5,0 c -0.5,0 -0.5,0.7778 -0.5,0.7778 0,0 0,0.7222 0.5,0.7222 l 12,0 c 0.5,0 0.5,-0.7222 0.5,-0.7222 0,0 0,-0.7777 -0.5,-0.7778 l -1.5,-4e-4 -3.86806,-8.1385 c -0.10754,-0.1882 -0.27083,-0.3612 -0.63194,-0.3611 z m 0,2.9996 2.5,5.5 -5,0 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -3)"/>
-            </g>
-            <rect y="1218.362" x="186" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g font-family="Sans">
-                <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m 211.53125,1221.3622 c -0.25,0 -0.36305,0.1197 -0.4375,0.25 l -2.85938,5.75 -0.73437,0 c -0.29329,0 -0.5,0.223 -0.5,0.5 0,0.277 0.20671,0.5 0.5,0.5 l 1.03125,0 6,0 0.9375,0 c 0.29329,0 0.53125,-0.223 0.53125,-0.5 0,-0.277 -0.23796,-0.5 -0.53125,-0.5 l -0.64063,0 -2.85937,-5.75 c -0.0745,-0.1303 -0.1875,-0.25 -0.4375,-0.25 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-                <path d="m 211.53125,1221.3622 c -0.25,0 -0.36305,0.1197 -0.4375,0.25 l -2.85938,5.75 -0.73437,0 c -0.29329,0 -0.5,0.223 -0.5,0.5 0,0.277 0.20671,0.5 0.5,0.5 l 1.03125,0 6,0 0.9375,0 c 0.29329,0 0.53125,-0.223 0.53125,-0.5 0,-0.277 -0.23796,-0.5 -0.53125,-0.5 l -0.64063,0 -2.85937,-5.75 c -0.0745,-0.1303 -0.1875,-0.25 -0.4375,-0.25 z m 0,2.5 1.5,3.5 -3,0 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            </g>
-            <rect width="12" height="12" x="204" y="1218.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78)">
-            <g>
-                <path d="m 254.75,1053.3622 c -0.9695,0 -1.75,0.7805 -1.75,1.75 0,0.9695 0.7805,1.75 1.75,1.75 0.9695,0 1.75,-0.7805 1.75,-1.75 0,-0.9695 -0.7805,-1.75 -1.75,-1.75 z m -8,2 c -0.9695,0 -1.75,0.7805 -1.75,1.75 0,0.9695 0.7805,1.75 1.75,1.75 0.9695,0 1.75,-0.7805 1.75,-1.75 0,-0.9695 -0.7805,-1.75 -1.75,-1.75 z m 9.25,2 c -0.37268,0 -0.98641,0.1345 -1.5,0.5 l -3.25,2.3125 c -0.8818,0.6275 -0.0727,1.7318 0.75,1.1875 l 2.125,-1.4062 c 0,0 1.40104,3.0042 0.875,4.4062 -0.0176,0.047 -0.0325,0.089 -0.0312,0.125 l -2.1875,5.8125 c -0.25094,0.6691 0.23179,1.0692 0.71875,1.0625 0.31932,0 0.62478,-0.193 0.78125,-0.5625 L 257,1064.3622 c 0,0 0.5,2.9998 2.5,3 1.20185,10e-5 2.08333,0 2.75,0 0.75,0 0.75,-0.75 0.75,-0.75 0,0 0,-0.75 -0.75,-0.75 -0.5,0 -1.75,-2e-4 -2.25,0 -1.06719,4e-4 -1,-1.6025 -1,-2.5 0,-1.5002 -1,-4 -1,-4 l 3,2 c 0.90639,0.6043 1.69152,-0.4657 0.8125,-1.125 l -3.3125,-2.375 c -0.60352,-0.4299 -0.79682,-0.4999 -1.5,-0.5 0,0 -0.5,0 -1,0 z m -10.5,2 c -0.5,0 -0.73648,0.2365 -1,0.5 l -2.125,2.125 c -0.2736,0.2736 -0.375,0.5185 -0.375,0.875 0,0.5 0.76433,0.7356 1.1875,0.3125 L 245,1061.3622 c 1,0 1.375,2.5 1,3.5 l -1.5,4 c -0.41546,1.1079 1.14426,1.4486 1.5,0.5 l 1.5,-4 c 0,0 0.5,1 1.5,1 l 3,0 c 1,0 1,-1.5 0,-1.5 l -2.5,0 c -0.5,0 -0.5,-1 -0.5,-1.5 0,-2 -1,-4 -2,-4 z" opacity=".3" color="#000" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="M 86.75,51 C 85.7805,51 85,51.7805 85,52.75 c 0,0.9695 0.7805,1.75 1.75,1.75 0.9695,0 1.75,-0.7805 1.75,-1.75 C 88.5,51.7805 87.7195,51 86.75,51 z m -8,2 C 77.7805,53 77,53.7805 77,54.75 c 0,0.9695 0.7805,1.75 1.75,1.75 0.9695,0 1.75,-0.7805 1.75,-1.75 C 80.5,53.7805 79.7195,53 78.75,53 z M 88,55 c -0.372678,0 -0.986408,0.1345 -1.5,0.5 l -3.25,2.3125 C 82.368196,58.44 83.17732,59.5443 84,59 l 2.125,-1.40625 c 0,0 1.401043,3.00425 0.875,4.40625 -0.01757,0.04683 -0.03251,0.08933 -0.03125,0.125 l -2.1875,5.8125 C 84.530309,68.606628 85.013036,69.006672 85.5,69 c 0.31932,-0.0044 0.624779,-0.193035 0.78125,-0.5625 L 89,62 c 0,0 0.5,2.9998 2.5,3 1.20185,1e-4 2.083333,0 2.75,0 C 95,65 95,64.25 95,64.25 c 0,0 0,-0.75 -0.75,-0.75 -0.5,0 -1.75,-2e-4 -2.25,0 -1.067187,4e-4 -1,-1.6025 -1,-2.5 0,-1.5002 -1,-4 -1,-4 l 3,2 c 0.906394,0.6043 1.691522,-0.4657 0.8125,-1.125 L 90.5,55.5 C 89.896477,55.0701 89.703177,55.0001 89,55 c 0,0 -0.5,0 -1,0 z m -10.5,2 c -0.5,0 -0.736476,0.2365 -1,0.5 l -2.125,2.125 C 74.1014,59.8986 74,60.1435 74,60.5 c 0,0.5 0.764327,0.7356 1.1875,0.3125 L 77,59 c 1,0 1.375,2.5 1,3.5 l -1.5,4 c -0.415461,1.1079 1.144264,1.4486 1.5,0.5 l 1.5,-4 c 0,0 0.5,1 1.5,1 l 3,0 c 1,0 1,-1.5 0,-1.5 l -2.5,0 C 81,62.5 81,61.5 81,61 81,59 80,57 79,57 z" transform="translate(168 1002.362)" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="240" y="1050.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78)" color="#000">
-            <g>
-                <path d="m 274.75,1053.3622 c -0.69036,0 -1.25,0.5596 -1.25,1.25 0,0.6904 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.5596 1.25,-1.25 0,-0.6904 -0.55964,-1.25 -1.25,-1.25 z m -5.6875,1 c -0.69036,0 -1.25,0.5596 -1.25,1.25 0,0.6904 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.5596 1.25,-1.25 0,-0.6904 -0.55964,-1.25 -1.25,-1.25 z m 6.6875,2 c -0.27951,0 -0.73981,0.1009 -1.125,0.375 l -2.4375,1.75 c -0.66135,0.4706 -0.0545,1.2832 0.5625,0.875 l 1.59375,-1.0625 c 0,0 0.43663,0.3561 0.65625,1.0625 l -0.0312,1.8438 -1.625,4.3437 c -0.18821,0.5019 0.16603,0.8175 0.53125,0.8125 0.23949,0 0.47639,-0.1604 0.59375,-0.4375 l 2.03125,-4.5625 c 0,0 0.375,1.9999 1.875,2 0.90139,10e-5 1.625,0 2.125,0 0.5,0 0.5,-0.5 0.5,-0.5 0,0 0,-0.5 -0.5,-0.5 -0.375,0 -1.625,-10e-5 -2,0 0,0 -0.5,0 -0.5,-1 0,-0.7037 -0.78022,-2.4984 -1,-3 l 0,-0.5 2.5,1.375 c 0.6798,0.4533 1.28427,-0.3492 0.625,-0.8437 l -2.625,-1.5313 c -0.51696,-0.2904 -1.08223,-0.5 -1.75,-0.5 z m -7.125,1 c -0.375,0 -0.55236,0.1774 -0.75,0.375 l -1.59375,1.5938 c -0.2052,0.2052 -0.28125,0.3888 -0.28125,0.6562 0,0.375 0.55763,0.5673 0.875,0.25 l 1.375,-1.375 c 0.3148,0 0.75,0.039 0.75,0.5 l 0,2.125 -1.125,3 c -0.3116,0.8309 0.8582,1.0865 1.125,0.375 l 1.125,-3 c 0,0 0.375,0.5 1.125,0.5 l 2.1875,0 c 0.75,0 0.75,-1 0,-1 l -1.9375,0 c 0,0 -0.5,0 -0.5,-0.5 l 0,-0.75 c 0,-1.5 -0.5,-2.75 -1.25,-2.75 l -1.125,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(0 -1)"/>
-                <path d="m 274.75,1053.3622 c -0.69036,0 -1.25,0.5596 -1.25,1.25 0,0.6904 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.5596 1.25,-1.25 0,-0.6904 -0.55964,-1.25 -1.25,-1.25 z m -5.6875,1 c -0.69036,0 -1.25,0.5596 -1.25,1.25 0,0.6904 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.5596 1.25,-1.25 0,-0.6904 -0.55964,-1.25 -1.25,-1.25 z m 6.6875,2 c -0.27951,0 -0.73981,0.1009 -1.125,0.375 l -2.4375,1.75 c -0.66135,0.4706 -0.0545,1.2832 0.5625,0.875 l 1.59375,-1.0625 c 0,0 0.43663,0.3561 0.65625,1.0625 l -0.0312,1.8438 -1.625,4.3437 c -0.18821,0.5019 0.16603,0.8175 0.53125,0.8125 0.23949,0 0.47639,-0.1604 0.59375,-0.4375 l 2.03125,-4.5625 c 0,0 0.375,1.9999 1.875,2 0.90139,10e-5 1.625,0 2.125,0 0.5,0 0.5,-0.5 0.5,-0.5 0,0 0,-0.5 -0.5,-0.5 -0.375,0 -1.625,-10e-5 -2,0 0,0 -0.5,0 -0.5,-1 0,-0.7037 -0.78022,-2.4984 -1,-3 l 0,-0.5 2.5,1.375 c 0.6798,0.4533 1.28427,-0.3492 0.625,-0.8437 l -2.625,-1.5313 c -0.51696,-0.2904 -1.08223,-0.5 -1.75,-0.5 z m -7.125,1 c -0.375,0 -0.55236,0.1774 -0.75,0.375 l -1.59375,1.5938 c -0.2052,0.2052 -0.28125,0.3888 -0.28125,0.6562 0,0.375 0.55763,0.5673 0.875,0.25 l 1.375,-1.375 c 0.3148,0 0.75,0.039 0.75,0.5 l 0,2.125 -1.125,3 c -0.3116,0.8309 0.8582,1.0865 1.125,0.375 l 1.125,-3 c 0,0 0.375,0.5 1.125,0.5 l 2.1875,0 c 0.75,0 0.75,-1 0,-1 l -1.9375,0 c 0,0 -0.5,0 -0.5,-0.5 l 0,-0.75 c 0,-1.5 -0.5,-2.75 -1.25,-2.75 l -1.125,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-            </g>
-            <rect y="1050.362" x="264" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78)" color="#000">
-            <g>
-                <path d="m 289,1051.8622 c -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z m -4,1 c -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z m 4.5,1.5 -0.5,0 -2,1 0,1 2,-1 0,1 0,1.5625 -1,3.4375 1,0 1,-3.5 c 0,0 0.25,1.4999 1.25,1.5 0.60093,10e-5 1.41667,0 1.75,0 l 0,-0.75 c -0.25,0 -1.25,-10e-5 -1.5,0 -0.53359,2e-4 -0.5,-0.8012 -0.5,-1.25 0,-0.7501 -0.5,-2 -0.5,-2 l 1.5,0.9375 c 0.4532,0.3021 0.84576,-0.2329 0.40625,-0.5625 l -1.65625,-1.125 c -0.30176,-0.2149 -0.39841,-0.2499 -0.75,-0.25 z m -4.75,1 c -0.25,0 -0.36824,0.1183 -0.5,0.25 l -1.0625,1.0625 c -0.1368,0.1368 -0.1875,0.2593 -0.1875,0.4375 0,0.25 0.38216,0.3678 0.59375,0.1563 l 0.90625,-0.9063 0.5,0 0,1 -1,2.75 c -0.20218,0.556 0.57214,0.7243 0.75,0.25 l 0.50463,-1.3 2.74537,0 0,-0.7 -1.5,0 0,-2 c 0,-0.5 -0.5,-1 -1,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 289,1051.8622 c -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z m -4,1 c -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z m 4.5,1.5 -0.5,0 -2,1 0,1 2,-1 0,1 0,1.5625 -1,3.4375 1,0 1,-3.5 c 0,0 0.25,1.4999 1.25,1.5 0.60093,10e-5 1.41667,0 1.75,0 l 0,-0.75 c -0.25,0 -1.25,-10e-5 -1.5,0 -0.53359,2e-4 -0.5,-0.8012 -0.5,-1.25 0,-0.7501 -0.5,-2 -0.5,-2 l 1.5,0.9375 c 0.4532,0.3021 0.84576,-0.2329 0.40625,-0.5625 l -1.65625,-1.125 c -0.30176,-0.2149 -0.39841,-0.2499 -0.75,-0.25 z m -4.75,1 c -0.25,0 -0.36824,0.1183 -0.5,0.25 l -1.0625,1.0625 c -0.1368,0.1368 -0.1875,0.2593 -0.1875,0.4375 0,0.25 0.38216,0.3678 0.59375,0.1563 l 0.90625,-0.9063 0.5,0 0,1 -1,2.75 c -0.20218,0.556 0.57214,0.7243 0.75,0.25 l 0.50463,-1.3 2.74537,0 0,-0.7 -1.5,0 0,-2 c 0,-0.5 -0.5,-1 -1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="12" height="12" x="282" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78)">
-            <g color="#000">
-                <path d="M 12.5,7 3,12 12.5,17 18,14.21875 c 0,0 0,2.520833 0,3.78125 0,2 2,2 2,2 l 0,-1 c 0,0 -1,-0.05719 -1,-1 0,-1.5 0,-4.34375 0,-4.34375 L 22,12 z M 8,16 8,18 c 0,0.4967 0.3250891,1.1625 1,1.5 l 3.5,1.5 3,-1.5 C 16.174911,19.1625 17.047132,18.494459 17,18 l 0,-2 -4.5,2.1875 z" transform="translate(240 68) translate(0 1004.362)" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-                <path transform="translate(240 68) translate(0 1004.362)" d="M 12.5,7 3,12 12.5,17 18,14.21875 c 0,0 0,2.520833 0,3.78125 0,2 2,2 2,2 l 0,-1 c 0,0 -1,-0.05719 -1,-1 0,-1.5 0,-4.34375 0,-4.34375 L 22,12 z M 8,16 8,18 c 0,0.4967 0.3250891,1.1625 1,1.5 l 3.5,1.5 3,-1.5 C 16.174911,19.1625 17.047132,18.494459 17,18 l 0,-2 -4.5,2.1875 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="240" y="1074.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78)" color="#000">
-            <g>
-                <path d="m 274.5,1078.3622 -6.5,3.5 6.5,3.5 4.5,-2.3437 0,3.5625 c 0,1.7812 1.5,1.5312 1.5,1.5312 l 0,-0.75 c 0,0 -0.78125,0 -0.78125,-0.7812 l 0,-3.9688 1.28125,-0.75 z m -3.5,6.5 0,1.4375 c 0,0.3588 0.51257,0.8187 1,1.0625 l 2.5,1 2.5,-1 c 0.48743,-0.2438 1,-0.7037 1,-1.0625 l 0,-1.4375 -3.5,1.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1)"/>
-                <path d="m 274.5,1078.3622 -6.5,3.5 6.5,3.5 4.5,-2.3437 0,3.5625 c 0,1.7812 1.5,1.5312 1.5,1.5312 l 0,-0.75 c 0,0 -0.78125,0 -0.78125,-0.7812 l 0,-3.9688 1.28125,-0.75 z m -3.5,6.5 0,1.4375 c 0,0.3588 0.51257,0.8187 1,1.0625 l 2.5,1 2.5,-1 c 0.48743,-0.2438 1,-0.7037 1,-1.0625 l 0,-1.4375 -3.5,1.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-            </g>
-            <rect y="1074.362" x="264" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78)" color="#000">
-            <g>
-                <path d="m 289.5,1077.3622 -4.5,2.5 4.5,2.5 2.5,-1.5 0,1.25 -2.5,1.25 -2.5,-1.25 0,1.25 2.5,1.5 2.5,-1.5 c 0,0.5 1,0.5 1,0.5 l 0,-0.5 c 0,0 -0.5,-0.029 -0.5,-0.5 l 0,-2 1.5,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1 -1)"/>
-                <path d="m 289.5,1077.3622 -4.5,2.5 4.5,2.5 2.5,-1.5 0,1.25 -2.5,1.25 -2.5,-1.25 0,1.25 2.5,1.5 2.5,-1.5 c 0,0.5 1,0.5 1,0.5 l 0,-0.5 c 0,0 -0.5,-0.029 -0.5,-0.5 l 0,-2 1.5,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            </g>
-            <rect width="12" height="12" x="282" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78)">
-            <g>
-                <path d="m 244,1101.3622 0,10 c 3,3 7,2 7,4 l 1,0 0,-9 c 0,-3 -5,-3 -8,-5 z m 17,0 c -3,2 -8,2 -8,5 l 0,9 1,0 c 0,-2 4,-1 7,-4 z" opacity=".3" color="#000" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(0 2)"/>
-                <path d="m 244,1102.3622 0,10 c 3,3 7,2 7,4 l 1,0 0,-9 c 0,-3 -5,-3 -8,-5 z m 17,0 c -3,2 -8,2 -8,5 l 0,9 1,0 c 0,-2 4,-1 7,-4 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 2) translate(0 -1)"/>
-            </g>
-            <rect width="24" height="24" x="240" y="1098.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78)" color="#000">
-            <g>
-                <path d="m 266,1103.7151 0,7.6471 c 2,2.5 5,1.4706 5,3 l 1,0 0,-6.8824 c 0,-2.2941 -3,-1.6176 -6,-3.7647 z m 13,0 c -3,2.1471 -6,1.4706 -6,3.7647 l 0,6.8824 1,0 c 0,-1.5294 3,-0.5 5,-3 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(1 -1)"/>
-                <path d="m 266,1103.7151 0,7.6471 c 2,2.5 5,1.4706 5,3 l 1,0 0,-6.8824 c 0,-2.2941 -3,-1.6176 -6,-3.7647 z m 13,0 c -3,2.1471 -6,1.4706 -6,3.7647 l 0,6.8824 1,0 c 0,-1.5294 3,-0.5 5,-3 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(1 -1)"/>
-            </g>
-            <rect y="1098.362" x="264" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78)" color="#000">
-            <g>
-                <path d="m 285,1100.3622 0,6 c 1.5,1.5 3.75,1 3.75,2 l 0.5,0 0,-5.5 c 0,-1.5 -2.75,-1.5 -4.25,-2.5 z m 9,0 c -1.5,1 -4.25,1 -4.25,2.5 l 0,5.5 0.5,0 c 0,-1 2.25,-0.5 3.75,-2 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1)"/>
-                <path d="m 285,1100.3622 0,6 c 1.5,1.5 3.75,1 3.75,2 l 0.5,0 0,-5.5 c 0,-1.5 -2.75,-1.5 -4.25,-2.5 z m 9,0 c -1.5,1 -4.25,1 -4.25,2.5 l 0,5.5 0.5,0 c 0,-1 2.25,-0.5 3.75,-2 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-            </g>
-            <rect width="12" height="12" x="282" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(234 -72)" color="#000">
-            <g>
-                <path d="M 11,4 C 10.446,4 10,4.446 10,5 L 10,9 6,9 C 5.446,9 5,9.446 5,10 l 0,3 c 0,0.554 0.446,1 1,1 l 4,0 0,4 c 0,0.554 0.446,1 1,1 l 3,0 c 0.554,0 1.068715,-0.450278 1,-1 l 0,-4 4,0 c 0.554,0 1,-0.446 1,-1 l 0,-3 C 20,9.446 19.554,9 19,9 L 15,9 15,5 C 15,4.446 14.554,4 14,4 z" transform="translate(240 118) translate(0 1004.362)" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path transform="translate(240 118) translate(-72 884.362)" d="m 83,124 c -0.554,0 -1,0.446 -1,1 l 0,4 -4,0 c -0.554,0 -1,0.446 -1,1 l 0,3 c 0,0.554 0.446,1 1,1 l 4,0 0,4 c 0,0.554 0.446,1 1,1 l 3,0 c 0.554,0 1,-0.446 1,-1 l 0,-4 4,0 c 0.554,0 1,-0.446 1,-1 l 0,-3 c 0,-0.554 -0.446,-1 -1,-1 l -4,0 0,-4 c 0,-0.554 -0.446,-1 -1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1122.362" x="240" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(234 -72)" color="#000">
-            <g>
-                <path d="m 11,1009.3622 c -0.554,0 -1,0.446 -1,1 l 0,3 -3,0 c -0.554,0 -1,0.446 -1,1 l 0,3 c 0,0.554 0.474429,1.1752 1,1 l 3,0 0,3 c 0,0.554 0.446,1 1,1 l 3,0 c 0.554,0 1,-0.446 1,-1 l 0,-3 3,0 c 0.554,0 1,-0.446 1,-1 l 0,-3 c 0,-0.554 -0.446,-1 -1,-1 l -3,0 0,-3 c 0,-0.554 -0.446,-1 -1,-1 z" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" fill="none" transform="translate(261 115)"/>
-                <path d="m 11,1009.3622 c -0.554,0 -1,0.446 -1,1 l 0,3 -3,0 c -0.554,0 -1,0.446 -1,1 l 0,3 c 0,0.554 0.474429,1.1752 1,1 l 3,0 0,3 c 0,0.554 0.446,1 1,1 l 3,0 c 0.554,0 1,-0.446 1,-1 l 0,-3 3,0 c 0.554,0 1,-0.446 1,-1 l 0,-3 c 0,-0.554 -0.446,-1 -1,-1 l -3,0 0,-3 c 0,-0.554 -0.446,-1 -1,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(261 115)"/>
-            </g>
-            <rect width="18" height="18" x="264" y="1122.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(234 -72)">
-            <path d="m 284,1128.3622 c 0,-0.554 0.446,-1 1,-1 l 2,0 0,-2 c 0,-0.554 0.446,-1 1,-1 l 1,0 c 0.554,0 1,0.446 1,1 l 0,2 2,0 c 0.554,0 1,0.446 1,1 l 0,1 c 0,0.554 -0.446,1 -1,1 l -2,0 0,2 c 0,0.554 -0.446,1 -1,1 l -1,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-2 -2,0 c -0.554,0 -1,-0.446 -1,-1 z" color="#000" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" fill="none" transform="translate(0 -1)" opacity=".3"/>
-            <path d="m 284,1128.3622 c 0,-0.554 0.446,-1 1,-1 l 2,0 0,-2 c 0,-0.554 0.446,-1 1,-1 l 1,0 c 0.554,0 1,0.446 1,1 l 0,2 2,0 c 0.554,0 1,0.446 1,1 l 0,1 c 0,0.554 -0.446,1 -1,1 l -2,0 0,2 c 0,0.554 -0.446,1 -1,1 l -1,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-2 -2,0 c -0.554,0 -1,-0.446 -1,-1 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-            <rect y="1122.362" x="282" height="12" width="12" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(234 -72)" color="#000">
-            <g>
-                <path d="m 252.5,1148.3622 c -3.03757,0 -5.5,1.1193 -5.5,2.5 l 0,3 c 0,1.3807 2.46243,2.5 5.5,2.5 3.03757,0 5.5,-1.1193 5.5,-2.5 l 0,-3 c 0,-1.3807 -2.46243,-2.5 -5.5,-2.5 z m -5.5,9 0,7.5 c 0,1.3807 2.46243,2.5 5.5,2.5 3.03757,0 5.5,-1.1193 5.5,-2.5 l 0,-7.5 c 0,-1 -0.5,-1 -1,-0.5 -0.83861,0.8935 -2.2278,1.5 -4.5,1.5 -2.22714,0 -3.63511,-0.6347 -4.5,-1.5 -0.5,-0.5 -1,-0.5 -1,0.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 252.5,1148.3622 c -3.03757,0 -5.5,1.1193 -5.5,2.5 l 0,3 c 0,1.3807 2.46243,2.5 5.5,2.5 3.03757,0 5.5,-1.1193 5.5,-2.5 l 0,-3 c 0,-1.3807 -2.46243,-2.5 -5.5,-2.5 z m -5.5,9 0,7.5 c 0,1.3807 2.46243,2.5 5.5,2.5 3.03757,0 5.5,-1.1193 5.5,-2.5 l 0,-7.5 c 0,-1 -0.5,-1 -1,-0.5 -0.83861,0.8935 -2.2278,1.5 -4.5,1.5 -2.22714,0 -3.63511,-0.6347 -4.5,-1.5 -0.5,-0.5 -1,-0.5 -1,0.5 z m 3,3 c 0.75195,0.1754 1.5967,0.2813 2.5,0.2813 0.9033,0 1.74805,-0.1059 2.5,-0.2813 l 0,4 c -0.75195,0.1754 -1.5967,0.2813 -2.5,0.2813 -0.9033,0 -1.74805,-0.1059 -2.5,-0.2813 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="240" y="1146.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(234 -72)" color="#000">
-            <g>
-                <path transform="translate(-1) translate(-353 1122.362)" d="m 627.5,27 c -1.933,0 -3.5,0.671573 -3.5,1.5 l 0,2.5 c 0,0.828427 1.567,1.5 3.5,1.5 1.933,0 3.5,-0.671573 3.5,-1.5 l 0,-2.5 c 0,-0.828427 -1.567,-1.5 -3.5,-1.5 z m -3.5,5.5 0,6.5 c 0,0 1.00002,1 3.5,1 2.50002,0 3.5,-1 3.5,-1 l 0,-6.5 c 0,0.8284 -1.567,1.5 -3.5,1.5 -1.933,0 -3.5,-0.6716 -3.5,-1.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 627.5,27 c -1.933,0 -3.5,0.671573 -3.5,1.5 l 0,2.5 c 0,0.828427 1.567,1.5 3.5,1.5 1.933,0 3.5,-0.671573 3.5,-1.5 l 0,-2.5 c 0,-0.828427 -1.567,-1.5 -3.5,-1.5 z m -3.5,5.5 0,6.5 c 0,0 1.00002,1 3.5,1 2.50002,0 3.5,-1 3.5,-1 l 0,-6.5 c 0,0.8284 -1.567,1.5 -3.5,1.5 -1.933,0 -3.5,-0.6716 -3.5,-1.5 z m 2,2.5 c 0.45315,0.092 0.96548,0.15625 1.5,0.15625 0.53452,0 1.04685,-0.06405 1.5,-0.15625 l 0,3 c -0.45315,0.0922 -0.96548,0.15625 -1.5,0.15625 -0.53452,0 -1.04685,-0.06425 -1.5,-0.15625 z" transform="translate(-1) translate(-353 1122.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1146.362" x="264" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(234 -72)">
-            <path d="m 288.5,1147.8622 c -1.38071,0 -2.5,0.4477 -2.5,1 l 0,1.5 c 0,0.5523 1.11929,1 2.5,1 1.38071,0 2.5,-0.4477 2.5,-1 l 0,-1.5 c 0,-0.5523 -1.11929,-1 -2.5,-1 z m -2.5,3.5 0,5 c 0,0.5523 1.11929,1 2.5,1 1.38071,0 2.5,-0.4477 2.5,-1 l 0,-5 c 0,0.5523 -1.11929,1 -2.5,1 -1.38071,0 -2.5,-0.4477 -2.5,-1 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 289.5,1148.8622 c -1.38071,0 -2.5,0.4477 -2.5,1 l 0,1.5 c 0,0.5523 1.11929,1 2.5,1 1.38071,0 2.5,-0.4477 2.5,-1 l 0,-1.5 c 0,-0.5523 -1.11929,-1 -2.5,-1 z m -2.5,3.5 0,5 c 0,0.5523 1.11929,1 2.5,1 1.38071,0 2.5,-0.4477 2.5,-1 l 0,-5 c 0,0.5523 -1.11929,1 -2.5,1 -1.38071,0 -2.5,-0.4477 -2.5,-1 z m 1,2 c 0,0 0.5,0.25 1.5,0.25 1,0 1.5,-0.25 1.5,-0.25 l 0,2 c 0,0 -0.5,0.25 -1.5,0.25 -1,0 -1.5,-0.25 -1.5,-0.25 l 0,-2 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            <rect width="12" height="12" x="282" y="1146.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(156 72)" color="#000">
-            <g>
-                <path d="m 258,1173.3622 -2.25,0.6563 1.09375,2.9687 2.15625,-0.625 z m -3.625,1.0313 -2.9375,0.8437 0.0625,0.125 0.5625,1.5313 0.5,1.3125 2.9375,-0.8438 z m -4.28125,1.2187 -2.59375,0.75 1.125,2.9688 2.59375,-0.75 -0.65625,-1.6875 z m -3.9375,1.125 -2.15625,0.625 1,3 2.25,-0.6562 z m -1.15625,3.625 0,9 c 0,0.554 0.44599,1 1,1 l 13,0 c 0.55401,0 1,-0.446 1,-1 l 0,-9 z m 2,2 11,0 0,3 -11,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 258,1173.3622 -2.25,0.6563 1.09375,2.9687 2.15625,-0.625 z m -3.625,1.0313 -2.9375,0.8437 0.0625,0.125 0.5625,1.5313 0.5,1.3125 2.9375,-0.8438 z m -4.28125,1.2187 -2.59375,0.75 1.125,2.9688 2.59375,-0.75 -0.65625,-1.6875 z m -3.9375,1.125 -2.15625,0.625 1,3 2.25,-0.6562 z m -1.15625,3.625 0,9 c 0,0.554 0.44599,1 1,1 l 13,0 c 0.55401,0 1,-0.446 1,-1 l 0,-9 z m 2,2 11,0 0,3 -11,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="240" y="1170.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(156 72)" color="#000">
-            <g>
-                <path d="m 278.23529,1172.0111 -1.72059,0.5018 0.8364,2.2703 1.6489,-0.478 z m -2.77206,0.7886 -2.24632,0.6452 0.86029,2.2702 2.24633,-0.6452 z m -3.2739,0.932 -1.98345,0.5735 0.86029,2.2702 1.98346,-0.5735 z m -3.01102,0.8603 -2.17831,0.7702 1,2 2.0147,-0.5 z m -1.17831,2.7702 0,7 c 0,0.5 0.5,1 1,1 l 10,0 c 0.5,0 1,-0.5 1,-1 l 0,-7 z m 2,2 8,0 0,2 -8,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 278.23529,1172.0111 -1.72059,0.5018 0.8364,2.2703 1.6489,-0.478 z m -2.77206,0.7886 -2.24632,0.6452 0.86029,2.2702 2.24633,-0.6452 z m -3.2739,0.932 -1.98345,0.5735 0.86029,2.2702 1.98346,-0.5735 z m -3.01102,0.8603 -2.17831,0.7702 1,2 2.0147,-0.5 z m -1.17831,2.7702 0,7 c 0,0.5 0.5,1 1,1 l 10,0 c 0.5,0 1,-0.5 1,-1 l 0,-7 z m 2,2 8,0 0,2 -8,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1170.362" x="264" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(156 72)" color="#000">
-            <g>
-                <path d="m 291.5,1171.8622 -7,2 0.5,1.5 7,-2 -0.5,-1.5 z m -6.5,3.5 0,4.5 c 0,0.3077 0.19231,0.5 0.5,0.5 l 6,0 c 0.30769,0 0.5,-0.1923 0.5,-0.5 l 0,-4.5 -7,0 z m 1,1 5,0 0,1 -5,0 0,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 291.5,1171.8622 -7,2 0.5,1.5 7,-2 -0.5,-1.5 z m -6.5,3.5 0,4.5 c 0,0.3077 0.19231,0.5 0.5,0.5 l 6,0 c 0.30769,0 0.5,-0.1923 0.5,-0.5 l 0,-4.5 -7,0 z m 1,1 5,0 0,1 -5,0 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="12" height="12" x="282" y="1170.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78 24)" color="#000">
-            <g>
-                <path transform="translate(0 -1) translate(-198 1027.362)" d="m 523.5,26 c -0.5,0 -0.5,0.5 -0.5,0.5 l 0,6 c 0,0.505147 0.5,1 1,1.5 0.5,0.5 0.52601,1.00584 0.5,1.5 l 0,1.5 -0.5,6.5 c -0.0383,0.4985 0.5,1.5 1.5,1.5 1,0 1.53846,-1 1.5,-1.5 l -0.5,-6.5 0,-1.5 c 0,-0.478617 0,-1 0.5,-1.5 0.46054,-0.460539 1,-0.978617 1,-1.5 l 0,-6 c 0,0 0,-0.5 -0.5,-0.5 -0.5,0 -0.5,0.5 -0.5,0.5 l 0,4.5 c 0,0 0,0.5 -0.5,0.5 C 526,31.5 526,31 526,31 l 0,-4.5 c 0,0 0,-0.5 -0.5,-0.5 -0.5,0 -0.5,0.5 -0.5,0.5 l 0,4.5 c 0,0 0,0.5 -0.5,0.5 C 524,31.5 524,31 524,31 l 0,-4.5 c 0,0 0,-0.5 -0.5,-0.5 z m 10.5,0 c -1,0 -2.86754,0.2351 -3.5,1.5 -0.5,1 -0.5,3.5 -0.5,4.5 l 0,5 c 0,0.5 0.5,1 1,1 l 1,0 0,6 c 0,0.5 0.5,1 1,1 0.5,0 1,-0.5 1,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 523.5,26 c -0.5,0 -0.5,0.5 -0.5,0.5 l 0,6 c 0,0.5 0.5,1 1,1.5 0.5,0.5 0.5,1 0.5,1.5 0,0 0,1 0,1.5 0,0.5 -0.5,6.5 -0.5,6.5 -0.0383,0.4985 0.5,1.5 1.5,1.5 1,0 1.53846,-1 1.5,-1.5 0,0 -0.5,-6 -0.5,-6.5 0,-0.5 0,-1.5 0,-1.5 0,-0.5 0,-1 0.5,-1.5 0.46054,-0.460539 1,-1 1,-1.5 l 0,-6 c 0,0 0,-0.5 -0.5,-0.5 -0.5,0 -0.5,0.5 -0.5,0.5 l 0,4.5 c 0,0 0,0.5 -0.5,0.5 C 526,31.5 526,31 526,31 l 0,-4.5 c 0,0 0,-0.5 -0.5,-0.5 -0.5,0 -0.5,0.5 -0.5,0.5 l 0,4.5 c 0,0 0,0.5 -0.5,0.5 C 524,31.5 524,31 524,31 l 0,-4.5 c 0,0 0,-0.5 -0.5,-0.5 z m 10.5,0 c -1,0 -2.86754,0.2351 -3.5,1.5 -0.5,1 -0.5,3.5 -0.5,4.5 l 0,5 c 0,0.5 0.5,1 1,1 l 1,0 0,6 c 0,0.5 0.5,1 1,1 0.5,0 1,-0.5 1,-1 z" transform="translate(0 -1) translate(-198 1027.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="318" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78 24)" color="#000">
-            <g>
-                <path d="m 348,1052.3622 -1,0 c 0,1.2963 0,3.2037 0,4.5 0,0.7777 1,0.7222 1,1.5 l 0,7 c 0,0.3889 0.5,1 1,1 0.5,0 1,-0.5 1,-1 l 0,-7 c 0,-0.7778 1,-0.7223 1,-1.5 0,-1.2963 0,-3.2037 0,-4.5 l -1,0 0,3 -0.5,0 0,-3 -1,0 0,3 -0.5,0 z m 8,0 c -0.77778,0 -2.00808,0.5162 -2.5,1.5 -0.38889,0.7777 -0.5,2.5 -0.5,3.5 l 0,3 c 0,0.5 0.61111,1 1,1 l 0,4 c 0,0.5 0.5,1 1,1 0.5,0 1,-0.5 1,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 348,1052.3622 -1,0 c 0,1.2963 0,3.2037 0,4.5 0,0.7777 1,0.7222 1,1.5 l 0,7 c 0,0.3889 0.5,1 1,1 0.5,0 1,-0.5 1,-1 l 0,-7 c 0,-0.7778 1,-0.7223 1,-1.5 0,-1.2963 0,-3.2037 0,-4.5 l -1,0 0,3 -0.5,0 0,-3 -1,0 0,3 -0.5,0 z m 8,0 c -0.77778,0 -2.00808,0.5162 -2.5,1.5 -0.38889,0.7777 -0.5,2.5 -0.5,3.5 l 0,3 c 0,0.5 0.61111,1 1,1 l 0,4 c 0,0.5 0.5,1 1,1 0.5,0 1,-0.5 1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1050.362" x="342" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78 24)" color="#000">
-            <g>
-                <path d="m 363.5,1051.3622 -0.5,0 c 0,0.8333 0,2.1667 0,3 0,0.5 1,0.5 1,1 l 0,6 1,0 0,-6 c 0,-0.5 1,-0.5 1,-1 0,-0.8333 0,-2.1667 0,-3 l -0.5,0 0,2 -0.75,0 0,-2 -0.5,0 0,2 -0.75,0 z m 6.5,0 c -0.5,0 -1.43377,0.1176 -1.75,0.75 -0.25,0.5 -0.25,1.25 -0.25,2.25 l 0,2.5 1,0 0,4.5 1,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 363.5,1051.3622 -0.5,0 c 0,0.8333 0,2.1667 0,3 0,0.5 1,0.5 1,1 l 0,6 1,0 0,-6 c 0,-0.5 1,-0.5 1,-1 0,-0.8333 0,-2.1667 0,-3 l -0.5,0 0,2 -0.75,0 0,-2 -0.5,0 0,2 -0.75,0 z m 6.5,0 c -0.5,0 -1.43377,0.1176 -1.75,0.75 -0.25,0.5 -0.25,1.25 -0.25,2.25 l 0,2.5 1,0 0,4.5 1,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="12" height="12" x="360" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78 24)" color="#000">
-            <g>
-                <path d="m 324,1079.3622 c -0.55401,0 -1,0.446 -1,1 l 0,9 c 0,0.554 0.44599,1 1,1 l 11,0 c 0.55401,0 1,-0.446 1,-1 l 0,-1 0.5,0 c 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-0.5 1,0 c 1,0 2,-1 2,-2 l 0,-1 0,-2 c 0,-0.5 -0.5,-1 -1,-1 l -3,0 0,-1 c 0,-0.554 -0.44599,-1 -1,-1 z m 12,3 2.5,0 c 0.5,0 0.5,0.5 0.5,0.5 l 0,2.5 c 0,0.5 -0.5,1 -1,1 l -1,0 -1,0 z m -15,9 1,1 1,1 13,0 1,-1 1,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 324,1079.3622 c -0.55401,0 -1,0.446 -1,1 l 0,9 c 0,0.554 0.44599,1 1,1 l 11,0 c 0.55401,0 1,-0.446 1,-1 l 0,-1 0.5,0 c 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-0.5 1,0 c 1,0 2,-1 2,-2 l 0,-1 0,-2 c 0,-0.5 -0.5,-1 -1,-1 l -3,0 0,-1 c 0,-0.554 -0.44599,-1 -1,-1 z m 12,3 2.5,0 c 0.5,0 0.5,0.5 0.5,0.5 l 0,2.5 c 0,0.5 -0.5,1 -1,1 l -1,0 -1,0 z m -15,9 1,1 1,1 13,0 1,-1 1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="318" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78 24)" color="#000">
-            <g>
-                <path d="m 347,1077.3622 c -0.5,0 -1,0.5 -1,1 l 0,6 c 0,0.5 0.5,1 1,1 l 7,0 c 0.40011,0 1,-0.5 1,-1 l 0,-0.4444 0.36111,0 c 0.36111,0 0.36111,-0.3611 0.36111,-0.3611 l 0,-0.3611 0.44445,0 c 0.72222,0 1.83333,-0.3334 1.83333,-1.4444 l 0,-1.889 c 0,-0.5 -0.25,-1 -0.75,-1 l -2.25,0 0,-0.5 c 0,-0.5 -0.5,-1 -1,-1 z m 8,2.2223 1.88889,0 c 0.36111,0 0.36111,0.2777 0.36111,0.2777 l 0,1.889 c 0,0.572 -0.72225,0.6064 -1.08333,0.611 l -0.44445,0 -0.72222,0 z m -10,6.7777 2,2 7,0 2,-2 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 347,1077.3622 c -0.5,0 -1,0.5 -1,1 l 0,6 c 0,0.5 0.5,1 1,1 l 7,0 c 0.40011,0 1,-0.5 1,-1 l 0,-0.4444 0.36111,0 c 0.36111,0 0.36111,-0.3611 0.36111,-0.3611 l 0,-0.3611 0.44445,0 c 0.72222,0 1.83333,-0.3334 1.83333,-1.4444 l 0,-1.889 c 0,-0.5 -0.25,-1 -0.75,-1 l -2.25,0 0,-0.5 c 0,-0.5 -0.5,-1 -1,-1 z m 8,2.2223 1.88889,0 c 0.36111,0 0.36111,0.2777 0.36111,0.2777 l 0,1.889 c 0,0.572 -0.72225,0.6064 -1.08333,0.611 l -0.44445,0 -0.72222,0 z m -10,6.7777 2,2 7,0 2,-2 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1074.362" x="342" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78 24)" color="#000">
-            <g>
-                <path d="m 363.5,1076.3622 c -0.27701,0 -0.5,0.223 -0.5,0.5 l 0,4.5 c 0,0.277 0.22299,0.5 0.5,0.5 l 5,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-0.5 0.25,0 c 0.25,0 0.25,-0.25 0.25,-0.25 l 0,-0.25 0.5,0 c 0.5,0 1,-0.5 1,-1 l 0,-0.5 0,-1 c 0,-0.25 -0.25,-0.5 -0.5,-0.5 l -1.5,0 0,-0.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 5.5,1.5 1.25,0 c 0.25,0 0.25,0.25 0.25,0.25 l 0,1.25 c 0,0.25 -0.25,0.5 -0.5,0.5 l -0.5,0 -0.5,0 z m -7,4.5 1.5,1.5 5,0 1.5,-1.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 363.5,1076.3622 c -0.27701,0 -0.5,0.223 -0.5,0.5 l 0,4.5 c 0,0.277 0.22299,0.5 0.5,0.5 l 5,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-0.5 0.25,0 c 0.25,0 0.25,-0.25 0.25,-0.25 l 0,-0.25 0.5,0 c 0.5,0 1,-0.5 1,-1 l 0,-0.5 0,-1 c 0,-0.25 -0.25,-0.5 -0.5,-0.5 l -1.5,0 0,-0.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 5.5,1.5 1.25,0 c 0.25,0 0.25,0.25 0.25,0.25 l 0,1.25 c 0,0.25 -0.25,0.5 -0.5,0.5 l -0.5,0 -0.5,0 z m -7,4.5 2,1 4,0 2,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="12" height="12" x="360" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78 24)" color="#000">
-            <g>
-                <path d="m 330,1102.3622 c -1,0 -1.88616,1.0065 -2,2 l -0.34375,3 -1.65625,0 c -0.5,0 -1,0.5 -1,1 l -1,10 c 0,0.5 0.5,1 1,1 l 13,0 c 0.5,0 1,-0.5 1,-1 l -1,-10 c 0,-0.5 -0.5,-1 -1,-1 l -1.65625,0 -0.34375,-3 c -0.11384,-0.9935 -1,-2 -2,-2 z m 0,1 3,0 c 0.5,0 0.94308,0.5033 1,1 l 0.34375,3 -5.6875,0 0.34375,-3 c 0.0569,-0.4967 0.5,-1 1,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1 -1)"/>
-                <path d="m 330,1102.3622 c -1,0 -1.88616,1.0065 -2,2 l -0.34375,3 -1.65625,0 c -0.5,0 -1,0.5 -1,1 l -1,10 c 0,0.5 0.5,1 1,1 l 13,0 c 0.5,0 1,-0.5 1,-1 l -1,-10 c 0,-0.5 -0.5,-1 -1,-1 l -1.65625,0 -0.34375,-3 c -0.11384,-0.9935 -1,-2 -2,-2 z m 0,1 3,0 c 0.5,0 0.94308,0.5033 1,1 l 0.34375,3 -5.6875,0 0.34375,-3 c 0.0569,-0.4967 0.5,-1 1,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            </g>
-            <rect width="24" height="24" x="318" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78 24)" color="#000">
-            <g>
-                <path d="m 350.26471,1100.3622 c -0.76471,0 -1.61475,0.7502 -1.76471,1.5 l -0.5,2.5 -1,0 c -0.38235,0 -1,0.6177 -1,1 l -1,8.2353 c 0,0.3823 0.5,0.7647 1,0.7647 l 11,0 c 0.5,0 1,-0.3824 1,-0.7647 l -1,-8.2353 c 0,-0.3823 -0.61765,-1 -1,-1 l -1,0 -0.5,-2.5 c -0.14996,-0.7498 -0.99999,-1.5 -1.7647,-1.5 z m 0,0.7647 2.47059,0 c 0.38236,0 0.92503,0.3604 1,0.7353 l 0.5,2.5 -5.4706,0 0.50001,-2.5 c 0.075,-0.3749 0.61764,-0.7353 1,-0.7353 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 350.26471,1100.3622 c -0.76471,0 -1.61475,0.7502 -1.76471,1.5 l -0.5,2.5 -1,0 c -0.38235,0 -1,0.6177 -1,1 l -1,8.2353 c 0,0.3823 0.5,0.7647 1,0.7647 l 11,0 c 0.5,0 1,-0.3824 1,-0.7647 l -1,-8.2353 c 0,-0.3823 -0.61765,-1 -1,-1 l -1,0 -0.5,-2.5 c -0.14996,-0.7498 -0.99999,-1.5 -1.7647,-1.5 z m 0,0.7647 2.47059,0 c 0.38236,0 0.92503,0.3604 1,0.7353 l 0.5,2.5 -5.4706,0 0.50001,-2.5 c 0.075,-0.3749 0.61764,-0.7353 1,-0.7353 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1098.362" x="342" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78 24)" color="#000">
-            <g>
-                <path d="m 365.17188,1099.8622 c -0.5,0 -0.92565,0.5056 -1,1 l -0.17188,1.5 -1,0 c -0.25,0 -0.5,0.25 -0.5,0.5 l -0.5,5 c 0,0.25 0.25,0.5 0.5,0.5 l 8,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l -0.5,-5 c 0,-0.25 -0.25,-0.5 -0.5,-0.5 l -1,0 -0.17187,-1.5 c -0.0569,-0.4967 -0.5,-1 -1,-1 z m 0,0.5 2.65625,0 c 0.25,0 0.4679,0.2199 0.5,0.5 l 0.17187,1.5 -4,0 0.17188,-1.5 c 0.0285,-0.2483 0.25,-0.5 0.5,-0.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 365.17188,1099.8622 c -0.5,0 -0.92565,0.5056 -1,1 l -0.17188,1.5 -1,0 c -0.25,0 -0.5,0.25 -0.5,0.5 l -0.5,5 c 0,0.25 0.25,0.5 0.5,0.5 l 8,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l -0.5,-5 c 0,-0.25 -0.25,-0.5 -0.5,-0.5 l -1,0 -0.17187,-1.5 c -0.0569,-0.4967 -0.5,-1 -1,-1 z m 0,0.5 2.65625,0 c 0.25,0 0.4679,0.2199 0.5,0.5 l 0.17187,1.5 -4,0 0.17188,-1.5 c 0.0285,-0.2483 0.25,-0.5 0.5,-0.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="12" height="12" x="360" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78 24)" color="#000">
-            <g>
-                <path d="m 328,1127.3622 c -3,0 -6,1.5 -6,4 l 0,2 17,0 0,-2 c -2e-5,-2.5 -3,-4 -6,-4 z m 0.5,1 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m -6,2 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m -12.5,4 c -0.50003,0 -1.00001,0.5 -1,1 10e-6,0.5 0.49997,1 1,1 l 17,0 c 0.50001,0 0.99999,-0.5 1,-1 2e-5,-0.5 -0.49999,-1 -1,-1 z m 0,3 0,1 c 0,1 1,2 2,2 l 13,0 c 1,0 2,-1 2,-2 l 0,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 328,1127.3622 c -3,0 -6,1.5 -6,4 l 0,2 17,0 0,-2 c -2e-5,-2.5 -3,-4 -6,-4 z m 0.5,1 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m -6,2 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m -12.5,4 c -0.50003,0 -1.00001,0.5 -1,1 10e-6,0.5 0.49997,1 1,1 l 17,0 c 0.50001,0 0.99999,-0.5 1,-1 0,-0.5 -0.5,-1 -1,-1 z m 0,3 0,1 c 0,1 1,2 2,2 l 13,0 c 1,0 2,-1 2,-2 l 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1122.362" x="318" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78 24)" color="#000">
-            <g>
-                <path d="m 350.5,1127.3622 c -2.05263,0 -3.5,0.7895 -3.5,2.5 l 0,1.5 11,0 0,-1.5 c 0,-1.7105 -1.44737,-2.5 -3.5,-2.5 l -4,0 z m 0,1.125 c 0.20711,0 0.375,0.1679 0.375,0.375 0,0.2071 -0.16789,0.375 -0.375,0.375 -0.20711,0 -0.375,-0.1679 -0.375,-0.375 0,-0.2071 0.16789,-0.375 0.375,-0.375 z m 4,0 c 0.20711,0 0.375,0.1679 0.375,0.375 0,0.2071 -0.16789,0.375 -0.375,0.375 -0.20711,0 -0.375,-0.1679 -0.375,-0.375 0,-0.2071 0.16789,-0.375 0.375,-0.375 z m -6,1 c 0.20711,0 0.375,0.1679 0.375,0.375 0,0.2071 -0.16789,0.375 -0.375,0.375 -0.20711,0 -0.375,-0.1679 -0.375,-0.375 0,-0.2071 0.16789,-0.375 0.375,-0.375 z m 4,0 c 0.20711,0 0.375,0.1679 0.375,0.375 0,0.2071 -0.16789,0.375 -0.375,0.375 -0.20711,0 -0.375,-0.1679 -0.375,-0.375 0,-0.2071 0.16789,-0.375 0.375,-0.375 z m 4,0 c 0.20711,0 0.375,0.1679 0.375,0.375 0,0.2071 -0.16789,0.375 -0.375,0.375 -0.20711,0 -0.375,-0.1679 -0.375,-0.375 0,-0.2071 0.16789,-0.375 0.375,-0.375 z m -9.5,2.875 c -0.34213,0 -0.50001,0.1579 -0.5,0.5 10e-6,0.3422 0.15787,0.5 0.5,0.5 l 11,0 c 0.34211,0 0.49999,-0.1578 0.5,-0.5 10e-6,-0.3421 -0.15789,-0.5 -0.5,-0.5 l -11,0 z m 0,2 0,0.625 c 0,0.6842 0.69079,1.375 1.375,1.375 l 8.25,0 c 0.68421,0 1.375,-0.6908 1.375,-1.375 l 0,-0.625 -11,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1 -1)"/>
-                <path d="m 350.5,1127.3622 c -2.05263,0 -3.5,0.7895 -3.5,2.5 l 0,1.5 11,0 0,-1.5 c 0,-1.7105 -1.44737,-2.5 -3.5,-2.5 l -4,0 z m 0,1.125 c 0.20711,0 0.375,0.1679 0.375,0.375 0,0.2071 -0.16789,0.375 -0.375,0.375 -0.20711,0 -0.375,-0.1679 -0.375,-0.375 0,-0.2071 0.16789,-0.375 0.375,-0.375 z m 4,0 c 0.20711,0 0.375,0.1679 0.375,0.375 0,0.2071 -0.16789,0.375 -0.375,0.375 -0.20711,0 -0.375,-0.1679 -0.375,-0.375 0,-0.2071 0.16789,-0.375 0.375,-0.375 z m -6,1 c 0.20711,0 0.375,0.1679 0.375,0.375 0,0.2071 -0.16789,0.375 -0.375,0.375 -0.20711,0 -0.375,-0.1679 -0.375,-0.375 0,-0.2071 0.16789,-0.375 0.375,-0.375 z m 4,0 c 0.20711,0 0.375,0.1679 0.375,0.375 0,0.2071 -0.16789,0.375 -0.375,0.375 -0.20711,0 -0.375,-0.1679 -0.375,-0.375 0,-0.2071 0.16789,-0.375 0.375,-0.375 z m 4,0 c 0.20711,0 0.375,0.1679 0.375,0.375 0,0.2071 -0.16789,0.375 -0.375,0.375 -0.20711,0 -0.375,-0.1679 -0.375,-0.375 0,-0.2071 0.16789,-0.375 0.375,-0.375 z m -9.5,2.875 c -0.34213,0 -0.50001,0.1579 -0.5,0.5 10e-6,0.3422 0.15787,0.5 0.5,0.5 l 11,0 c 0.34211,0 0.49999,-0.1578 0.5,-0.5 10e-6,-0.3421 -0.15789,-0.5 -0.5,-0.5 l -11,0 z m 0,2 0,0.625 c 0,0.6842 0.69079,1.375 1.375,1.375 l 8.25,0 c 0.68421,0 1.375,-0.6908 1.375,-1.375 l 0,-0.625 -11,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            </g>
-            <rect width="18" height="18" x="342" y="1122.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78 24)" color="#000">
-            <g>
-                <path d="m 365.5,1125.3622 c -1.42105,0 -3.1488,0.8723 -3.05264,2.0526 l 0,1.1974 8.05264,0 0,-1.1974 c 0,-1.1842 -1.57895,-2.0526 -3,-2.0526 z m -3.5,4 0,1 9,0 0,-1 z m 0.49996,1.75 c 0,0.4737 0.52632,1.25 1,1.25 l 6,0 c 0.47368,0 1,-0.7763 1,-1.25 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 365.5,1125.3622 c -1.42105,0 -3.1488,0.8723 -3.05264,2.0526 l 0,1.1974 8.05264,0 0,-1.1974 c 0,-1.1842 -1.57895,-2.0526 -3,-2.0526 z m -3.5,4 0,1 9,0 0,-1 z m 0.49996,1.75 c 0,0.4737 0.52632,1.25 1,1.25 l 6,0 c 0.47368,0 1,-0.7763 1,-1.25 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1122.362" x="360" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78 24)" color="#000">
-            <g>
-                <path d="m 324,1150.3622 c -0.5,0 -1,6e-4 -1,0.25 0,0.2506 0.34281,0.5479 0.5,0.75 l 7.5,7.8125 0,6.1875 -4,1 c -0.5,0.1667 -1,0.5 -1,1 l 11,0 c 0,-0.5 -0.5,-0.8333 -1,-1 l -4,-1 0,-6.1875 7.5,-7.8125 c 0.15719,-0.2021 0.5,-0.4994 0.5,-0.75 0,-0.2494 -0.5,-0.25 -1,-0.25 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1)"/>
-                <path d="m 324,1150.3622 c -0.5,0 -1,6e-4 -1,0.25 0,0.2506 0.34281,0.5479 0.5,0.75 l 7.5,7.8125 0,6.1875 -4,1 c -0.5,0.1667 -1,0.5 -1,1 l 11,0 c 0,-0.5 -0.5,-0.8333 -1,-1 l -4,-1 0,-6.1875 7.5,-7.8125 c 0.15719,-0.2021 0.5,-0.4994 0.5,-0.75 0,-0.2494 -0.5,-0.25 -1,-0.25 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-            </g>
-            <rect y="1146.362" x="318" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78 24)" color="#000">
-            <g>
-                <path d="m 346,1149.3622 c -0.40625,0 -1,0.047 -1,0.25 0,0.2036 0.37228,0.5858 0.5,0.75 l 5.5,6 0,4 -2.8125,1.1875 c -0.40625,0.1354 -0.6875,0.3125 -0.6875,0.8125 l 8,0 c 0,-0.5 -0.40625,-0.6771 -0.8125,-0.8125 l -2.6875,-1.1875 0,-4 5.5,-6 c 0.12772,-0.1642 0.5,-0.5464 0.5,-0.75 0,-0.2026 -0.59375,-0.25 -1,-0.25 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 346,1149.3622 c -0.40625,0 -1,0.047 -1,0.25 0,0.2036 0.37228,0.5858 0.5,0.75 l 5.5,6 0,4 -2.8125,1.1875 c -0.40625,0.1354 -0.6875,0.3125 -0.6875,0.8125 l 8,0 c 0,-0.5 -0.40625,-0.6771 -0.8125,-0.8125 l -2.6875,-1.1875 0,-4 5.5,-6 c 0.12772,-0.1642 0.5,-0.5464 0.5,-0.75 0,-0.2026 -0.59375,-0.25 -1,-0.25 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="18" height="18" x="342" y="1146.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78 24)" color="#000">
-            <g>
-                <path d="m 363.5,1149.3622 c -0.28125,0 -0.5,3e-4 -0.5,0.1406 0,0.141 0.19283,0.3082 0.28125,0.4219 l 3.71875,4.4375 0,2.5 c -1,0.5 -2.5,1 -2.5,1.5 l 6,0 c 0,-0.5 -1.5,-1 -2.5,-1.5 l 0,-2.5 3.71875,-4.4375 c 0.0884,-0.1137 0.28125,-0.2809 0.28125,-0.4219 0,-0.1403 -0.21875,-0.1406 -0.5,-0.1406 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1 -1)"/>
-                <path d="m 363.5,1149.3622 c -0.28125,0 -0.5,3e-4 -0.5,0.1406 0,0.141 0.19283,0.3082 0.28125,0.4219 l 3.71875,4.4375 0,2.5 c -1,0.5 -2.5,1 -2.5,1.5 l 6,0 c 0,-0.5 -1.5,-1 -2.5,-1.5 l 0,-2.5 3.71875,-4.4375 c 0.0884,-0.1137 0.28125,-0.2809 0.28125,-0.4219 0,-0.1403 -0.21875,-0.1406 -0.5,-0.1406 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            </g>
-            <rect y="1146.362" x="360" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78 24)" color="#000">
-            <g fill="#444">
-                <path transform="translate(318 167) translate(0 1004.362)" d="M 4,5 C 3.446,5 3,5.446 3,6 l 0,10 c 0,0.554 0.446,1 1,1 l 17,0 c 0.554,0 1,-0.446 1,-1 L 22,6 C 22,5.446 21.554,5 21,5 z m -0.5,2 18,0 0,2 -18,0 z m 0.5,6 3,0 0,2 -3,0 z m 9,1 7,0 0,1 -7,0 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-                <path d="M 4,5 C 3.446,5 3,5.446 3,6 l 0,10 c 0,0.554 0.446,1 1,1 l 17,0 c 0.554,0 1,-0.446 1,-1 L 22,6 C 22,5.446 21.554,5 21,5 z m -0.5,2 18,0 0,2 -18,0 z m 0.5,6 3,0 0,2 -3,0 z m 9,1 7,0 0,1 -7,0 z" transform="translate(318 167) translate(0 1004.362)" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1170.362" x="318" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78 24)" color="#000">
-            <g fill="#444">
-                <path d="m 346.72222,1177.3622 c -0.40011,0 -0.72222,0.3221 -0.72222,0.7223 l 0,6.5555 c 0,0.4001 0.32211,0.7222 0.72222,0.7222 l 11.55556,0 c 0.40011,0 0.72222,-0.3221 0.72222,-0.7222 l 0,-6.5555 c 0,-0.4002 -0.32211,-0.7223 -0.72222,-0.7223 z m -0.22222,1.5 12,0 0,1.5 -12,0 z m 0.5,4 2,0 0,1.5 -2,0 z m 6,0.7777 5,0 0,0.7223 -5,0 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" transform="translate(-1 -2)"/>
-                <path d="m 346.72222,1177.3622 c -0.40011,0 -0.72222,0.3221 -0.72222,0.7223 l 0,6.5555 c 0,0.4001 0.32211,0.7222 0.72222,0.7222 l 11.55556,0 c 0.40011,0 0.72222,-0.3221 0.72222,-0.7222 l 0,-6.5555 c 0,-0.4002 -0.32211,-0.7223 -0.72222,-0.7223 z m -0.22222,1.5 12,0 0,1.5 -12,0 z m 0.5,4 2,0 0,1.5 -2,0 z m 6,0.7777 5,0 0,0.7223 -5,0 z" overflow="visible" enable-background="accumulate" transform="translate(-1 -2)"/>
-            </g>
-            <rect width="18" height="18" x="342" y="1170.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78 24)" color="#000">
-            <g fill="#444">
-                <path d="m 363.5,1175.3622 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,5 c 0,0.277 0.223,0.5 0.5,0.5 l 8,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 0,1 8,0 0,1 -8,0 z m 0,3 1.5,0 0,1 -1.5,0 z m 4.5,0.5 3,0 0,0.5 -3,0 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" transform="translate(-1 -2)"/>
-                <path d="m 363.5,1175.3622 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,5 c 0,0.277 0.223,0.5 0.5,0.5 l 8,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 0,1 8,0 0,1 -8,0 z m 0,3 1.5,0 0,1 -1.5,0 z m 4.5,0.5 3,0 0,0.5 -3,0 z" overflow="visible" enable-background="accumulate" transform="translate(-1 -2)"/>
-            </g>
-            <rect y="1170.362" x="360" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78 24)" color="#000">
-            <g>
-                <path d="m 21,-19.000017 c -0.583333,0 -1.100899,0.163399 -1.46875,0.53125 C 19.163399,-18.100916 19,-17.58335 19,-17.000017 l -14,0 2,9 12,0 0,1 -11,0 c -1,0 -1,1 0,1 l 1.5,0 8,0 1.5,0 c 0.5,0 1,-0.5 1,-1 l 0,-1 0,-8 0,-1 c 0,0 0.0866,-0.649101 0.21875,-0.78125 0.132149,-0.132149 0.364583,-0.21875 0.78125,-0.21875 0.111026,0 0.292249,0 0.4,0 0.5,0 0.6,-0.248673 0.6,-0.5 0,-0.247421 -0.1,-0.5 -0.6,-0.5 -0.130972,0 -0.262788,0 -0.4,0 z m -3.5,13 c -0.828427,0 -1.5,0.671573 -1.5,1.5 0,0.828427 0.671573,1.5 1.5,1.5 0.828427,0 1.5,-0.671573 1.5,-1.5 0,-0.828427 -0.671573,-1.5 -1.5,-1.5 z m -8,0 c -0.8284271,0 -1.5,0.671573 -1.5,1.5 0,0.828427 0.6715729,1.5 1.5,1.5 0.828427,0 1.5,-0.671573 1.5,-1.5 0,-0.828427 -0.671573,-1.5 -1.5,-1.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(317 1217.362)"/>
-                <path d="m 21,-19.000017 c -0.583333,0 -1.100899,0.163399 -1.46875,0.53125 C 19.163399,-18.100916 19,-17.58335 19,-17.000017 l -14,0 2,9 12,0 0,1 -11,0 c -1,0 -1,1 0,1 l 1.5,0 8,0 1.5,0 c 0.5,0 1,-0.5 1,-1 l 0,-1 0,-8 0,-1 c 0,0 0.0866,-0.649101 0.21875,-0.78125 0.132149,-0.132149 0.364583,-0.21875 0.78125,-0.21875 0.111026,0 0.292249,0 0.4,0 0.5,0 0.6,-0.248673 0.6,-0.5 0,-0.247421 -0.1,-0.5 -0.6,-0.5 -0.130972,0 -0.262788,0 -0.4,0 z m -3.5,13 c -0.828427,0 -1.5,0.671573 -1.5,1.5 0,0.828427 0.671573,1.5 1.5,1.5 0.828427,0 1.5,-0.671573 1.5,-1.5 0,-0.828427 -0.671573,-1.5 -1.5,-1.5 z m -8,0 c -0.8284271,0 -1.5,0.671573 -1.5,1.5 0,0.828427 0.6715729,1.5 1.5,1.5 0.828427,0 1.5,-0.671573 1.5,-1.5 0,-0.828427 -0.671573,-1.5 -1.5,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(317 1217.362)"/>
-            </g>
-            <rect y="1194.362" x="318" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78 24)" color="#000">
-            <g>
-                <path d="m 357.5,1198.8622 c -1,0 -1.5,0.5 -1.5,1.5 l -10,0 1.05882,6 9.17647,0 0,1 -8.41176,0 c -0.76471,0 -0.76435,0.7411 0,0.7647 l 1.14706,0 6.11764,0 1.14706,0 c 0.38236,0 0.76471,-0.3824 0.76471,-0.7647 l 0,-1 0,-4.9412 0,-1.0588 c 0,-0.5 0.23836,-0.7353 0.7647,-0.7353 l 1.2353,0 0,-0.7647 z m -2.5,9.2059 c -0.6335,0 -1.14706,0.5136 -1.14706,1.147 0,0.6335 0.51356,1.1471 1.14706,1.1471 0.63351,0 1.14706,-0.5136 1.14706,-1.1471 0,-0.6334 -0.51355,-1.147 -1.14706,-1.147 z m -6,0 c -0.63351,0 -1.14706,0.5136 -1.14706,1.147 0,0.6335 0.51355,1.1471 1.14706,1.1471 0.6335,0 1.14706,-0.5136 1.14706,-1.1471 0,-0.6334 -0.51356,-1.147 -1.14706,-1.147 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-                <path d="m 357.5,1198.8622 c -1,0 -1.5,0.5 -1.5,1.5 l -10,0 1.05882,6 9.17647,0 0,1 -8.41176,0 c -0.76471,0 -0.76435,0.7411 0,0.7647 l 1.14706,0 6.11764,0 1.14706,0 c 0.38236,0 0.76471,-0.3824 0.76471,-0.7647 l 0,-1 0,-4.9412 0,-1.0588 c 0,-0.5 0.23836,-0.7353 0.7647,-0.7353 l 1.2353,0 0,-0.7647 z m -2.5,9.2059 c -0.6335,0 -1.14706,0.5136 -1.14706,1.147 0,0.6335 0.51356,1.1471 1.14706,1.1471 0.63351,0 1.14706,-0.5136 1.14706,-1.1471 0,-0.6334 -0.51355,-1.147 -1.14706,-1.147 z m -6,0 c -0.63351,0 -1.14706,0.5136 -1.14706,1.147 0,0.6335 0.51355,1.1471 1.14706,1.1471 0.6335,0 1.14706,-0.5136 1.14706,-1.1471 0,-0.6334 -0.51356,-1.147 -1.14706,-1.147 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            </g>
-            <rect width="18" height="18" x="342" y="1194.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(78 24)" color="#000">
-            <g>
-                <path d="m 371.5,1196.3622 c -0.29166,0 -0.55045,0.082 -0.73438,0.2657 -0.18392,0.1839 -0.26562,0.4427 -0.26562,0.7343 l -7.5,0 1,4 6.5,0 0,1 -6.13258,0 c -0.5,0 -0.5,0.5 0,0.5 l 0.88258,0 4.5,0 0.75,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-0.5 0,-4 0,-0.5 c 0,0 0.0433,-0.3245 0.10937,-0.3906 0.0661,-0.066 0.18229,-0.1094 0.39063,-0.1094 0.0555,0 0.5,0 0.5,0 l 0,-0.5 c 0,0 -0.4314,0 -0.5,0 z m -1.75,6.5 c -0.41422,0 -0.75,0.3358 -0.75,0.75 0,0.4142 0.33578,0.75 0.75,0.75 0.41422,0 0.75,-0.3358 0.75,-0.75 0,-0.4142 -0.33578,-0.75 -0.75,-0.75 z m -4.5,0 c -0.41422,0 -0.75,0.3358 -0.75,0.75 0,0.4142 0.33578,0.75 0.75,0.75 0.41422,0 0.75,-0.3358 0.75,-0.75 0,-0.4142 -0.33578,-0.75 -0.75,-0.75 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-                <path d="m 371.5,1196.3622 c -0.29166,0 -0.55045,0.082 -0.73438,0.2657 -0.18392,0.1839 -0.26562,0.4427 -0.26562,0.7343 l -7.5,0 1,4 6.5,0 0,1 -6.13258,0 c -0.5,0 -0.5,0.5 0,0.5 l 0.88258,0 4.5,0 0.75,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-0.5 0,-4 0,-0.5 c 0,0 0.0433,-0.3245 0.10937,-0.3906 0.0661,-0.066 0.18229,-0.1094 0.39063,-0.1094 0.0555,0 0.5,0 0.5,0 l 0,-0.5 c 0,0 -0.4314,0 -0.5,0 z m -1.75,6.5 c -0.41422,0 -0.75,0.3358 -0.75,0.75 0,0.4142 0.33578,0.75 0.75,0.75 0.41422,0 0.75,-0.3358 0.75,-0.75 0,-0.4142 -0.33578,-0.75 -0.75,-0.75 z m -4.5,0 c -0.41422,0 -0.75,0.3358 -0.75,0.75 0,0.4142 0.33578,0.75 0.75,0.75 0.41422,0 0.75,-0.3358 0.75,-0.75 0,-0.4142 -0.33578,-0.75 -0.75,-0.75 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-            </g>
-            <rect y="1194.362" x="360" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-78 72)" color="#000">
-            <g>
-                <path d="m 400.90625,1057.3622 c -0.4,0 -0.90625,0.5 -0.90625,1 l 0,9 c 0,0.5 0.50625,1 0.90625,1 l 15.1875,0 c 0.4,0 0.90625,-0.5 0.90625,-1 l 0,-9 c 0,-0.5 -0.50625,-1 -0.90625,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-                <path d="m 401,1057.3622 c -1,0 -0.5,0.3393 0,0.75 l 7,5.75 8,-5.75 c 0.5,-0.4107 1,-0.75 0,-0.75 l -8,0 z m -1,1.5 0,8.5 c 0,0.5 0.50625,1 0.90625,1 l 15.1875,0 c 0.4,0 0.90625,-0.5 0.90625,-1 l 0,-8.5 -9,6.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-            </g>
-            <rect width="24" height="24" x="396" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-78 72)" color="#000">
-            <g>
-                <path d="m 424,1057.3622 c -0.8125,0 -0.59375,0.3382 -0.1875,0.6719 l 5.6875,4.3281 5.6875,-4.3281 c 0.41835,-0.3184 0.625,-0.6719 -0.1875,-0.6719 z m -1,1.5 0,6.5 c 0,0.5 0.5,1 1,1 l 11,0 c 0.5,0 1,-0.5 1,-1 l 0,-6.5 -6.5,5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 -3)"/>
-                <path d="m 424,1057.3622 c -0.8125,0 -0.59375,0.3382 -0.1875,0.6719 l 5.6875,4.3281 5.6875,-4.3281 c 0.41835,-0.3184 0.625,-0.6719 -0.1875,-0.6719 z m -1,1.5 0,6.5 c 0,0.5 0.5,1 1,1 l 11,0 c 0.5,0 1,-0.5 1,-1 l 0,-6.5 -6.5,5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -3)"/>
-            </g>
-            <rect y="1050.362" x="420" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-78 72)" color="#000">
-            <path d="m 440,1053.3622 4.5,3 4.5,-3 z m 0,1 0,4.5 c 0,0.25 0.3,0.5 0.5,0.5 l 8,0 c 0.2,0 0.55423,-0.256 0.5,-0.5 l 3e-5,-4.5 -4.50003,3.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 440,1053.3622 4.5,3 4.5,-3 z m 0,1 0,4.5 c 0,0.25 0.3,0.5 0.5,0.5 l 8,0 c 0.2,0 0.55423,-0.256 0.5,-0.5 l 3e-5,-4.5 -4.50003,3.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect width="12" height="12" x="438" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-78 72)" color="#000">
-            <g>
-                <path d="m 152.5,74 -3.5,5 -2,-3 c -0.66279,1.165233 -3,4 -3,7 0,4.418278 4.08172,8 8.5,8 4.41828,0 8.5,-3.581722 8.5,-8 0,-3 -2.33721,-5.834767 -3,-7 l -2,3 z" transform="translate(396 70) translate(-140 933.362)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path transform="translate(396 70) translate(-140 933.362)" d="m 152.5,74 -3.5,5 -2,-3 c -0.66279,1.165233 -3,4 -3,7 0,4.418278 4.08172,8 8.5,8 4.41828,0 8.5,-3.581722 8.5,-8 0,-3 -2.33721,-5.834767 -3,-7 l -2,3 z m 0,8 c 0,0 3.5,2.684593 3.5,5 0,1 -1.5,2 -3.5,2 -2,0 -3.5,-1 -3.5,-2 0,-2.236068 3.5,-5 3.5,-5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="396" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-78 72)" color="#000">
-            <g>
-                <path d="m 429.5,1076.3622 -2.5,4 -1.5,-2 c -0.53852,0.9467 -2.5,3.0625 -2.5,5.5 0,3.5899 2.91015,6.5 6.5,6.5 3.58985,0 6.5,-2.9101 6.5,-6.5 0,-2.4375 -1.96148,-4.5533 -2.5,-5.5 l -1.5,2 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 429.5,1076.3622 -2.5,4 -1.5,-2 c -0.53852,0.9467 -2.5,3.0625 -2.5,5.5 0,3.5899 2.91015,6.5 6.5,6.5 3.58985,0 6.5,-2.9101 6.5,-6.5 0,-2.4375 -1.96148,-4.5533 -2.5,-5.5 l -1.5,2 z m 0,6.5 c 0,0 2.5,2.3687 2.5,4.25 0,0.8125 -0.875,1.75 -2.5,1.75 -1.625,0 -2.5,-0.9375 -2.5,-1.75 0,-1.8168 2.5,-4.25 2.5,-4.25 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1074.362" x="420" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-78 72)" color="#000">
-            <g>
-                <path d="m 445.5,1076.3622 -1.5,3 -1.5,-1.5 c -0.33139,0.5826 -1.5,2 -1.5,3.5 0,2.2092 2.29086,4 4.5,4 2.20914,0 4.5,-1.7908 4.5,-4 0,-1.5 -1.16861,-2.9174 -1.5,-3.5 l -1.5,1.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-                <path d="m 445.5,1076.3622 -1.5,3 -1.5,-1.5 c -0.33139,0.5826 -1.5,2 -1.5,3.5 0,2.2092 2.29086,4 4.5,4 2.20914,0 4.5,-1.7908 4.5,-4 0,-1.5 -1.16861,-2.9174 -1.5,-3.5 l -1.5,1.5 z m 0,4.5 c 0,0 1.5,1.3423 1.5,2.5 0,0.5 -0.5,1 -1.5,1 -1,0 -1.5,-0.5 -1.5,-1 0,-1.118 1.5,-2.5 1.5,-2.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            </g>
-            <rect width="12" height="12" x="438" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-78 72)" color="#000">
-            <g>
-                <path d="m 416,1106.3622 -7.5,-5 -7.5,5 0,2 0,7 -1.75,3 c -0.14834,0.2543 -0.25,0.3567 -0.25,0.5 0,0.5 0.63165,0.5 1,0.5 l 17,0 c 0.35499,0 1,0 1,-0.5 0,-0.1462 -0.0866,-0.2199 -0.25,-0.5 l -1.75,-3 0,-7 z m -12,3 c 0.554,0 0.90892,0.4535 1,1 l 0,6 -2,0 0,-2 0,-4 c 0,-0.554 0.446,-1 1,-1 z m 4.5,0 c 0.554,0 1.00866,0.4461 1,1 l 0,4 0,2 -2,0 0,-2 0,-4 c 0,-0.554 0.446,-1 1,-1 z m 4.5,0 c 0.554,0 1,0.446 1,1 l 0,6 -2,0 0,-2 0,-4 c 0,-0.554 0.446,-1 1,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 408.5,1101.3622 -7.5,5 15,0 z m -6.5,6 c -0.55401,0 -1,0.446 -1,1 l 0,7 -1.75,3 c -0.14834,0.2543 -0.25,0.3567 -0.25,0.5 0,0.5 0.63165,0.5 1,0.5 l 17,0 c 0.35499,0 1,0 1,-0.5 0,-0.1462 -0.0866,-0.2199 -0.25,-0.5 l -1.75,-3 0,-7 c 0,-0.554 -0.44599,-1 -1,-1 z m 2,2 c 0.554,0 0.90892,0.4535 1,1 l 0,6 -2,0 0,-2 0,-4 c 0,-0.554 0.446,-1 1,-1 z m 4.5,0 c 0.554,0 1.00866,0.4461 1,1 l 0,4 0,2 -2,0 0,-2 0,-4 c 0,-0.554 0.446,-1 1,-1 z m 4.5,0 c 0.554,0 1,0.446 1,1 l 0,6 -2,0 0,-2 0,-4 c 0,-0.554 0.446,-1 1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="396" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-78 72)" color="#000">
-            <g>
-                <path d="m 435,1105.3622 -5.5,-3 -5.5,3 0,1.9375 0,5.0625 -1,2.5 c 0,0.3611 0.23397,0.5 0.5,0.5 l 12,0 c 0.25638,0 0.5,-0.1389 0.5,-0.5 l -1,-2.5 0,-5.0625 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 -2)"/>
-                <path d="m 429.5,1102.3622 -5.5,3 11,0 z m -4.5,4 c -0.5,0 -1,0.493 -1,0.9375 l 0,5.0625 -1,2.5 c 0,0.3611 0.23397,0.5 0.5,0.5 l 12,0 c 0.25638,0 0.5,-0.1389 0.5,-0.5 l -1,-2.5 0,-5.0625 c 0,-0.4445 -0.5,-0.9375 -1,-0.9375 z m 1.5,1 0.5,0.5 0,1.5 0,3 -1,0 0,-3 0,-1.5 z m 3,0 0.5,0.5 0,1.5 0,3 -1,0 0,-3 0,-1.5 z m 3,0 0.5,0.5 0,1.5 0,3 -1,0 0,-3 0,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -2)"/>
-            </g>
-            <rect y="1098.362" x="420" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-78 72)" color="#000">
-            <g>
-                <path d="m 448,1102.3622 -3.5,-2 -3.5,2 0,5 0,1 -1,1 9,0 -1,-1 0,-1 z m -6,2.5 0.5,-0.5 0.5,0.5 0,2.5 -1,0 z m 2,0 0.5,-0.5 0.5,0.5 0,2.5 -1,0 z m 2,0 0.5,-0.5 0.5,0.5 0,2.5 -1,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-                <path d="m 444.5,1100.3622 -3.5,2 7,0 z m -3,3 c -0.27701,0 -0.5,0.223 -0.5,0.5 l 0,3.5 0,1 -1,1 9,0 -1,-1 0,-1 0,-3.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 0.5,1.5 0.5,-0.5 0.5,0.5 0,2.5 -1,0 z m 2,0 0.5,-0.5 0.5,0.5 0,2.5 -1,0 z m 2,0 0.5,-0.5 0.5,0.5 0,2.5 -1,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-            </g>
-            <rect width="12" height="12" x="438" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-78 72)" color="#000">
-            <g>
-                <path d="m 407,1125.3622 -1,1 0,1 7,0 0,-1 -1,-1 z m -1,3 0,0.5 c 0,1.933 1.56702,3.5 3.5,3.5 1.93298,0 3.5,-1.567 3.5,-3.5 l 0,-0.5 z m 1.1875,15 8.8125,0 0,-6 c 0,-1.5 -0.5,-4 -2,-4 l -1.5,0 -7.5,0 c -1.5,0 -2,2.5 -2,4 l 0,6 2.6875,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-                <path d="m 407,1125.3622 -1,1 0,1 7,0 0,-1 -1,-1 -5,0 z m -1,3 0,0.5 c 0,1.933 1.56702,3.5 3.5,3.5 1.93298,0 3.5,-1.567 3.5,-3.5 l 0,-0.5 -7,0 z m -1,5 c -1.5,0 -2,2.5 -2,4 l 0,6 2.6875,0 6.8125,-10 -7.5,0 z m 9,0 -6.8125,10 8.8125,0 0,-6 c 0,-1.5 -0.5,-4 -2,-4 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-            </g>
-            <rect y="1122.362" x="396" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-78 72)" color="#000">
-            <g>
-                <path d="m 430,1124.8622 -1,0.5 0,1 5,0 0,-1 -1,-0.5 z m -1,2.5 c -0.0333,0.1627 0,0.3274 0,0.5 0,1.3807 1.11931,2.5 2.5,2.5 1.38069,0 2.5,-1.1193 2.5,-2.5 0,-0.1726 0,-0.5 0,-0.5 z m 0,4 c -1.08333,0 -1.98585,1.7917 -2,2.875 l 0,4.125 1.53125,0 4.46875,-7 z m 5.5,0 -4.46875,7 5.96875,0 0,-4.125 c 0,-1.0834 -0.41666,-2.875 -1.5,-2.875 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-2)"/>
-                <path d="m 430,1124.8622 -1,0.5 0,1 5,0 0,-1 -1,-0.5 z m -1,2.5 c -0.0333,0.1627 0,0.3274 0,0.5 0,1.3807 1.11931,2.5 2.5,2.5 1.38069,0 2.5,-1.1193 2.5,-2.5 0,-0.1726 0,-0.5 0,-0.5 z m 0,4 c -1.08333,0 -1.98585,1.7917 -2,2.875 l 0,4.125 1.53125,0 4.46875,-7 z m 5.5,0 -4.46875,7 5.96875,0 0,-4.125 c 0,-1.0834 -0.41666,-2.875 -1.5,-2.875 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-2)"/>
-            </g>
-            <rect width="18" height="18" x="420" y="1122.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-78 72)" color="#000">
-            <g>
-                <path d="m 444,1124.3622 3,0 0,-1 -3,0 z m 0,0.75 c 0,0.9665 0.53351,1.75 1.5,1.75 0.96649,0 1.5,-0.7835 1.5,-1.75 l 0,-0.25 -3,0 z m -1,2.25 c -0.5,0 -1,1.5 -1,2 l 0,3 1.59375,0 3.40625,-5 z m 5,0 -3.40625,5 4.40625,0 0,-3 c 0,-0.5 -0.5,-2 -1,-2 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-                <path d="m 444,1124.3622 3,0 0,-1 -3,0 z m 0,0.75 c 0,0.9665 0.53351,1.75 1.5,1.75 0.96649,0 1.5,-0.7835 1.5,-1.75 l 0,-0.25 -3,0 z m -1,2.25 c -0.5,0 -1,1.5 -1,2 l 0,3 1.59375,0 3.40625,-5 z m 5,0 -3.40625,5 4.40625,0 0,-3 c 0,-0.5 -0.5,-2 -1,-2 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-            </g>
-            <rect y="1122.362" x="438" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-78 72)" color="#000">
-            <g>
-                <path d="m 6,1008.3622 c -0.554,0 -1,0.446 -1,1 l 0,3 0,7 0,3 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 l 0,-2 3,0 0,2 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 l 0,-2 3,0 0,2 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 l 0,-2 3,0 0,2 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 l 0,-13 c 0,-0.554 -0.446,-1 -1,-1 -0.554,0 -1,0.446 -1,1 l 0,2 -3,0 0,-2 c 0,-0.554 -0.446,-1 -1,-1 -0.554,0 -1,0.446 -1,1 l 0,2 -3,0 0,-2 c 0,-0.554 -0.446,-1 -1,-1 -0.554,0 -1,0.446 -1,1 l 0,2 -3,0 0,-2 c 0,-0.554 -0.446,-1 -1,-1 z m 1,5 3,0 0,5 -3,0 z m 5,0 3,0 0,5 -3,0 z m 5,0 3,0 0,5 -3,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(395 142)"/>
-                <path d="m 6,1008.3622 c -0.554,0 -1,0.446 -1,1 l 0,3 0,7 0,3 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 l 0,-2 3,0 0,2 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 l 0,-2 3,0 0,2 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 l 0,-2 3,0 0,2 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 l 0,-13 c 0,-0.554 -0.446,-1 -1,-1 -0.554,0 -1,0.446 -1,1 l 0,2 -3,0 0,-2 c 0,-0.554 -0.446,-1 -1,-1 -0.554,0 -1,0.446 -1,1 l 0,2 -3,0 0,-2 c 0,-0.554 -0.446,-1 -1,-1 -0.554,0 -1,0.446 -1,1 l 0,2 -3,0 0,-2 c 0,-0.554 -0.446,-1 -1,-1 z m 1,5 3,0 0,5 -3,0 z m 5,0 3,0 0,5 -3,0 z m 5,0 3,0 0,5 -3,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(395 142)"/>
-            </g>
-            <rect y="1146.362" x="396" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-78 72)" color="#000">
-            <g>
-                <path d="m 425,1151.3622 c -0.5,0 -0.5,0.5 -0.5,0.5 l 0,2.5 0,5.5 0,2 c 0,0 0,0.5 0.5,0.5 0.10655,0 0.29254,0 0.5,0 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-1.5 1.5,0 0,1.5 c 0,0 0,0.5 0.5,0.5 0.13055,0 0.41998,0 0.5,0 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-1.5 1.5,0 0,1.5 c 0,0 0,0.5 0.5,0.5 0.15024,0 0.40981,0 0.5,0 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-1.5 1.5,0 0,1.5 c 0,0 0,0.5 0.5,0.5 0.19083,0 0.38799,0 0.5,0 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-10 c 0,0 0,-0.5 -0.5,-0.5 -0.17136,0 -0.39867,0 -0.5,0 -0.5,0 -0.5,0.5 -0.5,0.5 l 0,2 -1.5,0 0,-2 c 0,0 0,-0.5 -0.5,-0.5 -0.0919,0 -0.34778,0 -0.5,0 -0.5,0 -0.5,0.5 -0.5,0.5 l 0,2 -1.5,0 0,-2 c 0,0 0,-0.5 -0.5,-0.5 -0.0981,0 -0.33377,0 -0.5,0 -0.5,0 -0.5,0.5 -0.5,0.5 l 0,2 -1.5,0 0,-2 c 0,0 0,-0.5 -0.5,-0.5 -0.19276,0 -0.38691,0 -0.5,0 z m 1,4 1.5,0 0,3.5 -1.5,0 z m 3,0 1.5,0 0,3.5 -1.5,0 z m 3,0 1.5,0 0,3.5 -1.5,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(0 -1)"/>
-                <path d="m 425,1151.3622 c -0.5,0 -0.5,0.5 -0.5,0.5 l 0,2.5 0,5.5 0,2 c 0,0 0,0.5 0.5,0.5 0.10655,0 0.29254,0 0.5,0 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-1.5 1.5,0 0,1.5 c 0,0 0,0.5 0.5,0.5 0.13055,0 0.41998,0 0.5,0 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-1.5 1.5,0 0,1.5 c 0,0 0,0.5 0.5,0.5 0.15024,0 0.40981,0 0.5,0 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-1.5 1.5,0 0,1.5 c 0,0 0,0.5 0.5,0.5 0.19083,0 0.38799,0 0.5,0 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-10 c 0,0 0,-0.5 -0.5,-0.5 -0.17136,0 -0.39867,0 -0.5,0 -0.5,0 -0.5,0.5 -0.5,0.5 l 0,2 -1.5,0 0,-2 c 0,0 0,-0.5 -0.5,-0.5 -0.0919,0 -0.34778,0 -0.5,0 -0.5,0 -0.5,0.5 -0.5,0.5 l 0,2 -1.5,0 0,-2 c 0,0 0,-0.5 -0.5,-0.5 -0.0981,0 -0.33377,0 -0.5,0 -0.5,0 -0.5,0.5 -0.5,0.5 l 0,2 -1.5,0 0,-2 c 0,0 0,-0.5 -0.5,-0.5 -0.19276,0 -0.38691,0 -0.5,0 z m 1,4 1.5,0 0,3.5 -1.5,0 z m 3,0 1.5,0 0,3.5 -1.5,0 z m 3,0 1.5,0 0,3.5 -1.5,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-            </g>
-            <rect width="18" height="18" x="420" y="1146.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-78 72)" color="#000">
-            <g>
-                <path d="m 441.5,1148.8622 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1.5 0,4 0,1.5 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-1 1,0 0,1 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.2541 0.5,-0.5 l 0,-1 1,0 0,1 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.2541 0.5,-0.5 l 0,-1 1,0 0,1 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-7 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1 -1,0 0,-1 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1 -1,0 0,-1 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 -0.277,0 -0.5,0.2474 -0.5,0.5 l 0,1 -1,0 0,-1 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 0.5,2.5 1,0 0,3 -1,0 z m 2,0 1,0 0,3 -1,0 z m 2,0 1,0 0,3 -1,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(0 -1)"/>
-                <path d="m 441.5,1148.8622 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1.5 0,4 0,1.5 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-1 1,0 0,1 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.2543 0.5,-0.5 l 0,-1 1,0 0,1 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.2541 0.5,-0.5 l 0,-1 1,0 0,1 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-7 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1 -1,0 0,-1 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1 -1,0 0,-1 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 -0.277,0 -0.5,0.2474 -0.5,0.5 l 0,1 -1,0 0,-1 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 0.5,2.5 1,0 0,3 -1,0 z m 2,0 1,0 0,3 -1,0 z m 2,0 1,0 0,3 -1,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-            </g>
-            <rect y="1146.362" x="438" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-78 72)" color="#000">
-            <g>
-                <path d="m 11,1006.3622 -2,1 -2,1 0,15 c 0,0.5 0.5,1 1,1 0.5,0 1,-0.5 1,-1 l 0,-9 c 0,0 1.000008,-0.5 2.00008,-1 1.99992,-0.9999 4.211171,2.8943 6.00004,1.9999 2.00008,-1 3,-1.4999 3,-1.4999 l 0,-7 c 0,0 -1.00012,0.5 -3.00012,1.5 -1.788869,0.8944 -3.99984,-3 -6,-2 z" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linecap="round" stroke-linejoin="round" fill="none" transform="translate(395 166)"/>
-                <path d="m 11,1006.3622 -2,1 -2,1 0,15 c 0,0.5 0.5,1 1,1 0.5,0 1,-0.5 1,-1 l 0,-9 c 0,0 1.000008,-0.5 2.00008,-1 1.99992,-0.9999 4.211171,2.8943 6.00004,1.9999 2.00008,-1 3,-1.4999 3,-1.4999 l 0,-7 c 0,0 -1.00012,0.5 -3.00012,1.5 -1.788869,0.8944 -3.99984,-3 -6,-2 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(395 166)"/>
-            </g>
-            <rect y="1170.362" x="396" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 486,1052.3622 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m -5.75,4 0.5,2 c 0.25,1 0.84716,1 1.59375,1 l 1.65625,0 c 0.59375,1 0.31467,2.4718 0.5,4 l -0.90625,0 c -1,0 -2.59375,1 -1.59375,3 l 1.5,3 c 1,2 2.5,0.5 2,-0.5 l -1.5,-3 c -0.25,-0.5 0.2643,-0.5 0.5,-0.5 1,0 2,0 2,0 l 0.46793,0 c 0,0 1.18374,2.6276 2.5781,4.4285 0.51472,0.6648 1.08486,1.5715 1.7985,1.5715 0.5,0 1.35684,-0.7727 0.44491,-1.861 -1.70774,-2.038 -2.78944,-4.139 -2.78944,-5.139 0,-1.1632 -0.20434,-3.6127 -0.5,-5 l 1.5,0 c 0.488,0.9781 1.25,2.5 1.25,2.5 0.55274,0.9574 1.75,0.8851 1.75,0 0,-0.1215 0,-0.3889 -0.13952,-0.6768 l -1.61048,-3.3232 c -0.10278,-0.2121 -0.25342,-0.5 -1,-0.5 l -2.25,0 -3.5625,0 -1.9375,0 -0.75,-2.5 c -0.3,-1 -1.75,-1 -1.75,0 0,0.5 0.17716,1.1071 0.25,1.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 486,1052.3622 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m -5.75,4 0.5,2 c 0.25,1 0.84716,1 1.59375,1 l 1.65625,0 c 0.59375,1 0.31467,2.4718 0.5,4 l -0.90625,0 c -1,0 -2.59375,1 -1.59375,3 l 1.5,3 c 1,2 2.5,0.5 2,-0.5 l -1.5,-3 c -0.25,-0.5 0.2643,-0.5 0.5,-0.5 l 2.46793,0 c 0,0 1.18374,2.6276 2.5781,4.4285 0.51472,0.6648 1.08486,1.5715 1.7985,1.5715 0.5,0 1.35684,-0.7727 0.44491,-1.861 -1.70774,-2.038 -2.78944,-4.139 -2.78944,-5.139 0,-1.1632 -0.20434,-3.6127 -0.5,-5 l 1.5,0 c 0.488,0.9781 1.25,2.5 1.25,2.5 0.55274,0.9574 1.75,0.8851 1.75,0 0,-0.1215 0,-0.3889 -0.13952,-0.6768 l -1.61048,-3.3232 c -0.10278,-0.2121 -0.25342,-0.5 -1,-0.5 l -7.75,0 -0.75,-2.5 c -0.3,-1 -1.75,-1 -1.75,0 0,0.5 0.17716,1.1071 0.25,1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="474" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 508.34321,1053.3622 c -0.75576,0 -1.36842,0.6126 -1.36842,1.3684 0,0.7558 0.61266,1.3684 1.36842,1.3684 0.75576,0 1.36842,-0.6126 1.36842,-1.3684 0,-0.7558 -0.61266,-1.3684 -1.36842,-1.3684 z m -3.93421,2.7368 0.34211,1.3685 c 0.17105,0.6842 0.57963,0.6842 1.09046,0.6842 l 1.13322,0 c 0.40625,0.6842 0.2153,1.7965 0.34211,2.8421 l -0.62007,0 c -0.68421,0 -1.77465,0.6842 -1.09046,2.0526 l 1.02632,2.0527 c 0.68419,1.3684 1.71051,0.3421 1.36842,-0.3421 l -1.02632,-2.0527 c -0.17105,-0.3421 0.18084,-0.3421 0.34211,-0.3421 l 1.68858,0 c 0,0 0.80993,1.6926 1.76396,2.9248 0.35218,0.4548 0.74228,1.0752 1.23056,1.0752 0.3421,0 0.92836,-0.5287 0.30441,-1.2733 -1.16845,-1.3944 -1.90857,-2.832 -1.90857,-3.5162 0,-0.7958 -0.13981,-2.4718 -0.3421,-3.421 l 1.02632,0 c 0.33389,0.6692 0.91994,1.7105 0.91994,1.7105 0.37819,0.6551 1,0.6056 1,0 0,-0.083 -0.01,-0.2617 -0.0955,-0.4631 l -0.96922,-2.2737 c -0.0633,-0.1484 -0.17339,-0.3421 -0.68421,-0.3421 l -5.30263,0 -0.51316,-1.7106 c -0.20526,-0.6842 -1.19737,-0.6842 -1.19737,0 0,0.3421 0.12121,0.7575 0.17105,1.0263 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1 -1)"/>
-                <path d="m 508.34321,1053.3622 c -0.75576,0 -1.36842,0.6126 -1.36842,1.3684 0,0.7558 0.61266,1.3684 1.36842,1.3684 0.75576,0 1.36842,-0.6126 1.36842,-1.3684 0,-0.7558 -0.61266,-1.3684 -1.36842,-1.3684 z m -3.93421,2.7368 0.34211,1.3685 c 0.17105,0.6842 0.57963,0.6842 1.09046,0.6842 l 1.13322,0 c 0.40625,0.6842 0.2153,1.7965 0.34211,2.8421 l -0.62007,0 c -0.68421,0 -1.77465,0.6842 -1.09046,2.0526 l 1.02632,2.0527 c 0.68419,1.3684 1.71051,0.3421 1.36842,-0.3421 l -1.02632,-2.0527 c -0.17105,-0.3421 0.18084,-0.3421 0.34211,-0.3421 l 1.68858,0 c 0,0 0.80993,1.6926 1.76396,2.9248 0.35218,0.4548 0.74228,1.0752 1.23056,1.0752 0.3421,0 0.92836,-0.5287 0.30441,-1.2733 -1.16845,-1.3944 -1.90857,-2.832 -1.90857,-3.5162 0,-0.7958 -0.13981,-2.4718 -0.3421,-3.421 l 1.02632,0 c 0.33389,0.6692 0.91994,1.7105 0.91994,1.7105 0.37819,0.6551 1,0.6056 1,0 0,-0.083 -0.01,-0.2617 -0.0955,-0.4631 l -0.96922,-2.2737 c -0.0633,-0.1484 -0.17339,-0.3421 -0.68421,-0.3421 l -5.30263,0 -0.51316,-1.7106 c -0.20526,-0.6842 -1.19737,-0.6842 -1.19737,0 0,0.3421 0.12121,0.7575 0.17105,1.0263 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            </g>
-            <rect y="1050.362" x="498" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)">
-            <g color="#000">
-                <path d="m 523,1052.3622 c -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z m -2.59375,1.2188 c -0.21864,0 -0.40625,0.1329 -0.40625,0.4062 0,0.2732 0.0851,0.6291 0.125,0.8438 l 0.28125,1 c 0.14851,0.5435 0.46689,0.5312 0.875,0.5312 l 0.90625,0 c 0.32455,0.5467 0.21119,1.1646 0.3125,2 l -0.5,0 c -0.54661,0 -1.45283,0.3131 -0.90625,1.4063 l 0.8125,1.6562 c 0.19635,0.3927 0.39466,0.4352 0.59375,0.4375 0.35509,0 0.65107,-0.3574 0.5,-0.7187 l -0.625,-1.5 c -0.11787,-0.2819 0.15241,-0.2813 0.28125,-0.2813 l 1.34375,0 c 0,0 0.45658,1.2032 1.21875,2.1875 0.28135,0.3634 0.57866,0.8125 0.96875,0.8125 0.2733,0 0.74847,-0.3739 0.25,-0.9687 -0.93348,-1.1141 -1.4375,-2.4847 -1.4375,-3.0313 0,-0.6357 -0.18215,-1.2417 -0.34375,-2 l 0.8125,0 c 0.26675,0.5347 0.71875,1.375 0.71875,1.375 0.30214,0.5233 0.8125,0.4838 0.8125,0 0,-0.067 0.006,-0.2142 -0.0625,-0.375 l -0.75,-1.7187 c -0.0503,-0.1186 -0.12315,-0.2813 -0.53125,-0.2813 l -4.28125,0 -0.40625,-1.375 c -0.082,-0.2733 -0.34386,-0.4062 -0.5625,-0.4062 z" transform="translate(-1 -1)" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 523,1052.3622 c -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z m -2.59375,1.2188 c -0.21864,0 -0.40625,0.1329 -0.40625,0.4062 0,0.2732 0.0851,0.6291 0.125,0.8438 l 0.28125,1 c 0.14851,0.5435 0.46689,0.5312 0.875,0.5312 l 0.90625,0 c 0.32455,0.5467 0.21119,1.1646 0.3125,2 l -0.5,0 c -0.54661,0 -1.45283,0.3131 -0.90625,1.4063 l 0.8125,1.6562 c 0.19635,0.3927 0.39466,0.4352 0.59375,0.4375 0.35509,0 0.65107,-0.3574 0.5,-0.7187 l -0.625,-1.5 c -0.11787,-0.2819 0.15241,-0.2813 0.28125,-0.2813 l 1.34375,0 c 0,0 0.45658,1.2032 1.21875,2.1875 0.28135,0.3634 0.57866,0.8125 0.96875,0.8125 0.2733,0 0.74847,-0.3739 0.25,-0.9687 -0.93348,-1.1141 -1.4375,-2.4847 -1.4375,-3.0313 0,-0.6357 -0.18215,-1.2417 -0.34375,-2 l 0.8125,0 c 0.26675,0.5347 0.71875,1.375 0.71875,1.375 0.30214,0.5233 0.8125,0.4838 0.8125,0 0,-0.067 0.006,-0.2142 -0.0625,-0.375 l -0.75,-1.7187 c -0.0503,-0.1186 -0.12315,-0.2813 -0.53125,-0.2813 l -4.28125,0 -0.40625,-1.375 c -0.082,-0.2733 -0.34386,-0.4062 -0.5625,-0.4062 z" transform="translate(-1 -1)" fill="#444" overflow="visible" enable-background="accumulate"/>
-                <rect y="1050.362" x="516" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            </g>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 13.5,1007.8622 c -4.68324,0 -8.5,3.8168 -8.5,8.5 0,4.6832 3.81676,8.5 8.5,8.5 4.68324,0 8.5,-3.8168 8.5,-8.5 0,-4.6832 -3.81676,-8.5 -8.5,-8.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(473 69.5)"/>
-                <path d="m 13.5,1007.8622 c -4.68324,0 -8.5,3.8168 -8.5,8.5 0,4.6832 3.81676,8.5 8.5,8.5 4.68324,0 8.5,-3.8168 8.5,-8.5 0,-4.6832 -3.81676,-8.5 -8.5,-8.5 z m 0,1.5 c 2.66601,0 4.97358,1.4738 6.15625,3.6563 -1.116,0.7404 -2.14179,1.1273 -2.15625,1.8437 -0.0101,0.4999 0,0.6412 0,1 0,0.5 0.26049,1.1434 1,1.5 l 1.75,0.8438 c -0.20034,0.7408 -0.52239,1.4106 -0.9375,2.0312 L 18,1019.3622 c -0.75,-0.5 -1.5,-0.8333 -2,-0.5 l -1.5,1 c -0.69338,0.4623 -0.62097,1 -0.5,1.5 l 0.46875,1.9375 c -0.31724,0.044 -0.63913,0.062 -0.96875,0.062 -0.69329,0 -1.36854,-0.095 -2,-0.2812 l 0,-1.7188 c 0,-1 -0.5,-1.5 -1,-2 -0.5,-0.5 -1,-1 -2,-1 l -1.71875,0 C 6.59519,1017.7307 6.5,1017.0555 6.5,1016.3622 c 0,-3.8778 3.12216,-7 7,-7 z m -3,3.5 -0.5,2 c -0.1418893,0.5676 -0.52003,1.1533 0,1.5 l 1.5,1 c 1,0.6667 1.44098,0.2795 2,0 l 1,-0.5 c 0.74536,-0.3727 1,-0.5 1,-1.5 l 0,-2 c 0,-0.5 0.0082,-0.7984 -1,-1 l -2.5,-0.5 c -1.04726,-0.2095 -1.244345,-0.023 -1.5,1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(473 69.5)"/>
-            </g>
-            <rect width="24" height="24" x="474" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 507.5,1078.3622 c -3.58129,0 -6.5,2.9188 -6.5,6.5 0,3.5812 2.91871,6.5 6.5,6.5 3.58129,0 6.5,-2.9188 6.5,-6.5 0,-3.5812 -2.91871,-6.5 -6.5,-6.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 -2)"/>
-                <path d="m 507.5,1078.3622 c -3.58129,0 -6.5,2.9188 -6.5,6.5 0,3.5812 2.91871,6.5 6.5,6.5 3.58129,0 6.5,-2.9188 6.5,-6.5 0,-3.5812 -2.91871,-6.5 -6.5,-6.5 z m 0,1.1471 c 2.03872,0 3.80332,1.127 4.70772,2.796 -0.85343,0.5661 -1.63784,0.862 -1.64889,1.4098 -0.007,0.3825 0,0.4903 0,0.7647 0,0.3824 0.19918,0.8743 0.76471,1.147 l 1.33822,0.6453 c -0.15319,0.5666 -0.39949,1.0788 -0.7169,1.5533 l -1.00369,-0.6692 c -0.57352,-0.3823 -1.14704,-0.637 -1.52941,-0.3823 l -1.14705,0.7648 c -0.53024,0.3535 -0.47486,0.7648 -0.38236,1.147 l 0.35845,1.4817 c -0.24259,0.033 -0.48875,0.047 -0.7408,0.047 -0.53017,0 -1.04653,-0.074 -1.5294,-0.215 l 0,-1.3146 c 0,-0.7646 -0.38236,-1.147 -0.76473,-1.5293 -0.38233,-0.3824 -0.7647,-0.7647 -1.52941,-0.7647 l -1.31434,0 c -0.14227,-0.4827 -0.21506,-0.9988 -0.21506,-1.5291 0,-2.9655 2.38754,-5.353 5.35294,-5.353 z m -2.29413,2.6764 -0.38233,1.5294 c -0.10848,0.4342 -0.39769,0.882 0,1.1471 l 1.14706,0.7646 c 0.76469,0.5099 1.10192,0.2139 1.5294,0 l 0.76471,-0.3822 c 0.56998,-0.2851 0.76469,-0.3824 0.76469,-1.147 l 0,-1.5294 c 0,-0.3825 0.006,-0.6106 -0.76469,-0.7647 l -1.91177,-0.3826 c -0.80084,-0.16 -0.95156,-0.018 -1.14707,0.7648 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -2)"/>
-            </g>
-            <rect y="1074.362" x="498" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 523.5,1076.3622 c -2.47936,0 -4.5,2.0207 -4.5,4.5 0,2.4793 2.02064,4.5 4.5,4.5 2.47936,0 4.5,-2.0207 4.5,-4.5 0,-2.4793 -2.02064,-4.5 -4.5,-4.5 z m 0,0.7941 c 1.41142,0 2.63307,0.7803 3.25919,1.9358 -0.59083,0.3919 -1.13389,0.5967 -1.14154,0.976 -0.005,0.2647 0,0.3394 0,0.5294 0,0.2647 0.1379,0.6053 0.52941,0.7941 l 0.92647,0.4467 c -0.10606,0.3922 -0.27657,0.7468 -0.49632,1.0754 l -0.69486,-0.4633 c -0.39706,-0.2647 -0.79411,-0.4411 -1.05882,-0.2647 l -0.79412,0.5294 c -0.36708,0.2448 -0.32875,0.5295 -0.2647,0.7942 l 0.24815,1.0257 c -0.16794,0.023 -0.33836,0.033 -0.51286,0.033 -0.36704,0 -0.72452,-0.051 -1.05882,-0.1489 l 0,-0.91 c 0,-0.5294 -0.26471,-0.7941 -0.52942,-1.0588 -0.2647,-0.2647 -0.52941,-0.5294 -1.05882,-0.5294 l -0.90993,0 c -0.0985,-0.3342 -0.14889,-0.6915 -0.14889,-1.0586 0,-2.053 1.65291,-3.7059 3.70588,-3.7059 z m -1.58824,1.853 -0.2647,1.0588 c -0.0751,0.3005 -0.27532,0.6106 0,0.7941 l 0.79412,0.5294 c 0.52941,0.353 0.76287,0.148 1.05882,0 l 0.52941,-0.2647 c 0.3946,-0.1973 0.52941,-0.2647 0.52941,-0.7941 l 0,-1.0588 c 0,-0.2647 0.004,-0.4227 -0.52941,-0.5294 l -1.32353,-0.2648 c -0.55443,-0.1108 -0.65877,-0.013 -0.79412,0.5295 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-                <path d="m 523.5,1076.3622 c -2.47936,0 -4.5,2.0207 -4.5,4.5 0,2.4793 2.02064,4.5 4.5,4.5 2.47936,0 4.5,-2.0207 4.5,-4.5 0,-2.4793 -2.02064,-4.5 -4.5,-4.5 z m 0,0.7941 c 1.41142,0 2.63307,0.7803 3.25919,1.9358 -0.59083,0.3919 -1.13389,0.5967 -1.14154,0.976 -0.005,0.2647 0,0.3394 0,0.5294 0,0.2647 0.1379,0.6053 0.52941,0.7941 l 0.92647,0.4467 c -0.10606,0.3922 -0.27657,0.7468 -0.49632,1.0754 l -0.69486,-0.4633 c -0.39706,-0.2647 -0.79411,-0.4411 -1.05882,-0.2647 l -0.79412,0.5294 c -0.36708,0.2448 -0.32875,0.5295 -0.2647,0.7942 l 0.24815,1.0257 c -0.16794,0.023 -0.33836,0.033 -0.51286,0.033 -0.36704,0 -0.72452,-0.051 -1.05882,-0.1489 l 0,-0.91 c 0,-0.5294 -0.26471,-0.7941 -0.52942,-1.0588 -0.2647,-0.2647 -0.52941,-0.5294 -1.05882,-0.5294 l -0.90993,0 c -0.0985,-0.3342 -0.14889,-0.6915 -0.14889,-1.0586 0,-2.053 1.65291,-3.7059 3.70588,-3.7059 z m -1.58824,1.853 -0.2647,1.0588 c -0.0751,0.3005 -0.27532,0.6106 0,0.7941 l 0.79412,0.5294 c 0.52941,0.353 0.76287,0.148 1.05882,0 l 0.52941,-0.2647 c 0.3946,-0.1973 0.52941,-0.2647 0.52941,-0.7941 l 0,-1.0588 c 0,-0.2647 0.004,-0.4227 -0.52941,-0.5294 l -1.32353,-0.2648 c -0.55443,-0.1108 -0.65877,-0.013 -0.79412,0.5295 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            </g>
-            <rect width="12" height="12" x="516" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path transform="translate(474 94) translate(-360 956.362)" d="m 372.5,53 c -6.5,0 -9.5,6.5 -9.5,6.5 0,0 3,6.5 9.5,6.5 6.5,0 9.5,-6.5 9.5,-6.5 0,0 -3,-6.5 -9.5,-6.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-                <path d="M 372.5 53 C 366 53 363 59.5 363 59.5 C 363 59.5 366 66 372.5 66 C 379 66 382 59.5 382 59.5 C 382 59.5 379 53 372.5 53 z M 369.5 58 C 369.777 58 370 58.223 370 58.5 L 370 59 L 372 59 L 372 58.5 C 372 58.223 372.223 58 372.5 58 C 372.777 58 373 58.223 373 58.5 L 373 59 L 375 59 L 375 58.5 C 375 58.223 375.223 58 375.5 58 C 375.777 58 376 58.223 376 58.5 L 376 59 L 377.5 59 C 377.777 59 378 59.223 378 59.5 C 378 59.777 377.777 60 377.5 60 L 376 60 L 376 60.5 C 376 60.777 375.777 61 375.5 61 C 375.223 61 375 60.777 375 60.5 L 375 60 L 373 60 L 373 60.5 C 373 60.777 372.777 61 372.5 61 C 372.223 61 372 60.777 372 60.5 L 372 60 L 370 60 L 370 60.5 C 370 60.777 369.777 61 369.5 61 C 369.223 61 369 60.777 369 60.5 L 369 60 L 367.5 60 C 367.223 60 367 59.777 367 59.5 C 367 59.223 367.223 59 367.5 59 L 369 59 L 369 58.5 C 369 58.223 369.223 58 369.5 58 z" transform="translate(474 94) translate(-360 956.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="474" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 507.5,1102.3622 c -4.78947,0 -6.5,4.5 -6.5,4.5 0,0 1.71053,4.5 6.5,4.5 4.78947,0 6.5,-4.5 6.5,-4.5 0,0 -1.71053,-4.5 -6.5,-4.5 z m -2.25,3 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,0.75 1.75,0 0,-0.75 c 0,-0.1385 0.1115,-0.25 0.25,-0.25 0.1385,0 0.25,0.1115 0.25,0.25 l 0,0.75 1.75,0 0,-0.75 c 0,-0.1385 0.1115,-0.25 0.25,-0.25 0.1385,0 0.28359,0.1156 0.25,0.25 l 0,0.75 0.5625,0 c 0.24622,0 0.4375,0.223 0.4375,0.5 0,0.277 -0.19128,0.5 -0.4375,0.5 l -0.5625,0 0,0.75 c 0,0.1385 -0.1115,0.25 -0.25,0.25 -0.1385,0 -0.21641,-0.1156 -0.25,-0.25 l 0,-0.75 -1.75,0 0,0.75 c 0,0.1385 -0.1115,0.25 -0.25,0.25 -0.1385,0 -0.25,-0.1115 -0.25,-0.25 l 0,-0.75 -1.75,0 0,0.75 c 0,0.1385 -0.1115,0.25 -0.25,0.25 -0.1385,0 -0.25,-0.1115 -0.25,-0.25 l 0,-0.75 -0.5625,0 c -0.24622,0 -0.4375,-0.223 -0.4375,-0.5 0,-0.277 0.19128,-0.5 0.4375,-0.5 l 0.5625,0 0,-0.75 c 0,-0.1385 0.1115,-0.25 0.25,-0.25 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-                <path d="m 507.5,1102.3622 c -4.78947,0 -6.5,4.5 -6.5,4.5 0,0 1.71053,4.5 6.5,4.5 4.78947,0 6.5,-4.5 6.5,-4.5 0,0 -1.71053,-4.5 -6.5,-4.5 z m -2.25,3 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,0.75 1.75,0 0,-0.75 c 0,-0.1385 0.1115,-0.25 0.25,-0.25 0.1385,0 0.25,0.1115 0.25,0.25 l 0,0.75 1.75,0 0,-0.75 c 0,-0.1385 0.1115,-0.25 0.25,-0.25 0.1385,0 0.28359,0.1156 0.25,0.25 l 0,0.75 0.5625,0 c 0.24622,0 0.4375,0.223 0.4375,0.5 0,0.277 -0.19128,0.5 -0.4375,0.5 l -0.5625,0 0,0.75 c 0,0.1385 -0.1115,0.25 -0.25,0.25 -0.1385,0 -0.21641,-0.1156 -0.25,-0.25 l 0,-0.75 -1.75,0 0,0.75 c 0,0.1385 -0.1115,0.25 -0.25,0.25 -0.1385,0 -0.25,-0.1115 -0.25,-0.25 l 0,-0.75 -1.75,0 0,0.75 c 0,0.1385 -0.1115,0.25 -0.25,0.25 -0.1385,0 -0.25,-0.1115 -0.25,-0.25 l 0,-0.75 -0.5625,0 c -0.24622,0 -0.4375,-0.223 -0.4375,-0.5 0,-0.277 0.19128,-0.5 0.4375,-0.5 l 0.5625,0 0,-0.75 c 0,-0.1385 0.1115,-0.25 0.25,-0.25 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1098.362" x="498" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 522.5,1101.3622 c -3.25,0 -4.5,3 -4.5,3 0,0 1.25,3 4.5,3 3.25,0 4.5,-3 4.5,-3 0,0 -1.25,-3 -4.5,-3 z m -1,2.5 1,0 0.5,0 1,0 0.5,0 0.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 0,0.1385 -0.1115,0.25 -0.25,0.25 l -0.5,0 -0.5,0 -1,0 -0.5,0 -1,0 -0.5,0 -0.75,0 c -0.1385,0 -0.25,-0.1115 -0.25,-0.25 0,-0.1385 0.1115,-0.25 0.25,-0.25 l 0.75,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 522.5,1101.3622 c -3.25,0 -4.5,3 -4.5,3 0,0 1.25,3 4.5,3 3.25,0 4.5,-3 4.5,-3 0,0 -1.25,-3 -4.5,-3 z m -1,2.5 1,0 0.5,0 1,0 0.5,0 0.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 0,0.1385 -0.1115,0.25 -0.25,0.25 l -0.5,0 -0.5,0 -1,0 -0.5,0 -1,0 -0.5,0 -0.75,0 c -0.1385,0 -0.25,-0.1115 -0.25,-0.25 0,-0.1385 0.1115,-0.25 0.25,-0.25 l 0.75,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="12" height="12" x="516" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 484,1125.3622 c -3.31371,0 -6,2.6863 -6,6 0,3.3137 2.68629,6 6,6 l 5,0 4.5,4.5 c 0.31628,0.3163 0.50625,0.5 0.90625,0.5 0.125,0 0.28125,0 0.4375,-0.1562 0.1563,-0.1563 0.15625,-0.3125 0.15625,-0.4375 0,-0.4 -0.21788,-0.6242 -0.5,-0.9063 l -4.5,-4.5 0,-5 c 0,-3.3137 -2.68629,-6 -6,-6 z m 5,8 0,3 -3,0 z m -9.5,4 c -0.82843,0 -1.5,0.6716 -1.5,1.5 0,0.8284 0.67157,1.5 1.5,1.5 0.82843,0 1.5,-0.6716 1.5,-1.5 0,-0.8284 -0.67157,-1.5 -1.5,-1.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-                <path d="m 484,1125.3622 c -3.31371,0 -6,2.6863 -6,6 0,3.3137 2.68629,6 6,6 l 5,0 4.5,4.5 c 0.31628,0.3163 0.50625,0.5 0.90625,0.5 0.125,0 0.28125,0 0.4375,-0.1562 0.1563,-0.1563 0.15625,-0.3125 0.15625,-0.4375 0,-0.4 -0.21788,-0.6242 -0.5,-0.9063 l -4.5,-4.5 0,-5 c 0,-3.3137 -2.68629,-6 -6,-6 z m 5,8 0,3 -3,0 z m -9.5,4 c -0.82843,0 -1.5,0.6716 -1.5,1.5 0,0.8284 0.67157,1.5 1.5,1.5 0.82843,0 1.5,-0.6716 1.5,-1.5 0,-0.8284 -0.67157,-1.5 -1.5,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1122.362" x="474" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 505.5,1124.3622 c -2.53402,0 -4.5,1.966 -4.5,4.5 0,2.534 2.14246,4.4984 4.67648,4.5 l 3.32352,0 4,4 1,0 0,-1 -4,-4 0,-3.3236 c 0,-2.534 -1.96599,-4.6764 -4.5,-4.6764 z m 3.5,5.7058 0,2.2942 -2.5,0 z m -6.85294,3.2942 c -0.63351,0 -1.14706,0.5135 -1.14706,1.147 0,0.6335 0.51355,1.1471 1.14706,1.1471 0.6335,0 1.14706,-0.5136 1.14706,-1.1471 0,-0.6335 -0.51356,-1.147 -1.14706,-1.147 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-                <path d="m 505.5,1124.3622 c -2.53402,0 -4.5,1.966 -4.5,4.5 0,2.534 2.14246,4.4984 4.67648,4.5 l 3.32352,0 4,4 1,0 0,-1 -4,-4 0,-3.3236 c 0,-2.534 -1.96599,-4.6764 -4.5,-4.6764 z m 3.5,5.7058 0,2.2942 -2.5,0 z m -6.85294,3.2942 c -0.63351,0 -1.14706,0.5135 -1.14706,1.147 0,0.6335 0.51355,1.1471 1.14706,1.1471 0.6335,0 1.14706,-0.5136 1.14706,-1.1471 0,-0.6335 -0.51356,-1.147 -1.14706,-1.147 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="18" height="18" x="498" y="1122.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 519.00003,1127.3621 c 0,1.6569 1.34314,3 3,3 l 2.5,0 2.99997,3.0001 0.5,0 -3e-5,-0.4999 -2.99997,-3.0001 0,-2.5 c 0,-1.6569 -1.34315,-3 -2.99999,-3 -1.65684,-10e-5 -2.99998,1.343 -2.99998,2.9999 z m 4.99997,0.5001 0,1.5 -1.5,0 z m -4.24997,3 c -0.41422,0 -0.75,0.3358 -0.75,0.75 0,0.4142 0.33578,0.75 0.75,0.75 0.41421,0 0.75,-0.3358 0.75,-0.75 0,-0.4142 -0.33579,-0.75 -0.75,-0.75 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-                <path d="m 519.00003,1127.3621 c 0,1.6569 1.34314,3 3,3 l 2.5,0 2.99997,3.0001 0.5,0 -3e-5,-0.4999 -2.99997,-3.0001 0,-2.5 c 0,-1.6569 -1.34315,-3 -2.99999,-3 -1.65684,-10e-5 -2.99998,1.343 -2.99998,2.9999 z m 4.99997,0.5001 0,1.5 -1.5,0 z m -4.24997,3 c -0.41422,0 -0.75,0.3358 -0.75,0.75 0,0.4142 0.33578,0.75 0.75,0.75 0.41421,0 0.75,-0.3358 0.75,-0.75 0,-0.4142 -0.33579,-0.75 -0.75,-0.75 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            </g>
-            <rect y="1122.362" x="516" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 484.5,1149.3622 -4.5,4 0,8 c 0,0.5 0.5,1 1,1 l 3.5625,0 1.9375,3.5 c 0.27778,0.5 0.5,0.5 1,0.5 l 2,0 c 0.5,0 0.72222,0 1,-0.5 l 1.9375,-3.5 3.5625,0 c 0.5,0 1,-0.5 1,-1 l 0,-8 -4.5,-4 -8,0 z m -0.5,4 9,0 0,6 -9,0 0,-6 z m 1,1 0,4 7,0 0,-4 -7,0 z m 0.5625,8 1.4375,0 0,1 1,0 0,-1 1,0 0,1 1,0 0,-1 1.4375,0 -0.5625,1 -0.875,0 0,1 0.34375,0 -0.34375,0.625 0,-0.625 -1,0 0,1 -1,0 0,-1 -1,0 0,0.625 -0.34375,-0.625 0.34375,0 0,-1 -0.875,0 -0.5625,-1 z m 2.4375,2 1,0 0,-1 -1,0 0,1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-2)"/>
-                <path d="m 484.5,1149.3622 -4.5,4 0,8 c 0,0.5 0.5,1 1,1 l 3.5625,0 1.9375,3.5 c 0.27778,0.5 0.5,0.5 1,0.5 l 2,0 c 0.5,0 0.72222,0 1,-0.5 l 1.9375,-3.5 3.5625,0 c 0.5,0 1,-0.5 1,-1 l 0,-8 -4.5,-4 -8,0 z m -0.5,4 9,0 0,6 -9,0 0,-6 z m 1,1 0,4 7,0 0,-4 -7,0 z m 0.5625,8 1.4375,0 0,1 1,0 0,-1 1,0 0,1 1,0 0,-1 1.4375,0 -0.5625,1 -0.875,0 0,1 0.34375,0 -0.34375,0.625 0,-0.625 -1,0 0,1 -1,0 0,-1 -1,0 0,0.625 -0.34375,-0.625 0.34375,0 0,-1 -0.875,0 -0.5625,-1 z m 2.4375,2 1,0 0,-1 -1,0 0,1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-2)"/>
-            </g>
-            <rect y="1146.362" x="474" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 505,1149.3622 -3,2 0,7 c 0,0.5 0.5,1 1,1 l 2.5,0 2,3 1,0 1,0 2,-3 2.5,0 c 0.5,0 1,-0.5 1,-1 l 0,-6.5 -3,-2.5 -7,0 z m 0,3 7,0 0,5 -7,0 0,-5 z m 1,1 0,3 5,0 0,-3 -5,0 z m 0.5,6 1.5,0 0,1 1,0 0,-1 1.5,0 -0.6875,1 -0.8125,0 0,1 -1,0 0,-1 -0.8125,0 -0.6875,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-                <path d="m 505,1149.3622 -3,2 0,7 c 0,0.5 0.5,1 1,1 l 2.5,0 2,3 1,0 1,0 2,-3 2.5,0 c 0.5,0 1,-0.5 1,-1 l 0,-6.5 -3,-2.5 -7,0 z m 0,3 7,0 0,5 -7,0 0,-5 z m 1,1 0,3 5,0 0,-3 -5,0 z m 0.5,6 1.5,0 0,1 1,0 0,-1 1.5,0 -0.6875,1 -0.8125,0 0,1 -1,0 0,-1 -0.8125,0 -0.6875,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            </g>
-            <rect width="18" height="18" x="498" y="1146.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 521,1148.3622 -2,2 0,4.5 c 0,0.25 0.25,0.5 0.5,0.5 l 1.5,0 1,1 1,1 1,0 1,-1 1,-1 1.5,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-4.5 -2,-2 -5,0 z m 0,2 5,0 0,3 -5,0 0,-3 z m 0.6875,0.6875 0,1.625 3.625,0 0,-1.625 -3.625,0 z m 0.3125,3.3125 1,0 0,1 1,0 0,-1 1,0 0,1 -1,1 -1,0 -1,-1 0,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-                <path d="m 521,1148.3622 -2,2 0,4.5 c 0,0.25 0.25,0.5 0.5,0.5 l 1.5,0 1,1 1,1 1,0 1,-1 1,-1 1.5,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-4.5 -2,-2 -5,0 z m 0,2 5,0 0,3 -5,0 0,-3 z m 0.6875,0.6875 0,1.625 3.625,0 0,-1.625 -3.625,0 z m 0.3125,3.3125 1,0 0,1 1,0 0,-1 1,0 0,1 -1,1 -1,0 -1,-1 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            </g>
-            <rect y="1146.362" x="516" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 480,1173.3622 c -1.25235,0 -2,0.7534 -2,2 0,1 2,2.5 3,3.5 1.99995,2 5.30187,3.8019 8.5,7 l 3,3 -0.5,0.5 c 0,0.5 0.5,1 1,1 l 1,-1 1,-1 c 0,-0.5 -0.5,-1 -1,-1 l -0.5,0.5 -3,-3 c -2.86335,-2.8633 -5.00005,-6.5 -7,-8.5 -1,-1 -2.5,-3 -3.5,-3 z m 3.5,10 c -0.82843,0 -1.5,0.6716 -1.5,1.5 0,0.8284 0.67157,1.5 1.5,1.5 0.82843,0 1.5,-0.6716 1.5,-1.5 0,-0.8284 -0.67157,-1.5 -1.5,-1.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 480,1173.3622 c -1.25235,0 -2,0.7534 -2,2 0,1 2,2.5 3,3.5 1.99995,2 5.30187,3.8019 8.5,7 l 3,3 -0.5,0.5 c 0,0.5 0.5,1 1,1 l 1,-1 1,-1 c 0,-0.5 -0.5,-1 -1,-1 l -0.5,0.5 -3,-3 c -2.86335,-2.8633 -5.00005,-6.5 -7,-8.5 -1,-1 -2.5,-3 -3.5,-3 z m 3.5,10 c -0.82843,0 -1.5,0.6716 -1.5,1.5 0,0.8284 0.67157,1.5 1.5,1.5 0.82843,0 1.5,-0.6716 1.5,-1.5 0,-0.8284 -0.67157,-1.5 -1.5,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1170.362" x="474" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 503,1172.3622 c 0,0 -1,0 -1.5,0.5 -0.5,0.5 -0.5,1.5 -0.5,1.5 2.5,3.5 7.07972,6.1418 8,7 l 2.59375,2.4063 -0.59375,0.5937 0,1 1,0 1,-1 1,-1 0,-1 -1,0 -0.59375,0.5938 L 510,1180.3622 c -2.36211,-2.5328 -3.5,-5.5 -7,-8 z m 1.75,9 c -0.69036,0 -1.25,0.5596 -1.25,1.25 0,0.6904 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.5596 1.25,-1.25 0,-0.6904 -0.55964,-1.25 -1.25,-1.25 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 503,1172.3622 c 0,0 -1,0 -1.5,0.5 -0.5,0.5 -0.5,1.5 -0.5,1.5 2.5,3.5 7.07972,6.1418 8,7 l 2.59375,2.4063 -0.59375,0.5937 0,1 1,0 1,-1 1,-1 0,-1 -1,0 -0.59375,0.5938 L 510,1180.3622 c -2.36211,-2.5328 -3.5,-5.5 -7,-8 z m 1.75,9 c -0.69036,0 -1.25,0.5596 -1.25,1.25 0,0.6904 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.5596 1.25,-1.25 0,-0.6904 -0.55964,-1.25 -1.25,-1.25 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="18" height="18" x="498" y="1170.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 518,1171.8622 0,1.5 c 1.5,2 4.58739,3.5874 6.5,5.5 l 1,1 0,1 1,0 0.5,-0.5 0,-1 -1,0 -1,-1 c -1.78431,-1.7843 -3.5,-5 -5.5,-6.5 z m 2,5.5 c -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 518,1171.8622 0,1.5 c 1.5,2 4.58739,3.5874 6.5,5.5 l 1,1 0,1 1,0 0.5,-0.5 0,-1 -1,0 -1,-1 c -1.78431,-1.7843 -3.5,-5 -5.5,-6.5 z m 2,5.5 c -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1170.362" x="516" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 483.5,1196.3623 c -0.34148,0 -0.5,0 -0.5,0.5 l 0,14.4375 c -2,0.062 -3,1.5625 -3,2.5625 0,0.5 0.5,0.5 0.5,0.5 l 12,0 c 0,0 0.5,0 0.5,-0.5 0,-2.5 -1.5,-4.5 -3,-4.5 -1.57233,0 -2.44309,2.7803 -4,3 -0.68271,0.096 -1.3424,-0.3453 -2,-0.6875 l 0,-9.3125 7,-3 -6.49838,-2.785 c -0.37647,-0.1613 -0.7515,-0.215 -1.00162,-0.215 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 483.5,1196.3623 c -0.34148,0 -0.5,0 -0.5,0.5 l 0,14.4375 c -2,0.062 -3,1.5625 -3,2.5625 0,0.5 0.5,0.5 0.5,0.5 l 12,0 c 0,0 0.5,0 0.5,-0.5 0,-2.5 -1.5,-4.5 -3,-4.5 -1.57233,0 -2.44309,2.7803 -4,3 -0.68271,0.096 -1.3424,-0.3453 -2,-0.6875 l 0,-9.3125 7,-3 -6.49838,-2.785 c -0.37647,-0.1613 -0.7515,-0.215 -1.00162,-0.215 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1194.362" x="474" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 505.38235,1196.3622 c -0.26113,0 -0.38235,0 -0.38235,0.3823 l 0,10.2758 c -1.52942,0.047 -2,1.0772 -2,1.8419 0,0.3823 0.5,0.5 0.5,0.5 l 8,0 c 0,0 0.5,-0.1177 0.5,-0.5 0,-1.9118 -0.85294,-3.5 -2,-3.5 -1.20237,0 -1.51531,2.3025 -2.70589,2.4706 -0.52207,0.074 -1.02653,-0.2641 -1.52941,-0.5257 l 0,-6.3567 5.35295,-2.2941 -4.96935,-2.1297 c -0.28787,-0.1234 -0.57468,-0.1644 -0.76595,-0.1644 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 505.38235,1196.3622 c -0.26113,0 -0.38235,0 -0.38235,0.3823 l 0,10.2758 c -1.52942,0.047 -2,1.0772 -2,1.8419 0,0.3823 0.5,0.5 0.5,0.5 l 8,0 c 0,0 0.5,-0.1177 0.5,-0.5 0,-1.9118 -0.85294,-3.5 -2,-3.5 -1.20237,0 -1.51531,2.3025 -2.70589,2.4706 -0.52207,0.074 -1.02653,-0.2641 -1.52941,-0.5257 l 0,-6.3567 5.35295,-2.2941 -4.96935,-2.1297 c -0.28787,-0.1234 -0.57468,-0.1644 -0.76595,-0.1644 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="18" height="18" x="498" y="1194.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 521,1195.3622 c -0.19513,0 -0.5,0.2143 -0.5,0.5 l 0,7.75 c -1.14286,0.035 -1.5,0.8929 -1.5,1.4643 0,0.2857 0.28571,0.2857 0.28571,0.2857 l 6.42858,0 c 0,0 0.28571,0 0.28571,-0.2857 0,-1.4286 -0.64286,-2.5714 -1.5,-2.5714 -0.89848,0 -1.18177,1.5887 -2.07143,1.7142 -0.39012,0.055 -1.05279,-0.1973 -1.42857,-0.3928 l 0,-4.9643 4,-1.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 521,1195.3622 c -0.19513,0 -0.5,0.2143 -0.5,0.5 l 0,7.75 c -1.14286,0.035 -1.5,0.8929 -1.5,1.4643 0,0.2857 0.28571,0.2857 0.28571,0.2857 l 6.42858,0 c 0,0 0.28571,0 0.28571,-0.2857 0,-1.4286 -0.64286,-2.5714 -1.5,-2.5714 -0.89848,0 -1.18177,1.5887 -2.07143,1.7142 -0.39012,0.055 -1.05279,-0.1973 -1.42857,-0.3928 l 0,-4.9643 4,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1194.362" x="516" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)">
-            <rect width="24" height="24" x="474" y="1218.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 489.125,1223.3622 c -0.15817,0 -0.43385,0.093 -0.5625,0.1563 l -4,1.9375 c -0.53242,0.2521 -0.72614,1.027 -0.375,1.5 l 1.21875,1.6562 -4.71875,3.6563 c 1.12895,0.229 1.9761,0.9379 2.8125,0.9375 1,5e-4 1.5,-1 3,-1 1.5,0 2,0.9995 3,1 0.4128,2e-4 0.83328,-0.1749 1.28125,-0.375 l -4.21875,-6.125 3.03125,-1.5313 c 0.60198,-0.301 0.56239,-0.8172 0.5,-1.125 -0.0591,-0.2918 -0.41903,-0.6875 -0.96875,-0.6875 z m 1.875,3 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m -11,8 c -0.69406,0 -1.33976,0.4049 -2,0.625 l 0,2.0313 c 0,0 1,-0.6558 2,-0.6563 1,-5e-4 2,1 3.5,1 1.5,0 1.97352,-0.9653 3,-1 1,5e-4 1.5,1 3,1 1.5,0 2.5,-1 3.5,-1 0.70165,0 2,0.6563 2,0.6563 l 0,-2.0313 c -0.6416,-0.2468 -1.34343,-0.625 -2,-0.625 -1.5,0 -2.5,1.0005 -3.5,1 -1,-5e-4 -1.5,-1 -3,-1 -1.5,0 -2,1.0005 -3,1 -1,5e-4 -2,-1 -3.5,-1 z" color="#000" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-            <path d="m 489.125,1223.3622 c -0.15817,0 -0.43385,0.093 -0.5625,0.1563 l -4,1.9375 c -0.53242,0.2521 -0.72614,1.027 -0.375,1.5 l 1.21875,1.6562 -4.71875,3.6563 c 1.12895,0.229 1.9761,0.9379 2.8125,0.9375 1,5e-4 1.5,-1 3,-1 1.5,0 2,0.9995 3,1 0.4128,2e-4 0.83328,-0.1749 1.28125,-0.375 l -4.21875,-6.125 3.03125,-1.5313 c 0.60198,-0.301 0.56239,-0.8172 0.5,-1.125 -0.0591,-0.2918 -0.41903,-0.6875 -0.96875,-0.6875 z m 1.875,3 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m -11,8 c -0.69406,0 -1.33976,0.4049 -2,0.625 l 0,2.0313 c 0,0 1,-0.6558 2,-0.6563 1,-5e-4 2,1 3.5,1 1.5,0 1.97352,-0.9653 3,-1 1,5e-4 1.5,1 3,1 1.5,0 2.5,-1 3.5,-1 0.70165,0 2,0.6563 2,0.6563 l 0,-2.0313 c -0.6416,-0.2468 -1.34343,-0.625 -2,-0.625 -1.5,0 -2.5,1.0005 -3.5,1 -1,-5e-4 -1.5,-1 -3,-1 -1.5,0 -2,1.0005 -3,1 -1,5e-4 -2,-1 -3.5,-1 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 510.75,1223.9872 c -0.11423,0 -0.31333,0.048 -0.40625,0.094 l -2.875,1.4063 c -0.38453,0.182 -0.53485,0.7521 -0.28125,1.0937 l 0.875,1.1875 -3.71875,2.1563 2,0.8125 2.15625,-0.875 2.15625,0.875 0.84375,-0.875 -2.59375,-3.4688 2.1875,-1.125 c 0.43476,-0.2174 0.42006,-0.5902 0.375,-0.8125 -0.0427,-0.2107 -0.32173,-0.4687 -0.71875,-0.4687 z m 1.75,2.375 c -0.82843,0 -1.5,0.6716 -1.5,1.5 0,0.8284 0.67157,1.5 1.5,1.5 0.82843,0 1.5,-0.6716 1.5,-1.5 0,-0.8284 -0.67157,-1.5 -1.5,-1.5 z m -4,4.5 -2,1 -2.5,-0.9375 -2,0.9375 0,1.5 2,-1 2.5,1 2,-1.0625 2,1.0625 2,-1.0625 2.5,1.0625 0,-1.5 -2.5,-1 -2,1 -2,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1 -2)"/>
-                <path d="m 510.75,1223.9872 c -0.11423,0 -0.31333,0.048 -0.40625,0.094 l -2.875,1.4063 c -0.38453,0.182 -0.53485,0.7521 -0.28125,1.0937 l 0.875,1.1875 -3.71875,2.1563 2,0.8125 2.15625,-0.875 2.15625,0.875 0.84375,-0.875 -2.59375,-3.4688 2.1875,-1.125 c 0.43476,-0.2174 0.42006,-0.5902 0.375,-0.8125 -0.0427,-0.2107 -0.32173,-0.4687 -0.71875,-0.4687 z m 1.75,2.375 c -0.82843,0 -1.5,0.6716 -1.5,1.5 0,0.8284 0.67157,1.5 1.5,1.5 0.82843,0 1.5,-0.6716 1.5,-1.5 0,-0.8284 -0.67157,-1.5 -1.5,-1.5 z m -4,4.5 -2,1 -2.5,-0.9375 -2,0.9375 0,1.5 2,-1 2.5,1 2,-1.0625 2,1.0625 2,-1.0625 2.5,1.0625 0,-1.5 -2.5,-1 -2,1 -2,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -2)"/>
-            </g>
-            <rect y="1218.362" x="498" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 525.5,1221.3622 -0.5,0.3038 -2.21875,1.29 c -0.26621,0.126 -0.36307,0.5134 -0.1875,0.75 l 0.60937,0.8281 -2.20312,1.8281 1,0.2344 1.5,-0.4685 1.5,0.4685 1,-0.2344 -2.21875,-2.7812 2.23437,-1.3907 -0.0156,-0.8281 z m 1,2.047 c -0.55228,0 -1,0.4477 -1,1 0,0.5522 0.44772,1 1,1 0.55228,0 1,-0.4478 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z m -6,3.9531 -1.5,0.4685 0,1.0312 0.15625,-0.047 1.34375,-0.4531 1.5,0.4998 1.5,-0.4998 1.5,0.4998 1.5,-0.4998 1.5,0.5 0,-1.0312 -1.5,-0.4685 -1.5,0.4685 -1.5,-0.4685 -1.5,0.4685 -1.5,-0.4685 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1 -1)"/>
-                <path d="m 525.5,1221.3622 -0.5,0.3038 -2.21875,1.29 c -0.26621,0.126 -0.36307,0.5134 -0.1875,0.75 l 0.60937,0.8281 -2.20312,1.8281 1,0.2344 1.5,-0.4685 1.5,0.4685 1,-0.2344 -2.21875,-2.7812 2.23437,-1.3907 -0.0156,-0.8281 z m 1,2.047 c -0.55228,0 -1,0.4477 -1,1 0,0.5522 0.44772,1 1,1 0.55228,0 1,-0.4478 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z m -6,3.9531 -1.5,0.4685 0,1.0312 0.15625,-0.047 1.34375,-0.4531 1.5,0.4998 1.5,-0.4998 1.5,0.4998 1.5,-0.4998 1.5,0.5 0,-1.0312 -1.5,-0.4685 -1.5,0.4685 -1.5,-0.4685 -1.5,0.4685 -1.5,-0.4685 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            </g>
-            <rect width="12" height="12" x="516" y="1218.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 479,1246.3623 c -1,1 -1,2 -1,2 l 10,10 1.5,-0.5 4,4 c 0.31628,0.3163 0.50625,0.5 0.90625,0.5 0.125,0 0.28125,0 0.4375,-0.1562 0.1563,-0.1563 0.15625,-0.3125 0.15625,-0.4375 0,-0.4 -0.21788,-0.6242 -0.5,-0.9063 l -4,-4 0.5,-1.5 -10,-10 c 0,0 -1,0 -2,1 z m 3.5,9 c -0.82843,0 -1.5,0.6716 -1.5,1.5 0,0.8284 0.67157,1.5 1.5,1.5 0.82843,0 1.5,-0.6716 1.5,-1.5 0,-0.8284 -0.67157,-1.5 -1.5,-1.5 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 479,1246.3623 c -1,1 -1,2 -1,2 l 10,10 1.5,-0.5 4,4 c 0.31628,0.3163 0.50625,0.5 0.90625,0.5 0.125,0 0.28125,0 0.4375,-0.1562 0.1563,-0.1563 0.15625,-0.3125 0.15625,-0.4375 0,-0.4 -0.21788,-0.6242 -0.5,-0.9063 l -4,-4 0.5,-1.5 -10,-10 c 0,0 -1,0 -2,1 z m 3.5,9 c -0.82843,0 -1.5,0.6716 -1.5,1.5 0,0.8284 0.67157,1.5 1.5,1.5 0.82843,0 1.5,-0.6716 1.5,-1.5 0,-0.8284 -0.67157,-1.5 -1.5,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="474" y="1242.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 504.4375,1245.331 c 0,0 -0.8125,0 -1.625,0.8125 -0.8125,0.8125 -0.8125,1.625 -0.8125,1.625 l 8.125,8.125 1.21875,-0.4062 2.4375,2.4375 c 0.25698,0.2569 0.425,0.4062 0.75,0.4062 0.10156,0 0.21679,0 0.34375,-0.125 0.12699,-0.127 0.125,-0.2421 0.125,-0.3437 0,-0.325 -0.17703,-0.5208 -0.40625,-0.75 l -2.4375,-2.4375 0.40625,-1.2188 -8.125,-8.125 z m 2.3125,10.0313 c -0.69036,0 -1.25,0.5596 -1.25,1.25 0,0.6903 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.5597 1.25,-1.25 0,-0.6904 -0.55964,-1.25 -1.25,-1.25 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1 -1)"/>
-                <path d="m 504.4375,1245.331 c 0,0 -0.8125,0 -1.625,0.8125 -0.8125,0.8125 -0.8125,1.625 -0.8125,1.625 l 8.125,8.125 1.21875,-0.4063 2.4375,2.4375 c 0.25698,0.2569 0.425,0.4063 0.75,0.4063 0.10156,0 0.21679,0 0.34375,-0.125 0.12699,-0.127 0.125,-0.2422 0.125,-0.3438 0,-0.325 -0.17703,-0.5208 -0.40625,-0.75 l -2.4375,-2.4375 0.40625,-1.2187 -8.125,-8.125 z m 2.3125,10.0312 c -0.69036,0 -1.25,0.5596 -1.25,1.25 0,0.6904 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.5596 1.25,-1.25 0,-0.6904 -0.55964,-1.25 -1.25,-1.25 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            </g>
-            <rect y="1242.362" x="498" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <path d="m 520,1243.6122 c 0,0 -0.5,0.25 -1,0.75 -0.5,0.5 -0.75,1 -0.75,1 l 5,5 1.25,0 2,2 0.5,0 0,-0.5 -2,-1.9995 0,-1.25 -5,-5 z m -1,5.25 c -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-            <path d="m 520,1243.6122 c 0,0 -0.5,0.25 -1,0.75 -0.5,0.5 -0.75,1 -0.75,1 l 5,5 1.25,0 2,2 0.5,0 0,-0.5 -2,-1.9995 0,-1.25 -5,-5 z m -1,5.25 c -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect width="12" height="12" x="516" y="1242.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)">
-            <g>
-                <path d="m 487,1270.3622 c -1,0 -2,0.5 -2,2 0,0.5367 0.0437,0.6282 0.15625,1.0938 l 0.6875,2.8437 -3.71875,2.2813 -3.375,-1.9688 c -0.11232,-0.066 -0.25876,-0.068 -0.4375,-0.031 -0.17874,0.037 -0.31287,0.2487 -0.3125,0.4687 3.7e-4,0.22 0.0964,0.3474 0.25,0.4375 l 14.5,8.5 c 0.45557,0.263 0.86658,0.3689 1.25,0.375 0.26822,0 0.53178,-0.035 0.75,-0.125 0.53015,-0.2179 0.86186,-0.6118 1.09375,-0.8437 0.11619,-0.1163 0.15625,-0.2581 0.15625,-0.4063 0,-0.2115 -0.12877,-0.4362 -0.40625,-0.4687 -0.17906,-0.021 -0.32448,0.044 -0.4375,0.1875 -0.23474,0.2976 -0.52777,0.5208 -0.78125,0.625 -0.25348,0.1042 -0.53381,0.1225 -1.125,-0.2188 l -9.28125,-5.4375 3.59375,-2.0937 c 0.33273,-0.228 0.50201,-0.6708 0.40625,-1.0625 l -0.40625,-1.6563 3.5756,2.1048 0.6744,2.5707 c 0.0771,0.2878 0.2899,0.536 0.5625,0.6563 l 2.28125,1 c 1.60608,0.704 1.83495,-0.8259 0.8125,-1.269 l -1.875,-0.8125 -1.59375,-6.2495 -3.0625,-1.75 c -0.78627,-0.4539 -1.4375,-0.75 -1.9375,-0.75 z m 8,2 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z" opacity=".3" color="#000" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1)"/>
-                <path d="m 12,1007.3622 c -1,0 -2,0.5 -2,2 0,0.5367 0.04369,0.6282 0.15625,1.0938 l 0.6875,2.8437 -3.71875,2.2813 -3.375,-1.9688 c -0.1123178,-0.066 -0.2587622,-0.068 -0.4375,-0.031 -0.1787379,0.037 -0.3128705,0.2487 -0.3125,0.4687 3.705e-4,0.22 0.096351,0.3474 0.25,0.4375 l 14.5,8.5 c 0.455571,0.263 0.866584,0.3689 1.25,0.375 0.268224,0 0.531782,-0.035 0.75,-0.125 0.530152,-0.2179 0.861863,-0.6118 1.09375,-0.8437 0.116186,-0.1163 0.15625,-0.2581 0.15625,-0.4063 0,-0.2115 -0.128771,-0.4362 -0.40625,-0.4687 -0.179057,-0.021 -0.324481,0.044 -0.4375,0.1875 -0.234744,0.2976 -0.527766,0.5208 -0.78125,0.625 -0.253484,0.1042 -0.533815,0.1225 -1.125,-0.2188 l -9.28125,-5.4375 3.59375,-2.0937 c 0.332726,-0.228 0.502014,-0.6708 0.40625,-1.0625 l -0.40625,-1.6563 3.575597,2.1048 0.674403,2.5707 c 0.0771,0.2878 0.289901,0.536 0.5625,0.6563 l 2.28125,1 c 1.60608,0.704 1.834949,-0.8259 0.8125,-1.269 l -1.875,-0.8125 -1.59375,-6.2495 -3.0625,-1.75 c -0.786272,-0.4539 -1.4375,-0.75 -1.9375,-0.75 z m 8,2 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1) translate(475 263)"/>
-            </g>
-            <rect width="24" height="24" x="474" y="1266.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 506,1270.3622 c -1,0 -1.5,0.5 -1.5,1.5 0,0.3954 0.13581,0.6569 0.21875,1 l 0.78125,2 -2.8125,1.9688 -2.6875,-1.4688 0,1 11,6 1,0 1,-1 -0.5,-0.5 -0.5,-0.5 0,1 -1,0 -7,-3.8125 2.46875,-1.6562 c 0.24517,-0.168 0.60181,-0.2426 0.53125,-0.5313 l -0.53125,-1.4687 2.53125,1.4687 0.625,1.9688 c 0.0568,0.2121 0.20539,0.4114 0.40625,0.5 l 1.6875,0.7187 c 1.18342,0.5187 1.34713,-0.611 0.59375,-0.9375 l -1.375,-0.5937 -0.9375,-2.6563 0,-2 -2.5,-1.4062 c -0.57936,-0.3344 -1,-0.5938 -1.5,-0.5938 z m 6.5,1.5 c -0.8139,0 -1.5,0.6861 -1.5,1.5 0,0.814 0.6861,1.5 1.5,1.5 0.81389,0 1.5,-0.686 1.5,-1.5 0,-0.8139 -0.68611,-1.5 -1.5,-1.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(0 -1)"/>
-                <path d="m 626,220 c -1,0 -1.5,0.5 -1.5,1.5 0,0.3954 0.13581,0.6569 0.21875,1 l 0.78125,2 -2.8125,1.96875 L 620,225 l 0,1 11,6 1,0 1,-1 -0.5,-0.5 -0.5,-0.5 0,1 -1,0 -7,-3.8125 2.46875,-1.65625 C 626.71392,225.36325 627.07056,225.2887 627,225 L 626.46875,223.53125 629,225 l 0.625,1.96875 c 0.0568,0.2121 0.20539,0.4114 0.40625,0.5 l 1.6875,0.71875 c 1.18342,0.5187 1.34713,-0.611 0.59375,-0.9375 l -1.375,-0.59375 L 630,224 l 0,-2 -2.5,-1.40625 C 626.92064,220.25935 626.5,220 626,220 z m 6.5,1.5 c -0.8139,0 -1.5,0.6861 -1.5,1.5 0,0.814 0.6861,1.5 1.5,1.5 0.81389,0 1.5,-0.686 1.5,-1.5 0,-0.8139 -0.68611,-1.5 -1.5,-1.5 z" transform="translate(0 -1) translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1266.362" x="498" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-234)" color="#000">
-            <g>
-                <path d="m 522,1269.3622 c -0.5,0 -1,1 -1,1.5 l 0,2 -1.625,0.7813 -1.375,-0.7813 0,0.5 7,4 0,-0.5 -4.6875,-2.6875 1.6875,-0.625 0,-2.1875 0.5,0 0.5,0 1,1.5 0,1.5 1,1 1,0 0,-1 -1,0 0,-1.5 -0.5,-2.5 -1.5,-1 -1,0 z m 4.5,1.5 c -0.55227,0 -1,0.4477 -1,1 0,0.5523 0.44773,1 1,1 0.18732,0 0.35013,-0.067 0.5,-0.1562 l 0,-1.6875 c -0.14987,-0.09 -0.31268,-0.1563 -0.5,-0.1563 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(0 -1)"/>
-                <path d="m 522,1269.3622 c -0.5,0 -1,1 -1,1.5 l 0,2 -1.625,0.7813 -1.375,-0.7813 0,0.5 7,4 0,-0.5 -4.6875,-2.6875 1.6875,-0.625 0,-2.1875 0.5,0 0.5,0 1,1.5 0,1.5 1,1 1,0 0,-1 -1,0 0,-1.5 -0.5,-2.5 -1.5,-1 -1,0 z m 4.5,1.5 c -0.55227,0 -1,0.4477 -1,1 0,0.5523 0.44773,1 1,1 0.18732,0 0.35013,-0.067 0.5,-0.1562 l 0,-1.6875 c -0.14987,-0.09 -0.31268,-0.1563 -0.5,-0.1563 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-            </g>
-            <rect width="12" height="12" x="516" y="1266.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g>
-            <g transform="translate(84 -2)">
-                <path d="m 21,1065.3622 0,1 -7,-1 0,0.031 0,3.9688 2,2.0002 c 0,0.5 -0.5,1 -1,1 -2,0 -5,0 -5,0 -0.5,0 -1,-0.5 -1,-1 l 2,-2.0002 0,-4 -7,1 0,-1 7,-4 c 0,0 0,-0.3333 0,-2 0,-1 0.5,-4 1.5,-4 1,0 1.5,3 1.5,4 0,1.6667 0,2 0,2 z" opacity=".3" color="#000" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 21,1065.8622 0,0.5 -7,-1 0,3.9998 2,2.0002 c 0,0.5 -0.5,1 -1,1 -2,0 -5,0 -5,0 -0.5,0 -1,-0.5 -1,-1 l 2,-2.0002 0,-4 -7,1 0,-0.4998 c 0,-0.5 0.3056731,-0.6379 0.5,-0.75 l 6.5,-3.7502 c 0,0 0,-0.3333 0,-2 0,-1 0.5,-4 1.5,-4 1,0 1.5,3 1.5,4 0,1.6667 0,2 0,2 l 6.5,3.7502 c 0.27841,0.1606 0.5,0.2411 0.5,0.75 z" fill="#444"/>
-            </g>
-            <rect width="24" height="24" x="84" y="1050.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g>
-            <g>
-                <path d="m 124.5,1060.3622 0,1 -5.5,-1 0,3 2,1.2222 0,0.7778 -6,0 0,-0.7778 2,-1.2222 0,-3 -5.5,1 0,-1 5.5,-3 c 0,0 0,-1.7036 0,-3 0,-0.7777 0.22222,-2 1,-2 0.77777,0 1,1.2223 1,2 0,1.2964 0,3 0,3 z" opacity=".3" color="#000" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 124.5,1060.3622 0,1 -5.5,-1 0,3 2,1.2222 0,0.7778 -6,0 0,-0.7778 2,-1.2222 0,-3 -5.5,1 0,-1 5.5,-3 c 0,0 0,-1.7036 0,-3 0,-0.7777 0.22222,-2 1,-2 0.77777,0 1,1.2223 1,2 0,1.2964 0,3 0,3 z" fill="#444"/>
-            </g>
-            <rect y="1050.362" x="108" height="18" width="18" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g>
-            <g>
-                <path d="m 137,1057.7908 0,0.5714 -3,-0.5 0,2 1,1.0556 0,0.4444 -3,0 0,-0.4444 1,-1.0556 0,-2 -3,0.5 0,-0.5714 3,-1.4286 c 0,0 0,-1.2592 0,-2 0,-0.4444 0.0556,-1 0.5,-1 0.44444,0 0.5,0.5556 0.5,1 0,0.7408 0,2 0,2 z" opacity=".3" color="#000" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1 -1)"/>
-                <path d="m 137,1057.7908 0,0.5714 -3,-0.5 0,2 1,1.0556 0,0.4444 -3,0 0,-0.4444 1,-1.0556 0,-2 -3,0.5 0,-0.5714 3,-1.4286 c 0,0 0,-1.2592 0,-2 0,-0.4444 0.0556,-1 0.5,-1 0.44444,0 0.5,0.5556 0.5,1 0,0.7408 0,2 0,2 z" fill="#444" transform="translate(-1 -1)"/>
-            </g>
-            <rect width="12" height="12" x="126" y="1050.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m 96.25,1091.3622 8.75,0 c 0.5,0 1,-0.5 1,-1 l 0,-3 c 0,-1 -0.48076,-1.4808 -1,-2 0,0 -0.66667,-0.6667 -1,-1 -0.33333,-0.3333 -1,-1 -2,-1 l -3,0 0,-2 4,0 2,0 c 0.55399,0 1,-0.446 1,-1 0,-0.554 -0.44601,-1 -1,-1 l -2,0 -3.5,0 -1,0 -4.5,0 -1,0 -1,0 c -0.553995,0 -1,0.446 -1,1 0,0.554 0.446005,1 1,1 l 1,0 1,0 4,0 0,2 -3,0 -4.28125,0 c -0.346043,-0.5969 -0.979146,-1 -1.71875,-1 -1.104569,0 -2,0.8954 -2,2 0,1.1046 0.895431,2 2,2 0.577042,0 1.072461,-0.2653 1.4375,-0.6562 L 94,1089.3622 c 1,1.0263 1.75,2 2.25,2 z m -7.25,-8 c 0.552285,0 1,0.4477 1,1 0,0.5523 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477 -1,-1 0,-0.5523 0.447715,-1 1,-1 z" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linecap="round" stroke-linejoin="round" transform="translate(0 1)"/>
-                <path d="m 96.25,1091.3622 8.75,0 c 0.5,0 1,-0.5 1,-1 l 0,-3 c 0,-1 -0.48076,-1.4808 -1,-2 0,0 -0.66667,-0.6667 -1,-1 -0.33333,-0.3333 -1,-1 -2,-1 l -3,0 0,-2 4,0 2,0 c 0.55399,0 1,-0.446 1,-1 0,-0.554 -0.44601,-1 -1,-1 l -2,0 -3.5,0 -1,0 -4.5,0 -1,0 -1,0 c -0.553995,0 -1,0.446 -1,1 0,0.554 0.446005,1 1,1 l 1,0 1,0 4,0 0,2 -3,0 -4.28125,0 c -0.346043,-0.5969 -0.979146,-1 -1.71875,-1 -1.104569,0 -2,0.8954 -2,2 0,1.1046 0.895431,2 2,2 0.577042,0 1.072461,-0.2653 1.4375,-0.6562 L 94,1089.3622 c 1,1.0263 1.75,2 2.25,2 z m -7.25,-8 c 0.552285,0 1,0.4477 1,1 0,0.5523 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477 -1,-1 0,-0.5523 0.447715,-1 1,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 1)"/>
-            </g>
-            <rect width="24" height="24" x="84" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m 118.19444,1087.3622 5.02778,0 c 0.38889,0 0.77778,-0.3889 0.77778,-0.7778 l 0,-2.3333 c 0,-0.7778 -0.37392,-1.1517 -0.77778,-1.5556 0,0 -0.51852,-0.5185 -0.77778,-0.7777 -0.25925,-0.2593 -0.77777,-0.5556 -1.55555,-0.5556 l -1.88889,0 0,-2 3.22222,0 c 0.43088,0 0.77778,-0.1247 0.77778,-0.5556 0,-0.4308 -0.29135,-0.4444 -0.72223,-0.4444 l -7.33333,0 c -0.43089,0 -0.83333,0.014 -0.83333,0.4444 0,0.4309 0.34939,0.5092 0.77778,0.5556 l 3.11111,0 0,2 -0.77778,0 -3.32986,0 c -0.26914,-0.4643 -0.76156,-0.7778 -1.3368,-0.7778 -0.85911,0 -1.55556,0.6964 -1.55556,1.5556 0,0.8591 0.69645,1.5555 1.55556,1.5555 0.4488,0 0.83413,-0.2063 1.11805,-0.5104 l 2.77083,2.6215 c 0.80962,0.766 1.36112,1.5556 1.75,1.5556 z m -5.63888,-6 c 0.42955,0 0.77777,0.3482 0.77777,0.7778 0,0.4295 -0.34822,0.7777 -0.77777,0.7777 -0.42956,0 -0.77778,-0.3482 -0.77778,-0.7777 0,-0.4296 0.34822,-0.7778 0.77778,-0.7778 z" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-                <path d="m 118.19444,1087.3622 5.02778,0 c 0.38889,0 0.77778,-0.3889 0.77778,-0.7778 l 0,-2.3333 c 0,-0.7778 -0.37392,-1.1517 -0.77778,-1.5556 0,0 -0.51852,-0.5185 -0.77778,-0.7777 -0.25925,-0.2593 -0.77777,-0.5556 -1.55555,-0.5556 l -1.88889,0 0,-2 3.22222,0 c 0.43088,0 0.77778,-0.1247 0.77778,-0.5556 0,-0.4308 -0.29135,-0.4444 -0.72223,-0.4444 l -7.33333,0 c -0.43089,0 -0.83333,0.014 -0.83333,0.4444 0,0.4309 0.34939,0.5092 0.77778,0.5556 l 3.11111,0 0,2 -0.77778,0 -3.32986,0 c -0.26914,-0.4643 -0.76156,-0.7778 -1.3368,-0.7778 -0.85911,0 -1.55556,0.6964 -1.55556,1.5556 0,0.8591 0.69645,1.5555 1.55556,1.5555 0.4488,0 0.83413,-0.2063 1.11805,-0.5104 l 2.77083,2.6215 c 0.80962,0.766 1.36112,1.5556 1.75,1.5556 z m -5.63888,-6 c 0.42955,0 0.77777,0.3482 0.77777,0.7778 0,0.4295 -0.34822,0.7777 -0.77777,0.7777 -0.42956,0 -0.77778,-0.3482 -0.77778,-0.7777 0,-0.4296 0.34822,-0.7778 0.77778,-0.7778 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1074.362" x="108" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m 132.625,1084.3622 3.875,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-1.5 c 0,-0.5 -0.24038,-0.7404 -0.5,-1 0,0 -0.33334,-0.3333 -0.5,-0.5 -0.16666,-0.1666 -0.5,-0.5 -1,-0.5 l -1,0 0,-1 1.5,0 1,0 c 0.27699,0 0.5,-0.223 0.5,-0.5 0,-0.277 -0.22301,-0.5 -0.5,-0.5 l -1,0 -1.5,0 -0.5,0 -2,0 -0.5,0 -0.5,0 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.277 0.223,0.5 0.5,0.5 l 0.5,0 0.5,0 1.5,0 0,1 -1,0 -2.14062,0 c -0.17303,-0.2984 -0.48958,-0.5 -0.85938,-0.5 -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.28852,0 0.53623,-0.1326 0.71875,-0.3281 l 1.78125,1.8281 c 0.5,0.5132 0.875,1 1.125,1 z m -3.625,-4 c 0.27614,0 0.5,0.2238 0.5,0.5 0,0.2762 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.2238 -0.5,-0.5 0,-0.2762 0.22386,-0.5 0.5,-0.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(0 -1)"/>
-                <path d="m 132.625,1084.3622 3.875,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-1.5 c 0,-0.5 -0.24038,-0.7404 -0.5,-1 0,0 -0.33334,-0.3333 -0.5,-0.5 -0.16666,-0.1666 -0.5,-0.5 -1,-0.5 l -1,0 0,-1 1.5,0 1,0 c 0.27699,0 0.5,-0.223 0.5,-0.5 0,-0.277 -0.22301,-0.5 -0.5,-0.5 l -1,0 -1.5,0 -0.5,0 -2,0 -0.5,0 -0.5,0 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.277 0.223,0.5 0.5,0.5 l 0.5,0 0.5,0 1.5,0 0,1 -1,0 -2.14062,0 c -0.17303,-0.2984 -0.48958,-0.5 -0.85938,-0.5 -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.28852,0 0.53623,-0.1326 0.71875,-0.3281 l 1.78125,1.8281 c 0.5,0.5132 0.875,1 1.125,1 z m -3.625,-4 c 0.27614,0 0.5,0.2238 0.5,0.5 0,0.2762 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.2238 -0.5,-0.5 0,-0.2762 0.22386,-0.5 0.5,-0.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-            </g>
-            <rect width="12" height="12" x="126" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g>
-                <path d="m 7,1076.3622 5.5,3 5.5,-3 z m 2,4 -3,2 0,11 c 0,0.5 0.5,1 1,1 l 11,0 c 0.5,0 1,-0.5 1,-1 l 0,-11 -3,-2 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(84 24)"/>
-                <path d="m 7,1076.3622 5.5,3 5.5,-3 z m 2,4 -3,2 0,11 c 0,0.5 0.5,1 1,1 l 2.5,0 3.5,0 2.5,0 2.5,0 c 0.5,0 1,-0.5 1,-1 l 0,-11 -3,-2 z m 1,2 5,0 2,1 0,3 -9,0 0,-3 z m -1,8 c 0.554,0 1,0.446 1,1 0,0.554 -0.446,1 -1,1 -0.554,0 -1,-0.446 -1,-1 0,-0.554 0.446,-1 1,-1 z m 7,0 c 0.554,0 1,0.446 1,1 0,0.554 -0.446,1 -1,1 -0.554,0 -1,-0.446 -1,-1 0,-0.554 0.446,-1 1,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(84 24)"/>
-            </g>
-            <rect y="1098.362" x="84" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g>
-                <path d="m 113,1100.3622 3.5,2 2,0 3.5,-2 z m 1,3 -2,1.5 0,7.5 c 0,0.5 0.5,1 1,1 l 9,0 c 0.5,0 1,-0.5 1,-1 l 0,-7.5 -2,-1.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 113,1100.3622 3.5,2 2,0 3.5,-2 z m 1,3 -2,1.5 0,7.5 c 0,0.5 0.5,1 1,1 l 9,0 c 0.5,0 1,-0.5 1,-1 l 0,-7.5 -2,-1.5 z m 1.5,1 4,0 1.5,1 0,2 -7,0 0,-2 z m -0.75,5.5 c 0.41421,0 0.75,0.3358 0.75,0.75 0,0.4142 -0.33579,0.75 -0.75,0.75 -0.41421,0 -0.75,-0.3358 -0.75,-0.75 0,-0.4142 0.33579,-0.75 0.75,-0.75 z m 5.5,0 c 0.41421,0 0.75,0.3358 0.75,0.75 0,0.4142 -0.33579,0.75 -0.75,0.75 -0.41421,0 -0.75,-0.3358 -0.75,-0.75 0,-0.4142 0.33579,-0.75 0.75,-0.75 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="18" height="18" x="108" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g>
-                <path d="m 129,1099.3622 3,2 1,0 3,-2 z m 1.5,3 -1.5,1 0,5.5 c 0,0.25 0.25,0.5 0.5,0.5 l 1.25,0 2.25,0 1.25,0 1.25,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-5.5 -1.5,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 129,1099.3622 3,2 1,0 3,-2 z m 1.5,3 -1.5,1 0,5.5 c 0,0.25 0.25,0.5 0.5,0.5 l 1.25,0 2.25,0 1.25,0 1.25,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-5.5 -1.5,-1 z m 0.5,1 3,0 1,0.5 0,1.5 -5,0 0,-1.5 z m -0.5,4 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1098.362" x="126" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g>
-                <path d="m 9,1079.3622 -3,2 0,11 c 0,0.5 0.5,1 1,1 l 11,0 c 0.5,0 1,-0.5 1,-1 l 0,-11 -3,-2 z m 3.5,15 -5.5,3 11,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(84 45)"/>
-                <path d="m 9,1079.3622 -3,2 0,11 c 0,0.5 0.5,1 1,1 l 11,0 c 0.5,0 1,-0.5 1,-1 l 0,-11 -3,-2 z m 1,2 5,0 2,1 0,3 -9,0 0,-3 z m -1,8 c 0.554,0 1,0.446 1,1 0,0.554 -0.446,1 -1,1 -0.554,0 -1,-0.446 -1,-1 0,-0.554 0.446,-1 1,-1 z m 7,0 c 0.554,0 1,0.446 1,1 0,0.554 -0.446,1 -1,1 -0.554,0 -1,-0.446 -1,-1 0,-0.554 0.446,-1 1,-1 z m -3.5,5 -5.5,3 11,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(84 45)"/>
-            </g>
-            <rect y="1122.362" x="84" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g>
-                <path d="m 114,1124.3622 -2,1.5 0,7.5 c 0,0.5 0.5,1 1,1 l 9,0 c 0.5,0 1.06608,-0.5044 1,-1 l 0,-7.5 -2,-1.5 z m 2.5,11 -3.5,2 9,0 -3.5,-2 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 234,98 -2,1.5 0,7.5 c 0,0.5 0.5,1 1,1 l 9,0 c 0.5,0 1,-0.5 1,-1 l 0,-7.5 -2,-1.5 z m 1.5,1 4,0 1.5,1 0,2 -7,0 0,-2 z m -0.75,5.5 c 0.41421,0 0.75,0.3358 0.75,0.75 0,0.4142 -0.33579,0.75 -0.75,0.75 -0.41421,0 -0.75,-0.3358 -0.75,-0.75 0,-0.4142 0.33579,-0.75 0.75,-0.75 z m 5.5,0 c 0.41421,0 0.75,0.3358 0.75,0.75 0,0.4142 -0.33579,0.75 -0.75,0.75 -0.41421,0 -0.75,-0.3358 -0.75,-0.75 0,-0.4142 0.33579,-0.75 0.75,-0.75 z m -3.75,4.5 -3.5,2 9,0 -3.5,-2 z" transform="translate(-120 1026.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="18" height="18" x="108" y="1122.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g>
-                <path d="m 130.5,1123.3622 -1.5,1 0,5.5 c 0,0.25 0.25,0.5 0.5,0.5 l 1.25,0 2.25,0 1.25,0 1.25,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-5.5 -1.5,-1 -4,0 z m 0.5,1 3,0 1,0.5 0,1.5 -5,0 0,-1.5 1,-0.5 z m -0.5,4 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m -2.5,3 -3,2 7,0 -3,-2 -1,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-                <path d="m 130.5,1123.3622 -1.5,1 0,5.5 c 0,0.25 0.25,0.5 0.5,0.5 l 1.25,0 2.25,0 1.25,0 1.25,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-5.5 -1.5,-1 -4,0 z m 0.5,1 3,0 1,0.5 0,1.5 -5,0 0,-1.5 1,-0.5 z m -0.5,4 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m -2.5,3 -3,2 7,0 -3,-2 -1,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1122.362" x="126" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)">
-            <g>
-                <path d="m 93,1149.3622 0,1 -2,0 c -0.5,0 -1,0.5 -1,1 l 0,6 0,5 0,1 0,1 1,0 0,2 2,0 0,-2 7,0 0,2 2,0 0,-2 1,0 0,-1 0,-1 0,-5 0,-6 c 0,-0.5 -0.5,-1 -1,-1 l -2,0 0,-1 -7,0 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <g transform="translate(-1 2)">
-                    <path d="m 10,1008.3622 0,1 -2,0 c -0.5,0 -1,0.5 -1,1 l 0,6 0,5 0,1 0,1 1,0 0,2 2,0 0,-2 7,0 0,2 2,0 0,-2 1,0 0,-1 0,-1 0,-5 0,-6 c 0,-0.5 -0.5,-1 -1,-1 l -2,0 0,-1 z m -1,3 9,0 0,3 0,2 -9,0 0,-2 z m 1,8 c 0.554,0 1,0.446 1,1 0,0.554 -0.446,1 -1,1 -0.554,0 -1,-0.446 -1,-1 0,-0.554 0.446,-1 1,-1 z m 7,0 c 0.554,0 1,0.446 1,1 0,0.554 -0.446,1 -1,1 -0.554,0 -1,-0.446 -1,-1 0,-0.554 0.446,-1 1,-1 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(84 139)"/>
-                </g>
-            </g>
-            <rect y="1146.362" x="84" height="24" width="24" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g>
-                <path d="m 114.5,1148.3622 0,1 -1.5,0 c -0.5,0 -1,0.5 -1,1 l 0,10 1,0 0,1 2,0 0,-1 5,0 0,1 2,0 0,-1 1,0 0,-10 c 0,-0.5 -0.5,-1 -1,-1 l -1.5,0 0,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="M 234.5 122 L 234.5 123 L 233 123 C 232.5 123 232 123.5 232 124 L 232 134 L 233 134 L 233 135 L 235 135 L 235 134 L 240 134 L 240 135 L 242 135 L 242 134 L 243 134 L 243 124 C 243 123.5 242.5 123 242 123 L 240.5 123 L 240.5 122 L 234.5 122 z M 234 124 L 241 124 L 241 128 L 234 128 L 234 124 z M 234.75 130.5 C 235.16421 130.5 235.5 130.83579 235.5 131.25 C 235.5 131.66421 235.16421 132 234.75 132 C 234.33579 132 234 131.66421 234 131.25 C 234 130.83579 234.33579 130.5 234.75 130.5 z M 240.25 130.5 C 240.66421 130.5 241 130.83579 241 131.25 C 241 131.66421 240.66421 132 240.25 132 C 239.83579 132 239.5 131.66421 239.5 131.25 C 239.5 130.83579 239.83579 130.5 240.25 130.5 z" transform="translate(-120 1026.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="18" height="18" x="108" y="1146.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g>
-                <path d="m 131,1147.3622 0,1 -1.5,0 c -0.25,0 -0.5,0.25 -0.5,0.5 l 0,3 0,2.5 0,0.5 0,0.5 1,0 0,1 1,0 0,-1 3,0 0,1 1,0 0,-1 1,0 0,-0.5 0,-0.5 0,-2.5 0,-3 c 0,-0.25 -0.25,-0.5 -0.5,-0.5 l -1.5,0 0,-1 -3,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 131,1147.3622 0,1 -1.5,0 c -0.25,0 -0.5,0.25 -0.5,0.5 l 0,3 0,2.5 0,0.5 0,0.5 1,0 0,1 1,0 0,-1 3,0 0,1 1,0 0,-1 1,0 0,-0.5 0,-0.5 0,-2.5 0,-3 c 0,-0.25 -0.25,-0.5 -0.5,-0.5 l -1.5,0 0,-1 z m -1,2 5,0 0,3 -5,0 z m 0.5,4 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1146.362" x="126" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g transform="translate(0 4)">
-                <g>
-                    <path d="m 9,1007.3622 c -0.5540096,0 -1,0.446 -1,1 l 0,16 c 0,0.5 0.5,1 1,1 l 9,0 c 0.5,0 1,-0.5 1,-1 l 0,-5 0.5,0 c 0.5,0 0.5,0.5 0.5,0.5 l 0,2 c 0,1 0.5,1.5 1.5,1.5 1,0 1.5,-0.5 1.5,-1.5 0,-1.1667 0,-4.5 0,-5.5 0,-1 -2,-2 -2,-3 l 0,-3 -1,0 -1,-1 0,-1 c 0,-0.554 -0.44599,-1 -1,-1 z m 1,2 7,0 0,4 -7,0 z m 9,3 1,0 c 0,0 0,0.8333 0,1.5 0,1 2,2 2,3 l 0,5 c 0,0.5 -0.5,0.5 -0.5,0.5 0,0 -0.5,0 -0.5,-0.5 0,0 0,-2 0,-2.5 0,-0.5 -0.5,-1 -1,-1 -0.333333,0 -1,0 -1,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(83 162)"/>
-                    <path d="m 9,1007.3622 c -0.5540096,0 -1,0.446 -1,1 l 0,16 c 0,0.5 0.5,1 1,1 l 9,0 c 0.5,0 1,-0.5 1,-1 l 0,-5 0.5,0 c 0.5,0 0.5,0.5 0.5,0.5 l 0,2 c 0,1 0.5,1.5 1.5,1.5 1,0 1.5,-0.5 1.5,-1.5 0,-1.1667 0,-4.5 0,-5.5 0,-1 -2,-2 -2,-3 l 0,-3 -1,0 -1,-1 0,-1 c 0,-0.554 -0.44599,-1 -1,-1 z m 1,2 7,0 0,4 -7,0 z m 9,3 1,0 c 0,0 0,0.8333 0,1.5 0,1 2,2 2,3 l 0,5 c 0,0.5 -0.5,0.5 -0.5,0.5 0,0 -0.5,0 -0.5,-0.5 0,0 0,-2 0,-2.5 0,-0.5 -0.5,-1 -1,-1 -0.333333,0 -1,0 -1,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(83 162)"/>
-                </g>
-            </g>
-            <rect width="24" height="24" x="84" y="1170.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g>
-                <path d="m 130.5,1171.3622 c -0.27701,0 -0.5,0.223 -0.5,0.5 l 0,8 c 0,0.25 0.25,0.5 0.5,0.5 l 4,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-0.5 1.25,0 c 0.5,0 0.75,-0.25 0.75,-0.75 l 0,-2.75 c 0,-0.5 -1,-1 -1,-1.5 l 0,-0.25 0,-0.75 -1,-1 0,-0.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -4,0 z m 0.5,1 3,0 0,2 -3,0 0,-2 z m 4,1.5 0.5,0 0,0.75 c 0,0.5 1,1 1,1.5 l 0,2.25 0,0.25 c 0,0.25 -0.25,0.25 -0.25,0.25 l -0.75,0 0,-1.5 -0.5,0 0,-3.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 130.5,1171.3622 c -0.27701,0 -0.5,0.223 -0.5,0.5 l 0,8 c 0,0.25 0.25,0.5 0.5,0.5 l 4,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-0.5 1.25,0 c 0.5,0 0.75,-0.25 0.75,-0.75 l 0,-2.75 c 0,-0.5 -1,-1 -1,-1.5 l 0,-0.25 0,-0.75 -1,-1 0,-0.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -4,0 z m 0.5,1 3,0 0,2 -3,0 0,-2 z m 4,1.5 0.5,0 0,0.75 c 0,0.5 1,1 1,1.5 l 0,2.25 0,0.25 c 0,0.25 -0.25,0.25 -0.25,0.25 l -0.75,0 0,-1.5 -0.5,0 0,-3.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="12" height="12" x="126" y="1170.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g fill="#b4b4b4" font-size="25.21" font-weight="bold" letter-spacing="0" word-spacing="0" font-family="Helvetica Neue">
-                <path d="m 117,1219.3622 -6,1.5 0,1.5 6,-1.5 6,1.5 0,-1.5 -6,-1.5 z m -2.72727,4 0,10 2.31818,0 0,-3.5625 0.98864,0 c 1.35227,0 2.40553,-0.274 3.13636,-0.8437 0.73579,-0.5697 1.0909,-1.3932 1.09091,-2.4688 -1e-5,-1.0345 -0.33168,-1.8242 -1.02273,-2.3437 -0.68608,-0.5241 -1.71165,-0.7812 -3.03409,-0.7813 l -3.47727,0 z m 2.31818,1.75 1.05682,0 c 0.63138,0 1.07031,0.1069 1.36363,0.3438 0.29829,0.237 0.44318,0.597 0.44319,1.0937 -1e-5,0.4922 -0.15839,0.8652 -0.51137,1.125 -0.35299,0.2552 -0.89135,0.4063 -1.60227,0.4063 l -0.75,0 0,-2.9688 z" style="text-indent:0;text-align:start;line-height:125%;text-transform:none;block-progression:tb;-inkscape-font-specification:Helvetica Neue Bold" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2.089" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="matrix(.917 0 0 1 10.25 0)"/>
-                <path style="text-indent:0;text-align:start;line-height:125%;text-transform:none;block-progression:tb;-inkscape-font-specification:Helvetica Neue Bold" d="m 117,1219.3622 -6,1.5 0,1.5 6,-1.5 6,1.5 0,-1.5 -6,-1.5 z m -2.72727,4 0,10 2.31818,0 0,-3.5625 0.98864,0 c 1.35227,0 2.40553,-0.274 3.13636,-0.8437 0.73579,-0.5697 1.0909,-1.3932 1.09091,-2.4688 -1e-5,-1.0345 -0.33168,-1.8242 -1.02273,-2.3437 -0.68608,-0.5241 -1.71165,-0.7812 -3.03409,-0.7813 l -3.47727,0 z m 2.31818,1.75 1.05682,0 c 0.63138,0 1.07031,0.1069 1.36363,0.3438 0.29829,0.237 0.44318,0.597 0.44319,1.0937 -1e-5,0.4922 -0.15839,0.8652 -0.51137,1.125 -0.35299,0.2552 -0.89135,0.4063 -1.60227,0.4063 l -0.75,0 0,-2.9688 z" fill="#444" overflow="visible" enable-background="accumulate" transform="matrix(.917 0 0 1 10.25 0)"/>
-            </g>
-            <rect y="1218.362" x="108" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m 9,77 -3,2 0,11 c 0,0.5 0.5,1 1,1 l 11,0 c 0.5,0 1,-0.5 1,-1 l 0,-11 -3,-2 z" transform="translate(84 21) translate(0 1004.362)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path transform="translate(84 21) translate(0 1004.362)" d="m 9,77 -3,2 0,11 c 0,0.5 0.5,1 1,1 l 2.5,0 3.5,0 2.5,0 2.5,0 c 0.5,0 1,-0.5 1,-1 l 0,-11 -3,-2 z m 1,2 5,0 2,1 0,3 -9,0 0,-3 z m -1,8 c 0.554,0 1,0.446 1,1 0,0.554 -0.446,1 -1,1 -0.554,0 -1,-0.446 -1,-1 0,-0.554 0.446,-1 1,-1 z m 7,0 c 0.554,0 1,0.446 1,1 0,0.554 -0.446,1 -1,1 -0.554,0 -1,-0.446 -1,-1 0,-0.554 0.446,-1 1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="84" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m 234,54 -2,1.5 0,7.5 c 0,0.5 0.5,1 1,1 l 9,0 c 0.5,0 1.06608,-0.504386 1,-1 l 0,-7.5 -2,-1.5 z" transform="translate(0 -2) translate(-120 1050.362)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 234,54 -2,1.5 0,7.5 c 0,0.5 0.5,1 1,1 l 9,0 c 0.5,0 1.06608,-0.504386 1,-1 l 0,-7.5 -2,-1.5 z m 1.5,1 4,0 1.5,1 0,2 -7,0 0,-2 z m -1.25,5.5 c 0.41421,0 0.75,0.335786 0.75,0.75 0,0.414214 -0.33579,0.75 -0.75,0.75 -0.41421,0 -0.75,-0.335786 -0.75,-0.75 0,-0.414214 0.33579,-0.75 0.75,-0.75 z m 6.5,0 c 0.41421,0 0.75,0.335786 0.75,0.75 0,0.414214 -0.33579,0.75 -0.75,0.75 -0.41421,0 -0.75,-0.335786 -0.75,-0.75 0,-0.414214 0.33579,-0.75 0.75,-0.75 z" transform="translate(0 -2) translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1098.362" x="108" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m 131.5,1102.3622 -1.5,1 0,5.5 c 0,0.25 0.25,0.5 0.5,0.5 l 1.25,0 2.25,0 1.25,0 1.25,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-5.5 -1.5,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1 -2)"/>
-                <path d="m 131.5,1102.3622 -1.5,1 0,5.5 c 0,0.25 0.25,0.5 0.5,0.5 l 1.25,0 2.25,0 1.25,0 1.25,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-5.5 -1.5,-1 z m 0.5,1 3,0 1,0.5 0,1.5 -5,0 0,-1.5 z m -0.5,4 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -2)"/>
-            </g>
-            <rect width="12" height="12" x="126" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-556 -24)" color="#000">
-            <path d="m 670,1220.3623 c -0.5,0 -1,0.5 -1,1 l 0,11 c 0,0.5 0.5,1 1,1 l 6,0 c 0.5,0 1,-0.5 1,-1 l 0,-3 c 0.16385,0 0.25,0 0.25,0 0.13687,0 0.25,0.096 0.25,0.25 0,0.19 0,0.5724 0,0.75 0,0.5 0.5,1 1,1 0.12942,0 0.34431,0 0.5,0 0.5,0 1,-0.4072 1,-1 0,-0.8426 0,-2.7778 0,-3.5 0,-1 -1,-1 -1,-1.9998 l 0,-1.5 -1,0 -1,-1.0002 0,-0.9998 c 0,-0.5 -0.5,-1 -1,-1 z m 0,1.5 6,0 0,2.5 -6,0 z m 7,3.5 1,0 c 0,1 1,1 1,2 l 0,2.75 c 0,0.25 -0.24998,0.25 -0.24998,0.25 0,0 -0.25002,0 -0.25,-0.25 0,0 0,-0.4201 0,-0.75 0,-0.5906 -0.49938,-1.0014 -1,-1 l -0.50009,-2e-4 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 670,1220.3623 c -0.5,0 -1,0.5 -1,1 l 0,11 c 0,0.5 0.5,1 1,1 l 6,0 c 0.5,0 1,-0.5 1,-1 l 0,-3 c 0.16385,0 0.25,0 0.25,0 0.13687,0 0.25,0.096 0.25,0.25 0,0.19 0,0.5724 0,0.75 0,0.5 0.5,1 1,1 0.12942,0 0.34431,0 0.5,0 0.5,0 1,-0.4072 1,-1 0,-0.8426 0,-2.7778 0,-3.5 0,-1 -1,-1 -1,-1.9998 l 0,-1.5 -1,0 -1,-1.0002 0,-0.9998 c 0,-0.5 -0.5,-1 -1,-1 z m 0,1.5 6,0 0,2.5 -6,0 z m 7,3.5 1,0 c 0,1 1,1 1,2 l 0,2.75 c 0,0.25 -0.24998,0.25 -0.24998,0.25 0,0 -0.25002,0 -0.25,-0.25 0,0 0,-0.4201 0,-0.75 0,-0.5906 -0.49938,-1.0014 -1,-1 l -0.50009,-2e-4 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect width="18" height="18" x="664" y="1218.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000" transform="translate(78 -192)">
-            <path d="m 443,195 2,16 c 0.0625,0.5 0.5,1 1,1 l 9,0 c 0.5,0 0.9375,-0.5 1,-1 l 2,-16 z m 2.25,2 10.5,0 -0.46875,4 -9.5625,0 z" transform="translate(-71 -1) translate(-49 1051.362)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path transform="translate(-71 -1) translate(-49 1051.362)" d="m 443,195 2,16 c 0.0625,0.5 0.5,1 1,1 l 9,0 c 0.5,0 0.9375,-0.5 1,-1 l 2,-16 z m 2.25,2 10.5,0 -0.46875,4 -9.5625,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g color="#000">
-            <path d="m 346,1244.3622 1.5,13 c 0.0577,0.5 0.5,1 1,1 l 6,0 c 0.5,0 0.94231,-0.5 1,-1 l 1.5,-13 z m 2,2 7,0 -0.4,3 -6.2,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(78 -192)"/>
-            <path d="m 346,1244.3622 1.5,13 c 0.0577,0.5 0.5,1 1,1 l 6,0 c 0.5,0 0.94231,-0.5 1,-1 l 1.5,-13 z m 2,2 7,0 -0.4,3 -6.2,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(78 -192)"/>
-        </g>
-        <g color="#000">
-            <path d="m 363,1243.3622 1,8.5 c 0.0357,0.2857 0.21428,0.5 0.5,0.5 l 4,0 c 0.28572,0 0.44996,-0.2165 0.5,-0.5 l 1,-8.5 z m 1.5,1 4,0 -0.25,2 -3.5,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(78 -192)"/>
-            <path d="m 363,1243.3622 1,8.5 c 0.0357,0.2857 0.21428,0.5 0.5,0.5 l 4,0 c 0.28572,0 0.44996,-0.2165 0.5,-0.5 l 1,-8.5 z m 1.5,1 4,0 -0.25,2 -3.5,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(78 -192)"/>
-        </g>
-        <g transform="translate(-156 -24)" color="#000">
-            <path d="m 345.78125,1268.3622 c -0.38889,0 -0.78125,0.3924 -0.78125,0.7813 l 0,5.5 c 0,1.7236 0.76389,3.7812 3.875,3.7812 0.27897,0 -0.11909,-0.027 0.125,-0.062 l 0,-2 -2.5,0 c 0,0 0.5555,-2 2.5,-2 l 0,-1.6562 c 0,-0.713 0.10973,-1.454 0.5,-1.8443 0.39026,-0.3903 0.86828,-1.267 2.5,-0.5005 l 1,0.5005 0,-1.7182 c 0,-0.3889 -0.39236,-0.7813 -0.78125,-0.7813 -0.72222,0 -2.21875,1 -3.21875,1 -1,0 -2.49653,-1 -3.21875,-1 z m 1.21875,2 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m 3.78125,1 c -0.36665,0 -0.78125,0.3924 -0.78125,0.7813 l 0,5.2187 c 0,1.7236 0.88889,4 4,4 3.11111,0 4,-2.2764 4,-4 l 0,-5.2187 c 0,-0.3889 -0.4146,-0.7813 -0.78125,-0.7813 -0.72222,0 -2.21875,1 -3.21875,1 -1,0 -2.49653,-1 -3.21875,-1 z m 1.21875,2 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m 4,0 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m -4.5,4 2.5625,0 2.4375,0 c 0,0 -0.55555,2 -2.5,2 -1.94444,0 -2.5,-2 -2.5,-2 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 345.78125,1268.3622 c -0.38889,0 -0.78125,0.3924 -0.78125,0.7813 l 0,5.5 c 0,1.7236 0.76389,3.7812 3.875,3.7812 0.27897,0 -0.11909,-0.027 0.125,-0.062 l 0,-2 -2.5,0 c 0,0 0.5555,-2 2.5,-2 l 0,-1.6562 c 0,-0.713 0.10973,-1.454 0.5,-1.8443 0.39026,-0.3903 0.88818,-1.308 2.5,-0.5005 l 1,0.5005 0,-1.7182 c 0,-0.3889 -0.39236,-0.7813 -0.78125,-0.7813 -0.72222,0 -2.21875,1 -3.21875,1 -1,0 -2.49653,-1 -3.21875,-1 z m 1.21875,2 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m 3.78125,1 c -0.36665,0 -0.78125,0.3924 -0.78125,0.7813 l 0,5.2187 c 0,1.7236 0.88889,4 4,4 3.11111,0 4,-2.2764 4,-4 l 0,-5.2187 c 0,-0.3889 -0.4146,-0.7813 -0.78125,-0.7813 -0.72222,0 -2.21875,1 -3.21875,1 -1,0 -2.49653,-1 -3.21875,-1 z m 1.21875,2 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m 4,0 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m -4.5,4 2.5625,0 2.4375,0 c 0,0 -0.55555,2 -2.5,2 -1.94444,0 -2.5,-2 -2.5,-2 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect y="1266.362" x="342" height="18" width="18" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-156 -24)" color="#000">
-            <g>
-                <path d="m 362.5,1268.3622 c -0.25,0 -0.5,0.25 -0.5,0.5 l 0,3 c 0,1.108 0.5,2.5 2.5,2.5 0.17934,0 0.34309,-0.01 0.5,-0.031 l 0,-1.4688 -2,0 c 0,0 0.25,-1 1.5,-1 0.25,0 0.34826,0.037 0.5,0.094 l 0,-1.094 c 0,-0.4583 0.20224,-0.8116 0.45312,-1.0625 0.25089,-0.2509 0.58854,-0.4375 1.04688,-0.4375 l 0.5,0 0,-0.4998 c 0,-0.25 -0.2643,-0.4998 -0.5,-0.5 -0.5,-4e-4 -1,0.4996 -2,0.4996 -0.86663,0 -1.5,-0.5 -2,-0.5 z m 1,2 c 0.27614,0 0.5,0.2239 0.5,0.5 0,0.2761 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.2239 -0.5,-0.5 0,-0.2761 0.22386,-0.5 0.5,-0.5 z m 3,0 c -0.2357,0 -0.5,0.25 -0.5,0.5 l 0,3 c 0,1.108 0.5,2.5 2.5,2.5 2,0 2.5,-1.392 2.5,-2.5 l 0,-3 c 0,-0.25 -0.2643,-0.5 -0.5,-0.5 -0.5,0 -1.25464,0.5 -2,0.5 -0.74536,0 -1.5,-0.5 -2,-0.5 z m 1,2 c 0.27614,0 0.5,0.2239 0.5,0.5 0,0.2761 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.2239 -0.5,-0.5 0,-0.2761 0.22386,-0.5 0.5,-0.5 z m 2,0 c 0.27614,0 0.5,0.2239 0.5,0.5 0,0.2761 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.2239 -0.5,-0.5 0,-0.2761 0.22386,-0.5 0.5,-0.5 z m -2.5,2 3,0 c 0,0 -0.25,1 -1.5,1 -1.25,0 -1.5,-1 -1.5,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 362.5,1268.3622 c -0.25,0 -0.5,0.25 -0.5,0.5 l 0,3 c 0,1.108 0.5,2.5 2.5,2.5 0.17934,0 0.34309,-0.01 0.5,-0.031 l 0,-1.4688 -2,0 c 0,0 0.25,-1 1.5,-1 0.25,0 0.34826,0.037 0.5,0.094 l 0,-1.094 c 0,-0.4583 0.20224,-0.8116 0.45312,-1.0625 0.25089,-0.2509 0.58854,-0.4375 1.04688,-0.4375 l 0.5,0 0,-0.4998 c 0,-0.25 -0.2643,-0.4998 -0.5,-0.5 -0.5,-4e-4 -1,0.4996 -2,0.4996 -0.86663,0 -1.5,-0.5 -2,-0.5 z m 1,2 c 0.27614,0 0.5,0.2239 0.5,0.5 0,0.2761 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.2239 -0.5,-0.5 0,-0.2761 0.22386,-0.5 0.5,-0.5 z m 3,0 c -0.2357,0 -0.5,0.25 -0.5,0.5 l 0,3 c 0,1.108 0.5,2.5 2.5,2.5 2,0 2.5,-1.392 2.5,-2.5 l 0,-3 c 0,-0.25 -0.2643,-0.5 -0.5,-0.5 -0.5,0 -1.25464,0.5 -2,0.5 -0.74536,0 -1.5,-0.5 -2,-0.5 z m 1,2 c 0.27614,0 0.5,0.2239 0.5,0.5 0,0.2761 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.2239 -0.5,-0.5 0,-0.2761 0.22386,-0.5 0.5,-0.5 z m 2,0 c 0.27614,0 0.5,0.2239 0.5,0.5 0,0.2761 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.2239 -0.5,-0.5 0,-0.2761 0.22386,-0.5 0.5,-0.5 z m -2.5,2 3,0 c 0,0 -0.25,1 -1.5,1 -1.25,0 -1.5,-1 -1.5,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect transform="translate(-120 1050.362)" y="216" x="480" height="12" width="12" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-156 -24)" color="#000">
-            <rect transform="translate(-120 1050.362)" y="240" x="480" height="12" width="12" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 366,1292.3622 c -2.5,0 -4,1.5 -4,3 0,1 0.5,2 2,2 1,0 1,0.25 1,1 0,1.5 1.5,2 2.5,2 2.5,0 3.5,-2.25 3.5,-4 0,-3.5 -2.51472,-4 -5,-4 z m -0.625,1 c 0.34517,0 0.625,0.2798 0.625,0.625 0,0.3452 -0.27983,0.625 -0.625,0.625 -0.34517,0 -0.625,-0.2798 -0.625,-0.625 0,-0.3452 0.27983,-0.625 0.625,-0.625 z m 2,0 c 0.34517,0 0.625,0.2798 0.625,0.625 0,0.3452 -0.27983,0.625 -0.625,0.625 -0.34517,0 -0.625,-0.2798 -0.625,-0.625 0,-0.3452 0.27983,-0.625 0.625,-0.625 z m -3.75,0.75 c 0.34517,0 0.625,0.2798 0.625,0.625 0,0.3452 -0.27983,0.625 -0.625,0.625 -0.34517,0 -0.625,-0.2798 -0.625,-0.625 0,-0.3452 0.27983,-0.625 0.625,-0.625 z m 5.75,0.25 c 0.34517,0 0.625,0.2798 0.625,0.625 0,0.3452 -0.27983,0.625 -0.625,0.625 -0.34517,0 -0.625,-0.2798 -0.625,-0.625 0,-0.3452 0.27983,-0.625 0.625,-0.625 z m -2.375,2.5 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 366,1292.3622 c -2.5,0 -4,1.5 -4,3 0,1 0.5,2 2,2 1,0 1,0.25 1,1 0,1.5 1.5,2 2.5,2 2.5,0 3.5,-2.25 3.5,-4 0,-3.5 -2.51472,-4 -5,-4 z m -0.625,1 c 0.34517,0 0.625,0.2798 0.625,0.625 0,0.3452 -0.27983,0.625 -0.625,0.625 -0.34517,0 -0.625,-0.2798 -0.625,-0.625 0,-0.3452 0.27983,-0.625 0.625,-0.625 z m 2,0 c 0.34517,0 0.625,0.2798 0.625,0.625 0,0.3452 -0.27983,0.625 -0.625,0.625 -0.34517,0 -0.625,-0.2798 -0.625,-0.625 0,-0.3452 0.27983,-0.625 0.625,-0.625 z m -3.75,0.75 c 0.34517,0 0.625,0.2798 0.625,0.625 0,0.3452 -0.27983,0.625 -0.625,0.625 -0.34517,0 -0.625,-0.2798 -0.625,-0.625 0,-0.3452 0.27983,-0.625 0.625,-0.625 z m 5.75,0.25 c 0.34517,0 0.625,0.2798 0.625,0.625 0,0.3452 -0.27983,0.625 -0.625,0.625 -0.34517,0 -0.625,-0.2798 -0.625,-0.625 0,-0.3452 0.27983,-0.625 0.625,-0.625 z m -2.375,2.5 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g transform="translate(-156 -24)" color="#000">
-            <g>
-                <path d="m 449,244 c -5,0 -8,4 -8,6 0,2 1,3.5 3,3.5 2,0 3,0.5 3,2 0,2 1.5,3.5 3.5,3.5 6.5,0 9.5,-3.5 9.5,-7 0,-6 -5,-8 -11,-8 z" transform="translate(-120 1050.362)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path transform="translate(-120 1050.362)" d="m 449,244 c -5,0 -8,4 -8,6 0,2 1,3.5 3,3.5 2,0 3,0.5 3,2 0,2 1.5,3.5 3.5,3.5 6.5,0 9.5,-3.5 9.5,-7 0,-6 -5,-8 -11,-8 z m -1.25,2 c 0.69034,0 1.25,0.55966 1.25,1.25 0,0.69034 -0.55966,1.25 -1.25,1.25 -0.69034,0 -1.25,-0.55966 -1.25,-1.25 0,-0.69034 0.55966,-1.25 1.25,-1.25 z m 4,0 c 0.69033,0 1.25,0.55967 1.25,1.25 0,0.69033 -0.55967,1.25 -1.25,1.25 -0.69033,0 -1.25,-0.55967 -1.25,-1.25 0,-0.69033 0.55967,-1.25 1.25,-1.25 z m 4,2 c 0.69034,0 1.25,0.55966 1.25,1.25 0,0.69034 -0.55966,1.25 -1.25,1.25 -0.69034,0 -1.25,-0.55966 -1.25,-1.25 0,-0.69034 0.55966,-1.25 1.25,-1.25 z m -11.5,1 c 0.69034,0 1.25,0.55966 1.25,1.25 0,0.69034 -0.55966,1.25 -1.25,1.25 -0.69034,0 -1.25,-0.55966 -1.25,-1.25 0,-0.69034 0.55966,-1.25 1.25,-1.25 z m 6.25,5 c 0.82843,0 1.5,0.67157 1.5,1.5 0,0.82843 -0.67157,1.5 -1.5,1.5 -0.82843,0 -1.5,-0.67157 -1.5,-1.5 0,-0.82843 0.67157,-1.5 1.5,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect transform="translate(-120 1050.362)" y="240" x="438" height="24" width="24" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-156 -24)" color="#000">
-            <g>
-                <path d="m 470.5,243 c -3.88889,0 -6.5,3.44444 -6.5,5 0,1.5 0.99999,2.5 2.5,2.5 1.55556,0 3,0.33333 3,1.5 0,1.55556 1.44444,2.5 3,2.5 4.5,0 6.5,-2.77778 6.5,-5.5 0,-5.5 -4.634,-6 -8.5,-6 z m -1.5,1.5 c 0.55228,0 1,0.44772 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 3,0 c 0.55227,0 1,0.44773 1,1 0,0.55227 -0.44773,1 -1,1 -0.55227,0 -1,-0.44773 -1,-1 0,-0.55227 0.44773,-1 1,-1 z m 3,1.5 c 0.54462,0 0.96875,0.45538 0.96875,1 0,0.54462 -0.42413,0.96875 -0.96875,0.96875 -0.54462,0 -1,-0.42413 -1,-0.96875 0,-0.54462 0.45538,-1 1,-1 z m -8,1 c 0.55229,0 1,0.44771 1,1 0,0.55229 -0.44771,1 -1,1 -0.55229,0 -1,-0.44771 -1,-1 0,-0.55229 0.44771,-1 1,-1 z" transform="matrix(1.001 0 0 1.001 -120.061 1050.581)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path transform="matrix(1.001 0 0 1.001 -120.061 1050.581)" d="m 470.5,243 c -3.88889,0 -6.5,3.44444 -6.5,5 0,1.5 0.99999,2.5 2.5,2.5 1.55556,0 3,0.33333 3,1.5 0,1.55556 1.44444,2.5 3,2.5 4.5,0 6.5,-2.77778 6.5,-5.5 0,-5.5 -4.634,-6 -8.5,-6 z m -1.5,1.5 c 0.55228,0 1,0.44772 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 z m 3,0 c 0.55227,0 1,0.44773 1,1 0,0.55227 -0.44773,1 -1,1 -0.55227,0 -1,-0.44773 -1,-1 0,-0.55227 0.44773,-1 1,-1 z m 3,1.5 c 0.54462,0 0.96875,0.45538 0.96875,1 0,0.54462 -0.42413,0.96875 -0.96875,0.96875 -0.54462,0 -1,-0.42413 -1,-0.96875 0,-0.54462 0.45538,-1 1,-1 z m -8,1 c 0.55229,0 1,0.44771 1,1 0,0.55229 -0.44771,1 -1,1 -0.55229,0 -1,-0.44771 -1,-1 0,-0.55229 0.44771,-1 1,-1 z m 5.25,3.5 c 0.69035,0 1.25,0.55965 1.25,1.25 0,0.69035 -0.55965,1.25 -1.25,1.25 -0.69035,0 -1.25,-0.55965 -1.25,-1.25 0,-0.69035 0.55965,-1.25 1.25,-1.25 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect transform="translate(-120 1050.362)" y="240" x="462" height="18" width="18" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)" color="#000">
-            <g font-size="25.21" font-weight="bold" letter-spacing="0" word-spacing="0" font-family="Helvetica Neue">
-                <path d="m 96.5,1216.3622 -6.5,2 0,2 6.5,-2 6.5,2 0,-2 -6.5,-2 z m -3.09375,4.25 0,11.4063 2.40625,0 0,-4.0625 1.0625,0 c 1.41666,0 2.51561,-0.3177 3.28125,-0.9688 0.77082,-0.6511 1.125,-1.5834 1.125,-2.8125 0,-1.1824 -0.33855,-2.0625 -1.0625,-2.6562 -0.71876,-0.5989 -1.77084,-0.9063 -3.15625,-0.9063 l -3.65625,0 z m 2.40625,1.9688 1.125,0 c 0.66145,0 1.1302,0.1354 1.4375,0.4062 0.3125,0.271 0.46875,0.7136 0.46875,1.2813 0,0.5625 -0.19271,0.9844 -0.5625,1.2812 -0.36979,0.2917 -0.91146,0.4375 -1.65625,0.4375 l -0.8125,0 0,-3.4062 z" style="text-indent:0;text-align:start;line-height:125%;text-transform:none;block-progression:tb;-inkscape-font-specification:Helvetica Neue Bold" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 6)"/>
-                <path style="text-indent:0;text-align:start;line-height:125%;text-transform:none;block-progression:tb;-inkscape-font-specification:Helvetica Neue Bold" d="m 96.5,1216.3622 -6.5,2 0,2 6.5,-2 6.5,2 0,-2 -6.5,-2 z m -3.09375,4.25 0,11.4063 2.40625,0 0,-4.0625 1.0625,0 c 1.41666,0 2.51561,-0.3177 3.28125,-0.9688 0.77082,-0.6511 1.125,-1.5834 1.125,-2.8125 0,-1.1824 -0.33855,-2.0625 -1.0625,-2.6562 -0.71876,-0.5989 -1.77084,-0.9063 -3.15625,-0.9063 l -3.65625,0 z m 2.40625,1.9688 1.125,0 c 0.66145,0 1.1302,0.1354 1.4375,0.4062 0.3125,0.271 0.46875,0.7136 0.46875,1.2813 0,0.5625 -0.19271,0.9844 -0.5625,1.2812 -0.36979,0.2917 -0.91146,0.4375 -1.65625,0.4375 l -0.8125,0 0,-3.4062 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 6)"/>
-            </g>
-            <rect width="24" height="24" x="84" y="1218.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <rect width="12" height="12" x="-30" y="1290.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m -23.5,1291.3622 c -1.61437,0 -3.5,1 -3.5,3.5 0,1.75 2.75,5.5 3.5,6.5 0.75,-1 3.5,-4.75 3.5,-6.5 0,-2.5 -1.88563,-3.5 -3.5,-3.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m -23.5,1291.3622 c -1.61437,0 -3.5,1 -3.5,3.5 0,1.75 2.75,5.5 3.5,6.5 0.75,-1 3.5,-4.75 3.5,-6.5 0,-2.5 -1.88563,-3.5 -3.5,-3.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g color="#000">
-            <rect width="12" height="12" x="126" y="1218.362" overflow="visible" enable-background="accumulate" fill="none"/>
-            <g style="text-indent:0;text-align:center;line-height:125%;text-transform:none;block-progression:tb;-inkscape-font-specification:Open Sans Bold" font-size="9.333" font-weight="bold" text-anchor="middle" fill="#444" overflow="visible" enable-background="accumulate" font-family="Open Sans">
-                <path d="m 132.31641,1224.1682 0.46484,0 c 0.43446,0 0.75955,-0.085 0.97526,-0.2552 0.21571,-0.1732 0.32356,-0.4238 0.32357,-0.7519 -1e-5,-0.3312 -0.0911,-0.5758 -0.27344,-0.7338 -0.17926,-0.158 -0.46181,-0.2369 -0.84766,-0.237 l -0.64257,0 0,1.9779 m 3.1901,-1.0573 c -1e-5,0.717 -0.22483,1.2654 -0.67448,1.6452 -0.44662,0.3798 -1.08312,0.5697 -1.9095,0.5697 l -0.60612,0 0,2.3698 -1.41276,0 0,-6.6628 2.12825,0 c 0.80816,0 1.42187,0.1747 1.84115,0.5241 0.4223,0.3463 0.63345,0.8644 0.63346,1.554" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 132.31641,1224.1682 0.46484,0 c 0.43446,0 0.75955,-0.085 0.97526,-0.2552 0.21571,-0.1732 0.32356,-0.4238 0.32357,-0.7519 -1e-5,-0.3312 -0.0911,-0.5758 -0.27344,-0.7338 -0.17926,-0.158 -0.46181,-0.2369 -0.84766,-0.237 l -0.64257,0 0,1.9779 m 3.1901,-1.0573 c -1e-5,0.717 -0.22483,1.2654 -0.67448,1.6452 -0.44662,0.3798 -1.08312,0.5697 -1.9095,0.5697 l -0.60612,0 0,2.3698 -1.41276,0 0,-6.6628 2.12825,0 c 0.80816,0 1.42187,0.1747 1.84115,0.5241 0.4223,0.3463 0.63345,0.8644 0.63346,1.554"/>
-            </g>
-        </g>
-        <g color="#000">
-            <path d="m 132.5,1243.3622 -3.5,1 0,1 3.5,-1 3.5,1 0,-1 -3.5,-1 z m -1.59375,2.6563 0,6.6875 1.40625,0 0,-2.375 0.625,0 c 0.82638,0 1.45963,-0.1827 1.90625,-0.5625 0.44965,-0.3798 0.65624,-0.9393 0.65625,-1.6563 -1e-5,-0.6896 -0.2027,-1.2162 -0.625,-1.5625 -0.41928,-0.3494 -1.03559,-0.5312 -1.84375,-0.5312 l -2.125,0 z m 1.40625,1.1562 0.65625,0 c 0.38585,10e-5 0.66449,0.092 0.84375,0.25 0.18234,0.158 0.28124,0.4188 0.28125,0.75 -1e-5,0.3281 -0.12804,0.5768 -0.34375,0.75 -0.21571,0.1702 -0.53429,0.25 -0.96875,0.25 l -0.46875,0 0,-2 z" style="text-indent:0;text-align:start;line-height:125%;text-transform:none;block-progression:tb;-inkscape-font-specification:Helvetica Neue Bold" font-size="25.21" font-weight="bold" letter-spacing="0" word-spacing="0" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" font-family="Helvetica Neue"/>
-            <path style="text-indent:0;text-align:start;line-height:125%;text-transform:none;block-progression:tb;-inkscape-font-specification:Helvetica Neue Bold" d="m 132.5,1243.3622 -3.5,1 0,1 3.5,-1 3.5,1 0,-1 -3.5,-1 z m -1.59375,2.6563 0,6.6875 1.40625,0 0,-2.375 0.625,0 c 0.82638,0 1.45963,-0.1827 1.90625,-0.5625 0.44965,-0.3798 0.65624,-0.9393 0.65625,-1.6563 -1e-5,-0.6896 -0.2027,-1.2162 -0.625,-1.5625 -0.41928,-0.3494 -1.03559,-0.5312 -1.84375,-0.5312 l -2.125,0 z m 1.40625,1.1562 0.65625,0 c 0.38585,10e-5 0.66449,0.092 0.84375,0.25 0.18234,0.158 0.28124,0.4188 0.28125,0.75 -1e-5,0.3281 -0.12804,0.5768 -0.34375,0.75 -0.21571,0.1702 -0.53429,0.25 -0.96875,0.25 l -0.46875,0 0,-2 z" font-size="25.21" font-weight="bold" letter-spacing="0" word-spacing="0" fill="#444" overflow="visible" enable-background="accumulate" font-family="Helvetica Neue"/>
-            <rect width="12" height="12" x="126" y="1242.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 24)">
-            <rect width="24" height="24" x="84" y="1194.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-            <g style="text-indent:0;text-align:center;line-height:125%;text-transform:none;block-progression:tb;-inkscape-font-specification:Open Sans Bold" font-size="12" font-weight="bold" text-anchor="middle" color="#000" fill="#444" overflow="visible" enable-background="accumulate" font-family="Open Sans" transform="matrix(1.333 0 0 1.333 84 -160.787)">
-                <path d="m 8.8710938,1025.077 0.5976562,0 c 0.55859,0 0.976558,-0.1093 1.253906,-0.3281 0.277339,-0.2226 0.416011,-0.5449 0.416016,-0.9668 -5e-6,-0.4258 -0.117193,-0.7402 -0.351563,-0.9434 -0.230473,-0.2031 -0.593754,-0.3046 -1.0898434,-0.3046 l -0.8261718,0 0,2.5429 m 4.1015622,-1.3593 c -7e-6,0.9218 -0.289069,1.6269 -0.867187,2.1152 -0.574225,0.4883 -1.392583,0.7324 -2.4550784,0.7324 l -0.7792968,0 0,3.0469 -1.8164063,0 0,-8.5664 2.7363281,0 c 1.0390574,0 1.8281194,0.2246 2.3671874,0.6738 0.542962,0.4453 0.814446,1.1113 0.814453,1.9981" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="1.5" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 8.8710938,1025.077 0.5976562,0 c 0.55859,0 0.976558,-0.1093 1.253906,-0.3281 0.277339,-0.2226 0.416011,-0.5449 0.416016,-0.9668 -5e-6,-0.4258 -0.117193,-0.7402 -0.351563,-0.9434 -0.230473,-0.2031 -0.593754,-0.3046 -1.0898434,-0.3046 l -0.8261718,0 0,2.5429 m 4.1015622,-1.3593 c -7e-6,0.9218 -0.289069,1.6269 -0.867187,2.1152 -0.574225,0.4883 -1.392583,0.7324 -2.4550784,0.7324 l -0.7792968,0 0,3.0469 -1.8164063,0 0,-8.5664 2.7363281,0 c 1.0390574,0 1.8281194,0.2246 2.3671874,0.6738 0.542962,0.4453 0.814446,1.1113 0.814453,1.9981"/>
-            </g>
-        </g>
-        <g color="#000">
-            <g font-size="25.21" font-weight="bold" letter-spacing="0" word-spacing="0" font-family="Helvetica Neue">
-                <path d="m 115,1222.3622 0,10 2.125,0 0,-3.5625 0.90625,0 c 1.23958,0 2.20507,-0.274 2.875,-0.8437 0.67447,-0.5697 0.99999,-1.3932 1,-2.4688 -1e-5,-1.0345 -0.30404,-1.8242 -0.9375,-2.3437 -0.62891,-0.5241 -1.56901,-0.7812 -2.78125,-0.7813 z m 2.125,1.75 0.96875,0 c 0.57877,0 0.98112,0.1069 1.25,0.3438 0.27343,0.237 0.40624,0.597 0.40625,1.0937 -1e-5,0.4922 -0.14519,0.8652 -0.46875,1.125 -0.32358,0.2552 -0.81707,0.4063 -1.46875,0.4063 l -0.6875,0 z" style="text-indent:0;text-align:start;line-height:125%;text-transform:none;block-progression:tb;-inkscape-font-specification:Helvetica Neue Bold" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path style="text-indent:0;text-align:start;line-height:125%;text-transform:none;block-progression:tb;-inkscape-font-specification:Helvetica Neue Bold" d="m 115,1222.3622 0,10 2.125,0 0,-3.5625 0.90625,0 c 1.23958,0 2.20507,-0.274 2.875,-0.8437 0.67447,-0.5697 0.99999,-1.3932 1,-2.4688 -1e-5,-1.0345 -0.30404,-1.8242 -0.9375,-2.3437 -0.62891,-0.5241 -1.56901,-0.7812 -2.78125,-0.7813 z m 2.125,1.75 0.96875,0 c 0.57877,0 0.98112,0.1069 1.25,0.3438 0.27343,0.237 0.40624,0.597 0.40625,1.0937 -1e-5,0.4922 -0.14519,0.8652 -0.46875,1.125 -0.32358,0.2552 -0.81707,0.4063 -1.46875,0.4063 l -0.6875,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1218.362" x="108" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <rect y="1050.362" x="-72" height="24" width="24" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m -59.5,1053.3622 c -4.69442,0 -8.5,3.8056 -8.5,8.5 0,4.6944 3.80558,8.5 8.5,8.5 4.69442,0 8.5,-3.8056 8.5,-8.5 0,-4.6944 -3.80558,-8.5 -8.5,-8.5 z m 0,2 c 3.589851,0 6.5,2.9101 6.5,6.5 0,3.5899 -2.910149,6.5 -6.5,6.5 -3.589851,0 -6.5,-2.9101 -6.5,-6.5 0,-3.5899 2.910149,-6.5 6.5,-6.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-            <path d="m -59.5,1053.3622 c -4.69442,0 -8.5,3.8056 -8.5,8.5 0,4.6944 3.80558,8.5 8.5,8.5 4.69442,0 8.5,-3.8056 8.5,-8.5 0,-4.6944 -3.80558,-8.5 -8.5,-8.5 z m 0,2 c 3.589851,0 6.5,2.9101 6.5,6.5 0,3.5899 -2.910149,6.5 -6.5,6.5 -3.589851,0 -6.5,-2.9101 -6.5,-6.5 0,-3.5899 2.910149,-6.5 6.5,-6.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g transform="translate(-468 216)" color="#000">
-            <g>
-                <path d="m 564.5,1076.3622 c -4.69444,0 -8.5,3.8056 -8.5,8.5 0,4.6944 3.80556,8.5 8.5,8.5 4.69444,0 8.5,-3.8056 8.5,-8.5 0,-4.6944 -3.80556,-8.5 -8.5,-8.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 564.5,1076.3622 c -4.69444,0 -8.5,3.8056 -8.5,8.5 0,4.6944 3.80556,8.5 8.5,8.5 4.69444,0 8.5,-3.8056 8.5,-8.5 0,-4.6944 -3.80556,-8.5 -8.5,-8.5 z m -5.5,7 11,0 0,3 -11,0 0,-3 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="552" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 -24)">
-            <g>
-                <path d="m 91.5,1294.3622 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.277 0.223,0.5 0.5,0.5 l 4,0 -0.5,3 0,1 -7,2 0,2 7,0 0,4 -2.5,1 0,1 8,0 0,-1 -2.5,-1 0,-1.9687 0,-2.0313 7,0 0,-2 -7,-2 0,-1 -0.5,-3 4,0 c 0.277,0 0.5,-0.223 0.5,-0.5 0,-0.277 -0.223,-0.5 -0.5,-0.5 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 91.5,1294.3622 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.277 0.223,0.5 0.5,0.5 l 4,0 -0.5,3 0,1 -7,2 0,2 7,0 0,4 -2.5,1 0,1 8,0 0,-1 -2.5,-1 0,-1.9687 0,-2.0313 7,0 0,-2 -7,-2 0,-1 -0.5,-3 4,0 c 0.277,0 0.5,-0.223 0.5,-0.5 0,-0.277 -0.223,-0.5 -0.5,-0.5 z" fill="#444"/>
-            </g>
-            <rect y="1290.362" x="84" height="24" width="24" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-468 216)" color="#000">
-            <g>
-                <path d="m 600.5,1075.3622 c -2.48528,0 -4.5,2.0147 -4.5,4.5 0,2.4853 2.01472,4.5 4.5,4.5 2.48528,0 4.5,-2.0147 4.5,-4.5 0,-2.4853 -2.01472,-4.5 -4.5,-4.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 600.5,1075.3622 c -2.48528,0 -4.5,2.0147 -4.5,4.5 0,2.4853 2.01472,4.5 4.5,4.5 2.48528,0 4.5,-2.0147 4.5,-4.5 0,-2.4853 -2.01472,-4.5 -4.5,-4.5 z m -2.5,4 5,0 0,1 -5,0 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="12" height="12" x="594" y="1074.362" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 -24)">
-            <g>
-                <path d="m 113.32353,1292.3622 c -0.21182,0 -0.38235,0.1705 -0.38235,0.3824 0,0.2118 0.17053,0.3823 0.38235,0.3823 l 3.05882,0 -0.38235,2.2353 0,0.9411 -5,1.5294 0,1.5295 5,0 0,3.4118 -2,0.8235 0,0.7647 7,0 0,-0.7647 -2,-0.8235 0,-3.4118 5,0 0,-1.5295 -5,-1.5294 0,-0.9411 -0.38235,-2.2353 3.05882,0 c 0.21182,0 0.38235,-0.1705 0.38235,-0.3823 0,-0.2119 -0.17053,-0.3824 -0.38235,-0.3824 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 1)"/>
-                <path d="m 113.32353,1292.3622 c -0.21182,0 -0.38235,0.1705 -0.38235,0.3824 0,0.2118 0.17053,0.3823 0.38235,0.3823 l 3.05882,0 -0.38235,2.2353 0,0.9411 -5,1.5294 0,1.5295 5,0 0,3.4118 -2,0.8235 0,0.7647 7,0 0,-0.7647 -2,-0.8235 0,-3.4118 5,0 0,-1.5295 -5,-1.5294 0,-0.9411 -0.38235,-2.2353 3.05882,0 c 0.21182,0 0.38235,-0.1705 0.38235,-0.3823 0,-0.2119 -0.17053,-0.3824 -0.38235,-0.3824 z" fill="#444" transform="translate(0 1)"/>
-            </g>
-            <rect y="1290.362" x="108" height="18" width="18" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 -24)">
-            <g>
-                <path d="m 131.25,1292.8622 c -0.1385,0 -0.25,0.1115 -0.25,0.25 0,0.1385 0.1115,0.25 0.25,0.25 l 2,0 -0.25,1 0,1 -4,1 0,1 4,0 0,2 -1,0.5 0,0.5 3,0 0,-0.5 -1,-0.5 0,-2 4,0 0,-1 -4,-1 0,-1 -0.25,-1 2,0 c 0.1385,0 0.25,-0.1115 0.25,-0.25 0,-0.1385 -0.1115,-0.25 -0.25,-0.25 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-                <path d="m 131.25,1292.8622 c -0.1385,0 -0.25,0.1115 -0.25,0.25 0,0.1385 0.1115,0.25 0.25,0.25 l 2,0 -0.25,1 0,1 -4,1 0,1 4,0 0,2 -1,0.5 0,0.5 3,0 0,-0.5 -1,-0.5 0,-2 4,0 0,-1 -4,-1 0,-1 -0.25,-1 2,0 c 0.1385,0 0.25,-0.1115 0.25,-0.25 0,-0.1385 -0.1115,-0.25 -0.25,-0.25 z" fill="#444" transform="translate(-1 -1)"/>
-            </g>
-            <rect width="12" height="12" x="126" y="1290.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 -24)" color="#000">
-            <path d="m 121,1364.3622 -1,0.5 -0.5,0.5 -0.5,1 0,1 0.0937,0.4063 -6.3437,6.3437 c -0.75,-0.75 -0.75,-2.75 0.25,-3.75 l 1,1 0,-4 -1.5,1.5 c -1,1 -1.5,1.5 -1.5,3 l 0,1.5 0,4 4,0 1.5,0 c 1,0 2,-0.5 3,-1.5 l 0.5,-0.5 1,-1 -1,0 -3,0 1,1 c -1,1 -3,1 -3.75,0.25 l 6.34375,-6.3437 0.40625,0.094 1,0 1,-0.5 0.5,-0.5 0.5,-1 0,-1 -0.5,-1 -0.5,-0.5 -1,-0.5 -1,0 z m 0,1.5 0.5,0 0.5,0 0.5,0.5 0,0.5 0,0.5 -0.5,0.5 -0.5,0 -0.5,0 -0.5,-0.5 0,-0.5 0,-0.5 0.5,-0.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 121,1364.3622 -1,0.5 -0.5,0.5 -0.5,1 0,1 0.0937,0.4063 -6.3437,6.3437 c -0.75,-0.75 -0.75,-2.75 0.25,-3.75 l 1,1 0,-4 -1.5,1.5 c -1,1 -1.5,1.5 -1.5,3 l 0,1.5 0,4 4,0 1.5,0 c 1,0 2,-0.5 3,-1.5 l 0.5,-0.5 1,-1 -1,0 -3,0 1,1 c -1,1 -3,1 -3.75,0.25 l 6.34375,-6.3437 0.40625,0.094 1,0 1,-0.5 0.5,-0.5 0.5,-1 0,-1 -0.5,-1 -0.5,-0.5 -1,-0.5 -1,0 z m 0,1.5 0.5,0 0.5,0 0.5,0.5 0,0.5 0,0.5 -0.5,0.5 -0.5,0 -0.5,0 -0.5,-0.5 0,-0.5 0,-0.5 0.5,-0.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect ry="0" rx="0" y="1362.362" x="108" height="18" width="18" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 -24)" color="#000">
-            <g>
-                <path transform="translate(-120 1050.362)" d="m 214,289 c -0.554,0 -1,0.446 -1,1 l -2,0 c -0.554,0 -1,0.446 -1,1 l 0,6.0625 -2,0.9375 2,4 0,2 c 1.5,0 2.5,1.0005 3.5,1 1,5e-4 1.5,-1 3,-1 1.5,0 2,0.9995 3,1 1,5e-4 2,-1 3.5,-1 l 0,-2 2,-4 -2,-0.9375 0,-6.0625 c 0,-0.554 -0.446,-1 -1,-1 l -2,0 c 0,-0.554 -0.446,-1 -1,-1 l -5,0 z m -2,3 9,0 0,4.125 -4.5,-2.125 -4.5,2.125 0,-4.125 z m -2,14 c -0.69406,0 -1.33976,0.4049 -2,0.625 l 0,2.03125 c 0,0 1,-0.65575 2,-0.65625 1,-5e-4 2,1 3.5,1 1.5,0 1.97352,-0.9653 3,-1 1,5e-4 1.5,1 3,1 1.5,0 2.5,-1 3.5,-1 0.70165,0 2,0.65625 2,0.65625 l 0,-2.03125 c -0.6416,-0.2468 -1.34343,-0.625 -2,-0.625 -1.5,0 -2.5,1.0005 -3.5,1 -1,-5e-4 -1.5,-1 -3,-1 -1.5,0 -2,1.0005 -3,1 -1,5e-4 -2,-1 -3.5,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 214,289 c -0.554,0 -1,0.446 -1,1 l -2,0 c -0.554,0 -1,0.446 -1,1 l 0,6.0625 -2,0.9375 2,4 0,2 c 1.5,0 2.5,1.0005 3.5,1 1,5e-4 1.5,-1 3,-1 1.5,0 2,0.9995 3,1 1,5e-4 2,-1 3.5,-1 l 0,-2 2,-4 -2,-0.9375 0,-6.0625 c 0,-0.554 -0.446,-1 -1,-1 l -2,0 c 0,-0.554 -0.446,-1 -1,-1 l -5,0 z m -2,3 9,0 0,4.125 -4.5,-2.125 -4.5,2.125 0,-4.125 z m -2,14 c -0.69406,0 -1.33976,0.4049 -2,0.625 l 0,2.03125 c 0,0 1,-0.65575 2,-0.65625 1,-5e-4 2,1 3.5,1 1.5,0 1.97352,-0.9653 3,-1 1,5e-4 1.5,1 3,1 1.5,0 2.5,-1 3.5,-1 0.70165,0 2,0.65625 2,0.65625 l 0,-2.03125 c -0.6416,-0.2468 -1.34343,-0.625 -2,-0.625 -1.5,0 -2.5,1.0005 -3.5,1 -1,-5e-4 -1.5,-1 -3,-1 -1.5,0 -2,1.0005 -3,1 -1,5e-4 -2,-1 -3.5,-1 z" transform="translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="24" height="24" x="84" y="1338.362" rx="0" ry="0" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 -24)" color="#000">
-            <path d="m 116,1339.3622 c -0.5,0 -1,0.5 -1,1 l -1.17646,0 c -0.45624,0 -0.85294,0.5438 -0.85294,1 l 0.0294,3.5 -2,1 2,3.5 0,1.5 2.5,1 2,-1 2,1 2.5,-1 0,-1.5 2,-3.5 -2,-1 0,-3.5 c 0,-0.4562 -0.36729,-1 -0.82353,-1 l -1.17647,0 c 0,-0.5 -0.5,-1 -1,-1 z m -2,2 7,0 0,3.0441 -3.5,-2.0441 -3.5,2.0441 z m -1,11 -2,1 0,1.5 2,-1 2.5,1 2,-1 2,1 2.5,-0.8534 2,0.8534 0,-1.5 -2,-1 -2.5,1 -2,-1 -2,1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 116,1339.3622 c -0.5,0 -1,0.5 -1,1 l -1.17646,0 c -0.45624,0 -0.85294,0.5438 -0.85294,1 l 0.0294,3.5 -2,1 2,3.5 0,1.5 2.5,1 2,-1 2,1 2.5,-1 0,-1.5 2,-3.5 -2,-1 0,-3.5 c 0,-0.4562 -0.36729,-1 -0.82353,-1 l -1.17647,0 c 0,-0.5 -0.5,-1 -1,-1 z m -2,2 7,0 0,3.0441 -3.5,-2.0441 -3.5,2.0441 z m -1,11 -2,1 0,1.5 2,-1 2.5,1 2,-1 2,1 2.5,-0.8534 2,0.8534 0,-1.5 -2,-1 -2.5,1 -2,-1 -2,1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect width="18" height="18" x="108" y="1338.362" rx="0" ry="0" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 -24)" color="#000">
-            <g>
-                <path d="m 130.5,1339.3622 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,3.5 -1,0.5 1,2 0,1 2,0.5 1.5,-0.5 1.5,0.5 2,-0.5 0,-1 1,-2 -1,-0.4687 0,-3.5313 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -1,0 -4,0 z m 0.5,1 5,0 0,2.5625 -2.5,-1.5625 -2.5,1.5 z m -0.5,7.4995 -1.5,0.4688 0,1.0312 0.15625,-0.062 1.34375,-0.4375 1.5,0.5 1.5,-0.5 1.5,0.5 1.5,-0.5 1.5,0.5 0,-1.0312 -1.5,-0.4688 -1.5,0.4688 -1.5,-0.4688 -1.5,0.4688 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-                <path d="m 130.5,1339.3622 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,3.5 -1,0.5 1,2 0,1 2,0.5 1.5,-0.5 1.5,0.5 2,-0.5 0,-1 1,-2 -1,-0.4687 0,-3.5313 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -1,0 -4,0 z m 0.5,1 5,0 0,2.5625 -2.5,-1.5625 -2.5,1.5 z m -0.5,7.4995 -1.5,0.4688 0,1.0312 0.15625,-0.062 1.34375,-0.4375 1.5,0.5 1.5,-0.5 1.5,0.5 1.5,-0.5 1.5,0.5 0,-1.0312 -1.5,-0.4688 -1.5,0.4688 -1.5,-0.4688 -1.5,0.4688 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-            </g>
-            <rect width="12" height="12" x="126" y="1338.362" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <path d="m -66.91667,1245.3622 c -0.54166,0 -1.08333,0.5421 -1.08333,1.0833 0,0.2697 0.0882,0.5283 0.30469,0.7448 l 6.67187,6.6719 -6.67187,6.6719 c -0.21656,0.2165 -0.30469,0.4751 -0.30469,0.7448 0,0.5412 0.54167,1.0833 1.08333,1.0833 0.27084,0 0.54167,-0.067 0.77865,-0.3046 l 6.63802,-6.6381 6.63802,6.6381 c 0.23698,0.2374 0.50781,0.3046 0.77865,0.3046 0.54166,0 1.08333,-0.5421 1.08333,-1.0833 0,-0.2697 -0.0882,-0.5283 -0.30469,-0.7448 l -6.67187,-6.6719 6.67187,-6.6719 c 0.21656,-0.2165 0.30469,-0.4751 0.30469,-0.7448 0,-0.5412 -0.54167,-1.0833 -1.08333,-1.0833 -0.27084,0 -0.54167,0.067 -0.77865,0.3047 l -6.63802,6.638 -6.63802,-6.638 c -0.23698,-0.2375 -0.50781,-0.3047 -0.77865,-0.3047 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" font-family="Sans"/>
-            <rect width="24" height="24" x="-72" y="1242.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m -66.91667,1245.3622 c -0.54166,0 -1.08333,0.5421 -1.08333,1.0833 0,0.2697 0.0882,0.5283 0.30469,0.7448 l 6.67187,6.6719 -6.67187,6.6719 c -0.21656,0.2165 -0.30469,0.4751 -0.30469,0.7448 0,0.5412 0.54167,1.0833 1.08333,1.0833 0.27084,0 0.54167,-0.067 0.77865,-0.3046 l 6.63802,-6.6381 6.63802,6.6381 c 0.23698,0.2374 0.50781,0.3046 0.77865,0.3046 0.54166,0 1.08333,-0.5421 1.08333,-1.0833 0,-0.2697 -0.0882,-0.5283 -0.30469,-0.7448 l -6.67187,-6.6719 6.67187,-6.6719 c 0.21656,-0.2165 0.30469,-0.4751 0.30469,-0.7448 0,-0.5412 -0.54167,-1.0833 -1.08333,-1.0833 -0.27084,0 -0.54167,0.067 -0.77865,0.3047 l -6.63802,6.638 -6.63802,-6.638 c -0.23698,-0.2375 -0.50781,-0.3047 -0.77865,-0.3047 z" fill="#444" overflow="visible" enable-background="accumulate" font-family="Sans"/>
-        </g>
-        <g transform="translate(0 -24)" color="#000">
-            <rect y="1314.362" x="108" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 117.5,1316.3622 c -3.58985,0 -6.5,2.9102 -6.5,6.5 0,3.5899 2.91015,6.5 6.5,6.5 3.58985,0 6.5,-2.9101 6.5,-6.5 0,-3.5898 -2.91015,-6.5 -6.5,-6.5 z m -3.5,6 7,0 0,2 -7,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 117.5,1316.3622 c -3.58985,0 -6.5,2.9102 -6.5,6.5 0,3.5899 2.91015,6.5 6.5,6.5 3.58985,0 6.5,-2.9101 6.5,-6.5 0,-3.5898 -2.91015,-6.5 -6.5,-6.5 z m -3.5,6 7,0 0,2 -7,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g transform="translate(0 -24)" color="#000">
-            <path d="m 101.5,1365.3622 c -1.933,0 -3.5,1.567 -3.5,3.5 0,0.4384 0.10282,0.8633 0.25,1.25 l -8.25,8.25 c 0,-1 0,-3 0,-4 0,-1.5 1,-2 1,-2 l 1,1 c 0,0 0,-2.6667 0,-4 0,-1 -0.5,-0.5 -1,0 -3,3 -3,2.9724 -3,5 l 0,4 0,3 c 0,0.5 0.5,1 1,1 l 3,0 4,0 c 2.02759,0 3.66667,-1.6667 5,-3 0.5,-0.5 0.99992,-0.9874 0,-1 l -4,0 1,1 c 0,0 -0.5,1 -2,1 -1,0 -3,0 -4,0 l 8.25,-8.25 c 0.38672,0.1472 0.81162,0.25 1.25,0.25 1.933,0 3.5,-1.567 3.5,-3.5 0,-1.933 -1.567,-3.5 -3.5,-3.5 z m 0,2 c 0.82842,0 1.5,0.6716 1.5,1.5 0,0.8284 -0.67158,1.5 -1.5,1.5 -0.82842,0 -1.5,-0.6716 -1.5,-1.5 0,-0.8284 0.67158,-1.5 1.5,-1.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <rect ry="0" rx="0" y="1362.362" x="84" height="24" width="24" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 101.5,1365.3622 c -1.933,0 -3.5,1.567 -3.5,3.5 0,0.4384 0.10282,0.8633 0.25,1.25 l -8.25,8.25 c 0,-1 0,-3 0,-4 0,-1.5 1,-2 1,-2 l 1,1 c 0,0 0,-2.6667 0,-4 0,-1 -0.5,-0.5 -1,0 -3,3 -3,2.9724 -3,5 l 0,4 0,3 c 0,0.5 0.5,1 1,1 l 3,0 4,0 c 2.02759,0 3.66667,-1.6667 5,-3 0.5,-0.5 0.99992,-0.9874 0,-1 l -4,0 1,1 c 0,0 -0.5,1 -2,1 -1,0 -3,0 -4,0 l 8.25,-8.25 c 0.38672,0.1472 0.81162,0.25 1.25,0.25 1.933,0 3.5,-1.567 3.5,-3.5 0,-1.933 -1.567,-3.5 -3.5,-3.5 z m 0,2 c 0.82842,0 1.5,0.6716 1.5,1.5 0,0.8284 -0.67158,1.5 -1.5,1.5 -0.82842,0 -1.5,-0.6716 -1.5,-1.5 0,-0.8284 0.67158,-1.5 1.5,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g transform="translate(0 -24)" color="#000">
-            <path transform="translate(-120 1074.362)" d="m 761,3 -7.5,6.5 c -0.36201,0.3017 -0.5,0.5 -0.5,0.75 0,0.4959 0.5,0.75 1,0.75 l 1,0 0,8 c 0,0.554 0.446,1 1,1 l 13,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 1,0 c 0.5,0 1,-0.2541 1,-0.75 C 772,10 771.86201,9.8017 771.5,9.5 L 764,3 z m -2,9 7,0 0,0.5 -7,0 z m 0,2 7,0 0,0.5 -7,0 z m 0,2 7,0 0,0.5 -7,0 z m 0,2 7,0 0,0.5 -7,0 z" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linejoin="round"/>
-            <rect width="24" height="24" x="630" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 761,3 -7.5,6.5 c -0.36201,0.3017 -0.5,0.5 -0.5,0.75 0,0.4959 0.5,0.75 1,0.75 l 1,0 0,8 c 0,0.554 0.446,1 1,1 l 13,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 1,0 c 0.5,0 1,-0.2541 1,-0.75 C 772,10 771.86201,9.8017 771.5,9.5 L 764,3 z m -2,9 7,0 0,0.5 -7,0 z m 0,2 7,0 0,0.5 -7,0 z m 0,2 7,0 0,0.5 -7,0 z m 0,2 7,0 0,0.5 -7,0 z" transform="translate(-120 1074.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g transform="translate(0 -24)" color="#000">
-            <path d="m 681,1099.3622 0,4 -1,0 0,-2 -3,2 0,-2 -3,2 0,0.8572 0,3.5714 c 0,0.3165 0.25485,0.5714 0.57143,0.5714 l 7.85714,0 c 0.31657,0 0.57143,-0.2549 0.57143,-0.5714 l 0,-3.8571 c 0,-0.3166 -0.25486,-0.5715 -0.57143,-0.5715 l -0.42857,0 0,-4 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 681,1099.3622 0,4 -1,0 0,-2 -3,2 0,-2 -3,2 0,0.8572 0,3.5714 c 0,0.3165 0.25485,0.5714 0.57143,0.5714 l 7.85714,0 c 0.31657,0 0.57143,-0.2549 0.57143,-0.5714 l 0,-3.8571 c 0,-0.3166 -0.25486,-0.5715 -0.57143,-0.5715 l -0.42857,0 0,-4 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect width="12" height="12" x="672" y="1098.362" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 -24)" color="#000">
-            <path d="m 666,1101.3622 c 0,1.6667 0,4 0,4 l -2,0 0,-2.4706 -3,2.4706 0,-2.4706 -3.17647,2.4706 C 657.46338,1105.6423 657,1105.774 657,1106.5975 l 0,5.9412 c 0,0.4562 0.36729,0.8235 0.82353,0.8235 l 11.35294,0 c 0.45624,0 0.82353,-0.3673 0.82353,-0.8235 l 0,-6.3529 c 0,-0.4563 -0.36729,-0.8236 -0.82353,-0.8236 l -1.17647,0 c 0,0 0,-2.3333 0,-4 l -1,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 666,1101.3622 c 0,1.6667 0,4 0,4 l -2,0 0,-2.4706 -3,2.4706 0,-2.4706 -3.17647,2.4706 C 657.46338,1105.6423 657,1105.774 657,1106.5975 l 0,5.9412 c 0,0.4562 0.36729,0.8235 0.82353,0.8235 l 11.35294,0 c 0.45624,0 0.82353,-0.3673 0.82353,-0.8235 l 0,-6.3529 c 0,-0.4563 -0.36729,-0.8236 -0.82353,-0.8236 l -1.17647,0 c 0,0 0,-2.3333 0,-4 l -1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect y="1098.362" x="654" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 -24)" color="#000">
-            <path d="m 646,1102.3622 c 0,1.3333 0,4 0,4 l -3,0 0,-3 -4,3 0,-3 -4,3 c -0.44321,0.3324 -1,0.5 -1,1.5 l 0,8.5 c 0,0.554 0.44599,1 1,1 l 15,0 c 0.55401,0 1,-0.446 1,-1 l 0,-9 c 0,-0.554 -0.44599,-1 -1,-1 l -2,0 c 0,0 0,-2.6667 0,-4 0,-0.5 -0.5286,-1 -1,-1 -0.4714,0 -1,0.5 -1,1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 646,1102.3622 c 0,1.3333 0,4 0,4 l -3,0 0,-3 -4,3 0,-3 -4,3 c -0.44321,0.3324 -1,0.5 -1,1.5 l 0,8.5 c 0,0.554 0.44599,1 1,1 l 15,0 c 0.55401,0 1,-0.446 1,-1 l 0,-9 c 0,-0.554 -0.44599,-1 -1,-1 l -2,0 c 0,0 0,-2.6667 0,-4 0,-0.5 -0.5286,-1 -1,-1 -0.4714,0 -1,0.5 -1,1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect y="1098.362" x="630" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 -24)" color="#000">
-            <path d="m 133,1388.3622 0,1 1,0 0,1 -2,0 0,-1 -1,0 0,1 -0.5,0.5 -0.5,0.5 -1,0 -1,2 1,2 1,0 1,0 1,-2 1.5,-2 1,0 0,0 -1.50005,1.9995 1.00005,2.0005 -5e-5,-5e-4 1,0 1,0 5e-5,5e-4 0.99995,-2.0005 -0.99995,-1.9995 -5e-5,-5e-4 -0.5,0 -0.5,-1 0,-1 -1,-1 -1,0 z m -2,3 1,0 0,1 -1,0 0,1 0,1 -2,0 0,-1 0,-1 2,0 z m 3,1 2,0 0,1 0,1 -2,0 0,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 133,1388.3622 0,1 1,0 0,1 -2,0 0,-1 -1,0 0,1 -0.5,0.5 -0.5,0.5 -1,0 -1,2 1,2 1,0 1,0 1,-2 1.5,-2 1,0 0,0 -1.50005,1.9995 1.00005,2.0005 -5e-5,-5e-4 1,0 1,0 5e-5,5e-4 0.99995,-2.0005 -0.99995,-1.9995 -5e-5,-5e-4 -0.5,0 -0.5,-1 0,-1 -1,-1 -1,0 z m -2,3 1,0 0,1 -1,0 0,1 0,1 -2,0 0,-1 0,-1 2,0 z m 3,1 2,0 0,1 0,1 -2,0 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect width="12" height="12" x="126" y="1386.362" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 -24)" color="#000">
-            <path transform="translate(-120 1050.362)" d="m 240,339 0,1 1,0.5 0,1.5 -5,0 0,-1 1,0 0,-0.5 -1,-0.5 -2,0 0,1 1,0 0,1 -1.25,2.125 C 233.50461,344.06012 233.26579,344 233,344 c -1.65686,0 -3,1.34314 -3,3 0,1.65686 1.34314,3 3,3 1.65686,0 3,-1.34314 3,-3 l 1,0 2.5,-4 1.5,0 0.53125,1.0625 C 240.10342,344.29297 239,345.50713 239,347 c 0,1.65685 1.34315,3 3,3 1.65685,0 3,-1.34315 3,-3 0,-1.43939 -1.02256,-2.64661 -2.375,-2.9375 L 242,342.5 242,340 241.5,339.5 240,339 z m -4.5,4 3,0 -2,3 -0.6875,0 c -0.21207,-0.59119 -0.58733,-1.11568 -1.09375,-1.46875 L 235.5,343 z m -2.5,2 c 1.10456,0 2,0.89544 2,2 0,1.10456 -0.89544,2 -2,2 -1.10456,0 -2,-0.89544 -2,-2 0,-1.10456 0.89544,-2 2,-2 z m 9,0 c 1.10457,0 2,0.89543 2,2 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 240,339 0,1 1,0.5 0,1.5 -5,0 0,-1 1,0 0,-0.5 -1,-0.5 -2,0 0,1 1,0 0,1 -1.25,2.125 C 233.50461,344.06012 233.26579,344 233,344 c -1.65686,0 -3,1.34314 -3,3 0,1.65686 1.34314,3 3,3 1.65686,0 3,-1.34314 3,-3 l 1,0 2.5,-4 1.5,0 0.53125,1.0625 C 240.10342,344.29297 239,345.50713 239,347 c 0,1.65685 1.34315,3 3,3 1.65685,0 3,-1.34315 3,-3 0,-1.43939 -1.02256,-2.64661 -2.375,-2.9375 L 242,342.5 242,340 241.5,339.5 240,339 z m -4.5,4 3,0 -2,3 -0.6875,0 c -0.21207,-0.59119 -0.58733,-1.11568 -1.09375,-1.46875 L 235.5,343 z m -2.5,2.25 c 0.9665,0 1.75,0.7835 1.75,1.75 0,0.9665 -0.7835,1.75 -1.75,1.75 -0.9665,0 -1.75,-0.7835 -1.75,-1.75 0,-0.9665 0.7835,-1.75 1.75,-1.75 z m 9,0 c 0.9665,0 1.75,0.7835 1.75,1.75 0,0.9665 -0.7835,1.75 -1.75,1.75 -0.9665,0 -1.75,-0.7835 -1.75,-1.75 0,-0.9665 0.7835,-1.75 1.75,-1.75 z" transform="translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect width="18" height="18" x="108" y="1386.362" rx="0" ry="0" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 -24)" color="#000">
-            <path d="m 98.875,1390.3622 c -0.56154,0.076 -0.63714,1.0579 -0.09375,1.2188 l 2.21875,0.875 0,1.9062 -7,0 0,-1 1.375,0 c 0.33019,0 0.625,-0.2948 0.625,-0.625 0,-0.3302 -0.29481,-0.6297 -0.625,-0.625 l -3.875,0 c -0.062,-0.01 -0.12547,-0.01 -0.1875,0 -0.32727,0.049 -0.58034,0.3915 -0.53125,0.7188 0.0491,0.3272 0.39149,0.5803 0.71875,0.5312 l 1.5,0 0,1 -1.0625,3.125 c -0.29968,-0.072 -0.61585,-0.125 -0.9375,-0.125 -2.20914,0 -4,1.7909 -4,4 0,2.2091 1.79086,4 4,4 2.20914,0 4,-1.7909 4,-4 0,-0.3004 -0.06221,-0.5935 -0.125,-0.875 l 1.125,0 c 0.19854,-0.01 0.39085,-0.1152 0.5,-0.2812 l 3.375,-4.8438 0.125,0 1,0 0.6875,2.0313 c -2.06189,0.1606 -3.6875,1.8656 -3.6875,3.9687 0,2.2091 1.79086,4 4,4 2.20914,0 4,-1.7909 4,-4 0,-1.8282 -1.23109,-3.3352 -2.90625,-3.8125 L 102,1394.3622 l 0,-2.3437 c 0,-0.1049 -0.0423,-0.211 -0.0937,-0.3125 -0.004,-0.01 0.004,-0.024 0,-0.031 -0.0149,-0.032 -0.0429,-0.064 -0.0625,-0.094 -0.032,-0.045 -0.0546,-0.086 -0.0937,-0.125 -0.0169,-0.016 -0.044,-0.017 -0.0625,-0.031 -0.0183,-0.015 -0.0433,-0.018 -0.0625,-0.031 -0.0324,-0.019 -0.0577,-0.05 -0.0937,-0.062 l -0.0312,-0.031 -0.4375,-0.1562 -1.84375,-0.75 c -0.06501,-0.025 -0.14929,-0.028 -0.21875,-0.031 -0.047,0 -0.0788,-0.011 -0.125,0 z m -4.875,5 4.40625,0 -2.71875,3.875 -1.3125,0 c -0.30967,-0.4941 -0.69912,-0.9009 -1.1875,-1.2187 L 94,1395.3622 z m -3,3.5 c 1.38071,0 2.5,1.1193 2.5,2.5 0,1.3807 -1.11929,2.5 -2.5,2.5 -1.38071,0 -2.5,-1.1193 -2.5,-2.5 0,-1.3807 1.11929,-2.5 2.5,-2.5 z m 11,0 c 1.38071,0 2.5,1.1193 2.5,2.5 0,1.3807 -1.11929,2.5 -2.5,2.5 -1.38071,0 -2.5,-1.1193 -2.5,-2.5 0,-0.1726 0.0292,-0.3373 0.0625,-0.5 0.23312,-1.1392 1.22938,-2 2.4375,-2 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 98.875,1390.3622 c -0.56154,0.076 -0.63714,1.0579 -0.09375,1.2188 l 2.21875,0.875 0,1.9062 -7,0 0,-1 1.375,0 c 0.33019,0 0.625,-0.2948 0.625,-0.625 0,-0.3302 -0.29481,-0.6297 -0.625,-0.625 l -3.875,0 c -0.062,-0.01 -0.12547,-0.01 -0.1875,0 -0.32727,0.049 -0.58034,0.3915 -0.53125,0.7188 0.0491,0.3272 0.39149,0.5803 0.71875,0.5312 l 1.5,0 0,1 -1.0625,3.125 c -0.29968,-0.072 -0.61585,-0.125 -0.9375,-0.125 -2.20914,0 -4,1.7909 -4,4 0,2.2091 1.79086,4 4,4 2.20914,0 4,-1.7909 4,-4 0,-0.3004 -0.06221,-0.5935 -0.125,-0.875 l 1.125,0 c 0.19854,-0.01 0.39085,-0.1152 0.5,-0.2812 l 3.375,-4.8438 0.125,0 1,0 0.6875,2.0313 c -2.06189,0.1606 -3.6875,1.8656 -3.6875,3.9687 0,2.2091 1.79086,4 4,4 2.20914,0 4,-1.7909 4,-4 0,-1.8282 -1.23109,-3.3352 -2.90625,-3.8125 L 102,1394.3622 l 0,-2.3437 c 0,-0.1049 -0.0423,-0.211 -0.0937,-0.3125 -0.004,-0.01 0.004,-0.024 0,-0.031 -0.0149,-0.032 -0.0429,-0.064 -0.0625,-0.094 -0.032,-0.045 -0.0546,-0.086 -0.0937,-0.125 -0.0169,-0.016 -0.044,-0.017 -0.0625,-0.031 -0.0183,-0.015 -0.0433,-0.018 -0.0625,-0.031 -0.0324,-0.019 -0.0577,-0.05 -0.0937,-0.062 l -0.0312,-0.031 -0.4375,-0.1562 -1.84375,-0.75 c -0.06501,-0.025 -0.14929,-0.028 -0.21875,-0.031 -0.047,0 -0.0788,-0.011 -0.125,0 z m -4.875,5 4.40625,0 -2.71875,3.875 -1.3125,0 c -0.30967,-0.4941 -0.69912,-0.9009 -1.1875,-1.2187 L 94,1395.3622 z m -3,3.5 c 1.38071,0 2.5,1.1193 2.5,2.5 0,1.3807 -1.11929,2.5 -2.5,2.5 -1.38071,0 -2.5,-1.1193 -2.5,-2.5 0,-1.3807 1.11929,-2.5 2.5,-2.5 z m 11,0 c 1.38071,0 2.5,1.1193 2.5,2.5 0,1.3807 -1.11929,2.5 -2.5,2.5 -1.38071,0 -2.5,-1.1193 -2.5,-2.5 0,-0.1726 0.0292,-0.3373 0.0625,-0.5 0.23312,-1.1392 1.22938,-2 2.4375,-2 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect width="24" height="24" x="84" y="1386.362" rx="0" ry="0" opacity=".3" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <path d="m 675.5,1099.3622 -0.5,0.5 0,9.5 3,0 0,-2 1,0 0,2 3,0 0,-9.5 -0.5,-0.5 -6,0 z m 0.5,2 2,0 0,0.5 -2,0 0,-0.5 z m 3,0 2,0 0,0.5 -2,0 0,-0.5 z m -3,2 2,0 0,0.5 -2,0 0,-0.5 z m 3,0 2,0 0,0.5 -2,0 0,-0.5 z m -3,2 2,0 0,0.5 -2,0 0,-0.5 z m 3,0 2,0 0,0.5 -2,0 0,-0.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 795.5,49 -0.5,0.5 0,9.5 3,0 0,-2 1,0 0,2 3,0 0,-9.5 -0.5,-0.5 z m 0.5,2 2,0 0,1 -2,0 z m 3,0 2,0 0,1 -2,0 z m -3,2 2,0 0,1 -2,0 z m 3,0 2,0 0,1 -2,0 z m -3,2 2,0 0,1 -2,0 z m 3,0 2,0 0,1 -2,0 z" transform="translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect y="1098.362" x="672" height="12" width="12" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <path d="m 658.78125,1100.3622 -0.78125,0.7813 0,13.2187 11,0 0,-13.2187 -0.78125,-0.7813 z m 1.21875,2.5 2,0 0,0.5 -2,0 z m 5,0 2,0 0,0.5 -2,0 z m -5,2 2,0 0,0.5 -2,0 z m 5,0 2,0 0,0.5 -2,0 z m -5,2 2,0 0,0.5 -2,0 z m 5,0 2,0 0,0.5 -2,0 z m -5,2 2,0 0,0.5 -2,0 z m 5,0 2,0 0,0.5 -2,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="M 778.78125 50 L 778 50.78125 L 778 64 L 782 64 L 782 61 L 785 61 L 785 64 L 789 64 L 789 50.78125 L 788.21875 50 L 778.78125 50 z M 780 52 L 782 52 L 782 53 L 780 53 L 780 52 z M 785 52 L 787 52 L 787 53 L 785 53 L 785 52 z M 780 54 L 782 54 L 782 55 L 780 55 L 780 54 z M 785 54 L 787 54 L 787 55 L 785 55 L 785 54 z M 780 56 L 782 56 L 782 57 L 780 57 L 780 56 z M 785 56 L 787 56 L 787 57 L 785 57 L 785 56 z M 780 58 L 782 58 L 782 59 L 780 59 L 780 58 z M 785 58 L 787 58 L 787 59 L 785 59 L 785 58 z" transform="translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect width="18" height="18" x="654" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <path transform="translate(-120 1050.362)" d="m 756,50 c -0.5,0 -1,0.5 -1,1 l 0,18 6.5,0 0,-3 2,0 0,3 6.5,0 0,-18 c 0,-0.5 -0.5,-1 -1,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 636,1100.3622 c -0.5,0 -1,0.5 -1,1 l 0,18 6,0 0,-3 3,0 0,3 6,0 0,-18 c 0,-0.5 -0.5,-1 -1,-1 z m 2,3 3,0 0,1 -3,0 z m 6,0 3,0 0,1 -3,0 z m -6,3 3,0 0,1 -3,0 z m 6,0 3,0 0,1 -3,0 z m -6,3 3,0 0,1 -3,0 z m 6,0 3,0 0,1 -3,0 z m -6,3 3,0 0,1 -3,0 z m 6,0 3,0 0,1 -3,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect width="24" height="24" x="630" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <path d="m 328.5,1268.3622 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1.5 -4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 l 13,0 c 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 l -4,0 0,-1.5 c 0,-0.277 -0.22299,-0.5 -0.5,-0.5 z m 0.5,1 3,0 0,1 -3,0 z m -5,4 c -0.554,0 -1.07547,0.4536 -0.98437,1 l 1.98437,12 c 0.0904,0.5465 0.446,1 1,1 l 9,0 c 0.554,0 0.9089,-0.4536 1,-1 l 1.98437,-12 c 0.0904,-0.5465 -0.43037,-1 -0.98437,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 328.5,1268.3622 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1.5 -4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 l 13,0 c 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 l -4,0 0,-1.5 c 0,-0.277 -0.22299,-0.5 -0.5,-0.5 z m 0.5,1 3,0 0,1 -3,0 z m -5,4 c -0.554,0 -1.07547,0.4536 -0.98437,1 l 1.98437,12 c 0.0904,0.5465 0.446,1 1,1 l 9,0 c 0.554,0 0.9089,-0.4536 1,-1 l 1.98437,-12 c 0.0904,-0.5465 -0.43037,-1 -0.98437,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect y="1266.362" x="318" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <path d="m 349.518,1268.3622 c -0.20411,0 -0.268,0.1643 -0.268,0.3684 l 0,1.6316 -2.51315,0 c -0.40822,0 -0.73685,0.092 -0.73685,0.5 0,0.4083 0.32863,0.5 0.73685,0.5 l 9.52631,0 c 0.40821,0 0.73684,-0.092 0.73684,-0.5 0,-0.4082 -0.32863,-0.5 -0.73684,-0.5 l -2.51316,0 0,-1.6316 c 0,-0.2041 -0.16389,-0.3684 -0.368,-0.3684 z m 0.482,0.7368 3,0 0,1.2632 -3,0 z m -3.26315,3.2632 c -0.40822,0 -0.78834,0.3343 -0.72122,0.7369 l 1.40542,8.5263 c 0.0664,0.4027 0.32863,0.7368 0.73685,0.7368 l 6.63157,0 c 0.40822,0 0.66972,-0.3342 0.73685,-0.7368 l 1.45805,-8.5263 c 0.0688,-0.4023 -0.313,-0.7369 -0.72121,-0.7369 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 349.518,1268.3622 c -0.20411,0 -0.268,0.1643 -0.268,0.3684 l 0,1.6316 -2.51315,0 c -0.40822,0 -0.73685,0.092 -0.73685,0.5 0,0.4083 0.32863,0.5 0.73685,0.5 l 9.52631,0 c 0.40821,0 0.73684,-0.092 0.73684,-0.5 0,-0.4082 -0.32863,-0.5 -0.73684,-0.5 l -2.51316,0 0,-1.6316 c 0,-0.2041 -0.16389,-0.3684 -0.368,-0.3684 z m 0.482,0.7368 3,0 0,1.2632 -3,0 z m -3.26315,3.2632 c -0.40822,0 -0.78834,0.3343 -0.72122,0.7369 l 1.40542,8.5263 c 0.0664,0.4027 0.32863,0.7368 0.73685,0.7368 l 6.63157,0 c 0.40822,0 0.66972,-0.3342 0.73685,-0.7368 l 1.45805,-8.5263 c 0.0688,-0.4023 -0.313,-0.7369 -0.72121,-0.7369 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect width="18" height="18" x="342" y="1266.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <path d="m 364.5,1267.3622 0,2 -1.5,0 0,1 7,0 0,-1 -1.5,0 0,-2 z m 0.5,1 3,0 0,1 -2.98995,0 z m -2,2.5 1,6.5 0.32584,0 4.26315,0 0.41101,0 1,-6.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 364.5,1267.3622 0,2 -1.5,0 0,1 7,0 0,-1 -1.5,0 0,-2 z m 0.5,1 3,0 0,1 -2.98995,0 z m -2,2.5 1,6.5 0.32584,0 4.26315,0 0.41101,0 1,-6.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect width="12" height="12" x="360" y="1266.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <path transform="translate(-120 1050.362)" d="m 446.5,242 c -1.38071,0 -2.5,1.11929 -2.5,2.5 0,1.38071 1.11929,2.5 2.5,2.5 1.38071,0 2.5,-1.11929 2.5,-2.5 0,-1.38071 -1.11929,-2.5 -2.5,-2.5 z m 8,0 c -1.38071,0 -2.5,1.11929 -2.5,2.5 0,1.38071 1.11929,2.5 2.5,2.5 1.38071,0 2.5,-1.11929 2.5,-2.5 0,-1.38071 -1.11929,-2.5 -2.5,-2.5 z m -8.5,6 c -1,0 -2,1 -2,2 l 0,2 -1.5,4.5 c 0,0.5 0.5,0.5 1,0.5 l 1.5,0 0,4 3,0 0,-4 1.5,0 c 0.5,0 1,0 1,-0.5 l -1.5,-4.5 0,-2 c 0,-1 -1,-2 -2,-2 z m 6,0 c -0.5,0 -1,0.5 -1,1 l 2,6 0,2 0,4 3,0 0,-4 0,-2 2,-6 c 0,-0.5 -0.5,-1 -1,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 446.5,242 c -1.38071,0 -2.5,1.11929 -2.5,2.5 0,1.38071 1.11929,2.5 2.5,2.5 1.38071,0 2.5,-1.11929 2.5,-2.5 0,-1.38071 -1.11929,-2.5 -2.5,-2.5 z m 8,0 c -1.38071,0 -2.5,1.11929 -2.5,2.5 0,1.38071 1.11929,2.5 2.5,2.5 1.38071,0 2.5,-1.11929 2.5,-2.5 0,-1.38071 -1.11929,-2.5 -2.5,-2.5 z m -8.5,6 c -1,0 -2,1 -2,2 l 0,2 -1.5,4.5 c 0,0.5 0.5,0.5 1,0.5 l 1.5,0 0,4 3,0 0,-4 1.5,0 c 0.5,0 1,0 1,-0.5 l -1.5,-4.5 0,-2 c 0,-1 -1,-2 -2,-2 z m 6,0 c -0.5,0 -1,0.5 -1,1 l 2,6 0,2 0,4 3,0 0,-4 0,-2 2,-6 c 0,-0.5 -0.5,-1 -1,-1 z" transform="translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect width="24" height="24" x="318" y="1290.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <path d="m 584.5,1052.3622 -1.5,0.5 -1,1.5 0,2.5 1.5,1 0,1.5 2,1 2,-1 0,-1.5 1.5,-1 0,-2.5 -1,-1.5 -1.5,-0.5 z m -0.5,2.5 0.5,0 0.5,0.5 0,0.5 -0.5,0.5 -0.5,0 -0.5,-0.5 0,-0.5 z m 2.5,0 0.5,0 0.5,0.5 0,0.5 -0.5,0.5 -0.5,0 -0.5,-0.5 0,-0.5 z m -6.5,5 0,1 3.875,1.75 -3.875,1.75 0,1 1,0 10,-4.5 0,-1 -1,0 -4.5,2.0313 -4.5,-2.0313 z m 8.21875,3.25 -1.59375,0.7188 3.375,1.5312 1,0 0,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 584.5,1052.3622 -1.5,0.5 -1,1.5 0,2.5 1.5,1 0,1.5 2,1 2,-1 0,-1.5 1.5,-1 0,-2.5 -1,-1.5 -1.5,-0.5 z m -0.5,2.5 0.5,0 0.5,0.5 0,0.5 -0.5,0.5 -0.5,0 -0.5,-0.5 0,-0.5 z m 2.5,0 0.5,0 0.5,0.5 0,0.5 -0.5,0.5 -0.5,0 -0.5,-0.5 0,-0.5 z m -6.5,5 0,1 3.875,1.75 -3.875,1.75 0,1 1,0 10,-4.5 0,-1 -1,0 -4.5,2.0313 -4.5,-2.0313 z m 8.21875,3.25 -1.59375,0.7188 3.375,1.5312 1,0 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect y="1050.362" x="576" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <path d="m 564.5,1054.3622 c -2.5,0 -4.5,2 -4.5,4 l 0,2 c 0,1 2,1 2,2 l 0,1 2.5,1 2.5,-1 0,-1 c 0,-1 2,-1 2,-2 l 0,-2 c 0,-2 -2,-4 -4.5,-4 z m -1.5,3 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m 3,0 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m -8,6 c -0.5,0 -1,0.5 -1,1 l 0,0.5 5.25,2.25 -5.25,2.25 0,0.5 c 0,0.5 0.5,1 1,1 l 14,-6 0,-0.5 c 0,-0.5 -0.5,-1 -1,-1 l -6.5,2.7813 -6.5,-2.7813 z m 10.5,4.5 -2.25,0.9688 4.75,2.0312 c 0.5,0 1,-0.5 1,-1 l 0,-0.5 -3.5,-1.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 564.5,1054.3622 c -2.5,0 -4.5,2 -4.5,4 l 0,2 c 0,1 2,1 2,2 l 0,1 2.5,1 2.5,-1 0,-1 c 0,-1 2,-1 2,-2 l 0,-2 c 0,-2 -2,-4 -4.5,-4 z m -1.5,3 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m 3,0 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m -8,6 c -0.5,0 -1,0.5 -1,1 l 0,0.5 5.25,2.25 -5.25,2.25 0,0.5 c 0,0.5 0.5,1 1,1 l 14,-6 0,-0.5 c 0,-0.5 -0.5,-1 -1,-1 l -6.5,2.7813 -6.5,-2.7813 z m 10.5,4.5 -2.25,0.9688 4.75,2.0312 c 0.5,0 1,-0.5 1,-1 l 0,-0.5 -3.5,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect y="1050.362" x="552" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <path d="m 599.5,1051.3622 -1.5,1.5 c 0,0 0,1.3333 0,2 l 1,1 c 0,0.1667 0,0.5 0,0.5 l 1.5,1 1.5,-1 0,-0.5 1,-1 0,-2 -1.5,-1.5 z m -0.5,2 1,0 0,0.5 -1,0 z m 2,0 1,0 0,0.5 -1,0 z m -5,3 0,1 0.56039,0.2802 2.43961,1.2198 -3,1.5 0,1 0.5,0 5.5,-2.5 3,-1.5 0,-1 -0.5,0 -3,1.5 -0.5,0.5 -1,0 -0.5,-0.5 -3,-1.5 z m 7,3 -1.5,0.5 3,1.5 0.5,0 0,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 599.5,1051.3622 -1.5,1.5 c 0,0 0,1.3333 0,2 l 1,1 c 0,0.1667 0,0.5 0,0.5 l 1.5,1 1.5,-1 0,-0.5 1,-1 0,-2 -1.5,-1.5 z m -0.5,2 1,0 0,0.5 -1,0 z m 2,0 1,0 0,0.5 -1,0 z m -5,3 0,1 0.56039,0.2802 2.43961,1.2198 -3,1.5 0,1 0.5,0 5.5,-2.5 3,-1.5 0,-1 -0.5,0 -3,1.5 -0.5,0.5 -1,0 -0.5,-0.5 -3,-1.5 z m 7,3 -1.5,0.5 3,1.5 0.5,0 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect width="12" height="12" x="594" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(154 -96)" color="#000">
-            <g>
-                <path transform="translate(2) translate(-276 1148.362)" d="m 768,97 -7.5,7.5 1.25,1.25 7.25,-7.25 0.5,0.5 -7.25,7.25 1.25,1.25 7.5,-7.5 0,-2 -1,-1 z m -11.5,5.5 -2.5,2.5 0.5,0.5 1,0 1,-1 1,1 -3.5,3.5 0,2 3,3 2,0 4.5,-4.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 768,97 -7.5,7.5 1.25,1.25 7.25,-7.25 0.5,0.5 -7.25,7.25 1.25,1.25 7.5,-7.5 0,-2 -1,-1 z m -11.5,5.5 -2.5,2.5 0.5,0.5 1,0 1,-1 1,1 -3.5,3.5 0,2 3,3 2,0 4.5,-4.5 z" transform="translate(2) translate(-276 1148.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1242.362" x="476" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(154 -96)" color="#000">
-            <g>
-                <path transform="translate(2 -2) translate(-276 1150.362)" d="m 787.5,95.5 -5.75,5.75 1,1 5.25,-5.25 0.5,0.5 -5.25,5.25 1,1 5.75,-5.75 0,-1.5 -1,-1 z m -8.25,4.25 -2.25,2.25 0,0.5 0.5,0 1,-1 1,1 -2.5,2.5 0,1.5 2.5,2.5 1.5,0 3.75,-3.75 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 787.5,95.5 -5.75,5.75 1,1 5.25,-5.25 0.5,0.5 -5.25,5.25 1,1 5.75,-5.75 0,-1.5 -1,-1 z m -8.25,4.25 -2.25,2.25 0,0.5 0.5,0 1,-1 1,1 -2.5,2.5 0,1.5 2.5,2.5 1.5,0 3.75,-3.75 z" transform="translate(2 -2) translate(-276 1150.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect width="18" height="18" x="500" y="1242.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(154 -96)" color="#000">
-            <g>
-                <path d="m 525.5,1245.8622 -4,4 1.5,1.5 4,-4 0,-1 -0.5,-0.5 z m -6,3 -1.5,1.5 0,0.5 0.5,0 0.5,-0.5 0.5,0.5 -1.5,1.5 0,1.5 1.5,1.5 1.5,0 2.5,-2.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(2 -2)"/>
-                <path d="m 525.5,1245.8622 -4,4 1.5,1.5 4,-4 0,-1 -0.5,-0.5 z m -6,3 -1.5,1.5 0,0.5 0.5,0 0.5,-0.5 0.5,0.5 -1.5,1.5 0,1.5 1.5,1.5 1.5,0 2.5,-2.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(2 -2)"/>
-            </g>
-            <rect y="1242.362" x="518" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(154 -96)" color="#000">
-            <g>
-                <path d="m 484.5,1269.3622 c -0.5,0 -0.84615,0.5 -1,1 l -5.34375,15.9688 c -0.038,0.1133 -0.15625,0.4166 -0.15625,0.5312 0,0.5 0.5,0.5 1,0.5 0.5,0 0.97049,0 1.15625,-0.5 l 0.84375,-2.25 5.5,-2.75 5.5,2.75 0.84375,2.25 c 0.18576,0.5 0.65625,0.5 1.15625,0.5 0.5,0 1,0 1,-0.5 0,-0.1146 -0.11823,-0.418 -0.15625,-0.5312 L 489.5,1270.3622 c -0.15385,-0.5 -0.5,-1 -1,-1 z m 4.5,7 0.6875,1.9063 -3.1875,1.5937 -3.1875,-1.5937 0.6875,-1.9063 z m -6.3125,3.5938 1.8125,0.9062 -2.625,1.3125 z m 7.625,0 0.8125,2.2187 -2.625,-1.3125 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(2)"/>
-                <path d="m 484.5,1269.3622 c -0.5,0 -0.84615,0.5 -1,1 l -5.34375,15.9688 c -0.038,0.1133 -0.15625,0.4166 -0.15625,0.5312 0,0.5 0.5,0.5 1,0.5 0.5,0 0.97049,0 1.15625,-0.5 l 0.84375,-2.25 5.5,-2.75 5.5,2.75 0.84375,2.25 c 0.18576,0.5 0.65625,0.5 1.15625,0.5 0.5,0 1,0 1,-0.5 0,-0.1146 -0.11823,-0.418 -0.15625,-0.5312 L 489.5,1270.3622 c -0.15385,-0.5 -0.5,-1 -1,-1 z m 4.5,7 0.6875,1.9063 -3.1875,1.5937 -3.1875,-1.5937 0.6875,-1.9063 z m -6.3125,3.5938 1.8125,0.9062 -2.625,1.3125 z m 7.625,0 0.8125,2.2187 -2.625,-1.3125 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(2)"/>
-            </g>
-            <rect width="24" height="24" x="476" y="1266.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(154 -96)" color="#000">
-            <g>
-                <path d="m 506,1271.3622 c -0.38235,10e-5 -0.6636,0.3676 -0.78125,0.75 l -4.21875,13.25 2,0 0.90625,-2.7187 3.59375,-2.0313 3.59375,2.0313 0.90625,2.7187 2,0 -4.21875,-13.25 c -0.11765,-0.3824 -0.3989,-0.7499 -0.78125,-0.75 z m 0,5 3,0 0.5,1.4688 -2,1.2812 -2,-1.2812 z m -0.875,2.6563 1.375,0.8437 -2.0625,1.1875 z m 4.75,0 0.6875,2.0312 -2.0625,-1.1875 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(2 -3)"/>
-                <path d="m 506,1271.3622 c -0.38235,10e-5 -0.6636,0.3676 -0.78125,0.75 l -4.21875,13.25 2,0 0.90625,-2.7187 3.59375,-2.0313 3.59375,2.0313 0.90625,2.7187 2,0 -4.21875,-13.25 c -0.11765,-0.3824 -0.3989,-0.7499 -0.78125,-0.75 z m 0,5 3,0 0.5,1.4688 -2,1.2812 -2,-1.2812 z m -0.875,2.6563 1.375,0.8437 -2.0625,1.1875 z m 4.75,0 0.6875,2.0312 -2.0625,-1.1875 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(2 -3)"/>
-            </g>
-            <rect y="1266.362" x="500" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(154 -96)" color="#000">
-            <g>
-                <path d="m 521,1270.3622 -3,9 1,0 0.5,0 0.5,-1.5312 2.5,-1.4688 2.5,1.4688 0.5,1.5312 1.5,0 -3,-9 z m 0.5,3 2,0 0.5,1.5313 -0.71875,0.4687 -0.28125,0 0,0.1875 -0.5,0.3125 -0.5,-0.3125 0,-0.1875 -0.28125,0 L 521,1274.8935 z m -0.78125,2.375 0.28125,0.125 0.5,0.25 -0.5,0.25 -0.59375,0.3125 0.0937,-0.3125 0,-0.5 0.1875,0 z m 3.5625,0 0.0312,0.125 0.1875,0 0,0.5 0.0937,0.3125 -0.59365,-0.3125 -0.5,-0.25 0.5,-0.25 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(2 -3)"/>
-                <path d="m 521,1270.3622 -3,9 1,0 0.5,0 0.5,-1.5312 2.5,-1.4688 2.5,1.4688 0.5,1.5312 1.5,0 -3,-9 z m 0.5,3 2,0 0.5,1.5313 -0.71875,0.4687 -0.28125,0 0,0.1875 -0.5,0.3125 -0.5,-0.3125 0,-0.1875 -0.28125,0 L 521,1274.8935 z m -0.78125,2.375 0.28125,0.125 0.5,0.25 -0.5,0.25 -0.59375,0.3125 0.0937,-0.3125 0,-0.5 0.1875,0 z m 3.5625,0 0.0312,0.125 0.1875,0 0,0.5 0.0937,0.3125 -0.59365,-0.3125 -0.5,-0.25 0.5,-0.25 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(2 -3)"/>
-            </g>
-            <rect width="12" height="12" x="518" y="1266.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(154 -96)" color="#000">
-            <g>
-                <path d="m 477,1295.3622 1,1 -2,2 0,1 3,0.5 c 0,1.5 2.52937,0.6765 2.99995,3.5 l 5e-5,5 1,0 1,-4 1,4 1,0 0,-4 c 2,0 3,-1 4,-1 0,0 0.5,1.6502 0.5,2.5 0,0.8498 -0.5,2.5 -0.5,2.5 l 1,0 1.5,-4 1.5,4 1,0 c 0,0 0,-2.6667 0,-4 0,-0.5 -1,-1 -1,-1.5 0,-1.4121 1,-1.5 1,-2.5 0,-0.2838 0,-2.5 0,-3 0,-0.5 -0.5,-1 -1,-1 l -13,0 -1,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(2)"/>
-                <path d="m 477,1295.3622 1,1 -2,2 0,1 3,0.5 c 0,1.5 2.52937,0.6765 2.99995,3.5 l 5e-5,5 1,0 1,-4 1,4 1,0 0,-4 c 2,0 3,-1 4,-1 0,0 0.5,1.6502 0.5,2.5 0,0.8498 -0.5,2.5 -0.5,2.5 l 1,0 1.5,-4 1.5,4 1,0 c 0,0 0,-2.6667 0,-4 0,-0.5 -1,-1 -1,-1.5 0,-1.4121 1,-1.5 1,-2.5 0,-0.2838 0,-2.5 0,-3 0,-0.5 -0.5,-1 -1,-1 l -13,0 -1,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(2)"/>
-            </g>
-            <rect y="1290.362" x="476" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(154 -96)" color="#000">
-            <g>
-                <path d="m 500.68421,1295.3622 0.68421,0.7895 -1.36842,1.7105 0,0.5 2.05263,0.1842 c 0,1.0263 1.62539,1.384 1.94737,3.3158 l 0,3.5 0.5,0 0.99998,-3 1,3 0.5,0 0,-3 c 2.05263,0 1.63158,-0.5 3,-0.5 0,0 -0.079,1.208 -0.079,1.7895 0,0.5814 -0.3421,1.7105 -0.3421,1.7105 l 0.68421,0 1.02631,-2.7368 1.02632,2.7368 0.68421,0 c 0,0 7e-5,-2.0878 7e-5,-3 l -0.5,-1 0.5,-1 c 0,-0.1942 0,-2.6579 0,-3 l -1,-1 -8.5,0 -0.76323,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(2 -1)"/>
-                <path d="m 500.68421,1295.3622 0.68421,0.7895 -1.36842,1.7105 0,0.5 2.05263,0.1842 c 0,1.0263 1.62539,1.384 1.94737,3.3158 l 0,3.5 0.5,0 0.99998,-3 1,3 0.5,0 0,-3 c 2.05263,0 1.63158,-0.5 3,-0.5 0,0 -0.079,1.208 -0.079,1.7895 0,0.5814 -0.3421,1.7105 -0.3421,1.7105 l 0.68421,0 1.02631,-2.7368 1.02632,2.7368 0.68421,0 c 0,0 7e-5,-2.0878 7e-5,-3 l -0.5,-1 0.5,-1 c 0,-0.1942 0,-2.6579 0,-3 l -1,-1 -8.5,0 -0.76323,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(2 -1)"/>
-            </g>
-            <rect width="18" height="18" x="500" y="1290.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(154 -96)" color="#000">
-            <g>
-                <path transform="translate(2 -1) translate(-120 1050.362)" d="m 639,243 0.5,1 -1.5,0 0,1 1,0 1,1 c 10e-6,0.59553 2e-5,1.21287 0,1.53125 l 0,2.46875 0.5,0 0.5,-2 1,2 0.5,0 0,-2 c 0.94737,0 1.52631,-0.5 2,-0.5 l 0,1 c 0,0.4025 0.0312,1.5 0.0312,1.5 l 0.46875,0 1,-2 0.5,2 0.5,0 0,-2 0,-1 0,-1.09375 0,-0.90625 -1,-1 -4.99995,0 -0.375,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 639,243 0.5,1 -1.5,0 0,1 1,0 1,1 c 10e-6,0.59553 2e-5,1.21287 0,1.53125 l 0,2.46875 0.5,0 0.5,-2 1,2 0.5,0 0,-2 c 0.94737,0 1.52631,-0.5 2,-0.5 l 0,1 c 0,0.4025 0.0312,1.5 0.0312,1.5 l 0.46875,0 1,-2 0.5,2 0.5,0 0,-2 0,-1 0,-1.09375 0,-0.90625 -1,-1 -4.99995,0 -0.375,-1 z" transform="translate(2 -1) translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-            <rect y="1290.362" x="518" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(154 -96)" color="#000">
-            <g>
-                <path d="m 478,1320.3622 c 0,2.2083 0,6.625 0,6.625 l 0,2.0313 0,1.9687 0,1.375 c 0,0.5 0.5,1 1,1 l 5,0 -4,-14 c 0,0 -0.66667,0 -1,0 -0.5,0 -1,0.5 -1,1 z m 8.5,6 c -0.10553,0 -0.21675,0.033 -0.3125,0.062 l -2.4375,0.8438 0.53125,1.875 2.21875,-0.7813 2.6875,0.9375 c 0.10312,0.034 0.20717,0.062 0.3125,0.062 0.10533,0 0.21434,-0.032 0.3125,-0.062 l 3.1875,-0.9375 2,0.6563 0,-2.0313 -1.6875,-0.5625 c -0.0994,-0.033 -0.20697,-0.062 -0.3125,-0.062 -0.10553,0 -0.21062,0.029 -0.3125,0.062 l -3.1875,0.9375 -2.6875,-0.9375 c -0.10552,-0.035 -0.20697,-0.062 -0.3125,-0.062 z m 0,4 c -0.10553,0 -0.21675,0.033 -0.3125,0.062 l -1.375,0.4688 0.53125,1.875 1.15625,-0.4063 2.6875,0.9375 c 0.10312,0.034 0.20717,0.062 0.3125,0.062 0.10533,0 0.21434,-0.032 0.3125,-0.062 l 3.1875,-0.9375 2,0.6563 0,-2.0313 -1.6875,-0.5625 c -0.0994,-0.033 -0.20697,-0.062 -0.3125,-0.062 -0.10553,0 -0.21062,0.029 -0.3125,0.062 l -3.1875,0.9375 -2.6875,-0.9375 c -0.10552,-0.035 -0.20697,-0.062 -0.3125,-0.062 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(2)"/>
-                <path d="m 478,1320.3622 c 0,2.2083 0,6.625 0,6.625 l 0,2.0313 0,1.9687 0,1.375 c 0,0.5 0.5,1 1,1 l 5,0 -4,-14 c 0,0 -0.66667,0 -1,0 -0.5,0 -1,0.5 -1,1 z m 8.5,6 c -0.10553,0 -0.21675,0.033 -0.3125,0.062 l -2.4375,0.8438 0.53125,1.875 2.21875,-0.7813 2.6875,0.9375 c 0.10312,0.034 0.20717,0.062 0.3125,0.062 0.10533,0 0.21434,-0.032 0.3125,-0.062 l 3.1875,-0.9375 2,0.6563 0,-2.0313 -1.6875,-0.5625 c -0.0994,-0.033 -0.20697,-0.062 -0.3125,-0.062 -0.10553,0 -0.21062,0.029 -0.3125,0.062 l -3.1875,0.9375 -2.6875,-0.9375 c -0.10552,-0.035 -0.20697,-0.062 -0.3125,-0.062 z m 0,4 c -0.10553,0 -0.21675,0.033 -0.3125,0.062 l -1.375,0.4688 0.53125,1.875 1.15625,-0.4063 2.6875,0.9375 c 0.10312,0.034 0.20717,0.062 0.3125,0.062 0.10533,0 0.21434,-0.032 0.3125,-0.062 l 3.1875,-0.9375 2,0.6563 0,-2.0313 -1.6875,-0.5625 c -0.0994,-0.033 -0.20697,-0.062 -0.3125,-0.062 -0.10553,0 -0.21062,0.029 -0.3125,0.062 l -3.1875,0.9375 -2.6875,-0.9375 c -0.10552,-0.035 -0.20697,-0.062 -0.3125,-0.062 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(2)"/>
-            </g>
-            <rect width="24" height="24" x="476" y="1314.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(154 -96)" color="#000">
-            <g>
-                <path d="m 501,1316.3622 0,12 5,0 -3,-12 z m 6.5,6.5 -1.21875,0.625 0.34375,1.3125 0.875,-0.4375 2,1 2.5,-0.8437 2,0.8437 0,-1.5 -2,-1 -2.5,1 z m 0,3 -0.5625,0.2813 0.34375,1.3437 0.21875,-0.125 2,1 2.5,-0.8437 2,0.8437 0,-1.5 -2,-1 -2.5,1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(2)"/>
-                <path d="m 501,1316.3622 0,12 5,0 -3,-12 z m 6.5,6.5 -1.21875,0.625 0.34375,1.3125 0.875,-0.4375 2,1 2.5,-0.8437 2,0.8437 0,-1.5 -2,-1 -2.5,1 z m 0,3 -0.5625,0.2813 0.34375,1.3437 0.21875,-0.125 2,1 2.5,-0.8437 2,0.8437 0,-1.5 -2,-1 -2.5,1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(2)"/>
-            </g>
-            <rect y="1314.362" x="500" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(154 -96)" color="#000">
-            <g>
-                <path d="m 518,1316.3622 0,9 4,0 -3,-9 z m 4.5,5.5 -0.59375,0.1875 0.28125,0.9063 0.3125,-0.094 1.5,0.5 1.5,-0.5 1.5,0.5 0,-1.0313 -1.5,-0.4687 -1.5,0.4687 z m 0,2 0.375,1.125 1.125,0.375 1.5,-0.5 1.5,0.5 0,-1.0312 -1.5,-0.4688 -1.5,0.4688 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(2 -1)"/>
-                <path d="m 518,1316.3622 0,9 4,0 -3,-9 z m 4.5,5.5 -0.59375,0.1875 0.28125,0.9063 0.3125,-0.094 1.5,0.5 1.5,-0.5 1.5,0.5 0,-1.0313 -1.5,-0.4687 -1.5,0.4687 z m 0,2 0.375,1.125 1.125,0.375 1.5,-0.5 1.5,0.5 0,-1.0312 -1.5,-0.4688 -1.5,0.4688 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(2 -1)"/>
-            </g>
-            <rect width="12" height="12" x="518" y="1314.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-156 192)" color="#000">
-            <path d="m 702.5,26 -0.5,0.5 0,3 -2,2.5 0,8 6,0 0,-8 -2,-2.5 0,-3 -0.5,-0.5 -1,0 z m 4.5,6 0,3 c 0,0 0,1 1,1 l 1,0 0,3 -1.5,0.5 -0.5,0.5 5,0 -0.5,-0.5 -1.5,-0.5 0,-3 1,0 c 1,0 1,-1 1,-1 l 0,-3 -5,0 z" transform="translate(-120 1050.362)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <rect y="1074.362" x="576" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 582.5,1076.3622 -0.5,0.5 0,3 -2,2.5 0,8 6,0 0,-8 -2,-2.5 0,-3 -0.5,-0.5 -1,0 z m 4.5,6 0,3 c 0,0 0,1 1,1 l 1,0 0,3 -1.5,0.5 -0.5,0.5 5,0 -0.5,-0.5 -1.5,-0.5 0,-3 1,0 c 1,0 1,-1 1,-1 l 0,-3 -5,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g transform="translate(-156 192)" color="#000">
-            <path d="m 718,25 0,2 -2,2 0,5.40625 0.59375,0.59375 4.03125,0 0.375,-0.5 0,-5.5 -2,-2 0,-2 -1,0 z m 4,4 0,2 1,1 0,2 -1,1 3,0 -1,-1 0,-2 1,-1 0,-2 -3,0 z" transform="translate(-120 1050.362)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <rect width="12" height="12" x="594" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 598,1075.3622 0,2 -2,2 0,5.4063 0.59375,0.5937 4.03125,0 0.375,-0.5 0,-5.5 -2,-2 0,-2 -1,0 z m 4,4 0,2 1,1 0,2 -1,1 3,0 -1,-1 0,-2 1,-1 0,-2 -3,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g transform="translate(-156 192)" color="#000">
-            <path d="m 680,27 c -0.55401,0 -0.5,0.6273 -0.5,1 l 0,2.5 c 0,0.5 -0.49764,1.2488 -1,1.5 -1,0.5 -1.5,1 -1.5,2 l 0,9 c 0,0.554 0.44599,1 1,1 l 5,0 c 0.55401,0 1,-0.446 1,-1 l 0,-9 c 0,-1 -0.5,-1.5 -1.5,-2 -0.49864,-0.2493 -1,-1 -1,-1.5 l 0,-2.5 c 0,-0.5 0.054,-1 -0.5,-1 z m 6,7 0,3 c 0,1 1,2 2,2 l 1,0 0,2.5 c 0,0.5 -1,1.5 -2,1.5 -1,0 -1,1 -1,1 l 7,0 c 0,0 0,-1 -1,-1 -1,0 -2,-1 -2,-1.5 l 0,-2.5 1,0 c 1,0 2,-1 2,-2 l 0,-3 z" transform="translate(-120 1050.362)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <rect width="24" height="24" x="552" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 560,1077.3622 c -0.55401,0 -0.5,0.6273 -0.5,1 l 0,2.5 c 0,0.5 -0.49764,1.2488 -1,1.5 -1,0.5 -1.5,1 -1.5,2 l 0,9 c 0,0.554 0.44599,1 1,1 l 5,0 c 0.55401,0 1,-0.446 1,-1 l 0,-9 c 0,-1 -0.5,-1.5 -1.5,-2 -0.49864,-0.2493 -1,-1 -1,-1.5 l 0,-2.5 c 0,-0.5 0.054,-1 -0.5,-1 z m 6,7 0,3 c 0,1 1,2 2,2 l 1,0 0,2.5 c 0,0.5 -1,1.5 -2,1.5 -1,0 -1,1 -1,1 l 7,0 c 0,0 0,-1 -1,-1 -1,0 -2,-1 -2,-1.5 l 0,-2.5 1,0 c 1,0 2,-1 2,-2 l 0,-3 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g>
-            <path d="m 18.5,1150.3622 c 0,0 -2.5,1 -2.5,2 0,0.6667 0,1.3958 0,2 0,1 -2,1 -2,2 0,2.3333 0,9 0,9 l 9,0 c 0,0 0,-6.6667 0,-9 0,-1 -2,-1 -2,-2.1875 0,-0.6042 0,-1.2083 0,-1.8125 0,-1 -2.5,-2 -2.5,-2 z m -8.5,8 c 0,2.3333 0,7 0,7 l 2,0 c 0,0 0,-4.6667 0,-7 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 z m 15,0 c 0,2.3333 0,7 0,7 l 2,0 c 0,0 0,-4.6667 0,-7 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <g transform="translate(0 24)">
-                <rect width="24" height="24" x="6" y="1122.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-            </g>
-            <path d="m 18.5,1150.3622 c 0,0 -2.5,1 -2.5,2 0,0.6667 0,1.3958 0,2 0,1 -2,1 -2,2 0,2.3333 0,9 0,9 l 9,0 c 0,0 0,-6.6667 0,-9 0,-1 -2,-1 -2,-2.1875 0,-0.6042 0,-1.2083 0,-1.8125 0,-1 -2.5,-2 -2.5,-2 z m -8.5,8 c 0,2.3333 0,7 0,7 l 2,0 c 0,0 0,-4.6667 0,-7 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 z m 15,0 c 0,2.3333 0,7 0,7 l 2,0 c 0,0 0,-4.6667 0,-7 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g>
-            <path d="m 54.5,1148.3622 -1.5,0.9411 0,1.0589 -1,1 0,5 5,0 0,-5 -1,-1 0,-0.9596 z m -4.5,4 0,4 1,0 0,-4 z m 8,0 0,4 1,0 0,-4 z" color="#000" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linejoin="round"/>
-            <g transform="translate(0 24)">
-                <rect width="12" height="12" x="48" y="1122.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-            </g>
-            <path d="m 54.5,1148.3622 -1.5,0.9411 0,1.0589 -1,1 0,5 5,0 0,-5 -1,-1 0,-0.9596 z m -4.5,4 0,4 1,0 0,-4 z m 8,0 0,4 1,0 0,-4 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g>
-            <path d="m 39.5,1149.8622 -1.5,1.5 0,1.5 -2,2 0,6.5 7,0 0,-6.5 -2,-2 0,-1.5 z m -6.5,6 0,5.5 1.5,0 0,-5.5 z m 11.5,0 0,5.5 1.5,0 0,-5.5 z" color="#000" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linejoin="round"/>
-            <g transform="translate(0 24)">
-                <rect y="1122.362" x="30" height="18" width="18" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-            </g>
-            <path d="m 39.5,1149.8622 -1.5,1.5 0,1.5 -2,2 0,6.5 7,0 0,-6.5 -2,-2 0,-1.5 z m -6.5,6 0,5.5 1.5,0 0,-5.5 z m 11.5,0 0,5.5 1.5,0 0,-5.5 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g color="#000">
-            <path d="m 259,1304.8622 c 0,-3.5 -5,-9.5 -6.5,-11.5 -1.5,2 -6.5,8 -6.5,11.5 0,3.5 3.27126,6.5 6.5,6.5 3.22874,0 6.5,-3 6.5,-6.5 z" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-            <rect y="1290.362" x="240" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 259,1304.8622 c 0,-3.5 -5,-9.5 -6.5,-11.5 -1.5,2 -6.5,8 -6.5,11.5 0,3.5 3.27126,6.5 6.5,6.5 3.22874,0 6.5,-3 6.5,-6.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g color="#000">
-            <path d="m 273.5,1305.3622 c -2.33186,0 -4.5,-2 -4.5,-4.5 0,-2.5278 3.41667,-7.0556 4.5,-8.5 1.08334,1.4444 4.5,5.9722 4.5,8.5 0,2.5 -2.16813,4.5 -4.5,4.5 z" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-            <rect width="18" height="18" x="264" y="1290.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 273.5,1305.3622 c -2.33186,0 -4.5,-2 -4.5,-4.5 0,-2.5278 3.41667,-7.0556 4.5,-8.5 1.08334,1.4444 4.5,5.9722 4.5,8.5 0,2.5 -2.16813,4.5 -4.5,4.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g color="#000">
-            <rect y="1290.362" x="282" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 288.5,1301.3622 c -1.61437,0 -3.5,-1 -3.5,-3.5 0,-1.75 2.75,-5.5 3.5,-6.5 0.75,1 3.5,4.75 3.5,6.5 0,2.5 -1.88563,3.5 -3.5,3.5 z" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-            <path d="m 288.5,1301.3622 c -1.61437,0 -3.5,-1 -3.5,-3.5 0,-1.75 2.75,-5.5 3.5,-6.5 0.75,1 3.5,4.75 3.5,6.5 0,2.5 -1.88563,3.5 -3.5,3.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g color="#000">
-            <path d="m 277,1317.3622 c -1,0 -2.78873,1.8029 -3.09375,3.4063 l -0.9375,4.875 0.53125,-0.2813 2,1 0.90625,-0.375 c 0.13935,-0.7507 0.46178,-2.4691 0.59375,-3.125 0.15329,-0.7618 0.8,-1.5 1.5,-1.5 l 1,0 -1,-1 -0.5,0 -1,0 -1,1 0,-1 c 0,-1 1.00625,-2 1.90625,-2 l 1.09375,0 -1,-1 -1,0 z m -8.5,3 -1,1 1,0 c 0.7,0 1.34671,0.7382 1.5,1.5 0.13324,0.6622 0.45816,2.4257 0.59375,3.1563 l 0.875,0.3437 0.84375,-0.4062 -0.8125,-3.5938 c -0.09,-0.4006 -0.20226,-0.6854 -0.5,-1 l -1,-1 -1,0 -0.5,0 z m 0.5,6 -2,1 0,1.5 2,-1 2.5,1 2,-1 2,1 2.5,-0.8437 2,0.8437 0,-1.5 -2,-1 -2.5,1 -2,-1 -2,1 -2.5,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 277,1317.3622 c -1,0 -2.78873,1.8029 -3.09375,3.4063 l -0.9375,4.875 0.53125,-0.2813 2,1 0.90625,-0.375 c 0.13935,-0.7507 0.46178,-2.4691 0.59375,-3.125 0.15329,-0.7618 0.8,-1.5 1.5,-1.5 l 1,0 -1,-1 -0.5,0 -1,0 -1,1 0,-1 c 0,-1 1.00625,-2 1.90625,-2 l 1.09375,0 -1,-1 -1,0 z m -8.5,3 -1,1 1,0 c 0.7,0 1.34671,0.7382 1.5,1.5 0.13324,0.6622 0.45816,2.4257 0.59375,3.1563 l 0.875,0.3437 0.84375,-0.4062 -0.8125,-3.5938 c -0.09,-0.4006 -0.20226,-0.6854 -0.5,-1 l -1,-1 -1,0 -0.5,0 z m 0.5,6 -2,1 0,1.5 2,-1 2.5,1 2,-1 2,1 2.5,-0.8437 2,0.8437 0,-1.5 -2,-1 -2.5,1 -2,-1 -2,1 -2.5,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect y="1314.362" x="264" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <rect width="24" height="24" x="240" y="1314.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 257,1318.3622 c -2,0 -3.59749,2 -4,4 l -1.125,5.5625 c 0.18718,-0.039 0.39682,-0.062 0.625,-0.062 1.5,0 2,0.9995 3,1 0.19687,1e-4 0.39306,-0.032 0.59375,-0.094 0.22556,-1.1217 0.7493,-3.6263 0.90625,-4.4063 0.19161,-0.9523 1,-2 2,-2 l 1,0 c 5e-5,-0.5 -0.49995,-1 -1,-1 l -1,0 c -0.83057,0 -1.60124,0.3065 -2.15625,0.75 l 0.15625,-0.75 c 0.1973,-0.9804 1,-2 2,-2 l 1,0 c 0,-0.5 -0.5,-1 -1,-1 l -1,0 z m -11,3 c -0.50005,0 -1.00005,0.5 -1,1 l 1,0 c 1,0 1.80839,1.0477 2,2 0.15208,0.7559 0.66263,3.2025 0.90625,4.4063 0.20069,0.062 0.39688,0.094 0.59375,0.094 0.56577,2e-4 0.98268,-0.3158 1.5,-0.5937 l -1,-4.9063 c -0.20125,-1 -1.50005,-2 -3,-2 l -1,0 z m 0,8 c -0.69406,0 -1.33976,0.4049 -2,0.625 l 0,2.0313 c 0,0 1,-0.6558 2,-0.6563 1,-5e-4 2,1 3.5,1 1.5,0 1.97352,-0.9653 3,-1 1,5e-4 1.5,1 3,1 1.5,0 2.5,-1 3.5,-1 0.70165,0 2,0.6563 2,0.6563 l 0,-2.0313 c -0.6416,-0.2468 -1.34343,-0.625 -2,-0.625 -1.5,0 -2.5,1.0005 -3.5,1 -1,-5e-4 -1.5,-1 -3,-1 -1.5,0 -2,1.0005 -3,1 -1,5e-4 -2,-1 -3.5,-1 z" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-            <path d="m 257,1318.3622 c -2,0 -3.59749,2 -4,4 l -1.125,5.5625 c 0.18718,-0.039 0.39682,-0.062 0.625,-0.062 1.5,0 2,0.9995 3,1 0.19687,1e-4 0.39306,-0.032 0.59375,-0.094 0.22556,-1.1217 0.7493,-3.6263 0.90625,-4.4063 0.19161,-0.9523 1,-2 2,-2 l 1,0 c 5e-5,-0.5 -0.49995,-1 -1,-1 l -1,0 c -0.83057,0 -1.60124,0.3065 -2.15625,0.75 l 0.15625,-0.75 c 0.1973,-0.9804 1,-2 2,-2 l 1,0 c 0,-0.5 -0.5,-1 -1,-1 l -1,0 z m -11,3 c -0.50005,0 -1.00005,0.5 -1,1 l 1,0 c 1,0 1.80839,1.0477 2,2 0.15208,0.7559 0.66263,3.2025 0.90625,4.4063 0.20069,0.062 0.39688,0.094 0.59375,0.094 0.56577,2e-4 0.98268,-0.3158 1.5,-0.5937 l -1,-4.9063 c -0.20125,-1 -1.50005,-2 -3,-2 l -1,0 z m 0,8 c -0.69406,0 -1.33976,0.4049 -2,0.625 l 0,2.0313 c 0,0 1,-0.6558 2,-0.6563 1,-5e-4 2,1 3.5,1 1.5,0 1.97352,-0.9653 3,-1 1,5e-4 1.5,1 3,1 1.5,0 2.5,-1 3.5,-1 0.70165,0 2,0.6563 2,0.6563 l 0,-2.0313 c -0.6416,-0.2468 -1.34343,-0.625 -2,-0.625 -1.5,0 -2.5,1.0005 -3.5,1 -1,-5e-4 -1.5,-1 -3,-1 -1.5,0 -2,1.0005 -3,1 -1,5e-4 -2,-1 -3.5,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g color="#000">
-            <path d="M 411 266 L 409.5 267.5 L 408.5 270 L 408.5 271.5 L 410 272 L 410.53125 271.8125 C 410.67042 271.08976 410.94593 270.26876 411 270 L 413 270 L 412 269 L 411 269 L 410 270 L 410.5 268 L 411.5 267 L 412.5 267 L 411.5 266 L 411 266 z M 406 269 L 405 270 L 407 270 L 407 272 L 408 271.65625 L 408 270 L 407 269 L 406 269 z M 405.5 272.5 L 404 272.96875 L 404 274 L 405.5 273.5 L 407 274 L 408.5 273.5 L 410 274 L 411.5 273.5 L 413 274 L 413 272.96875 L 411.5 272.5 L 410 273 L 408.5 272.5 L 407 273 L 405.5 272.5 z" transform="translate(-120 1050.362)" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-            <rect width="12" height="12" x="282" y="1314.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path transform="translate(-120 1050.362)" d="M 411 266 L 409.5 267.5 L 408.5 270 L 408.5 271.5 L 410 272 L 410.53125 271.8125 C 410.67042 271.08976 410.94593 270.26876 411 270 L 413 270 L 412 269 L 411 269 L 410 270 L 410.5 268 L 411.5 267 L 412.5 267 L 411.5 266 L 411 266 z M 406 269 L 405 270 L 407 270 L 407 272 L 408 271.65625 L 408 270 L 407 269 L 406 269 z M 405.5 272.5 L 404 272.96875 L 404 274 L 405.5 273.5 L 407 274 L 408.5 273.5 L 410 274 L 411.5 273.5 L 413 274 L 413 272.96875 L 411.5 272.5 L 410 273 L 408.5 272.5 L 407 273 L 405.5 272.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g color="#000">
-            <rect width="18" height="18" x="654" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 664,1053.3622 -1,0 -6,5 0,1 1,0 0,6 11,0 0,-6 1,0 0,-1 z m -3,6.5 5,0 0,0.5 -5,0 z m 0,2 5,0 0,0.5 -5,0 z m 0,2 5,0 0,0.5 -5,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 664,1053.3622 -1,0 -6,5 0,1 1,0 0,6 11,0 0,-6 1,0 0,-1 z m -3,6.5 5,0 0,0.5 -5,0 z m 0,2 5,0 0,0.5 -5,0 z m 0,2 5,0 0,0.5 -5,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g color="#000">
-            <path d="m 664,1125.3622 -1,0 -6,5 0,1 1,0 0,6 11,0 0,-6 1,0 0,-1 z" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linejoin="round"/>
-            <path d="m 664,1125.3622 -1,0 -6,5 0,1 1,0 0,6 11,0 0,-6 1,0 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect y="1122.362" x="654" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(0 48)" color="#000">
-            <path d="m 641,1077.3622 -7.5,6.5 c -0.3561,0.3086 -0.5,0.5 -0.5,0.75 0,0.4959 0.5,0.75 1,0.75 l 1,0 0,8 c 0,0.554 0.446,1 1,1 l 6.5,0 6.5,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 1,0 c 0.5,0 1,-0.2541 1,-0.75 0,-0.25 -0.13799,-0.4483 -0.5,-0.75 l -7.5,-6.5 z" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linejoin="round"/>
-            <rect y="1074.362" x="630" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 641,1077.3622 -7.5,6.5 c -0.3561,0.3086 -0.5,0.5 -0.5,0.75 0,0.4959 0.5,0.75 1,0.75 l 1,0 0,8 c 0,0.554 0.446,1 1,1 l 6.5,0 6.5,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 1,0 c 0.5,0 1,-0.2541 1,-0.75 0,-0.25 -0.13799,-0.4483 -0.5,-0.75 l -7.5,-6.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g>
-            <path d="m 679,1124.3622 -1,0 -4,3.3076 0,0.6924 1,0 0,4 7,0 0,-4 1,0 0,-0.6924 z" color="#000" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linejoin="round"/>
-            <g transform="translate(78 -48)">
-                <rect y="1170.362" x="594" height="12" width="12" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-            </g>
-            <path d="m 679,1124.3622 -1,0 -4,3.3076 0,0.6924 1,0 0,4 7,0 0,-4 1,0 0,-0.6924 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g color="#000">
-            <path d="m 679,1052.3622 -1,0 -4,3.3125 0,0.6875 1,0 0,4 2,0 0,-0.5 3,0 0,0.5 2,0 0,-4 1,0 0,-0.6875 z m -2,4.5 3,0 0,0.5 -3,0 z m 0,1 3,0 0,0.5 -3,0 z m 0,1 3,0 0,0.5 -3,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <rect y="1050.362" x="672" height="12" width="12" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 679,1052.3622 -1,0 -4,3.3125 0,0.6875 1,0 0,4 2,0 0,-0.5 3,0 0,0.5 2,0 0,-4 1,0 0,-0.6875 z m -2,4.5 3,0 0,0.5 -3,0 z m 0,1 3,0 0,0.5 -3,0 z m 0,1 3,0 0,0.5 -3,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g color="#000">
-            <path d="m 350,1244.3622 -3,1.5 0,12.5 1,0 0,-8 2,-1 3.5,2 2.5,-1 0,-5 -2.5,1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <rect width="18" height="18" x="342" y="1242.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 350,1244.3622 -3,1.5 0,12.5 1,0 0,-8 2,-1 3.5,2 2.5,-1 0,-5 -2.5,1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g color="#000">
-            <path d="m 365.5,1244.3622 -2.5,1 0,8 1,0 0,-5 1.5,-0.5 2.5,1.5 2,-1 0,-3.5 -2,1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <rect y="1242.362" x="360" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 365.5,1244.3622 -2.5,1 0,8 1,0 0,-5 1.5,-0.5 2.5,1.5 2,-1 0,-3.5 -2,1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g transform="translate(-2)" color="#000">
-            <path d="m 336,1318.3622 c -1,0 -1.32629,0.3263 -2,1 l -8,8 c -0.5,0.5 -1,1 -1,2 0,0.8333 0,1 0,1.5 0,1 0.5,1.5 1,2 l 0.5625,0.5625 3.5,-3.5 -0.5625,-0.5625 c -0.50009,-0.5 0,-1 0,-1 l 5.5,-5.5 c 0,0 0.5,-0.5 1,0 l 0.5625,0.5625 3.5,-3.5 c 0,0 -0.375,-0.375 -0.5625,-0.5625 -0.5,-0.5 -1,-1 -2,-1 -0.5,0 -1.5,0 -1.5,0 z m 4.4375,1.9375 -3.5,3.5 0.5625,0.5625 c 0.35356,0.3535 1.14645,0.3536 1.5,0 l 2,-2 c 0.35359,-0.3537 0.35357,-1.1465 0,-1.5 z m -10,10 -3.5,3.5 0.5625,0.5625 c 0.35362,0.3537 1.1464,0.3534 1.5,0 l 2,-2 c 0.35372,-0.3536 0.35352,-1.1466 0,-1.5 z" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-            <path d="m 336,1318.3622 c -1,0 -1.32629,0.3263 -2,1 l -8,8 c -0.5,0.5 -1,1 -1,2 0,0.8333 0,1 0,1.5 0,1 0.5,1.5 1,2 l 0.5625,0.5625 3.5,-3.5 -0.5625,-0.5625 c -0.50009,-0.5 0,-1 0,-1 l 5.5,-5.5 c 0,0 0.5,-0.5 1,0 l 0.5625,0.5625 3.5,-3.5 c 0,0 -0.375,-0.375 -0.5625,-0.5625 -0.5,-0.5 -1,-1 -2,-1 -0.5,0 -1.5,0 -1.5,0 z m 4.4375,1.9375 -3.5,3.5 0.5625,0.5625 c 0.35356,0.3535 1.14645,0.3536 1.5,0 l 2,-2 c 0.35359,-0.3537 0.35357,-1.1465 0,-1.5 z m -10,10 -3.5,3.5 0.5625,0.5625 c 0.35362,0.3537 1.1464,0.3534 1.5,0 l 2,-2 c 0.35372,-0.3536 0.35352,-1.1466 0,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect y="1314.362" x="320" height="24" width="24" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="matrix(.75 0 0 .75 102 329.589)" color="#000">
-            <path transform="matrix(1.333 0 0 1.333 -295.999 961.029)" d="M 472.5 267 L 464 275.5 L 464 278 L 465.3125 279.3125 L 468.3125 276.3125 L 467.5 275.5 L 472.5 270.5 L 473.3125 271.3125 L 476.3125 268.3125 L 475 267 L 472.5 267 z M 476.6875 268.6875 L 473.6875 271.6875 L 474 272 L 475 272 L 477 270 L 477 269 L 476.6875 268.6875 z M 468.6875 276.6875 L 465.6875 279.6875 L 466 280 L 467 280 L 469 278 L 469 277 L 468.6875 276.6875 z" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-            <path d="M 472.5 267 L 464 275.5 L 464 278 L 465.3125 279.3125 L 468.3125 276.3125 L 467.5 275.5 L 472.5 270.5 L 473.3125 271.3125 L 476.3125 268.3125 L 475 267 L 472.5 267 z M 476.6875 268.6875 L 473.6875 271.6875 L 474 272 L 475 272 L 477 270 L 477 269 L 476.6875 268.6875 z M 468.6875 276.6875 L 465.6875 279.6875 L 466 280 L 467 280 L 469 278 L 469 277 L 468.6875 276.6875 z" transform="matrix(1.333 0 0 1.333 -295.999 961.029)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect width="24" height="24" x="320" y="1314.362" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="translate(-2 24)" color="#000">
-            <path d="m 447,291.5 -4.5,4.5 4.5,0 0,-4.5 z m 7,0.5 c -1,0 -1.32629,0.3263 -2,1 l -8,8 c -0.5,0.5 -1,1 -1,2 l 0,1.5 c 0,1 0.5,1.5 1,2 l 0.5625,0.5625 3.5,-3.5 L 447.5,303 c -0.50009,-0.5 0,-1 0,-1 l 5.5,-5.5 c 0,0 0.5,-0.5 1,0 l 0.5625,0.5625 3.5,-3.5 L 457.5,293 c -0.5,-0.5 -1,-1 -2,-1 l -1.5,0 z m 4.4375,1.9375 -3.5,3.5 L 455.5,298 c 0.35356,0.3535 1.14645,0.3536 1.5,0 l 2,-2 c 0.35359,-0.3537 0.35357,-1.1465 0,-1.5 l -0.5625,-0.5625 z m -10,10 -3.5,3.5 L 445.5,308 c 0.35362,0.3537 1.1464,0.3534 1.5,0 l 2,-2 c 0.35372,-0.3536 0.35352,-1.1466 0,-1.5 l -0.5625,-0.5625 z" transform="translate(-118 1026.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect width="24" height="24" x="320" y="1314.362" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="matrix(.75 0 0 .75 102 352.589)" color="#000">
-            <path d="m 327.99998,1316.3622 -4.66666,4.6667 4.66666,0 z m 7.33332,0.6667 -11.33331,11.3333 0,3.3333 1.75,1.75 3.99999,-4 -1.08333,-1.0833 6.66665,-6.6667 1.08334,1.0834 3.99999,-4 -1.75,-1.75 z m 5.58333,2.25 -3.99999,4 0.41666,0.4166 1.33333,0 2.66666,-2.6666 0,-1.3334 z m -10.66665,10.6666 -3.99999,4 0.41666,0.4167 1.33333,0 2.66667,-2.6667 0,-1.3333 z" opacity=".3" stroke="#fff" stroke-width="2.667" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 327.99998,1316.3622 -4.66665,4.6667 4.66665,0 z m 7.33333,0.6667 -11.33332,11.3333 0,3.3333 1.75,1.75 3.99999,-4 -1.08333,-1.0833 6.66666,-6.6667 1.08333,1.0834 3.99999,-4 -1.75,-1.75 z m 5.58332,2.25 -3.99999,4 0.41666,0.4166 1.33333,0 2.66667,-2.6666 0,-1.3334 z m -10.66665,10.6666 -3.99999,4 0.41666,0.4167 1.33333,0 2.66667,-2.6667 0,-1.3333 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect y="1314.362" x="320" height="24" width="24" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g>
-            <path transform="translate(-120 1050.362)" d="M 484 289.5 L 481.5 292 L 484 292 L 484 289.5 z M 487.5 290 L 482 295.5 L 482 297.5 L 483 298.5 L 484 298.5 L 485 297.5 L 485 296.5 L 484 295.5 L 487.5 292 L 488.5 293 L 489.5 293 L 490.5 292 L 490.5 291 L 489.5 290 L 487.5 290 z" color="#000" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-            <g transform="translate(0 23)">
-                <rect y="1314.362" x="320" height="24" width="24" color="#000" overflow="visible" enable-background="accumulate" fill="none" transform="matrix(.5 0 0 .5 200 658.18)"/>
-                <path transform="translate(-120 1027.362)" d="M 484 289.5 L 481.5 292 L 484 292 L 484 289.5 z M 487.5 290 L 482 295.5 L 482 297.5 L 483 298.5 L 484 298.5 L 485 297.5 L 485 296.5 L 484 295.5 L 487.5 292 L 488.5 293 L 489.5 293 L 490.5 292 L 490.5 291 L 489.5 290 L 487.5 290 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-        </g>
-        <g>
-            <path d="m 367.5,1317.3622 -5.5,5.5 0,2 1,1 1,0 1,-1 0,-1 -1,-1 3.5,-3.5 1,1 1,0 1,-1 0,-1 -1,-1 z" color="#000" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-            <rect width="24" height="24" x="320" y="1314.362" color="#000" overflow="visible" enable-background="accumulate" fill="none" transform="matrix(.5 0 0 .5 200 658.18)"/>
-            <path d="m 367.5,1317.3622 -5.5,5.5 0,2 1,1 1,0 1,-1 0,-1 -1,-1 3.5,-3.5 1,1 1,0 1,-1 0,-1 -1,-1 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g transform="translate(0 -1)">
-            <path d="m 329.5,1365.3622 c -1.3807,0 -2.5,1.1193 -2.5,2.5 0,1.3808 1.1193,2.5 2.5,2.5 1.3807,0 2.5,-1.1192 2.5,-2.5 0,-1.3807 -1.1193,-2.5 -2.5,-2.5 z m -0.5,6 c -1,0 -2,1 -2,2 l 0,3.5 c 0,1.5 1,2.5 2.5,2.5 l 5,0 2.625,3.5 c 0.22625,0.3321 0.48443,0.5 0.875,0.5 0.50005,0 1.00005,-0.5 1,-1 0,-0.293 -0.16664,-0.5202 -0.28125,-0.7187 L 336,1377.8622 c -0.18118,-0.3138 -0.49995,-0.5001 -1,-0.5 l -2.5,0 -1,-4 c -0.24256,-0.9702 -0.5,-2 -1.5,-2 z m -3,2 c -2.33117,0.8233 -4,3.387 -4,6 0,3.3137 2.6863,6 6,6 2.97561,0 5.43327,-2.1586 5.90625,-5 l -1.90625,0 c -0.5381,1.73 -1.84289,3 -3.75,3 -2.34721,0 -4.25,-1.9028 -4.25,-4.25 0,-1.5176 0.80334,-2.9981 2,-3.75 z" opacity=".3" color="#000" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 329.5,1365.3622 c -1.3807,0 -2.5,1.1193 -2.5,2.5 0,1.3808 1.1193,2.5 2.5,2.5 1.3807,0 2.5,-1.1192 2.5,-2.5 0,-1.3807 -1.1193,-2.5 -2.5,-2.5 z m -0.5,6 c -1,0 -2,1 -2,2 l 0,3.5 c 0,1.5 1,2.5 2.5,2.5 l 5,0 2.625,3.5 c 0.22625,0.3321 0.48443,0.5 0.875,0.5 0.50005,0 1.00005,-0.5 1,-1 0,-0.293 -0.16664,-0.5202 -0.28125,-0.7187 L 336,1377.8622 c -0.18118,-0.3138 -0.49995,-0.5001 -1,-0.5 l -2.5,0 -1,-4 c -0.24256,-0.9702 -0.5,-2 -1.5,-2 z m -3,2 c -2.33117,0.8233 -4,3.387 -4,6 0,3.3137 2.6863,6 6,6 2.97561,0 5.43327,-2.1586 5.90625,-5 l -1.90625,0 c -0.5381,1.73 -1.84289,3 -3.75,3 -2.34721,0 -4.25,-1.9028 -4.25,-4.25 0,-1.5176 0.80334,-2.9981 2,-3.75 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect y="1314.362" x="320" height="24" width="24" color="#000" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-2 49)"/>
-        </g>
-        <g transform="translate(0 -1)" color="#000">
-            <rect width="18" height="18" x="342" y="1363.362" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 350.5,1364.3622 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m -0.5,5 -1,1 0,4 1,1 4.375,0 2.625,3 1,0 0,-1 -2.5,-3.125 -0.5,-0.375 -2,0 -1,-3.5 -1,-1 -1,0 z m -2,1.5 c -1.74838,0.6175 -3,2.5403 -3,4.5 0,2.4853 2.01472,4.5 4.5,4.5 2.23171,0 4.08276,-1.3689 4.4375,-3.5 l -1.4375,0 c -0.40358,1.2975 -1.38217,2 -2.8125,2 -1.76041,0 -3.1875,-1.4271 -3.1875,-3.1875 0,-1.1382 0.6025,-2.2486 1.5,-2.8125 l 0,-1.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 350.5,1364.3622 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m -0.5,5 -1,1 0,4 1,1 4.375,0 2.625,3 1,0 0,-1 -2.5,-3.125 -0.5,-0.375 -2,0 -1,-3.5 -1,-1 -1,0 z m -2,1.5 c -1.74838,0.6175 -3,2.5403 -3,4.5 0,2.4853 2.01472,4.5 4.5,4.5 2.23171,0 4.08276,-1.3689 4.4375,-3.5 l -1.4375,0 c -0.40358,1.2975 -1.38217,2 -2.8125,2 -1.76041,0 -3.1875,-1.4271 -3.1875,-3.1875 0,-1.1382 0.6025,-2.2486 1.5,-2.8125 l 0,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g transform="translate(0 -1)" color="#000">
-            <path d="m 365.5,1364.3622 c -0.82843,0 -1.5,0.6716 -1.5,1.5 0,0.8284 0.67157,1.5 1.5,1.5 0.82843,0 1.5,-0.6716 1.5,-1.5 0,-0.8284 -0.67157,-1.5 -1.5,-1.5 z m -0.5,3.5 0,3.5 3.25,0 1.75,2 1,0 0,-0.5 -2,-2.5 -1.65625,0 -0.84375,-2.5 -1.5,0 z m -1,0.5 c -1.16559,0.4117 -2,1.6935 -2,3 0,1.6569 1.34315,3 3,3 1.36817,0 2.51442,-0.7711 2.875,-2 l -1.03125,0 c -0.32327,0.6419 -0.90219,1 -1.71875,1 -1.17361,0 -2.125,-0.9514 -2.125,-2.125 0,-0.7588 0.40167,-1.499 1,-1.875 l 0,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 365.5,1364.3622 c -0.82843,0 -1.5,0.6716 -1.5,1.5 0,0.8284 0.67157,1.5 1.5,1.5 0.82843,0 1.5,-0.6716 1.5,-1.5 0,-0.8284 -0.67157,-1.5 -1.5,-1.5 z m -0.5,3.5 0,3.5 3.25,0 1.75,2 1,0 0,-0.5 -2,-2.5 -1.65625,0 -0.84375,-2.5 -1.5,0 z m -1,0.5 c -1.16559,0.4117 -2,1.6935 -2,3 0,1.6569 1.34315,3 3,3 1.36817,0 2.51442,-0.7711 2.875,-2 l -1.03125,0 c -0.32327,0.6419 -0.90219,1 -1.71875,1 -1.17361,0 -2.125,-0.9514 -2.125,-2.125 0,-0.7588 0.40167,-1.499 1,-1.875 l 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect y="1363.362" x="360" height="12" width="12" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <path d="m 348.00001,1291.3622 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m 6.99999,0 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m -7.49999,5 -1.5,1.5 0,2.5 -1.5,2.5 0.5,0.5 2,0 0,3 2,0 0,-3 2,0 0.5,-0.5 -1.5,-2.5 0,-2.5 -1.5,-1.5 z m 5.49999,0 -0.99999,1 1.99999,4.5 0,4.5 2,0 0,-4.5 2.00001,-4.5 -1.00001,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 348.00001,1291.3622 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m 6.99999,0 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m -7.49999,5 -1.5,1.5 0,2.5 -1.5,2.5 0.5,0.5 2,0 0,3 2,0 0,-3 2,0 0.5,-0.5 -1.5,-2.5 0,-2.5 -1.5,-1.5 z m 5.49999,0 -0.99999,1 1.99999,4.5 0,4.5 2,0 0,-4.5 2.00001,-4.5 -1.00001,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect y="1290.362" x="342" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g transform="matrix(.5 0 0 .5 201 645.181)" color="#000">
-            <path transform="matrix(2 0 0 2 -642 810.362)" d="m 484,241 c -0.69036,0 -1.25,0.55964 -1.25,1.25 0,0.69036 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.55964 1.25,-1.25 0,-0.69036 -0.55964,-1.25 -1.25,-1.25 z m 5,0 c -0.69036,0 -1.25,0.55964 -1.25,1.25 0,0.69036 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.55964 1.25,-1.25 0,-0.69036 -0.55964,-1.25 -1.25,-1.25 z m -6,3 0,1.5 -1.5,2.5 1.5,0 0,2 2,0 0,-2 1.5,0 -1.5,-2.5 0,-1.5 -2,0 z m 4,0 1,3.5 0,2.5 2,0 0,-2.5 1,-3.5 -4,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 484,241 c -0.69036,0 -1.25,0.55964 -1.25,1.25 0,0.69036 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.55964 1.25,-1.25 0,-0.69036 -0.55964,-1.25 -1.25,-1.25 z m 5,0 c -0.69036,0 -1.25,0.55964 -1.25,1.25 0,0.69036 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.55964 1.25,-1.25 0,-0.69036 -0.55964,-1.25 -1.25,-1.25 z m -6,3 0,1.5 -1.5,2.5 1.5,0 0,2 2,0 0,-2 1.5,0 -1.5,-2.5 0,-1.5 -2,0 z m 4,0 1,3.5 0,2.5 2,0 0,-2.5 1,-3.5 -4,0 z" transform="matrix(2 0 0 2 -642 810.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect y="1290.362" x="318" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g>
-            <rect width="24" height="24" x="396" y="1290.362" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-            <g transform="translate(1)">
-                <path transform="translate(-121 1050.362)" d="m 526,244 c -0.5,0 -1,0.5 -1,1 l 0,10 -1,0 c -1.65685,0 -3,1.3431 -3,3 0,1.6569 1.34315,3 3,3 1.65684,0 3,-1.3431 3,-3 l 0,-9 7,0 0,6 -1,0 c -1.65685,0 -3,1.3431 -3,3 0,1.6569 1.34315,3 3,3 1.65685,0 3,-1.3431 3,-3 l 0,-13 c 0,-0.5 -0.5,-1 -1,-1 l -9,0 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 526,244 c -0.5,0 -1,0.5 -1,1 l 0,10 -1,0 c -1.65685,0 -3,1.3431 -3,3 0,1.6569 1.34315,3 3,3 1.65684,0 3,-1.3431 3,-3 l 0,-9 7,0 0,6 -1,0 c -1.65685,0 -3,1.3431 -3,3 0,1.6569 1.34315,3 3,3 1.65685,0 3,-1.3431 3,-3 l 0,-13 c 0,-0.5 -0.5,-1 -1,-1 l -9,0 z" transform="translate(-121 1050.362)" fill="#454545"/>
-            </g>
-        </g>
-        <g transform="matrix(.5 0 0 .5 240 645.181)">
-            <path transform="matrix(2 0 0 2 -720 810.362)" d="M 563 242 L 563 247.5 L 562.5 247.5 C 561.67157 247.5 561 248.17155 561 249 C 561 249.82845 561.67157 250.5 562.5 250.5 C 563.32842 250.5 564 249.82845 564 249 L 564 245 L 567 245 L 567 247.5 L 566.5 247.5 C 565.67158 247.5 565 248.17155 565 249 C 565 249.82845 565.67157 250.5 566.5 250.5 C 567.32842 250.5 568 249.82845 568 249 L 568 242 L 563 242 z" fill="#fff" opacity=".3" color="#000" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <rect y="1290.362" x="396" height="24" width="24" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="M 563 242 L 563 247.5 L 562.5 247.5 C 561.67157 247.5 561 248.17155 561 249 C 561 249.82845 561.67157 250.5 562.5 250.5 C 563.32842 250.5 564 249.82845 564 249 L 564 245 L 567 245 L 567 247.5 L 566.5 247.5 C 565.67158 247.5 565 248.17155 565 249 C 565 249.82845 565.67157 250.5 566.5 250.5 C 567.32842 250.5 568 249.82845 568 249 L 568 242 L 563 242 z" transform="matrix(2 0 0 2 -720 810.362)" fill="#454545"/>
-        </g>
-        <g transform="matrix(.75 0 0 .75 123 322.591)">
-            <rect y="1290.362" x="396" height="24" width="24" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-            <g transform="translate(1)">
-                <path transform="matrix(1.333 0 0 1.333 -325 970.362)" d="m 547.5,243 -0.75,0.75 0,7.5 -0.75,0 c -1.24264,0 -2.25,1.00733 -2.25,2.25 0,1.24267 1.00736,2.25 2.25,2.25 1.24263,0 2.25,-1.00733 2.25,-2.25 l 0,-6.5 5.25,0 0,4.25 -0.75,0 c -1.24264,0 -2.25,1.00733 -2.25,2.25 0,1.24267 1.00736,2.25 2.25,2.25 1.24264,0 2.25,-1.00733 2.25,-2.25 l 0,-9.75 -0.75,-0.75 -6.75,0 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 547.5,243 -0.75,0.75 0,7.5 -0.75,0 c -1.24264,0 -2.25,1.00733 -2.25,2.25 0,1.24267 1.00736,2.25 2.25,2.25 1.24263,0 2.25,-1.00733 2.25,-2.25 l 0,-6.5 5.25,0 0,4.25 -0.75,0 c -1.24264,0 -2.25,1.00733 -2.25,2.25 0,1.24267 1.00736,2.25 2.25,2.25 1.24264,0 2.25,-1.00733 2.25,-2.25 l 0,-9.75 -0.75,-0.75 -6.75,0 z" transform="matrix(1.333 0 0 1.333 -325 970.362)" fill="#454545"/>
-            </g>
-        </g>
-        <g color="#000">
-            <path d="m 637.5,1245.3622 c -0.5,0 -0.78339,0.1967 -1,0.5 l -2.5,3.5 2,0 0,3 5,0 0,-3 2,0 -2.5,-3.5 c -0.21661,-0.3033 -0.5,-0.5 -1,-0.5 z m 12.5,0 0,2 -4,0 c -0.5,0 -1,0.5 -1,1 l 0,4 6,0 0,-7 z m -14,9 c -0.5,0 -1,0.5 -1,1 l 0,7 2,0 0,-2 1,0 0,2 4,0 0,-7 c 0,-0.5 -0.5,-1 -1,-1 z m 12,-1 -3,4 1.5,0 -1.5,3 2,0 0,2 2,0 0,-2 2,0 -1.5,-3 1.5,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="M 757.5 195 C 757 195 756.71661 195.1967 756.5 195.5 L 754 199 L 756 199 L 756 202 L 761 202 L 761 199 L 763 199 L 760.5 195.5 C 760.28339 195.1967 760 195 759.5 195 L 757.5 195 z M 770 195 L 770 197 L 766 197 C 765.5 197 765 197.5 765 198 L 765 202 L 771 202 L 771 195 L 770 195 z M 768 203 L 765 207 L 766.5 207 L 765 210 L 767 210 L 767 212 L 769 212 L 769 210 L 771 210 L 769.5 207 L 771 207 L 768 203 z M 756 204 C 755.5 204 755 204.5 755 205 L 755 212 L 757 212 L 757 210 L 758 210 L 758 212 L 762 212 L 762 205 C 762 204.5 761.5 204 761 204 L 756 204 z M 757 206 L 758 206 L 758 207 L 757 207 L 757 206 z M 759 206 L 760 206 L 760 207 L 759 207 L 759 206 z M 757 208 L 758 208 L 758 209 L 757 209 L 757 208 z M 759 208 L 760 208 L 760 209 L 759 209 L 759 208 z M 759 210 L 760 210 L 760 211 L 759 211 L 759 210 z" transform="translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect y="1242.362" x="630" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <path d="m 657.99999,1244.3622 -2,3 1,0 0,3 5,0 0,-3 1,0 -2,-3 z m 11,0 0,2 -3,0 -1,1 0,3 5,0 0,-6 z m -11.99999,8 -10e-6,1 0,5 1,0 0,-2 1,0 0,2 3,0 0,-5 0,-1 z m 10.49999,-1 -2.5,4 1.5,0 -1.5,2 2,0 0,1 1,0 0,-1 2,0 -1.5,-2 1.5,0 z m -9.5,3 1,0 0,1 -1,0 z m 2,0 1,0 0,1 -1,0 z m 0,2 1,0 0,1 -1,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 657.99999,1244.3622 -2,3 1,0 0,3 5,0 0,-3 1,0 -2,-3 z m 11,0 0,2 -3,0 -1,1 0,3 5,0 0,-6 z m -11.99999,8 -10e-6,1 0,5 1,0 0,-2 1,0 0,2 3,0 0,-5 0,-1 z m 10.49999,-1 -2.5,4 1.5,0 -1.5,2 2,0 0,1 1,0 0,-1 2,0 -1.5,-2 1.5,0 z m -9.5,3 1,0 0,1 -1,0 z m 2,0 1,0 0,1 -1,0 z m 0,2 1,0 0,1 -1,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect width="18" height="18" x="654" y="1242.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <g>
-                <path d="m 633.69998,1246.3622 -3.4,3.4 1.7,0 0,3.4 5.1,0 0,-3.4 1.7,0 -3.4,-3.4 z m 10.2,0 0,1.7 -2.23125,0 -1.16875,1.275 0,3.825 5.1,0 0,-6.8 z m -10.2,10.2 -1.7,0 0,6.8 1.7,0 0,-1.7 1.7,0 0,1.7 1.7,0 0,-6.8 -1.7,0 z m 9.35,-1.7 -3.4,4.25 1.7,0 -1.7,2.55 2.55,0 0,1.7 1.7,0 0,-1.7 2.55,0 -1.7,-2.55 1.7,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="3.4" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="matrix(.588 0 0 .588 302.235 510.208)"/>
-                <path d="m 633.69998,1246.3622 -3.4,3.4 1.7,0 0,3.4 5.1,0 0,-3.4 1.7,0 -3.4,-3.4 z m 10.2,0 0,1.7 -2.23125,0 -1.16875,1.275 0,3.825 5.1,0 0,-6.8 z m -10.2,10.2 -1.7,0 0,6.8 1.7,0 0,-1.7 1.7,0 0,1.7 1.7,0 0,-6.8 -1.7,0 z m 9.35,-1.7 -3.4,4.25 1.7,0 -1.7,2.55 2.55,0 0,1.7 1.7,0 0,-1.7 2.55,0 -1.7,-2.55 1.7,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="matrix(.588 0 0 .588 302.235 510.208)"/>
-            </g>
-            <rect y="1242.362" x="672" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <path d="m 636,1269.3622 0,2 -2,0 0,13 8,0 0,-13 -2,0 0,-2 -4,0 z m 9,2 0,3 -2,0 0,12 8,0 0,-12 -2,0 0,-3 -1,0 0,3 -2,0 0,-3 -1,0 z m -10,2 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -4,2 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m 5,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -13,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m 5,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -13,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m 5,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -13,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m 5,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" opacity=".3" stroke-linecap="round" stroke-linejoin="round"/>
-            <rect width="24" height="24" x="630" y="1266.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 636,1269.3622 0,2 -2,0 0,13 8,0 0,-13 -2,0 0,-2 -4,0 z m 9,2 0,3 -2,0 0,12 8,0 0,-12 -2,0 0,-3 -1,0 0,3 -2,0 0,-3 -1,0 z m -10,2 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -4,2 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m 5,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -13,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m 5,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -13,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m 5,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -13,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m 5,1 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g color="#000">
-            <path d="m 658,1268.3622 0,2 -1,0 0,10 6,0 0,-10 -1,0 0,-2 -4,0 z m 7,2 0,3 -1,0 0,9 6,0 0,-9 -1,0 0,-3 -1,0 0,3 -2,0 0,-3 -1,0 z m -7,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m -3,2 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m 4,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m -10,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m 4,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m -10,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m 4,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m -3,2 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 658,1268.3622 0,2 -1,0 0,10 6,0 0,-10 -1,0 0,-2 -4,0 z m 7,2 0,3 -1,0 0,9 6,0 0,-9 -1,0 0,-3 -1,0 0,3 -2,0 0,-3 -1,0 z m -7,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m -3,2 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m 4,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m -10,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m 4,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m -10,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m 4,1 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z m -3,2 1,0 0,1 -1,0 0,-1 z m 3,0 1,0 0,1 -1,0 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect y="1266.362" x="654" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <path d="m 638,1296.3622 -3,1.5 c -0.51116,0.2556 -1,1 -1,1.5 l 0,8 3,0 0,-3 2,0 0,3 3,0 0,-8 c 0,-0.5 -0.50201,-1.251 -1,-1.5 l -3,-1.5 z m 9,2 -3,1.5 c -0.51116,0.2556 -1,1 -1,1.5 l 0,8 3,0 0,-3 2,0 0,3 3,0 0,-8 c 0,-0.5 -0.50201,-1.251 -1,-1.5 l -3,-1.5 z m -12,2 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -4,2 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m 5,0 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -4,2 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 638,1296.3622 -3,1.5 c -0.51116,0.2556 -1,1 -1,1.5 l 0,8 3,0 0,-3 2,0 0,3 3,0 0,-8 c 0,-0.5 -0.50201,-1.251 -1,-1.5 l -3,-1.5 z m 9,2 -3,1.5 c -0.51116,0.2556 -1,1 -1,1.5 l 0,8 3,0 0,-3 2,0 0,3 3,0 0,-8 c 0,-0.5 -0.50201,-1.251 -1,-1.5 l -3,-1.5 z m -12,2 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -4,2 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m 5,0 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -4,2 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect y="1290.362" x="630" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <g color="#000">
-            <path d="m 676,1292.8622 -2,1.5 0,5 1.5,0 0,-1 1,0 0,1 1.5,0 0,-5 z m -1,2 2,0 0,0.5 -2,0 z m 4,0.5 0,5 1.5,0 0,-1 1,0 0,1 1.5,0 0,-5 -2,-1.5 z m 1,0.5 2,0 0,0.5 -2,0 z m -5,1 2,0 0,0.5 -2,0 z m 5,1 2,0 0,0.5 -2,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <rect y="1290.362" x="672" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 676,1292.8622 -2,1.5 0,5 1.5,0 0,-1 1,0 0,1 1.5,0 0,-5 z m -1,2 2,0 0,0.5 -2,0 z m 4,0.5 0,5 1.5,0 0,-1 1,0 0,1 1.5,0 0,-5 -2,-1.5 z m 1,0.5 2,0 0,0.5 -2,0 z m -5,1 2,0 0,0.5 -2,0 z m 5,1 2,0 0,0.5 -2,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g color="#000">
-            <path d="m 660,1293.3622 -3,2 0,7 2,0 0,-2 2,0 0,2 2,0 0,-7 z m 4,4 0,7 2,0 0,-2 2,0 0,2 2,0 0,-7 -3,-2 z m -6,-1 1,0 0,1 -1,0 z m 3,0 1,0 0,1 -1,0 z m 4,2 1,0 0,1 -1,0 z m 3,0 1,0 0,1 -1,0 z m -10,0 1,0 0,1 -1,0 z m 3,0 1,0 0,1 -1,0 z m 4,2 1,0 0,1 -1,0 z m 3,0 1,0 0,1 -1,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <rect width="18" height="18" x="654" y="1290.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 660,1293.3622 -3,2 0,7 2,0 0,-2 2,0 0,2 2,0 0,-7 z m 4,4 0,7 2,0 0,-2 2,0 0,2 2,0 0,-7 -3,-2 z m -6,-1 1,0 0,1 -1,0 z m 3,0 1,0 0,1 -1,0 z m 4,2 1,0 0,1 -1,0 z m 3,0 1,0 0,1 -1,0 z m -10,0 1,0 0,1 -1,0 z m 3,0 1,0 0,1 -1,0 z m 4,2 1,0 0,1 -1,0 z m 3,0 1,0 0,1 -1,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g color="#000">
-            <path d="m 638,1319.3622 -4.5,4 c -0.5,0.5 0,1 0.5,1 l 1,0 0,5 1,0 1,0 0,-3 2,0 0,3 1,0 1,0 0,-5 1,0 c 0.5,0 1,-0.5 0.5,-1 l -4.5,-4 z m 9,3 -4.5,4 c -0.5,0.5 0,1 0.5,1 l 1,0 0,5 1,0 1,0 0,-3 2,0 0,3 1,0 1,0 0,-5 1,0 c 0.5,0 1,-0.5 0.5,-1 l -4.5,-4 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <rect width="24" height="24" x="630" y="1314.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path transform="translate(-120 1050.362)" d="M 758 269 L 753.5 273 C 753 273.5 753.5 274 754 274 L 755 274 L 755 279 L 756 279 L 757 279 L 757 276 L 759 276 L 759 279 L 760 279 L 761 279 L 761 274 L 762 274 C 762.5 274 763 273.5 762.5 273 L 758 269 z M 767 272 L 762.5 276 C 762 276.5 762.5 277 763 277 L 764 277 L 764 282 L 765 282 L 766 282 L 766 279 L 768 279 L 768 282 L 769 282 L 770 282 L 770 277 L 771 277 C 771.5 277 772 276.5 771.5 276 L 767 272 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g color="#000">
-            <path d="m 675,1267.3622 0,1 -1,0 0,8 4,0 0,-8 -1,0 0,-1 -2,0 z m 5,1 0,2 -1,0 0,7 4,0 0,-7 -1,0 0,-2 -0.5,0 0,2 -1,0 0,-2 -0.5,0 z m -5,1 2,0 0,0.5 -2,0 0,-0.5 z m 0,2 2,0 0,0.5 -2,0 0,-0.5 z m 5,0 2,0 0,0.5 -2,0 0,-0.5 z m -5,2 2,0 0,0.5 -2,0 0,-0.5 z m 5,0 2,0 0,0.5 -2,0 0,-0.5 z m 0,2 2,0 0,0.5 -2,0 0,-0.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <rect width="12" height="12" x="672" y="1266.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 675,1267.3622 0,1 -1,0 0,8 4,0 0,-8 -1,0 0,-1 -2,0 z m 5,1 0,2 -1,0 0,7 4,0 0,-7 -1,0 0,-2 -0.5,0 0,2 -1,0 0,-2 -0.5,0 z m -5,1 2,0 0,0.5 -2,0 0,-0.5 z m 0,2 2,0 0,0.5 -2,0 0,-0.5 z m 5,0 2,0 0,0.5 -2,0 0,-0.5 z m -5,2 2,0 0,0.5 -2,0 0,-0.5 z m 5,0 2,0 0,0.5 -2,0 0,-0.5 z m 0,2 2,0 0,0.5 -2,0 0,-0.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g color="#000">
-            <path d="m 676.5,1316.8622 -2.5,2.5 1,0 0,3 1,0 0,-1.5 1,0 0,1.5 1,0 0,-3 1,0 z m 4,2 -2,2 0,0.5 0.5,0 0,3 1,0 0,-1.5 1,0 0,1.5 1,0 0,-3 1,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <rect width="12" height="12" x="672" y="1314.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 676.5,1316.8622 -2.5,2.5 1,0 0,3 1,0 0,-1.5 1,0 0,1.5 1,0 0,-0.5 0,-0.5 0,-1.5 0,-0.5 1,0 -2.5,-2.5 z m 4,2 -2,2 0,0.5 0.5,0 0,3 1,0 0,-1.5 1,0 0,1.5 1,0 0,-3 1,0 -2.5,-2.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g color="#000">
-            <path d="m 660.5,1318.8622 -3.5,2.5 0,1 1,0 0,4 2,0 0,-2 1,0 0,2 2,0 0,-4 1,0 0,-1 -3.5,-2.5 z m 6,2 -3,2.1563 0,1.3437 0.5,0 0,4 2,0 0,-2 1,0 0,2 2,0 0,-4 1,0 0,-1 -3.5,-2.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <rect y="1314.362" x="654" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path transform="translate(-120 1050.362)" d="M 780.5 268.5 L 777 271 L 777 272 L 778 272 L 778 276 L 780 276 L 780 274 L 781 274 L 781 276 L 783 276 L 783 272 L 784 272 L 784 271 L 780.5 268.5 z M 786.5 270.5 L 783.5 272.65625 L 783.5 274 L 784 274 L 784 278 L 786 278 L 786 276 L 787 276 L 787 278 L 789 278 L 789 274 L 790 274 L 790 273 L 786.5 270.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g color="#000">
-            <rect y="1338.362" x="630" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <g>
-                <path transform="translate(-120 1050.362)" d="m 767,295 0,10 5,0 0,-10 c 0,-1.5 -0.5,-3 -2.5,-3 -2,0 -2.5,1.5 -2.5,3 z m -11,0 c -0.5,0 -1,0.5 -1.5,1 l -2.5,3 1,0 0,6 12,0 0,-6 1,0 -2.5,-3 c -0.5,-0.5 -1,-1 -1.5,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-                <path d="m 767,295 0,10 5,0 0,-10 c 0,-1.5 -0.5,-3 -2.5,-3 -2,0 -2.5,1.5 -2.5,3 z m -11,0 c -0.5,0 -1,0.5 -1.5,1 l -2.5,3 1,0 0,6 7,0 0,-3 2,0 0,3 3,0 0,-6 1,0 -2.5,-3 c -0.5,-0.5 -1,-1 -1.5,-1 z m 5,2 c 0,0 2,1.2546 2,2 l 0,1 -4,0 0,-1 c 0,-0.7454 2,-2 2,-2 z" transform="translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            </g>
-        </g>
-        <g color="#000">
-            <path d="m 802,290 -1,1 0,6 2,0 0,-6 z m -6.5,2 -2,2 0.5,0 0,3 6,0 0,-3 0.5,0 -2,-2 z" transform="translate(-120 1050.362)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <rect y="1338.362" x="672" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path transform="translate(-120 1050.362)" d="m 802,290 -1,1 0,6 2,0 0,-6 z m -6.5,2 -2,2 0.5,0 0,3 3,0 0,-2 1,0 0,2 2,0 0,-3 0.5,0 -2,-2 z m 2,1 1,1 -2,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <g color="#000">
-            <path d="m 667,1344.3622 0,8 4,0 0,-8 -1,-2 -2,0 z m -9.5,0 -2.5,3 1,0 0,5 9,0 0,-5 1,0 -2,-3 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <rect width="18" height="18" x="654" y="1338.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 667,1344.3622 0,8 4,0 0,-8 -1,-2 -2,0 z m -9.5,0 -2.5,3 1,0 0,5 6,0 0,-2 1,0 0,2 2,0 0,-5 1,0 -2,-3 z m 5,2 1.5,1 0,1 -3,0 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/marker-12.svg b/data/styles/symbols/maki/marker-12.svg
deleted file mode 100644
index b937cbb621..0000000000
--- a/data/styles/symbols/maki/marker-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(30 -250)" color="#000">
-        <rect width="12" height="12" x="-30" y="1290.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m -23.5,1291.3622 c -1.61437,0 -3.5,1 -3.5,3.5 0,1.75 2.75,5.5 3.5,6.5 0.75,-1 3.5,-4.75 3.5,-6.5 0,-2.5 -1.88563,-3.5 -3.5,-3.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m -23.5,1291.3622 c -1.61437,0 -3.5,1 -3.5,3.5 0,1.75 2.75,5.5 3.5,6.5 0.75,-1 3.5,-4.75 3.5,-6.5 0,-2.5 -1.88563,-3.5 -3.5,-3.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/marker-18.svg b/data/styles/symbols/maki/marker-18.svg
deleted file mode 100644
index 64aa2a114a..0000000000
--- a/data/styles/symbols/maki/marker-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(48 -256)">
-        <path d="m -38.5,1292.3622 c -2.33186,0 -4.5,2 -4.5,4.5 0,2.5278 3.41667,7.0556 4.5,8.5 1.08334,-1.4444 4.5,-5.9722 4.5,-8.5 0,-2.5 -2.16813,-4.5 -4.5,-4.5 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <rect y="1290.362" x="-48" height="18" width="18" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m -38.5,1292.3622 c -2.33186,0 -4.5,2 -4.5,4.5 0,2.5278 3.41667,7.0556 4.5,8.5 1.08334,-1.4444 4.5,-5.9722 4.5,-8.5 0,-2.5 -2.16813,-4.5 -4.5,-4.5 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/marker-24.svg b/data/styles/symbols/maki/marker-24.svg
deleted file mode 100644
index 69c36adeef..0000000000
--- a/data/styles/symbols/maki/marker-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(72 -262)">
-        <g>
-            <path d="m -53,1266.8622 c 0,3.5 -5,9.5 -6.5,11.5 -1.5,-2 -6.5,-8 -6.5,-11.5 0,-3.5 3.27126,-6.5 6.5,-6.5 3.22874,0 6.5,3 6.5,6.5 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 33)"/>
-            <path d="m 120.99314,310.86219 c 0,3.5 -5,9.5 -6.5,11.5 -1.5,-2 -6.5,-8 -6.5,-11.5 0,-3.5 3.27126,-6.5 6.5,-6.5 3.22874,0 6.5,3 6.5,6.5 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 33) translate(-173.993 956)"/>
-        </g>
-        <rect width="24" height="24" x="-72" y="1290.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/marker-stroked-12.svg b/data/styles/symbols/maki/marker-stroked-12.svg
deleted file mode 100644
index 4f4612022e..0000000000
--- a/data/styles/symbols/maki/marker-stroked-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(30 -226)" color="#000">
-        <g>
-            <path transform="translate(-120 1050.362)" d="m 96.5,217 c -1.61437,0 -3.5,1 -3.5,3.5 0,1.75 2.75,5.5 3.5,6.5 0.75,-1 3.5,-4.75 3.5,-6.5 0,-2.5 -1.88563,-3.5 -3.5,-3.5 z m 0,1 c 1.255621,0 2.5,1 2.5,2.5 0,1.3611 -1.916667,4.2222 -2.5,5 -0.583333,-0.7778 -2.5,-3.6389 -2.5,-5 0,-1.5 1.244379,-2.5 2.5,-2.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 96.5,217 c -1.61437,0 -3.5,1 -3.5,3.5 0,1.75 2.75,5.5 3.5,6.5 0.75,-1 3.5,-4.75 3.5,-6.5 0,-2.5 -1.88563,-3.5 -3.5,-3.5 z m 0,1 c 1.255621,0 2.5,1 2.5,2.5 0,1.3611 -1.916667,4.2222 -2.5,5 -0.583333,-0.7778 -2.5,-3.6389 -2.5,-5 0,-1.5 1.244379,-2.5 2.5,-2.5 z" transform="translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="12" height="12" x="-30" y="1266.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/marker-stroked-18.svg b/data/styles/symbols/maki/marker-stroked-18.svg
deleted file mode 100644
index fadc25e4b8..0000000000
--- a/data/styles/symbols/maki/marker-stroked-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(48 -232)" color="#000">
-        <g>
-            <path d="m -38.5,1268.3622 c -2.33186,0 -4.5,2 -4.5,4.5 0,2.5278 3.41667,7.0556 4.5,8.5 1.08334,-1.4444 4.5,-5.9722 4.5,-8.5 0,-2.5 -2.16813,-4.5 -4.5,-4.5 z m 0,1.5 c 1.5,0 3,1.2501 3,3 0,2 -2.249996,5 -3,6 -0.749998,-1 -3,-4 -3,-6 0,-1.7499 1.5,-3 3,-3 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m -38.5,1268.3622 c -2.33186,0 -4.5,2 -4.5,4.5 0,2.5278 3.41667,7.0556 4.5,8.5 1.08334,-1.4444 4.5,-5.9722 4.5,-8.5 0,-2.5 -2.16813,-4.5 -4.5,-4.5 z m 0,1.5 c 1.5,0 3,1.2501 3,3 0,2 -2.249996,5 -3,6 -0.749998,-1 -3,-4 -3,-6 0,-1.7499 1.5,-3 3,-3 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1266.362" x="-48" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/marker-stroked-24.svg b/data/styles/symbols/maki/marker-stroked-24.svg
deleted file mode 100644
index 373472e671..0000000000
--- a/data/styles/symbols/maki/marker-stroked-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(72 -238)">
-        <g color="#000" transform="translate(-72 262)">
-            <path d="m 114.49314,304.36219 c -3.22874,0 -6.5,3 -6.5,6.5 0,3.5 5,9.5 6.5,11.5 1.5,-2 6.5,-8 6.5,-11.5 0,-3.5 -3.27126,-6.5 -6.5,-6.5 z m 0,2 c 2.51124,0 4.5,1.77778 4.5,4.5 0,2.72222 -3.33334,6.94444 -4.5,8.5 -1.16666,-1.55556 -4.5,-5.77778 -4.5,-8.5 0,-2.72222 1.98876,-4.5 4.5,-4.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-101.993 703)"/>
-            <path d="m 114.49314,304.36219 c -3.22874,0 -6.5,3 -6.5,6.5 0,3.5 5,9.5 6.5,11.5 1.5,-2 6.5,-8 6.5,-11.5 0,-3.5 -3.27126,-6.5 -6.5,-6.5 z m 0,2 c 2.51124,0 4.5,1.77778 4.5,4.5 0,2.72222 -3.33334,6.94444 -4.5,8.5 -1.16666,-1.55556 -4.5,-5.77778 -4.5,-8.5 0,-2.72222 1.98876,-4.5 4.5,-4.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-101.993 703)"/>
-        </g>
-        <rect width="24" height="24" x="-72" y="1266.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/minefield-12.svg b/data/styles/symbols/maki/minefield-12.svg
deleted file mode 100644
index c4f190e837..0000000000
--- a/data/styles/symbols/maki/minefield-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-594 -82)" color="#000">
-        <rect y="1122.362" x="594" height="12" width="12" overflow="visible" enable-background="accumulate" fill="none"/>
-        <g>
-            <path transform="translate(-120 1050.362)" d="m 720.25,73 -1.75,4 -3,-2.5 0.8125,4.09375 C 716.58749,79.48745 716.9,80 717.5,80 l 1.5,0 0,-1 2.5,0 0,1 1.40625,0 c 0.6,0 0.89137,-0.26465 1.1875,-0.90625 L 725,74.5 721.5,77 z m -0.75,6.5 0,1.0625 c -1.14465,0.120929 -2,0.981219 -2,1.4375 l 0,1 2.75,0.0058 L 723,83 l 0,-1 c 0,-0.456281 -0.85535,-1.316571 -2,-1.4375 L 721,79.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 720.25,73 -1.75,4 -3,-2.5 0.8125,4.09375 C 716.58749,79.48745 716.9,80 717.5,80 l 1.5,0 0,-1 2.5,0 0,1 1.40625,0 c 0.6,0 0.89137,-0.26465 1.1875,-0.90625 L 725,74.5 721.5,77 z m -0.75,6.5 0,1.0625 c -1.14465,0.120929 -2,0.981219 -2,1.4375 l 0,1 2.75,0.0058 L 723,83 l 0,-1 c 0,-0.456281 -0.85535,-1.316571 -2,-1.4375 L 721,79.5 z" transform="translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/minefield-18.svg b/data/styles/symbols/maki/minefield-18.svg
deleted file mode 100644
index 14c5d641fe..0000000000
--- a/data/styles/symbols/maki/minefield-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-576 -88)" color="#000">
-        <rect width="18" height="18" x="576" y="1122.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <g>
-            <path transform="translate(-120 1050.362)" d="m 704,74 -2,5.5 -4.5,-3 1.40625,5.25 c 0.37744,1.2266 0.83272,1.25 1.65625,1.25 l 1.4375,0 0,-1 4,0 0,1 1.5,0 c 0.82353,0 1.21855,-0.3693 1.625,-1.25 l 1.375,-5.25 -4.5,3 -2,-5.5 z m -1,9 0,1.03125 c -2.00249,0.151943 -3.5,0.755242 -3.5,1.46875 0,0.828427 2.01472,1.5 4.5,1.5 2.48528,0 4.5,-0.671573 4.5,-1.5 0,-0.713508 -1.49751,-1.316807 -3.5,-1.46875 L 705,83 l -2,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 585.5,1124.3622 -2,5.5 -4.5,-3 1.40625,5.25 c 0.37744,1.2266 0.83272,1.25 1.65625,1.25 l 1.4375,0 0,-1 4,0 0,1 1.5,0 c 0.82353,0 1.21855,-0.3693 1.625,-1.25 l 1.375,-5.25 -4.5,3 z m -1,9 0,1.0313 c -2.00249,0.1519 -3.5,0.7552 -3.5,1.4687 0,0.8284 2.01472,1.5 4.5,1.5 0.44629,0 0.8774,-0.022 1.2844,-0.062 1.85949,-0.1842 3.2156,-0.7583 3.2156,-1.438 0,-0.7135 -1.49751,-1.3168 -3.5,-1.4687 l 0,-1.0313 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/minefield-24.svg b/data/styles/symbols/maki/minefield-24.svg
deleted file mode 100644
index 1fb8f093a1..0000000000
--- a/data/styles/symbols/maki/minefield-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-552 -94)" color="#000">
-        <g>
-            <path transform="translate(-120 1050.362)" d="m 683.5,76 -2.5,7 -6,-4 2,6.5 c 0.45832,1.4895 1,1.5 2,1.5 l 2,0 0,-1 5,0 0,1 2,0 c 1,0 1.50645,-0.4306 2,-1.5 l 2,-6.5 -6,4 -2.5,-7 z m -1.5,11 0,1 c -2.216,0 -4,0.669 -4,1.5 0,0.831 1.784,1.5 4,1.5 l 3,0 c 2.216,0 4,-0.669 4,-1.5 0,-0.831 -1.784,-1.5 -4,-1.5 l 0,-1 -3,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 564.5,1126.3622 -2.5,7 -6,-4 2,6.5 c 0.45832,1.4895 1,1.5 2,1.5 l 2,0 0,-1 5,0 0,1 2,0 c 1,0 1.50645,-0.4306 2,-1.5 l 2,-6.5 -6,4 -2.5,-7 z m -1.5,11 0,1 c -2.216,0 -4,0.669 -4,1.5 0,0.831 1.784,1.5 4,1.5 l 3,0 c 2.216,0 4,-0.669 4,-1.5 0,-0.831 -1.784,-1.5 -4,-1.5 l 0,-1 -3,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="552" y="1122.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/monument-12.svg b/data/styles/symbols/maki/monument-12.svg
deleted file mode 100644
index d793318646..0000000000
--- a/data/styles/symbols/maki/monument-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-204 -106)" color="#000">
-        <g>
-            <path d="m 210.5,1147.3622 c 0,0 -1.5,1.5 -1.5,2 l 0,4 -0.5,0 c -0.27701,0 -0.46371,0.2254 -0.5,0.5 l 0,1.5 -0.5,0 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,0.5 7,0 0,-0.5 c 0,-0.277 -0.22301,-0.5 -0.5,-0.5 l -0.5,0 0,-1.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -0.5,0 0,-4 c 0,-0.5 -1.5,-2 -1.5,-2 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 210.5,1147.3622 c 0,0 -1.5,1.5 -1.5,2 l 0,4 -0.5,0 c -0.27701,0 -0.46371,0.2254 -0.5,0.5 l 0,1.5 -0.5,0 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,0.5 7,0 0,-0.5 c 0,-0.277 -0.22301,-0.5 -0.5,-0.5 l -0.5,0 0,-1.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -0.5,0 0,-4 c 0,-0.5 -1.5,-2 -1.5,-2 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1146.362" x="204" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/monument-18.svg b/data/styles/symbols/maki/monument-18.svg
deleted file mode 100644
index a39999c2d6..0000000000
--- a/data/styles/symbols/maki/monument-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-186 -112)" color="#000">
-        <g>
-            <path d="m 195.44444,1148.3622 c 0,0 -1.44444,1.7223 -1.44444,2.5 l 0,7.5 -1,0 c -0.43092,0 -1,0.5136 -1,0.9445 l 0,1.5555 -1,0 c -0.5,0 -1,0.5 -1,1 l 0,0.5 11,0 0,-0.5 c 0,-0.5 -0.5,-1 -1,-1 l -1,0 0,-1.5 c 0,-0.5 -0.5,-1 -1,-1 l -1,0 0,-7.5 c 0,-0.7777 -1.55556,-2.5 -1.55556,-2.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 195.44444,1148.3622 c 0,0 -1.44444,1.7223 -1.44444,2.5 l 0,7.5 -1,0 c -0.43092,0 -1,0.5136 -1,0.9445 l 0,1.5555 -1,0 c -0.5,0 -1,0.5 -1,1 l 0,0.5 11,0 0,-0.5 c 0,-0.5 -0.5,-1 -1,-1 l -1,0 0,-1.5 c 0,-0.5 -0.5,-1 -1,-1 l -1,0 0,-7.5 c 0,-0.7777 -1.55556,-2.5 -1.55556,-2.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="18" height="18" x="186" y="1146.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/monument-24.svg b/data/styles/symbols/maki/monument-24.svg
deleted file mode 100644
index 6a367007ec..0000000000
--- a/data/styles/symbols/maki/monument-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-162 -118)" color="#000">
-        <g>
-            <path d="m 174.5,1147.3622 c 0,0 -2.59054,2.0041 -2.5,3 l 0,11 -2,0 c -0.55401,0 -1,0.446 -1,1 l 0,2 -1,0 c -0.55399,0 -1,0.446 -1,1 l 0,1 15,0 0,-1 c 0,-0.554 -0.44601,-1 -1,-1 l -1,0 0,-2 c 0,-0.554 -0.44599,-1 -1,-1 l -2,0 0,-11 c 0,-1 -2.5,-3 -2.5,-3 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 1)"/>
-            <path d="m 174.5,1147.3622 c 0,0 -2.59054,2.0041 -2.5,3 l 0,11 -2,0 c -0.55401,0 -1,0.446 -1,1 l 0,2 -1,0 c -0.55399,0 -1,0.446 -1,1 l 0,1 15,0 0,-1 c 0,-0.554 -0.44601,-1 -1,-1 l -1,0 0,-2 c 0,-0.554 -0.44599,-1 -1,-1 l -2,0 0,-11 c 0,-1 -2.5,-3 -2.5,-3 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 1)"/>
-        </g>
-        <rect y="1146.362" x="162" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/museum-12.svg b/data/styles/symbols/maki/museum-12.svg
deleted file mode 100644
index bb5200f574..0000000000
--- a/data/styles/symbols/maki/museum-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-204 -82)" color="#000">
-        <g>
-            <path d="m 213,1125.3622 -3.5,-2 -3.5,2 0,5 0,1 -1,1 9,0 -1,-1 0,-1 z m -5.5,2 c 0.25,0 0.5,0 0.75,0 0.25,0 0.5,0.5 0.5,0.5 l 0.75,1.5 0.75,-1.5 c 0.13438,-0.2687 0.25,-0.5 0.5,-0.5 0.25,0 0.5,0 0.75,0 0.277,0 0.5,0.223 0.5,0.5 l 0,2.5 c 0,0.25 -0.25,0.5 -0.5,0.5 -0.25,0 -0.5,-0.25 -0.5,-0.5 l 0,-2 -0.75,1.5 c -0.11941,0.2388 -0.25,0.5 -0.75,0.5 -0.5,0 -0.6306,-0.2612 -0.75,-0.5 l -0.75,-1.5 0,2 c 0,0.25 -0.25,0.5 -0.5,0.5 -0.25,0 -0.5,-0.25 -0.5,-0.5 l 0,-0.5 0,-2 c 0,-0.277 0.223,-0.5 0.5,-0.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(1)"/>
-            <path d="m 209.5,1123.3622 -3.5,2 7,0 z m -3,3 c -0.27701,0 -0.5,0.223 -0.5,0.5 l 0,3.5 0,1 -1,1 9,0 -1,-1 0,-1 0,-3.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 1,1 c 0.25,0 0.5,0 0.75,0 0.25,0 0.5,0.5 0.5,0.5 l 0.75,1.5 0.75,-1.5 c 0.13438,-0.2687 0.25,-0.5 0.5,-0.5 0.25,0 0.5,0 0.75,0 0.277,0 0.5,0.223 0.5,0.5 l 0,2.5 c 0,0.25 -0.25,0.5 -0.5,0.5 -0.25,0 -0.5,-0.25 -0.5,-0.5 l 0,-2 -0.75,1.5 c -0.11941,0.2388 -0.25,0.5 -0.75,0.5 -0.5,0 -0.6306,-0.2612 -0.75,-0.5 l -0.75,-1.5 0,2 c 0,0.25 -0.25,0.5 -0.5,0.5 -0.25,0 -0.5,-0.25 -0.5,-0.5 l 0,-0.5 0,-2 c 0,-0.277 0.223,-0.5 0.5,-0.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(1)"/>
-        </g>
-        <rect y="1122.362" x="204" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/museum-18.svg b/data/styles/symbols/maki/museum-18.svg
deleted file mode 100644
index 4f1c590304..0000000000
--- a/data/styles/symbols/maki/museum-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-186 -88)" color="#000">
-        <g>
-            <path d="m 201,1129.3622 -4.5,-3 -4.5,3 0,1.9445 0,5.0555 -1,1.5 c 0,0.3611 0.23397,0.5 0.5,0.5 l 10,0 c 0.25638,0 0.5,-0.1389 0.5,-0.5 l -1,-1.5 0,-5.0555 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            <path d="m 196.5,1126.3622 -4.5,3 9,0 z m -3.5,4 c -0.5,0 -1,0.5 -1,0.9445 l 0,5.0555 -1,1.5 c 0,0.3611 0.23397,0.5 0.5,0.5 l 10,0 c 0.25638,0 0.5,-0.1389 0.5,-0.5 l -1,-1.5 0,-5.0555 c 0,-0.4445 -0.5,-0.9445 -1,-0.9445 z m 2,1.5 c 0.5,0 0.5,0 1,1 l 0.5,1 0.5,-1 c 0.5,-1 0.5,-1 1,-1 0.5,0 1,0.5 1,1 l 0,3.5 c 0,0.3611 -0.13889,0.5 -0.5,0.5 -0.36111,0 -0.5,-0.1389 -0.5,-0.5 l 0,-2.8889 -1,1.8889 c -0.2647,0.5 -0.7353,0.5 -1,0 l -1,-1.8889 0,2.8889 c 0,0.3611 -0.13889,0.5 -0.5,0.5 -0.36111,0 -0.50005,-0.1389 -0.50005,-0.5 l 0,-0.7222 5e-5,-2.7778 c 1e-5,-0.5 0.5,-1 1,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-        </g>
-        <rect width="18" height="18" x="186" y="1122.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/museum-24.svg b/data/styles/symbols/maki/museum-24.svg
deleted file mode 100644
index 350c7309ea..0000000000
--- a/data/styles/symbols/maki/museum-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-162 -94)" color="#000">
-        <g>
-            <path d="m 174.5,1126.3622 -6.5,5 13,0 z m -5.5,6 c -0.55401,0 -0.92165,0.4516 -1,1 l 0,7 -1.75,3 c -0.14833,0.2543 -0.25,0.3567 -0.25,0.5 0,0.5 0.63165,0.5 1,0.5 l 15,0 c 0.35499,0 1,0 1,-0.5 0,-0.1462 -0.0866,-0.2199 -0.25,-0.5 l -1.75,-3 0,-7 c 0,-0.554 -0.44599,-1 -1,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-            <path d="m 174.5,1126.3622 -6.5,5 13,0 z m -5.5,6 c -0.55401,0 -0.92165,0.4516 -1,1 l 0,7 -1.75,3 c -0.14833,0.2543 -0.25,0.3567 -0.25,0.5 0,0.5 0.63165,0.5 1,0.5 l 15,0 c 0.35499,0 1,0 1,-0.5 0,-0.1462 -0.0866,-0.2199 -0.25,-0.5 l -1.75,-3 0,-7 c 0,-0.554 -0.44599,-1 -1,-1 z m 2,2 c 0.5,0 1,0 1.5,0 0.5,0 1,1 1,1 l 1,2.5 1,-2.5 c 0.22318,-0.558 0.5,-1 1,-1 0.5,0 1,0 1.5,0 0.554,0 1,0.446 1,1 l 0,5 c 0,0.5 -0.5,1 -1,1 -0.5,0 -1,-0.5 -1,-1 l 0,-4 -1.5,3 c 0,0 -0.5,1 -1,1 -0.5,0 -1,-1 -1,-1 l -1.5,-3 0,4 c 0,0.5 -0.5,1 -1,1 -0.5,0 -1,-0.5 -1,-1 l 0,-1 0,-4 c 0,-0.554 0.446,-1 1,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-        </g>
-        <rect y="1122.362" x="162" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/music-12.svg b/data/styles/symbols/maki/music-12.svg
deleted file mode 100644
index 1fff5c3b78..0000000000
--- a/data/styles/symbols/maki/music-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="matrix(.5 0 0 .5 -198 -645.181)">
-        <path transform="matrix(2 0 0 2 -720 810.362)" d="m 563,242 0,5.5 -0.5,0 c -0.82843,0 -1.5,0.67155 -1.5,1.5 0,0.82845 0.67157,1.5 1.5,1.5 0.82842,0 1.5,-0.67155 1.5,-1.5 l 0,-4 3,0 0,2.5 -0.5,0 c -0.82842,0 -1.5,0.67155 -1.5,1.5 0,0.82845 0.67157,1.5 1.5,1.5 0.82842,0 1.5,-0.67155 1.5,-1.5 l 0,-7 -5,0 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <rect y="1290.362" x="396" height="24" width="24" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 563,242 0,5.5 -0.5,0 c -0.82843,0 -1.5,0.67155 -1.5,1.5 0,0.82845 0.67157,1.5 1.5,1.5 0.82842,0 1.5,-0.67155 1.5,-1.5 l 0,-4 3,0 0,2.5 -0.5,0 c -0.82842,0 -1.5,0.67155 -1.5,1.5 0,0.82845 0.67157,1.5 1.5,1.5 0.82842,0 1.5,-0.67155 1.5,-1.5 l 0,-7 -5,0 z" transform="matrix(2 0 0 2 -720 810.362)" fill="#454545"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/music-18.svg b/data/styles/symbols/maki/music-18.svg
deleted file mode 100644
index befb210b95..0000000000
--- a/data/styles/symbols/maki/music-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="matrix(.75 0 0 .75 -297 -967.771)">
-        <rect y="1290.362" x="396" height="24" width="24" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        <g transform="translate(1)">
-            <path transform="matrix(1.333 0 0 1.333 -325 970.362)" d="m 547.5,243 -0.75,0.75 0,7.5 -0.75,0 c -1.24264,0 -2.25,1.00733 -2.25,2.25 0,1.24267 1.00736,2.25 2.25,2.25 1.24263,0 2.25,-1.00733 2.25,-2.25 l 0,-6.5 5.25,0 0,4.25 -0.75,0 c -1.24264,0 -2.25,1.00733 -2.25,2.25 0,1.24267 1.00736,2.25 2.25,2.25 1.24264,0 2.25,-1.00733 2.25,-2.25 l 0,-9.75 -0.75,-0.75 -6.75,0 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 547.5,243 -0.75,0.75 0,7.5 -0.75,0 c -1.24264,0 -2.25,1.00733 -2.25,2.25 0,1.24267 1.00736,2.25 2.25,2.25 1.24263,0 2.25,-1.00733 2.25,-2.25 l 0,-6.5 5.25,0 0,4.25 -0.75,0 c -1.24264,0 -2.25,1.00733 -2.25,2.25 0,1.24267 1.00736,2.25 2.25,2.25 1.24264,0 2.25,-1.00733 2.25,-2.25 l 0,-9.75 -0.75,-0.75 -6.75,0 z" transform="matrix(1.333 0 0 1.333 -325 970.362)" fill="#454545"/>
-        </g>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/music-24.svg b/data/styles/symbols/maki/music-24.svg
deleted file mode 100644
index a37c58d6da..0000000000
--- a/data/styles/symbols/maki/music-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-396 -262)">
-        <rect width="24" height="24" x="396" y="1290.362" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        <g transform="translate(1)">
-            <path transform="translate(-121 1050.362)" d="m 526,244 c -0.5,0 -1,0.5 -1,1 l 0,10 -1,0 c -1.65685,0 -3,1.3431 -3,3 0,1.6569 1.34315,3 3,3 1.65684,0 3,-1.3431 3,-3 l 0,-9 7,0 0,6 -1,0 c -1.65685,0 -3,1.3431 -3,3 0,1.6569 1.34315,3 3,3 1.65685,0 3,-1.3431 3,-3 l 0,-13 c 0,-0.5 -0.5,-1 -1,-1 l -9,0 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 526,244 c -0.5,0 -1,0.5 -1,1 l 0,10 -1,0 c -1.65685,0 -3,1.3431 -3,3 0,1.6569 1.34315,3 3,3 1.65684,0 3,-1.3431 3,-3 l 0,-9 7,0 0,6 -1,0 c -1.65685,0 -3,1.3431 -3,3 0,1.6569 1.34315,3 3,3 1.65685,0 3,-1.3431 3,-3 l 0,-13 c 0,-0.5 -0.5,-1 -1,-1 l -9,0 z" transform="translate(-121 1050.362)" fill="#454545"/>
-        </g>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/oil-well-12.svg b/data/styles/symbols/maki/oil-well-12.svg
deleted file mode 100644
index 61ae82e25b..0000000000
--- a/data/styles/symbols/maki/oil-well-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-518 -226)" color="#000">
-        <g>
-            <path d="m 521,1270.3622 -3,9 1,0 0.5,0 0.5,-1.5312 2.5,-1.4688 2.5,1.4688 0.5,1.5312 1.5,0 -3,-9 z m 0.5,3 2,0 0.5,1.5313 -0.71875,0.4687 -0.28125,0 0,0.1875 -0.5,0.3125 -0.5,-0.3125 0,-0.1875 -0.28125,0 L 521,1274.8935 z m -0.78125,2.375 0.28125,0.125 0.5,0.25 -0.5,0.25 -0.59375,0.3125 0.0937,-0.3125 0,-0.5 0.1875,0 z m 3.5625,0 0.0312,0.125 0.1875,0 0,0.5 0.0937,0.3125 -0.59365,-0.3125 -0.5,-0.25 0.5,-0.25 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(2 -3)"/>
-            <path d="m 521,1270.3622 -3,9 1,0 0.5,0 0.5,-1.5312 2.5,-1.4688 2.5,1.4688 0.5,1.5312 1.5,0 -3,-9 z m 0.5,3 2,0 0.5,1.5313 -0.71875,0.4687 -0.28125,0 0,0.1875 -0.5,0.3125 -0.5,-0.3125 0,-0.1875 -0.28125,0 L 521,1274.8935 z m -0.78125,2.375 0.28125,0.125 0.5,0.25 -0.5,0.25 -0.59375,0.3125 0.0937,-0.3125 0,-0.5 0.1875,0 z m 3.5625,0 0.0312,0.125 0.1875,0 0,0.5 0.0937,0.3125 -0.59365,-0.3125 -0.5,-0.25 0.5,-0.25 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(2 -3)"/>
-        </g>
-        <rect width="12" height="12" x="518" y="1266.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/oil-well-18.svg b/data/styles/symbols/maki/oil-well-18.svg
deleted file mode 100644
index e768f02d35..0000000000
--- a/data/styles/symbols/maki/oil-well-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-500 -232)" color="#000">
-        <g>
-            <path d="m 506,1271.3622 c -0.38235,10e-5 -0.6636,0.3676 -0.78125,0.75 l -4.21875,13.25 2,0 0.90625,-2.7187 3.59375,-2.0313 3.59375,2.0313 0.90625,2.7187 2,0 -4.21875,-13.25 c -0.11765,-0.3824 -0.3989,-0.7499 -0.78125,-0.75 z m 0,5 3,0 0.5,1.4688 -2,1.2812 -2,-1.2812 z m -0.875,2.6563 1.375,0.8437 -2.0625,1.1875 z m 4.75,0 0.6875,2.0312 -2.0625,-1.1875 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(2 -3)"/>
-            <path d="m 506,1271.3622 c -0.38235,10e-5 -0.6636,0.3676 -0.78125,0.75 l -4.21875,13.25 2,0 0.90625,-2.7187 3.59375,-2.0313 3.59375,2.0313 0.90625,2.7187 2,0 -4.21875,-13.25 c -0.11765,-0.3824 -0.3989,-0.7499 -0.78125,-0.75 z m 0,5 3,0 0.5,1.4688 -2,1.2812 -2,-1.2812 z m -0.875,2.6563 1.375,0.8437 -2.0625,1.1875 z m 4.75,0 0.6875,2.0312 -2.0625,-1.1875 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(2 -3)"/>
-        </g>
-        <rect y="1266.362" x="500" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/oil-well-24.svg b/data/styles/symbols/maki/oil-well-24.svg
deleted file mode 100644
index 863428d522..0000000000
--- a/data/styles/symbols/maki/oil-well-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-476 -238)" color="#000">
-        <g>
-            <path d="m 484.5,1269.3622 c -0.5,0 -0.84615,0.5 -1,1 l -5.34375,15.9688 c -0.038,0.1133 -0.15625,0.4166 -0.15625,0.5312 0,0.5 0.5,0.5 1,0.5 0.5,0 0.97049,0 1.15625,-0.5 l 0.84375,-2.25 5.5,-2.75 5.5,2.75 0.84375,2.25 c 0.18576,0.5 0.65625,0.5 1.15625,0.5 0.5,0 1,0 1,-0.5 0,-0.1146 -0.11823,-0.418 -0.15625,-0.5312 L 489.5,1270.3622 c -0.15385,-0.5 -0.5,-1 -1,-1 z m 4.5,7 0.6875,1.9063 -3.1875,1.5937 -3.1875,-1.5937 0.6875,-1.9063 z m -6.3125,3.5938 1.8125,0.9062 -2.625,1.3125 z m 7.625,0 0.8125,2.2187 -2.625,-1.3125 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(2)"/>
-            <path d="m 484.5,1269.3622 c -0.5,0 -0.84615,0.5 -1,1 l -5.34375,15.9688 c -0.038,0.1133 -0.15625,0.4166 -0.15625,0.5312 0,0.5 0.5,0.5 1,0.5 0.5,0 0.97049,0 1.15625,-0.5 l 0.84375,-2.25 5.5,-2.75 5.5,2.75 0.84375,2.25 c 0.18576,0.5 0.65625,0.5 1.15625,0.5 0.5,0 1,0 1,-0.5 0,-0.1146 -0.11823,-0.418 -0.15625,-0.5312 L 489.5,1270.3622 c -0.15385,-0.5 -0.5,-1 -1,-1 z m 4.5,7 0.6875,1.9063 -3.1875,1.5937 -3.1875,-1.5937 0.6875,-1.9063 z m -6.3125,3.5938 1.8125,0.9062 -2.625,1.3125 z m 7.625,0 0.8125,2.2187 -2.625,-1.3125 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(2)"/>
-        </g>
-        <rect width="24" height="24" x="476" y="1266.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/package.json b/data/styles/symbols/maki/package.json
deleted file mode 100644
index d7e039bc97..0000000000
--- a/data/styles/symbols/maki/package.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "author": "MapBox",
-    "name": "maki",
-    "description": "Pixel-perfect icons for web cartography",
-    "version": "0.2.0",
-    "homepage": "http://mapbox.com/maki",
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/mapbox/maki"
-    }
-}
diff --git a/data/styles/symbols/maki/park-12.svg b/data/styles/symbols/maki/park-12.svg
deleted file mode 100644
index fae9cf2754..0000000000
--- a/data/styles/symbols/maki/park-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-204 -10)" color="#000">
-        <g>
-            <path d="m 210.5,1053.3622 -3,3 1.71875,0 -2.21875,2 2,0 -2,2 3,0 0,2 1,0 0,-2 3,0 -2,-2 2,0 -2.21875,-2 1.71875,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(0 -2)"/>
-            <path d="m 210.5,1053.3622 -3,3 1.71875,0 -2.21875,2 2,0 -2,2 3,0 0,2 1,0 0,-2 3,0 -2,-2 2,0 -2.21875,-2 1.71875,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -2)"/>
-        </g>
-        <rect width="12" height="12" x="204" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/park-18.svg b/data/styles/symbols/maki/park-18.svg
deleted file mode 100644
index 15c75ad921..0000000000
--- a/data/styles/symbols/maki/park-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-186 -16)" color="#000">
-        <g>
-            <path d="m 195.5,1052.3622 -4,4 2.5,0 -3,3 2.5,0 -2.5,3 4,0 0,3 1,0 0,-3 4,0 -2.5,-3 2.5,0 -3,-3 2.5,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 195.5,1052.3622 -4,4 2.5,0 -3,3 2.5,0 -2.5,3 4,0 0,3 1,0 0,-3 4,0 -2.5,-3 2.5,0 -3,-3 2.5,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1050.362" x="186" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/park-24.svg b/data/styles/symbols/maki/park-24.svg
deleted file mode 100644
index 2d014f37f5..0000000000
--- a/data/styles/symbols/maki/park-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-162 -22)">
-        <g color="#000" transform="translate(162 23)">
-            <path d="m 12.5,1030.3622 -5.5,5 3,0 -4,4 3,0 -3,4 5,0 0,3 0,0.5 0,0.5 c 0,0.554 0.446,1 1,1 l 1,0 c 0.554,0 1,-0.446 1,-1 l 0,-0.5 0,-0.5 0,-3 5,0 -3,-4 3,0 -4,-4 3,0 -5.5,-5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 12.5,1030.3622 -5.5,5 3,0 -4,4 3,0 -3,4 5,0 0,3 0,0.5 0,0.5 c 0,0.554 0.446,1 1,1 l 1,0 c 0.554,0 1,-0.446 1,-1 l 0,-0.5 0,-0.5 0,-3 5,0 -3,-4 3,0 -1,-1 -3,-3 3,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="162" y="1050.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/park2-12.svg b/data/styles/symbols/maki/park2-12.svg
deleted file mode 100644
index f0b4b70b75..0000000000
--- a/data/styles/symbols/maki/park2-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-204 -34)" color="#000">
-        <g>
-            <path d="m 210.84375,1076.3622 c -0.5625,0.047 -0.84375,0.75 -0.84375,1.5 -1,-0.5 -1.5,-0.25 -1.5,0.75 0,1 1,1.25 1,1.25 0,0 -1.5,-0.2461 -1.5,1.25 0,0.6903 0.80965,1.25 1.5,1.25 l 0,1 1.5,0 0,3 1,0 0,-3 1.5,0 0,-1 c 1,0 1.5,-0.5976 1.5,-1.25 0,-1.496 -1.5,-1.25 -1.5,-1.25 0,0 1,-0.25 1,-1.25 0,-1 -1,-1.25 -1.5,-0.75 0,-1 -0.5,-1.5 -1.5,-1.5 -0.25,0 -0.46875,-0.016 -0.65625,0 z m -0.34375,6 2,0 -0.5,1 -1,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1 -1)"/>
-            <path d="m 210.84375,1076.3622 c -0.5625,0.047 -0.84375,0.75 -0.84375,1.5 -1,-0.5 -1.5,-0.25 -1.5,0.75 0,1 1,1.25 1,1.25 0,0 -1.5,-0.2461 -1.5,1.25 0,0.6903 0.80965,1.25 1.5,1.25 l 0,1 1.5,0 0,3 1,0 0,-3 1.5,0 0,-1 c 1,0 1.5,-0.5976 1.5,-1.25 0,-1.496 -1.5,-1.25 -1.5,-1.25 0,0 1,-0.25 1,-1.25 0,-1 -1,-1.25 -1.5,-0.75 0,-1 -0.5,-1.5 -1.5,-1.5 -0.25,0 -0.46875,-0.016 -0.65625,0 z m -0.34375,6 2,0 -0.5,1 -1,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-        </g>
-        <rect width="12" height="12" x="204" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/park2-18.svg b/data/styles/symbols/maki/park2-18.svg
deleted file mode 100644
index 18e7ae6c09..0000000000
--- a/data/styles/symbols/maki/park2-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-186 -40)" color="#000">
-        <g>
-            <path d="m 200,1083.3622 c 0,-1 -1,-2 -1.5,-2 0.30686,-0.3437 0.61108,-1.0028 0.61108,-1.4999 0,-1.0738 -1.11108,-2.0001 -2.11108,-2.0001 0,-1 -0.5,-1.5 -1.5,-1.5 -1,0 -1.5,0.5 -1.5,1.5 -1,0 -2.11108,0.9266 -2.11108,2.0005 0,0.4971 0.30422,1.1558 0.61108,1.4995 -0.5,0 -1.5,1 -1.5,2 0,1 0.5,2.056 2.05557,2.056 l 0.38889,0 0.0555,0.944 1.5,1.5 -4e-5,2.5 1,0 4e-5,-2.5004 1.5,-1.4996 0.0555,-0.944 0.55902,-0.012 C 199.5,1085.3622 200,1084.3622 200,1083.3622 z m -5.5,2 2,0 0,0.5 -1,1 -1,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 200,1083.3622 c 0,-1 -1,-2 -1.5,-2 0.30686,-0.3437 0.61108,-1.0028 0.61108,-1.4999 0,-1.0738 -1.11108,-2.0001 -2.11108,-2.0001 0,-1 -0.5,-1.5 -1.5,-1.5 -1,0 -1.5,0.5 -1.5,1.5 -1,0 -2.11108,0.9266 -2.11108,2.0005 0,0.4971 0.30422,1.1558 0.61108,1.4995 -0.5,0 -1.5,1 -1.5,2 0,1 0.5,2.056 2.05557,2.056 l 0.38889,0 0.0555,0.944 1.5,1.5 -4e-5,2.5 1,0 4e-5,-2.5004 1.5,-1.4996 0.0555,-0.944 0.55902,-0.012 C 199.5,1085.3622 200,1084.3622 200,1083.3622 z m -5.5,2 2,0 0,0.5 -1,1 -1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1074.362" x="186" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/park2-24.svg b/data/styles/symbols/maki/park2-24.svg
deleted file mode 100644
index 9629b329d6..0000000000
--- a/data/styles/symbols/maki/park2-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-162 -46)" color="#000">
-        <g>
-            <path d="m 52,1085.8622 c 0,-1.0701 -0.679778,-1.9871 -1.625,-2.3437 0.39454,-0.442 0.625,-1.0172 0.625,-1.6563 0,-1.3807 -1.119288,-2.5 -2.5,-2.5 -0.196751,0 -0.378848,0.019 -0.5625,0.062 -0.209307,-1.1692 -1.208135,-2.0625 -2.4375,-2.0622 -1.229365,2e-4 -2.228193,0.8935 -2.4375,2.0627 -0.183652,-0.043 -0.365749,-0.062 -0.5625,-0.062 -1.380712,0 -2.5,1.1193 -2.5,2.5 0,0.6391 0.23046,1.2143 0.625,1.6563 -0.945222,0.3566 -1.625,1.2731 -1.625,2.3432 0,1.3807 1,2.5005 2.5,2.5005 l 0.5,0 2,3.5 0,3.4995 3,0 0,-3.5 2,-3.4995 0.71875,-0.015 C 51,1088.3622 52,1087.1672 52,1085.8622 z m -8,2.5 3,0 -1,2 -1,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" transform="translate(129)"/>
-            <path d="m 52,1085.8622 c 0,-1.0701 -0.679778,-1.9871 -1.625,-2.3437 0.39454,-0.442 0.625,-1.0172 0.625,-1.6563 0,-1.3807 -1.119288,-2.5 -2.5,-2.5 -0.196751,0 -0.378848,0.019 -0.5625,0.062 -0.209307,-1.1692 -1.208135,-2.0625 -2.4375,-2.0622 -1.229365,2e-4 -2.228193,0.8935 -2.4375,2.0627 -0.183652,-0.043 -0.365749,-0.062 -0.5625,-0.062 -1.380712,0 -2.5,1.1193 -2.5,2.5 0,0.6391 0.23046,1.2143 0.625,1.6563 -0.945222,0.3566 -1.625,1.2731 -1.625,2.3432 0,1.3807 1,2.5005 2.5,2.5005 l 0.5,0 2,3.5 0,3.4995 3,0 0,-3.5 2,-3.4995 0.71875,-0.015 C 51,1088.3622 52,1087.1672 52,1085.8622 z m -8,2.5 3,0 -1,2 -1,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(129)"/>
-        </g>
-        <rect width="24" height="24" x="162" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/parking-12.svg b/data/styles/symbols/maki/parking-12.svg
deleted file mode 100644
index d26c40ca49..0000000000
--- a/data/styles/symbols/maki/parking-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-126 -178)" color="#000">
-        <rect width="12" height="12" x="126" y="1218.362" overflow="visible" enable-background="accumulate" fill="none"/>
-        <g style="text-indent:0;text-align:center;line-height:125%;text-transform:none;block-progression:tb;-inkscape-font-specification:Open Sans Bold" font-size="9.333" font-weight="bold" text-anchor="middle" fill="#444" overflow="visible" enable-background="accumulate" font-family="Open Sans">
-            <path d="m 132.31641,1224.1682 0.46484,0 c 0.43446,0 0.75955,-0.085 0.97526,-0.2552 0.21571,-0.1732 0.32356,-0.4238 0.32357,-0.7519 -1e-5,-0.3312 -0.0911,-0.5758 -0.27344,-0.7338 -0.17926,-0.158 -0.46181,-0.2369 -0.84766,-0.237 l -0.64257,0 0,1.9779 m 3.1901,-1.0573 c -1e-5,0.717 -0.22483,1.2654 -0.67448,1.6452 -0.44662,0.3798 -1.08312,0.5697 -1.9095,0.5697 l -0.60612,0 0,2.3698 -1.41276,0 0,-6.6628 2.12825,0 c 0.80816,0 1.42187,0.1747 1.84115,0.5241 0.4223,0.3463 0.63345,0.8644 0.63346,1.554" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 132.31641,1224.1682 0.46484,0 c 0.43446,0 0.75955,-0.085 0.97526,-0.2552 0.21571,-0.1732 0.32356,-0.4238 0.32357,-0.7519 -1e-5,-0.3312 -0.0911,-0.5758 -0.27344,-0.7338 -0.17926,-0.158 -0.46181,-0.2369 -0.84766,-0.237 l -0.64257,0 0,1.9779 m 3.1901,-1.0573 c -1e-5,0.717 -0.22483,1.2654 -0.67448,1.6452 -0.44662,0.3798 -1.08312,0.5697 -1.9095,0.5697 l -0.60612,0 0,2.3698 -1.41276,0 0,-6.6628 2.12825,0 c 0.80816,0 1.42187,0.1747 1.84115,0.5241 0.4223,0.3463 0.63345,0.8644 0.63346,1.554"/>
-        </g>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/parking-18.svg b/data/styles/symbols/maki/parking-18.svg
deleted file mode 100644
index c6dca64f10..0000000000
--- a/data/styles/symbols/maki/parking-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-108 -184)" color="#000">
-        <g font-size="25.21" font-weight="bold" letter-spacing="0" word-spacing="0" font-family="Helvetica Neue">
-            <path d="m 115,1222.3622 0,10 2.125,0 0,-3.5625 0.90625,0 c 1.23958,0 2.20507,-0.274 2.875,-0.8437 0.67447,-0.5697 0.99999,-1.3932 1,-2.4688 -1e-5,-1.0345 -0.30404,-1.8242 -0.9375,-2.3437 -0.62891,-0.5241 -1.56901,-0.7812 -2.78125,-0.7813 z m 2.125,1.75 0.96875,0 c 0.57877,0 0.98112,0.1069 1.25,0.3438 0.27343,0.237 0.40624,0.597 0.40625,1.0937 -1e-5,0.4922 -0.14519,0.8652 -0.46875,1.125 -0.32358,0.2552 -0.81707,0.4063 -1.46875,0.4063 l -0.6875,0 z" style="text-indent:0;text-align:start;line-height:125%;text-transform:none;block-progression:tb;-inkscape-font-specification:Helvetica Neue Bold" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path style="text-indent:0;text-align:start;line-height:125%;text-transform:none;block-progression:tb;-inkscape-font-specification:Helvetica Neue Bold" d="m 115,1222.3622 0,10 2.125,0 0,-3.5625 0.90625,0 c 1.23958,0 2.20507,-0.274 2.875,-0.8437 0.67447,-0.5697 0.99999,-1.3932 1,-2.4688 -1e-5,-1.0345 -0.30404,-1.8242 -0.9375,-2.3437 -0.62891,-0.5241 -1.56901,-0.7812 -2.78125,-0.7813 z m 2.125,1.75 0.96875,0 c 0.57877,0 0.98112,0.1069 1.25,0.3438 0.27343,0.237 0.40624,0.597 0.40625,1.0937 -1e-5,0.4922 -0.14519,0.8652 -0.46875,1.125 -0.32358,0.2552 -0.81707,0.4063 -1.46875,0.4063 l -0.6875,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1218.362" x="108" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/parking-24.svg b/data/styles/symbols/maki/parking-24.svg
deleted file mode 100644
index 0da0465ab2..0000000000
--- a/data/styles/symbols/maki/parking-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-84 -166)">
-        <rect width="24" height="24" x="84" y="1194.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        <g style="text-indent:0;text-align:center;line-height:125%;text-transform:none;block-progression:tb;-inkscape-font-specification:Open Sans Bold" font-size="12" font-weight="bold" text-anchor="middle" color="#000" fill="#444" overflow="visible" enable-background="accumulate" font-family="Open Sans" transform="matrix(1.333 0 0 1.333 84 -160.787)">
-            <path d="m 8.8710938,1025.077 0.5976562,0 c 0.55859,0 0.976558,-0.1093 1.253906,-0.3281 0.277339,-0.2226 0.416011,-0.5449 0.416016,-0.9668 -5e-6,-0.4258 -0.117193,-0.7402 -0.351563,-0.9434 -0.230473,-0.2031 -0.593754,-0.3046 -1.0898434,-0.3046 l -0.8261718,0 0,2.5429 m 4.1015622,-1.3593 c -7e-6,0.9218 -0.289069,1.6269 -0.867187,2.1152 -0.574225,0.4883 -1.392583,0.7324 -2.4550784,0.7324 l -0.7792968,0 0,3.0469 -1.8164063,0 0,-8.5664 2.7363281,0 c 1.0390574,0 1.8281194,0.2246 2.3671874,0.6738 0.542962,0.4453 0.814446,1.1113 0.814453,1.9981" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="1.5" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 8.8710938,1025.077 0.5976562,0 c 0.55859,0 0.976558,-0.1093 1.253906,-0.3281 0.277339,-0.2226 0.416011,-0.5449 0.416016,-0.9668 -5e-6,-0.4258 -0.117193,-0.7402 -0.351563,-0.9434 -0.230473,-0.2031 -0.593754,-0.3046 -1.0898434,-0.3046 l -0.8261718,0 0,2.5429 m 4.1015622,-1.3593 c -7e-6,0.9218 -0.289069,1.6269 -0.867187,2.1152 -0.574225,0.4883 -1.392583,0.7324 -2.4550784,0.7324 l -0.7792968,0 0,3.0469 -1.8164063,0 0,-8.5664 2.7363281,0 c 1.0390574,0 1.8281194,0.2246 2.3671874,0.6738 0.542962,0.4453 0.814446,1.1113 0.814453,1.9981"/>
-        </g>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/parking-garage-12.svg b/data/styles/symbols/maki/parking-garage-12.svg
deleted file mode 100644
index 937779791b..0000000000
--- a/data/styles/symbols/maki/parking-garage-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-126 -202)" color="#000">
-        <path d="m 132.5,1243.3622 -3.5,1 0,1 3.5,-1 3.5,1 0,-1 -3.5,-1 z m -1.59375,2.6563 0,6.6875 1.40625,0 0,-2.375 0.625,0 c 0.82638,0 1.45963,-0.1827 1.90625,-0.5625 0.44965,-0.3798 0.65624,-0.9393 0.65625,-1.6563 -1e-5,-0.6896 -0.2027,-1.2162 -0.625,-1.5625 -0.41928,-0.3494 -1.03559,-0.5312 -1.84375,-0.5312 l -2.125,0 z m 1.40625,1.1562 0.65625,0 c 0.38585,10e-5 0.66449,0.092 0.84375,0.25 0.18234,0.158 0.28124,0.4188 0.28125,0.75 -1e-5,0.3281 -0.12804,0.5768 -0.34375,0.75 -0.21571,0.1702 -0.53429,0.25 -0.96875,0.25 l -0.46875,0 0,-2 z" style="text-indent:0;text-align:start;line-height:125%;text-transform:none;block-progression:tb;-inkscape-font-specification:Helvetica Neue Bold" font-size="25.21" font-weight="bold" letter-spacing="0" word-spacing="0" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" font-family="Helvetica Neue"/>
-        <path style="text-indent:0;text-align:start;line-height:125%;text-transform:none;block-progression:tb;-inkscape-font-specification:Helvetica Neue Bold" d="m 132.5,1243.3622 -3.5,1 0,1 3.5,-1 3.5,1 0,-1 -3.5,-1 z m -1.59375,2.6563 0,6.6875 1.40625,0 0,-2.375 0.625,0 c 0.82638,0 1.45963,-0.1827 1.90625,-0.5625 0.44965,-0.3798 0.65624,-0.9393 0.65625,-1.6563 -1e-5,-0.6896 -0.2027,-1.2162 -0.625,-1.5625 -0.41928,-0.3494 -1.03559,-0.5312 -1.84375,-0.5312 l -2.125,0 z m 1.40625,1.1562 0.65625,0 c 0.38585,10e-5 0.66449,0.092 0.84375,0.25 0.18234,0.158 0.28124,0.4188 0.28125,0.75 -1e-5,0.3281 -0.12804,0.5768 -0.34375,0.75 -0.21571,0.1702 -0.53429,0.25 -0.96875,0.25 l -0.46875,0 0,-2 z" font-size="25.21" font-weight="bold" letter-spacing="0" word-spacing="0" fill="#444" overflow="visible" enable-background="accumulate" font-family="Helvetica Neue"/>
-        <rect width="12" height="12" x="126" y="1242.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/parking-garage-18.svg b/data/styles/symbols/maki/parking-garage-18.svg
deleted file mode 100644
index ed18ec57b2..0000000000
--- a/data/styles/symbols/maki/parking-garage-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-108 -184)" color="#000">
-        <g fill="#b4b4b4" font-size="25.21" font-weight="bold" letter-spacing="0" word-spacing="0" font-family="Helvetica Neue">
-            <path d="m 117,1219.3622 -6,1.5 0,1.5 6,-1.5 6,1.5 0,-1.5 -6,-1.5 z m -2.72727,4 0,10 2.31818,0 0,-3.5625 0.98864,0 c 1.35227,0 2.40553,-0.274 3.13636,-0.8437 0.73579,-0.5697 1.0909,-1.3932 1.09091,-2.4688 -1e-5,-1.0345 -0.33168,-1.8242 -1.02273,-2.3437 -0.68608,-0.5241 -1.71165,-0.7812 -3.03409,-0.7813 l -3.47727,0 z m 2.31818,1.75 1.05682,0 c 0.63138,0 1.07031,0.1069 1.36363,0.3438 0.29829,0.237 0.44318,0.597 0.44319,1.0937 -1e-5,0.4922 -0.15839,0.8652 -0.51137,1.125 -0.35299,0.2552 -0.89135,0.4063 -1.60227,0.4063 l -0.75,0 0,-2.9688 z" style="text-indent:0;text-align:start;line-height:125%;text-transform:none;block-progression:tb;-inkscape-font-specification:Helvetica Neue Bold" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2.089" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="matrix(.917 0 0 1 10.25 0)"/>
-            <path style="text-indent:0;text-align:start;line-height:125%;text-transform:none;block-progression:tb;-inkscape-font-specification:Helvetica Neue Bold" d="m 117,1219.3622 -6,1.5 0,1.5 6,-1.5 6,1.5 0,-1.5 -6,-1.5 z m -2.72727,4 0,10 2.31818,0 0,-3.5625 0.98864,0 c 1.35227,0 2.40553,-0.274 3.13636,-0.8437 0.73579,-0.5697 1.0909,-1.3932 1.09091,-2.4688 -1e-5,-1.0345 -0.33168,-1.8242 -1.02273,-2.3437 -0.68608,-0.5241 -1.71165,-0.7812 -3.03409,-0.7813 l -3.47727,0 z m 2.31818,1.75 1.05682,0 c 0.63138,0 1.07031,0.1069 1.36363,0.3438 0.29829,0.237 0.44318,0.597 0.44319,1.0937 -1e-5,0.4922 -0.15839,0.8652 -0.51137,1.125 -0.35299,0.2552 -0.89135,0.4063 -1.60227,0.4063 l -0.75,0 0,-2.9688 z" fill="#444" overflow="visible" enable-background="accumulate" transform="matrix(.917 0 0 1 10.25 0)"/>
-        </g>
-        <rect y="1218.362" x="108" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/parking-garage-24.svg b/data/styles/symbols/maki/parking-garage-24.svg
deleted file mode 100644
index 396918f16c..0000000000
--- a/data/styles/symbols/maki/parking-garage-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-84 -190)" color="#000">
-        <g font-size="25.21" font-weight="bold" letter-spacing="0" word-spacing="0" font-family="Helvetica Neue">
-            <path d="m 96.5,1216.3622 -6.5,2 0,2 6.5,-2 6.5,2 0,-2 -6.5,-2 z m -3.09375,4.25 0,11.4063 2.40625,0 0,-4.0625 1.0625,0 c 1.41666,0 2.51561,-0.3177 3.28125,-0.9688 0.77082,-0.6511 1.125,-1.5834 1.125,-2.8125 0,-1.1824 -0.33855,-2.0625 -1.0625,-2.6562 -0.71876,-0.5989 -1.77084,-0.9063 -3.15625,-0.9063 l -3.65625,0 z m 2.40625,1.9688 1.125,0 c 0.66145,0 1.1302,0.1354 1.4375,0.4062 0.3125,0.271 0.46875,0.7136 0.46875,1.2813 0,0.5625 -0.19271,0.9844 -0.5625,1.2812 -0.36979,0.2917 -0.91146,0.4375 -1.65625,0.4375 l -0.8125,0 0,-3.4062 z" style="text-indent:0;text-align:start;line-height:125%;text-transform:none;block-progression:tb;-inkscape-font-specification:Helvetica Neue Bold" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 6)"/>
-            <path style="text-indent:0;text-align:start;line-height:125%;text-transform:none;block-progression:tb;-inkscape-font-specification:Helvetica Neue Bold" d="m 96.5,1216.3622 -6.5,2 0,2 6.5,-2 6.5,2 0,-2 -6.5,-2 z m -3.09375,4.25 0,11.4063 2.40625,0 0,-4.0625 1.0625,0 c 1.41666,0 2.51561,-0.3177 3.28125,-0.9688 0.77082,-0.6511 1.125,-1.5834 1.125,-2.8125 0,-1.1824 -0.33855,-2.0625 -1.0625,-2.6562 -0.71876,-0.5989 -1.77084,-0.9063 -3.15625,-0.9063 l -3.65625,0 z m 2.40625,1.9688 1.125,0 c 0.66145,0 1.1302,0.1354 1.4375,0.4062 0.3125,0.271 0.46875,0.7136 0.46875,1.2813 0,0.5625 -0.19271,0.9844 -0.5625,1.2812 -0.36979,0.2917 -0.91146,0.4375 -1.65625,0.4375 l -0.8125,0 0,-3.4062 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 6)"/>
-        </g>
-        <rect width="24" height="24" x="84" y="1218.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/pharmacy-12.svg b/data/styles/symbols/maki/pharmacy-12.svg
deleted file mode 100644
index 67c061a487..0000000000
--- a/data/styles/symbols/maki/pharmacy-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-282 -106)">
-        <path d="m 288.5,1147.8622 c -1.38071,0 -2.5,0.4477 -2.5,1 l 0,1.5 c 0,0.5523 1.11929,1 2.5,1 1.38071,0 2.5,-0.4477 2.5,-1 l 0,-1.5 c 0,-0.5523 -1.11929,-1 -2.5,-1 z m -2.5,3.5 0,5 c 0,0.5523 1.11929,1 2.5,1 1.38071,0 2.5,-0.4477 2.5,-1 l 0,-5 c 0,0.5523 -1.11929,1 -2.5,1 -1.38071,0 -2.5,-0.4477 -2.5,-1 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 289.5,1148.8622 c -1.38071,0 -2.5,0.4477 -2.5,1 l 0,1.5 c 0,0.5523 1.11929,1 2.5,1 1.38071,0 2.5,-0.4477 2.5,-1 l 0,-1.5 c 0,-0.5523 -1.11929,-1 -2.5,-1 z m -2.5,3.5 0,5 c 0,0.5523 1.11929,1 2.5,1 1.38071,0 2.5,-0.4477 2.5,-1 l 0,-5 c 0,0.5523 -1.11929,1 -2.5,1 -1.38071,0 -2.5,-0.4477 -2.5,-1 z m 1,2 c 0,0 0.5,0.25 1.5,0.25 1,0 1.5,-0.25 1.5,-0.25 l 0,2 c 0,0 -0.5,0.25 -1.5,0.25 -1,0 -1.5,-0.25 -1.5,-0.25 l 0,-2 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-        <rect width="12" height="12" x="282" y="1146.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/pharmacy-18.svg b/data/styles/symbols/maki/pharmacy-18.svg
deleted file mode 100644
index b01328687c..0000000000
--- a/data/styles/symbols/maki/pharmacy-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-264 -112)" color="#000">
-        <g>
-            <path transform="translate(-1) translate(-353 1122.362)" d="m 627.5,27 c -1.933,0 -3.5,0.671573 -3.5,1.5 l 0,2.5 c 0,0.828427 1.567,1.5 3.5,1.5 1.933,0 3.5,-0.671573 3.5,-1.5 l 0,-2.5 c 0,-0.828427 -1.567,-1.5 -3.5,-1.5 z m -3.5,5.5 0,6.5 c 0,0 1.00002,1 3.5,1 2.50002,0 3.5,-1 3.5,-1 l 0,-6.5 c 0,0.8284 -1.567,1.5 -3.5,1.5 -1.933,0 -3.5,-0.6716 -3.5,-1.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 627.5,27 c -1.933,0 -3.5,0.671573 -3.5,1.5 l 0,2.5 c 0,0.828427 1.567,1.5 3.5,1.5 1.933,0 3.5,-0.671573 3.5,-1.5 l 0,-2.5 c 0,-0.828427 -1.567,-1.5 -3.5,-1.5 z m -3.5,5.5 0,6.5 c 0,0 1.00002,1 3.5,1 2.50002,0 3.5,-1 3.5,-1 l 0,-6.5 c 0,0.8284 -1.567,1.5 -3.5,1.5 -1.933,0 -3.5,-0.6716 -3.5,-1.5 z m 2,2.5 c 0.45315,0.092 0.96548,0.15625 1.5,0.15625 0.53452,0 1.04685,-0.06405 1.5,-0.15625 l 0,3 c -0.45315,0.0922 -0.96548,0.15625 -1.5,0.15625 -0.53452,0 -1.04685,-0.06425 -1.5,-0.15625 z" transform="translate(-1) translate(-353 1122.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1146.362" x="264" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/pharmacy-24.svg b/data/styles/symbols/maki/pharmacy-24.svg
deleted file mode 100644
index 247f0fd17a..0000000000
--- a/data/styles/symbols/maki/pharmacy-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-240 -118)" color="#000">
-        <g>
-            <path d="m 252.5,1148.3622 c -3.03757,0 -5.5,1.1193 -5.5,2.5 l 0,3 c 0,1.3807 2.46243,2.5 5.5,2.5 3.03757,0 5.5,-1.1193 5.5,-2.5 l 0,-3 c 0,-1.3807 -2.46243,-2.5 -5.5,-2.5 z m -5.5,9 0,7.5 c 0,1.3807 2.46243,2.5 5.5,2.5 3.03757,0 5.5,-1.1193 5.5,-2.5 l 0,-7.5 c 0,-1 -0.5,-1 -1,-0.5 -0.83861,0.8935 -2.2278,1.5 -4.5,1.5 -2.22714,0 -3.63511,-0.6347 -4.5,-1.5 -0.5,-0.5 -1,-0.5 -1,0.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 252.5,1148.3622 c -3.03757,0 -5.5,1.1193 -5.5,2.5 l 0,3 c 0,1.3807 2.46243,2.5 5.5,2.5 3.03757,0 5.5,-1.1193 5.5,-2.5 l 0,-3 c 0,-1.3807 -2.46243,-2.5 -5.5,-2.5 z m -5.5,9 0,7.5 c 0,1.3807 2.46243,2.5 5.5,2.5 3.03757,0 5.5,-1.1193 5.5,-2.5 l 0,-7.5 c 0,-1 -0.5,-1 -1,-0.5 -0.83861,0.8935 -2.2278,1.5 -4.5,1.5 -2.22714,0 -3.63511,-0.6347 -4.5,-1.5 -0.5,-0.5 -1,-0.5 -1,0.5 z m 3,3 c 0.75195,0.1754 1.5967,0.2813 2.5,0.2813 0.9033,0 1.74805,-0.1059 2.5,-0.2813 l 0,4 c -0.75195,0.1754 -1.5967,0.2813 -2.5,0.2813 -0.9033,0 -1.74805,-0.1059 -2.5,-0.2813 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="240" y="1146.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/pitch-12.svg b/data/styles/symbols/maki/pitch-12.svg
deleted file mode 100644
index a708c40b9d..0000000000
--- a/data/styles/symbols/maki/pitch-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-516 -10)">
-        <g color="#000">
-            <path d="m 523,1052.3622 c -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z m -2.59375,1.2188 c -0.21864,0 -0.40625,0.1329 -0.40625,0.4062 0,0.2732 0.0851,0.6291 0.125,0.8438 l 0.28125,1 c 0.14851,0.5435 0.46689,0.5312 0.875,0.5312 l 0.90625,0 c 0.32455,0.5467 0.21119,1.1646 0.3125,2 l -0.5,0 c -0.54661,0 -1.45283,0.3131 -0.90625,1.4063 l 0.8125,1.6562 c 0.19635,0.3927 0.39466,0.4352 0.59375,0.4375 0.35509,0 0.65107,-0.3574 0.5,-0.7187 l -0.625,-1.5 c -0.11787,-0.2819 0.15241,-0.2813 0.28125,-0.2813 l 1.34375,0 c 0,0 0.45658,1.2032 1.21875,2.1875 0.28135,0.3634 0.57866,0.8125 0.96875,0.8125 0.2733,0 0.74847,-0.3739 0.25,-0.9687 -0.93348,-1.1141 -1.4375,-2.4847 -1.4375,-3.0313 0,-0.6357 -0.18215,-1.2417 -0.34375,-2 l 0.8125,0 c 0.26675,0.5347 0.71875,1.375 0.71875,1.375 0.30214,0.5233 0.8125,0.4838 0.8125,0 0,-0.067 0.006,-0.2142 -0.0625,-0.375 l -0.75,-1.7187 c -0.0503,-0.1186 -0.12315,-0.2813 -0.53125,-0.2813 l -4.28125,0 -0.40625,-1.375 c -0.082,-0.2733 -0.34386,-0.4062 -0.5625,-0.4062 z" transform="translate(-1 -1)" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 523,1052.3622 c -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z m -2.59375,1.2188 c -0.21864,0 -0.40625,0.1329 -0.40625,0.4062 0,0.2732 0.0851,0.6291 0.125,0.8438 l 0.28125,1 c 0.14851,0.5435 0.46689,0.5312 0.875,0.5312 l 0.90625,0 c 0.32455,0.5467 0.21119,1.1646 0.3125,2 l -0.5,0 c -0.54661,0 -1.45283,0.3131 -0.90625,1.4063 l 0.8125,1.6562 c 0.19635,0.3927 0.39466,0.4352 0.59375,0.4375 0.35509,0 0.65107,-0.3574 0.5,-0.7187 l -0.625,-1.5 c -0.11787,-0.2819 0.15241,-0.2813 0.28125,-0.2813 l 1.34375,0 c 0,0 0.45658,1.2032 1.21875,2.1875 0.28135,0.3634 0.57866,0.8125 0.96875,0.8125 0.2733,0 0.74847,-0.3739 0.25,-0.9687 -0.93348,-1.1141 -1.4375,-2.4847 -1.4375,-3.0313 0,-0.6357 -0.18215,-1.2417 -0.34375,-2 l 0.8125,0 c 0.26675,0.5347 0.71875,1.375 0.71875,1.375 0.30214,0.5233 0.8125,0.4838 0.8125,0 0,-0.067 0.006,-0.2142 -0.0625,-0.375 l -0.75,-1.7187 c -0.0503,-0.1186 -0.12315,-0.2813 -0.53125,-0.2813 l -4.28125,0 -0.40625,-1.375 c -0.082,-0.2733 -0.34386,-0.4062 -0.5625,-0.4062 z" transform="translate(-1 -1)" fill="#444" overflow="visible" enable-background="accumulate"/>
-            <rect y="1050.362" x="516" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/pitch-18.svg b/data/styles/symbols/maki/pitch-18.svg
deleted file mode 100644
index 9bbcaaf93b..0000000000
--- a/data/styles/symbols/maki/pitch-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-498 -16)" color="#000">
-        <g>
-            <path d="m 508.34321,1053.3622 c -0.75576,0 -1.36842,0.6126 -1.36842,1.3684 0,0.7558 0.61266,1.3684 1.36842,1.3684 0.75576,0 1.36842,-0.6126 1.36842,-1.3684 0,-0.7558 -0.61266,-1.3684 -1.36842,-1.3684 z m -3.93421,2.7368 0.34211,1.3685 c 0.17105,0.6842 0.57963,0.6842 1.09046,0.6842 l 1.13322,0 c 0.40625,0.6842 0.2153,1.7965 0.34211,2.8421 l -0.62007,0 c -0.68421,0 -1.77465,0.6842 -1.09046,2.0526 l 1.02632,2.0527 c 0.68419,1.3684 1.71051,0.3421 1.36842,-0.3421 l -1.02632,-2.0527 c -0.17105,-0.3421 0.18084,-0.3421 0.34211,-0.3421 l 1.68858,0 c 0,0 0.80993,1.6926 1.76396,2.9248 0.35218,0.4548 0.74228,1.0752 1.23056,1.0752 0.3421,0 0.92836,-0.5287 0.30441,-1.2733 -1.16845,-1.3944 -1.90857,-2.832 -1.90857,-3.5162 0,-0.7958 -0.13981,-2.4718 -0.3421,-3.421 l 1.02632,0 c 0.33389,0.6692 0.91994,1.7105 0.91994,1.7105 0.37819,0.6551 1,0.6056 1,0 0,-0.083 -0.01,-0.2617 -0.0955,-0.4631 l -0.96922,-2.2737 c -0.0633,-0.1484 -0.17339,-0.3421 -0.68421,-0.3421 l -5.30263,0 -0.51316,-1.7106 c -0.20526,-0.6842 -1.19737,-0.6842 -1.19737,0 0,0.3421 0.12121,0.7575 0.17105,1.0263 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1 -1)"/>
-            <path d="m 508.34321,1053.3622 c -0.75576,0 -1.36842,0.6126 -1.36842,1.3684 0,0.7558 0.61266,1.3684 1.36842,1.3684 0.75576,0 1.36842,-0.6126 1.36842,-1.3684 0,-0.7558 -0.61266,-1.3684 -1.36842,-1.3684 z m -3.93421,2.7368 0.34211,1.3685 c 0.17105,0.6842 0.57963,0.6842 1.09046,0.6842 l 1.13322,0 c 0.40625,0.6842 0.2153,1.7965 0.34211,2.8421 l -0.62007,0 c -0.68421,0 -1.77465,0.6842 -1.09046,2.0526 l 1.02632,2.0527 c 0.68419,1.3684 1.71051,0.3421 1.36842,-0.3421 l -1.02632,-2.0527 c -0.17105,-0.3421 0.18084,-0.3421 0.34211,-0.3421 l 1.68858,0 c 0,0 0.80993,1.6926 1.76396,2.9248 0.35218,0.4548 0.74228,1.0752 1.23056,1.0752 0.3421,0 0.92836,-0.5287 0.30441,-1.2733 -1.16845,-1.3944 -1.90857,-2.832 -1.90857,-3.5162 0,-0.7958 -0.13981,-2.4718 -0.3421,-3.421 l 1.02632,0 c 0.33389,0.6692 0.91994,1.7105 0.91994,1.7105 0.37819,0.6551 1,0.6056 1,0 0,-0.083 -0.01,-0.2617 -0.0955,-0.4631 l -0.96922,-2.2737 c -0.0633,-0.1484 -0.17339,-0.3421 -0.68421,-0.3421 l -5.30263,0 -0.51316,-1.7106 c -0.20526,-0.6842 -1.19737,-0.6842 -1.19737,0 0,0.3421 0.12121,0.7575 0.17105,1.0263 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-        </g>
-        <rect y="1050.362" x="498" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/pitch-24.svg b/data/styles/symbols/maki/pitch-24.svg
deleted file mode 100644
index d5c8a17aac..0000000000
--- a/data/styles/symbols/maki/pitch-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-474 -22)" color="#000">
-        <g>
-            <path d="m 486,1052.3622 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m -5.75,4 0.5,2 c 0.25,1 0.84716,1 1.59375,1 l 1.65625,0 c 0.59375,1 0.31467,2.4718 0.5,4 l -0.90625,0 c -1,0 -2.59375,1 -1.59375,3 l 1.5,3 c 1,2 2.5,0.5 2,-0.5 l -1.5,-3 c -0.25,-0.5 0.2643,-0.5 0.5,-0.5 1,0 2,0 2,0 l 0.46793,0 c 0,0 1.18374,2.6276 2.5781,4.4285 0.51472,0.6648 1.08486,1.5715 1.7985,1.5715 0.5,0 1.35684,-0.7727 0.44491,-1.861 -1.70774,-2.038 -2.78944,-4.139 -2.78944,-5.139 0,-1.1632 -0.20434,-3.6127 -0.5,-5 l 1.5,0 c 0.488,0.9781 1.25,2.5 1.25,2.5 0.55274,0.9574 1.75,0.8851 1.75,0 0,-0.1215 0,-0.3889 -0.13952,-0.6768 l -1.61048,-3.3232 c -0.10278,-0.2121 -0.25342,-0.5 -1,-0.5 l -2.25,0 -3.5625,0 -1.9375,0 -0.75,-2.5 c -0.3,-1 -1.75,-1 -1.75,0 0,0.5 0.17716,1.1071 0.25,1.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 486,1052.3622 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m -5.75,4 0.5,2 c 0.25,1 0.84716,1 1.59375,1 l 1.65625,0 c 0.59375,1 0.31467,2.4718 0.5,4 l -0.90625,0 c -1,0 -2.59375,1 -1.59375,3 l 1.5,3 c 1,2 2.5,0.5 2,-0.5 l -1.5,-3 c -0.25,-0.5 0.2643,-0.5 0.5,-0.5 l 2.46793,0 c 0,0 1.18374,2.6276 2.5781,4.4285 0.51472,0.6648 1.08486,1.5715 1.7985,1.5715 0.5,0 1.35684,-0.7727 0.44491,-1.861 -1.70774,-2.038 -2.78944,-4.139 -2.78944,-5.139 0,-1.1632 -0.20434,-3.6127 -0.5,-5 l 1.5,0 c 0.488,0.9781 1.25,2.5 1.25,2.5 0.55274,0.9574 1.75,0.8851 1.75,0 0,-0.1215 0,-0.3889 -0.13952,-0.6768 l -1.61048,-3.3232 c -0.10278,-0.2121 -0.25342,-0.5 -1,-0.5 l -7.75,0 -0.75,-2.5 c -0.3,-1 -1.75,-1 -1.75,0 0,0.5 0.17716,1.1071 0.25,1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="474" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/place-of-worship-12.svg b/data/styles/symbols/maki/place-of-worship-12.svg
deleted file mode 100644
index 81a7ce9ddd..0000000000
--- a/data/styles/symbols/maki/place-of-worship-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-48 -106)">
-        <path d="m 54.5,1148.3622 -1.5,0.9411 0,1.0589 -1,1 0,5 5,0 0,-5 -1,-1 0,-0.9596 z m -4.5,4 0,4 1,0 0,-4 z m 8,0 0,4 1,0 0,-4 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <g transform="translate(0 24)">
-            <rect width="12" height="12" x="48" y="1122.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <path d="m 54.5,1148.3622 -1.5,0.9411 0,1.0589 -1,1 0,5 5,0 0,-5 -1,-1 0,-0.9596 z m -4.5,4 0,4 1,0 0,-4 z m 8,0 0,4 1,0 0,-4 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/place-of-worship-18.svg b/data/styles/symbols/maki/place-of-worship-18.svg
deleted file mode 100644
index f6205f96a6..0000000000
--- a/data/styles/symbols/maki/place-of-worship-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-30 -112)">
-        <path d="m 39.5,1149.8622 -1.5,1.5 0,1.5 -2,2 0,6.5 7,0 0,-6.5 -2,-2 0,-1.5 z m -6.5,6 0,5.5 1.5,0 0,-5.5 z m 11.5,0 0,5.5 1.5,0 0,-5.5 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <g transform="translate(0 24)">
-            <rect y="1122.362" x="30" height="18" width="18" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <path d="m 39.5,1149.8622 -1.5,1.5 0,1.5 -2,2 0,6.5 7,0 0,-6.5 -2,-2 0,-1.5 z m -6.5,6 0,5.5 1.5,0 0,-5.5 z m 11.5,0 0,5.5 1.5,0 0,-5.5 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/place-of-worship-24.svg b/data/styles/symbols/maki/place-of-worship-24.svg
deleted file mode 100644
index 3e66783ce5..0000000000
--- a/data/styles/symbols/maki/place-of-worship-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-6 -118)">
-        <path d="m 18.5,1150.3622 c 0,0 -2.5,1 -2.5,2 0,0.6667 0,1.3958 0,2 0,1 -2,1 -2,2 0,2.3333 0,9 0,9 l 9,0 c 0,0 0,-6.6667 0,-9 0,-1 -2,-1 -2,-2.1875 0,-0.6042 0,-1.2083 0,-1.8125 0,-1 -2.5,-2 -2.5,-2 z m -8.5,8 c 0,2.3333 0,7 0,7 l 2,0 c 0,0 0,-4.6667 0,-7 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 z m 15,0 c 0,2.3333 0,7 0,7 l 2,0 c 0,0 0,-4.6667 0,-7 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <g transform="translate(0 24)">
-            <rect width="24" height="24" x="6" y="1122.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        </g>
-        <path d="m 18.5,1150.3622 c 0,0 -2.5,1 -2.5,2 0,0.6667 0,1.3958 0,2 0,1 -2,1 -2,2 0,2.3333 0,9 0,9 l 9,0 c 0,0 0,-6.6667 0,-9 0,-1 -2,-1 -2,-2.1875 0,-0.6042 0,-1.2083 0,-1.8125 0,-1 -2.5,-2 -2.5,-2 z m -8.5,8 c 0,2.3333 0,7 0,7 l 2,0 c 0,0 0,-4.6667 0,-7 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 z m 15,0 c 0,2.3333 0,7 0,7 l 2,0 c 0,0 0,-4.6667 0,-7 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/police-12.svg b/data/styles/symbols/maki/police-12.svg
deleted file mode 100644
index 3c8795385f..0000000000
--- a/data/styles/symbols/maki/police-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-438 -82)" color="#000">
-        <g>
-            <path d="m 444,1124.3622 3,0 0,-1 -3,0 z m 0,0.75 c 0,0.9665 0.53351,1.75 1.5,1.75 0.96649,0 1.5,-0.7835 1.5,-1.75 l 0,-0.25 -3,0 z m -1,2.25 c -0.5,0 -1,1.5 -1,2 l 0,3 1.59375,0 3.40625,-5 z m 5,0 -3.40625,5 4.40625,0 0,-3 c 0,-0.5 -0.5,-2 -1,-2 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-            <path d="m 444,1124.3622 3,0 0,-1 -3,0 z m 0,0.75 c 0,0.9665 0.53351,1.75 1.5,1.75 0.96649,0 1.5,-0.7835 1.5,-1.75 l 0,-0.25 -3,0 z m -1,2.25 c -0.5,0 -1,1.5 -1,2 l 0,3 1.59375,0 3.40625,-5 z m 5,0 -3.40625,5 4.40625,0 0,-3 c 0,-0.5 -0.5,-2 -1,-2 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-        </g>
-        <rect y="1122.362" x="438" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/police-18.svg b/data/styles/symbols/maki/police-18.svg
deleted file mode 100644
index fdd113bc5e..0000000000
--- a/data/styles/symbols/maki/police-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-420 -88)" color="#000">
-        <g>
-            <path d="m 430,1124.8622 -1,0.5 0,1 5,0 0,-1 -1,-0.5 z m -1,2.5 c -0.0333,0.1627 0,0.3274 0,0.5 0,1.3807 1.11931,2.5 2.5,2.5 1.38069,0 2.5,-1.1193 2.5,-2.5 0,-0.1726 0,-0.5 0,-0.5 z m 0,4 c -1.08333,0 -1.98585,1.7917 -2,2.875 l 0,4.125 1.53125,0 4.46875,-7 z m 5.5,0 -4.46875,7 5.96875,0 0,-4.125 c 0,-1.0834 -0.41666,-2.875 -1.5,-2.875 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-2)"/>
-            <path d="m 430,1124.8622 -1,0.5 0,1 5,0 0,-1 -1,-0.5 z m -1,2.5 c -0.0333,0.1627 0,0.3274 0,0.5 0,1.3807 1.11931,2.5 2.5,2.5 1.38069,0 2.5,-1.1193 2.5,-2.5 0,-0.1726 0,-0.5 0,-0.5 z m 0,4 c -1.08333,0 -1.98585,1.7917 -2,2.875 l 0,4.125 1.53125,0 4.46875,-7 z m 5.5,0 -4.46875,7 5.96875,0 0,-4.125 c 0,-1.0834 -0.41666,-2.875 -1.5,-2.875 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-2)"/>
-        </g>
-        <rect width="18" height="18" x="420" y="1122.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/police-24.svg b/data/styles/symbols/maki/police-24.svg
deleted file mode 100644
index f03f90a26c..0000000000
--- a/data/styles/symbols/maki/police-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-396 -94)" color="#000">
-        <g>
-            <path d="m 407,1125.3622 -1,1 0,1 7,0 0,-1 -1,-1 z m -1,3 0,0.5 c 0,1.933 1.56702,3.5 3.5,3.5 1.93298,0 3.5,-1.567 3.5,-3.5 l 0,-0.5 z m 1.1875,15 8.8125,0 0,-6 c 0,-1.5 -0.5,-4 -2,-4 l -1.5,0 -7.5,0 c -1.5,0 -2,2.5 -2,4 l 0,6 2.6875,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-            <path d="m 407,1125.3622 -1,1 0,1 7,0 0,-1 -1,-1 -5,0 z m -1,3 0,0.5 c 0,1.933 1.56702,3.5 3.5,3.5 1.93298,0 3.5,-1.567 3.5,-3.5 l 0,-0.5 -7,0 z m -1,5 c -1.5,0 -2,2.5 -2,4 l 0,6 2.6875,0 6.8125,-10 -7.5,0 z m 9,0 -6.8125,10 8.8125,0 0,-6 c 0,-1.5 -0.5,-4 -2,-4 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1)"/>
-        </g>
-        <rect y="1122.362" x="396" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/post-12.svg b/data/styles/symbols/maki/post-12.svg
deleted file mode 100644
index 43d54f6e0d..0000000000
--- a/data/styles/symbols/maki/post-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-438.006 -10)" color="#000">
-        <path d="m 440,1053.3622 4.5,3 4.5,-3 z m 0,1 0,4.5 c 0,0.25 0.3,0.5 0.5,0.5 l 8,0 c 0.2,0 0.55423,-0.256 0.5,-0.5 l 3e-5,-4.5 -4.50003,3.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 440,1053.3622 4.5,3 4.5,-3 z m 0,1 0,4.5 c 0,0.25 0.3,0.5 0.5,0.5 l 8,0 c 0.2,0 0.55423,-0.256 0.5,-0.5 l 3e-5,-4.5 -4.50003,3.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect width="12" height="12" x="438" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/post-18.svg b/data/styles/symbols/maki/post-18.svg
deleted file mode 100644
index 8c1cc29f5b..0000000000
--- a/data/styles/symbols/maki/post-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-420 -16)" color="#000">
-        <g>
-            <path d="m 424,1057.3622 c -0.8125,0 -0.59375,0.3382 -0.1875,0.6719 l 5.6875,4.3281 5.6875,-4.3281 c 0.41835,-0.3184 0.625,-0.6719 -0.1875,-0.6719 z m -1,1.5 0,6.5 c 0,0.5 0.5,1 1,1 l 11,0 c 0.5,0 1,-0.5 1,-1 l 0,-6.5 -6.5,5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 -3)"/>
-            <path d="m 424,1057.3622 c -0.8125,0 -0.59375,0.3382 -0.1875,0.6719 l 5.6875,4.3281 5.6875,-4.3281 c 0.41835,-0.3184 0.625,-0.6719 -0.1875,-0.6719 z m -1,1.5 0,6.5 c 0,0.5 0.5,1 1,1 l 11,0 c 0.5,0 1,-0.5 1,-1 l 0,-6.5 -6.5,5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -3)"/>
-        </g>
-        <rect y="1050.362" x="420" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/post-24.svg b/data/styles/symbols/maki/post-24.svg
deleted file mode 100644
index a9a3a319e3..0000000000
--- a/data/styles/symbols/maki/post-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-396 -22)" color="#000">
-        <g>
-            <path d="m 400.90625,1057.3622 c -0.4,0 -0.90625,0.5 -0.90625,1 l 0,9 c 0,0.5 0.50625,1 0.90625,1 l 15.1875,0 c 0.4,0 0.90625,-0.5 0.90625,-1 l 0,-9 c 0,-0.5 -0.50625,-1 -0.90625,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-            <path d="m 401,1057.3622 c -1,0 -0.5,0.3393 0,0.75 l 7,5.75 8,-5.75 c 0.5,-0.4107 1,-0.75 0,-0.75 l -8,0 z m -1,1.5 0,8.5 c 0,0.5 0.50625,1 0.90625,1 l 15.1875,0 c 0.4,0 0.90625,-0.5 0.90625,-1 l 0,-8.5 -9,6.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-        </g>
-        <rect width="24" height="24" x="396" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/prison-12.svg b/data/styles/symbols/maki/prison-12.svg
deleted file mode 100644
index dd9b68e458..0000000000
--- a/data/styles/symbols/maki/prison-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-438 -106)" color="#000">
-        <g>
-            <path d="m 441.5,1148.8622 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1.5 0,4 0,1.5 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-1 1,0 0,1 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.2541 0.5,-0.5 l 0,-1 1,0 0,1 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.2541 0.5,-0.5 l 0,-1 1,0 0,1 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-7 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1 -1,0 0,-1 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1 -1,0 0,-1 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 -0.277,0 -0.5,0.2474 -0.5,0.5 l 0,1 -1,0 0,-1 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 0.5,2.5 1,0 0,3 -1,0 z m 2,0 1,0 0,3 -1,0 z m 2,0 1,0 0,3 -1,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(0 -1)"/>
-            <path d="m 441.5,1148.8622 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1.5 0,4 0,1.5 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-1 1,0 0,1 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.2543 0.5,-0.5 l 0,-1 1,0 0,1 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.2541 0.5,-0.5 l 0,-1 1,0 0,1 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-7 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1 -1,0 0,-1 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1 -1,0 0,-1 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 -0.277,0 -0.5,0.2474 -0.5,0.5 l 0,1 -1,0 0,-1 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 0.5,2.5 1,0 0,3 -1,0 z m 2,0 1,0 0,3 -1,0 z m 2,0 1,0 0,3 -1,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-        </g>
-        <rect y="1146.362" x="438" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/prison-18.svg b/data/styles/symbols/maki/prison-18.svg
deleted file mode 100644
index c8ebadabbc..0000000000
--- a/data/styles/symbols/maki/prison-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-420 -112)" color="#000">
-        <g>
-            <path d="m 425,1151.3622 c -0.5,0 -0.5,0.5 -0.5,0.5 l 0,2.5 0,5.5 0,2 c 0,0 0,0.5 0.5,0.5 0.10655,0 0.29254,0 0.5,0 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-1.5 1.5,0 0,1.5 c 0,0 0,0.5 0.5,0.5 0.13055,0 0.41998,0 0.5,0 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-1.5 1.5,0 0,1.5 c 0,0 0,0.5 0.5,0.5 0.15024,0 0.40981,0 0.5,0 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-1.5 1.5,0 0,1.5 c 0,0 0,0.5 0.5,0.5 0.19083,0 0.38799,0 0.5,0 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-10 c 0,0 0,-0.5 -0.5,-0.5 -0.17136,0 -0.39867,0 -0.5,0 -0.5,0 -0.5,0.5 -0.5,0.5 l 0,2 -1.5,0 0,-2 c 0,0 0,-0.5 -0.5,-0.5 -0.0919,0 -0.34778,0 -0.5,0 -0.5,0 -0.5,0.5 -0.5,0.5 l 0,2 -1.5,0 0,-2 c 0,0 0,-0.5 -0.5,-0.5 -0.0981,0 -0.33377,0 -0.5,0 -0.5,0 -0.5,0.5 -0.5,0.5 l 0,2 -1.5,0 0,-2 c 0,0 0,-0.5 -0.5,-0.5 -0.19276,0 -0.38691,0 -0.5,0 z m 1,4 1.5,0 0,3.5 -1.5,0 z m 3,0 1.5,0 0,3.5 -1.5,0 z m 3,0 1.5,0 0,3.5 -1.5,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(0 -1)"/>
-            <path d="m 425,1151.3622 c -0.5,0 -0.5,0.5 -0.5,0.5 l 0,2.5 0,5.5 0,2 c 0,0 0,0.5 0.5,0.5 0.10655,0 0.29254,0 0.5,0 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-1.5 1.5,0 0,1.5 c 0,0 0,0.5 0.5,0.5 0.13055,0 0.41998,0 0.5,0 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-1.5 1.5,0 0,1.5 c 0,0 0,0.5 0.5,0.5 0.15024,0 0.40981,0 0.5,0 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-1.5 1.5,0 0,1.5 c 0,0 0,0.5 0.5,0.5 0.19083,0 0.38799,0 0.5,0 0.5,0 0.5,-0.5 0.5,-0.5 l 0,-10 c 0,0 0,-0.5 -0.5,-0.5 -0.17136,0 -0.39867,0 -0.5,0 -0.5,0 -0.5,0.5 -0.5,0.5 l 0,2 -1.5,0 0,-2 c 0,0 0,-0.5 -0.5,-0.5 -0.0919,0 -0.34778,0 -0.5,0 -0.5,0 -0.5,0.5 -0.5,0.5 l 0,2 -1.5,0 0,-2 c 0,0 0,-0.5 -0.5,-0.5 -0.0981,0 -0.33377,0 -0.5,0 -0.5,0 -0.5,0.5 -0.5,0.5 l 0,2 -1.5,0 0,-2 c 0,0 0,-0.5 -0.5,-0.5 -0.19276,0 -0.38691,0 -0.5,0 z m 1,4 1.5,0 0,3.5 -1.5,0 z m 3,0 1.5,0 0,3.5 -1.5,0 z m 3,0 1.5,0 0,3.5 -1.5,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-        </g>
-        <rect width="18" height="18" x="420" y="1146.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/prison-24.svg b/data/styles/symbols/maki/prison-24.svg
deleted file mode 100644
index 706a0d67d2..0000000000
--- a/data/styles/symbols/maki/prison-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-396 -118)" color="#000">
-        <g>
-            <path d="m 6,1008.3622 c -0.554,0 -1,0.446 -1,1 l 0,3 0,7 0,3 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 l 0,-2 3,0 0,2 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 l 0,-2 3,0 0,2 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 l 0,-2 3,0 0,2 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 l 0,-13 c 0,-0.554 -0.446,-1 -1,-1 -0.554,0 -1,0.446 -1,1 l 0,2 -3,0 0,-2 c 0,-0.554 -0.446,-1 -1,-1 -0.554,0 -1,0.446 -1,1 l 0,2 -3,0 0,-2 c 0,-0.554 -0.446,-1 -1,-1 -0.554,0 -1,0.446 -1,1 l 0,2 -3,0 0,-2 c 0,-0.554 -0.446,-1 -1,-1 z m 1,5 3,0 0,5 -3,0 z m 5,0 3,0 0,5 -3,0 z m 5,0 3,0 0,5 -3,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(395 142)"/>
-            <path d="m 6,1008.3622 c -0.554,0 -1,0.446 -1,1 l 0,3 0,7 0,3 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 l 0,-2 3,0 0,2 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 l 0,-2 3,0 0,2 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 l 0,-2 3,0 0,2 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 l 0,-13 c 0,-0.554 -0.446,-1 -1,-1 -0.554,0 -1,0.446 -1,1 l 0,2 -3,0 0,-2 c 0,-0.554 -0.446,-1 -1,-1 -0.554,0 -1,0.446 -1,1 l 0,2 -3,0 0,-2 c 0,-0.554 -0.446,-1 -1,-1 -0.554,0 -1,0.446 -1,1 l 0,2 -3,0 0,-2 c 0,-0.554 -0.446,-1 -1,-1 z m 1,5 3,0 0,5 -3,0 z m 5,0 3,0 0,5 -3,0 z m 5,0 3,0 0,5 -3,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(395 142)"/>
-        </g>
-        <rect y="1146.362" x="396" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/rail-12.svg b/data/styles/symbols/maki/rail-12.svg
deleted file mode 100644
index 55f7a0431a..0000000000
--- a/data/styles/symbols/maki/rail-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-126 -58)" color="#000">
-        <g>
-            <path d="m 131.5,1102.3622 -1.5,1 0,5.5 c 0,0.25 0.25,0.5 0.5,0.5 l 1.25,0 2.25,0 1.25,0 1.25,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-5.5 -1.5,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1 -2)"/>
-            <path d="m 131.5,1102.3622 -1.5,1 0,5.5 c 0,0.25 0.25,0.5 0.5,0.5 l 1.25,0 2.25,0 1.25,0 1.25,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-5.5 -1.5,-1 z m 0.5,1 3,0 1,0.5 0,1.5 -5,0 0,-1.5 z m -0.5,4 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -2)"/>
-        </g>
-        <rect width="12" height="12" x="126" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/rail-18.svg b/data/styles/symbols/maki/rail-18.svg
deleted file mode 100644
index 21a67526e9..0000000000
--- a/data/styles/symbols/maki/rail-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-108 -64)" color="#000">
-        <g>
-            <path d="m 234,54 -2,1.5 0,7.5 c 0,0.5 0.5,1 1,1 l 9,0 c 0.5,0 1.06608,-0.504386 1,-1 l 0,-7.5 -2,-1.5 z" transform="translate(0 -2) translate(-120 1050.362)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 234,54 -2,1.5 0,7.5 c 0,0.5 0.5,1 1,1 l 9,0 c 0.5,0 1.06608,-0.504386 1,-1 l 0,-7.5 -2,-1.5 z m 1.5,1 4,0 1.5,1 0,2 -7,0 0,-2 z m -1.25,5.5 c 0.41421,0 0.75,0.335786 0.75,0.75 0,0.414214 -0.33579,0.75 -0.75,0.75 -0.41421,0 -0.75,-0.335786 -0.75,-0.75 0,-0.414214 0.33579,-0.75 0.75,-0.75 z m 6.5,0 c 0.41421,0 0.75,0.335786 0.75,0.75 0,0.414214 -0.33579,0.75 -0.75,0.75 -0.41421,0 -0.75,-0.335786 -0.75,-0.75 0,-0.414214 0.33579,-0.75 0.75,-0.75 z" transform="translate(0 -2) translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1098.362" x="108" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/rail-24.svg b/data/styles/symbols/maki/rail-24.svg
deleted file mode 100644
index d04a863a78..0000000000
--- a/data/styles/symbols/maki/rail-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-84 -70)" color="#000">
-        <g>
-            <path d="m 9,77 -3,2 0,11 c 0,0.5 0.5,1 1,1 l 11,0 c 0.5,0 1,-0.5 1,-1 l 0,-11 -3,-2 z" transform="translate(84 21) translate(0 1004.362)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path transform="translate(84 21) translate(0 1004.362)" d="m 9,77 -3,2 0,11 c 0,0.5 0.5,1 1,1 l 2.5,0 3.5,0 2.5,0 2.5,0 c 0.5,0 1,-0.5 1,-1 l 0,-11 -3,-2 z m 1,2 5,0 2,1 0,3 -9,0 0,-3 z m -1,8 c 0.554,0 1,0.446 1,1 0,0.554 -0.446,1 -1,1 -0.554,0 -1,-0.446 -1,-1 0,-0.554 0.446,-1 1,-1 z m 7,0 c 0.554,0 1,0.446 1,1 0,0.554 -0.446,1 -1,1 -0.554,0 -1,-0.446 -1,-1 0,-0.554 0.446,-1 1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="84" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/rail-above-12.svg b/data/styles/symbols/maki/rail-above-12.svg
deleted file mode 100644
index 4d26b53247..0000000000
--- a/data/styles/symbols/maki/rail-above-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-126 -82)" color="#000">
-        <g>
-            <path d="m 130.5,1123.3622 -1.5,1 0,5.5 c 0,0.25 0.25,0.5 0.5,0.5 l 1.25,0 2.25,0 1.25,0 1.25,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-5.5 -1.5,-1 -4,0 z m 0.5,1 3,0 1,0.5 0,1.5 -5,0 0,-1.5 1,-0.5 z m -0.5,4 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m -2.5,3 -3,2 7,0 -3,-2 -1,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 130.5,1123.3622 -1.5,1 0,5.5 c 0,0.25 0.25,0.5 0.5,0.5 l 1.25,0 2.25,0 1.25,0 1.25,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-5.5 -1.5,-1 -4,0 z m 0.5,1 3,0 1,0.5 0,1.5 -5,0 0,-1.5 1,-0.5 z m -0.5,4 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m -2.5,3 -3,2 7,0 -3,-2 -1,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1122.362" x="126" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/rail-above-18.svg b/data/styles/symbols/maki/rail-above-18.svg
deleted file mode 100644
index 2cf52132de..0000000000
--- a/data/styles/symbols/maki/rail-above-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-108 -88)" color="#000">
-        <g>
-            <path d="m 114,1124.3622 -2,1.5 0,7.5 c 0,0.5 0.5,1 1,1 l 9,0 c 0.5,0 1.06608,-0.5044 1,-1 l 0,-7.5 -2,-1.5 z m 2.5,11 -3.5,2 9,0 -3.5,-2 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 234,98 -2,1.5 0,7.5 c 0,0.5 0.5,1 1,1 l 9,0 c 0.5,0 1,-0.5 1,-1 l 0,-7.5 -2,-1.5 z m 1.5,1 4,0 1.5,1 0,2 -7,0 0,-2 z m -0.75,5.5 c 0.41421,0 0.75,0.3358 0.75,0.75 0,0.4142 -0.33579,0.75 -0.75,0.75 -0.41421,0 -0.75,-0.3358 -0.75,-0.75 0,-0.4142 0.33579,-0.75 0.75,-0.75 z m 5.5,0 c 0.41421,0 0.75,0.3358 0.75,0.75 0,0.4142 -0.33579,0.75 -0.75,0.75 -0.41421,0 -0.75,-0.3358 -0.75,-0.75 0,-0.4142 0.33579,-0.75 0.75,-0.75 z m -3.75,4.5 -3.5,2 9,0 -3.5,-2 z" transform="translate(-120 1026.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="18" height="18" x="108" y="1122.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/rail-above-24.svg b/data/styles/symbols/maki/rail-above-24.svg
deleted file mode 100644
index fcd2024644..0000000000
--- a/data/styles/symbols/maki/rail-above-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-84 -94)" color="#000">
-        <g>
-            <path d="m 9,1079.3622 -3,2 0,11 c 0,0.5 0.5,1 1,1 l 11,0 c 0.5,0 1,-0.5 1,-1 l 0,-11 -3,-2 z m 3.5,15 -5.5,3 11,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(84 45)"/>
-            <path d="m 9,1079.3622 -3,2 0,11 c 0,0.5 0.5,1 1,1 l 11,0 c 0.5,0 1,-0.5 1,-1 l 0,-11 -3,-2 z m 1,2 5,0 2,1 0,3 -9,0 0,-3 z m -1,8 c 0.554,0 1,0.446 1,1 0,0.554 -0.446,1 -1,1 -0.554,0 -1,-0.446 -1,-1 0,-0.554 0.446,-1 1,-1 z m 7,0 c 0.554,0 1,0.446 1,1 0,0.554 -0.446,1 -1,1 -0.554,0 -1,-0.446 -1,-1 0,-0.554 0.446,-1 1,-1 z m -3.5,5 -5.5,3 11,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(84 45)"/>
-        </g>
-        <rect y="1122.362" x="84" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/rail-underground-12.svg b/data/styles/symbols/maki/rail-underground-12.svg
deleted file mode 100644
index de5f3213d2..0000000000
--- a/data/styles/symbols/maki/rail-underground-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-126 -58)" color="#000">
-        <g>
-            <path d="m 129,1099.3622 3,2 1,0 3,-2 z m 1.5,3 -1.5,1 0,5.5 c 0,0.25 0.25,0.5 0.5,0.5 l 1.25,0 2.25,0 1.25,0 1.25,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-5.5 -1.5,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 129,1099.3622 3,2 1,0 3,-2 z m 1.5,3 -1.5,1 0,5.5 c 0,0.25 0.25,0.5 0.5,0.5 l 1.25,0 2.25,0 1.25,0 1.25,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l 0,-5.5 -1.5,-1 z m 0.5,1 3,0 1,0.5 0,1.5 -5,0 0,-1.5 z m -0.5,4 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 4,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1098.362" x="126" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/rail-underground-18.svg b/data/styles/symbols/maki/rail-underground-18.svg
deleted file mode 100644
index d4668392e2..0000000000
--- a/data/styles/symbols/maki/rail-underground-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-108 -64)" color="#000">
-        <g>
-            <path d="m 113,1100.3622 3.5,2 2,0 3.5,-2 z m 1,3 -2,1.5 0,7.5 c 0,0.5 0.5,1 1,1 l 9,0 c 0.5,0 1,-0.5 1,-1 l 0,-7.5 -2,-1.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 113,1100.3622 3.5,2 2,0 3.5,-2 z m 1,3 -2,1.5 0,7.5 c 0,0.5 0.5,1 1,1 l 9,0 c 0.5,0 1,-0.5 1,-1 l 0,-7.5 -2,-1.5 z m 1.5,1 4,0 1.5,1 0,2 -7,0 0,-2 z m -0.75,5.5 c 0.41421,0 0.75,0.3358 0.75,0.75 0,0.4142 -0.33579,0.75 -0.75,0.75 -0.41421,0 -0.75,-0.3358 -0.75,-0.75 0,-0.4142 0.33579,-0.75 0.75,-0.75 z m 5.5,0 c 0.41421,0 0.75,0.3358 0.75,0.75 0,0.4142 -0.33579,0.75 -0.75,0.75 -0.41421,0 -0.75,-0.3358 -0.75,-0.75 0,-0.4142 0.33579,-0.75 0.75,-0.75 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="18" height="18" x="108" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/rail-underground-24.svg b/data/styles/symbols/maki/rail-underground-24.svg
deleted file mode 100644
index 70146a4abd..0000000000
--- a/data/styles/symbols/maki/rail-underground-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-84 -70)" color="#000">
-        <g>
-            <path d="m 7,1076.3622 5.5,3 5.5,-3 z m 2,4 -3,2 0,11 c 0,0.5 0.5,1 1,1 l 11,0 c 0.5,0 1,-0.5 1,-1 l 0,-11 -3,-2 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(84 24)"/>
-            <path d="m 7,1076.3622 5.5,3 5.5,-3 z m 2,4 -3,2 0,11 c 0,0.5 0.5,1 1,1 l 2.5,0 3.5,0 2.5,0 2.5,0 c 0.5,0 1,-0.5 1,-1 l 0,-11 -3,-2 z m 1,2 5,0 2,1 0,3 -9,0 0,-3 z m -1,8 c 0.554,0 1,0.446 1,1 0,0.554 -0.446,1 -1,1 -0.554,0 -1,-0.446 -1,-1 0,-0.554 0.446,-1 1,-1 z m 7,0 c 0.554,0 1,0.446 1,1 0,0.554 -0.446,1 -1,1 -0.554,0 -1,-0.446 -1,-1 0,-0.554 0.446,-1 1,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(84 24)"/>
-        </g>
-        <rect y="1098.362" x="84" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/religious-christian-12.svg b/data/styles/symbols/maki/religious-christian-12.svg
deleted file mode 100644
index c1f240d5ae..0000000000
--- a/data/styles/symbols/maki/religious-christian-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-48 -10)" color="#000">
-        <g>
-            <path d="m 54.25,1051.3622 c -0.461667,0 -0.745042,0.3717 -0.75,0.8333 l 0,2.1667 -3,0 0,1.5 3,0 0,5.5 0.666667,0 0.833333,0 0,-5.5 3,0 0,-1.4996 -3,0 0,-2.1667 c 0,-0.4616 -0.288333,-0.8333 -0.75,-0.8333 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 54.25,1051.3622 c -0.461667,0 -0.745042,0.3717 -0.75,0.8333 l 0,2.1667 -3,0 0,1.5 3,0 0,5.5 0.666667,0 0.833333,0 0,-5.5 3,0 0,-1.4996 -3,0 0,-2.1667 c 0,-0.4616 -0.288333,-0.8333 -0.75,-0.8333 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="12" height="12" x="48" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/religious-christian-18.svg b/data/styles/symbols/maki/religious-christian-18.svg
deleted file mode 100644
index d95a1ab634..0000000000
--- a/data/styles/symbols/maki/religious-christian-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-30 -16)" color="#000">
-        <g>
-            <path d="m 38,1051.3622 c -0.738667,0 -1,0.7614 -1,1.5 l 0,2.5 -4,0 0,2 4,0 0,9 2,0 0,-9 4,0 0,-2 -4,0 0,-2.5 c 0,-0.7386 -0.261334,-1.5 -1,-1.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(1)"/>
-            <path d="m 38,1051.3622 c -0.738667,0 -1,0.7614 -1,1.5 l 0,2.5 -4,0 0,2 4,0 0,9 2,0 0,-9 4,0 0,-2 -4,0 0,-2.5 c 0,-0.7386 -0.261334,-1.5 -1,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(1)"/>
-        </g>
-        <rect y="1050.362" x="30" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/religious-christian-24.svg b/data/styles/symbols/maki/religious-christian-24.svg
deleted file mode 100644
index bd5704cee1..0000000000
--- a/data/styles/symbols/maki/religious-christian-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-6 -22)" color="#000">
-        <g>
-            <path d="m 18.5,1053.3622 c -0.831,0 -1.5,0.669 -1.5,1.5 l 0,3.5 -5,0 0,3 5,0 0,10 1.5,0 1.5,0 0,-10 5,0 0,-3 -5,0 0,-3.5 c 0,-0.831 -0.669,-1.5 -1.5,-1.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 18.5,1053.3622 c -0.831,0 -1.5,0.669 -1.5,1.5 l 0,3.5 -5,0 0,3 5,0 0,10 1.5,0 1.5,0 0,-10 5,0 0,-3 -5,0 0,-3.5 c 0,-0.831 -0.669,-1.5 -1.5,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="6" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/religious-jewish-12.svg b/data/styles/symbols/maki/religious-jewish-12.svg
deleted file mode 100644
index afa931d674..0000000000
--- a/data/styles/symbols/maki/religious-jewish-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-48 -58)">
-        <g>
-            <path d="m 54.5,1099.3622 -1.5,2 -3,0 2,2.5 -2,2.5 3,0 1.5,2 1.5,-2 3,0 -2,-2.5 2,-2.5 -3,0 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 54.5,1099.3622 -1.5,2 -3,0 2,2.5 -2,2.5 3,0 1.5,2 1.5,-2 3,0 -2,-2.5 2,-2.5 -3,0 z" fill="#444"/>
-        </g>
-        <rect y="1098.362" x="48" height="12" width="12" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/religious-jewish-18.svg b/data/styles/symbols/maki/religious-jewish-18.svg
deleted file mode 100644
index dfc9a9537d..0000000000
--- a/data/styles/symbols/maki/religious-jewish-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-30 -64)">
-        <g>
-            <path d="m 39.5,1099.3622 -2.5,3 -4,0 2.5,4.5 -2.5,4.5 4,0 2.5,3 2.5,-3 4,0 -2.5,-4.5 2.5,-4.5 -4,0 -2.5,-3 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 39.5,1099.3622 -2.5,3 -4,0 2.5,4.5 -2.5,4.5 4,0 2.5,3 2.5,-3 4,0 -2.5,-4.5 2.5,-4.5 -4,0 -2.5,-3 z" fill="#444"/>
-        </g>
-        <rect width="18" height="18" x="30" y="1098.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/religious-jewish-24.svg b/data/styles/symbols/maki/religious-jewish-24.svg
deleted file mode 100644
index 5fc5158055..0000000000
--- a/data/styles/symbols/maki/religious-jewish-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-6 -70)">
-        <g>
-            <path d="m 18.5,1101.3622 -3,4 -5,0 3,5 -3,5 5,0 3,4 3,-4 5,0 -3,-5 3,-5 -5,0 z" opacity=".3" color="#000" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 18.5,1101.3622 -3,4 -5,0 3,5 -3,5 5,0 3,4 3,-4 5,0 -3,-5 3,-5 -5,0 z" fill="#444"/>
-        </g>
-        <rect y="1098.362" x="6" height="24" width="24" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/religious-muslim-12.svg b/data/styles/symbols/maki/religious-muslim-12.svg
deleted file mode 100644
index 765877411d..0000000000
--- a/data/styles/symbols/maki/religious-muslim-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-48 -34)" color="#000">
-        <g>
-            <path d="m 54,1076.3622 c -2.20914,0 -4,1.7909 -4,4 0,2.2091 1.79086,4 4,4 0.71498,0 1.38793,-0.2026 1.96875,-0.5312 -0.15181,0.02 -0.31145,0.031 -0.46875,0.031 -1.93297,0 -3.5,-1.567 -3.5,-3.5 0,-1.933 1.56703,-3.5 3.5,-3.5 0.1573,0 0.31694,0.011 0.46875,0.031 -0.656459,-0.3737 -1.214844,-0.5308 -1.96875,-0.5308 z m 3,1.5 -1,1.5 -1,0 1,1.5 -0.5,1.5 1.5,-1 1.5,1 -0.5,-1.5 1,-1.5 -1,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 54,1076.3622 c -2.20914,0 -4,1.7909 -4,4 0,2.2091 1.79086,4 4,4 0.71498,0 1.38793,-0.2026 1.96875,-0.5312 -0.15181,0.02 -0.31145,0.031 -0.46875,0.031 -1.93297,0 -3.5,-1.567 -3.5,-3.5 0,-1.933 1.56703,-3.5 3.5,-3.5 0.1573,0 0.31694,0.011 0.46875,0.031 -0.656459,-0.3737 -1.214844,-0.5308 -1.96875,-0.5308 z m 3,1.5 -1,1.5 -1,0 1,1.5 -0.5,1.5 1.5,-1 1.5,1 -0.5,-1.5 1,-1.5 -1,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="12" height="12" x="48" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/religious-muslim-18.svg b/data/styles/symbols/maki/religious-muslim-18.svg
deleted file mode 100644
index 486ceb69c4..0000000000
--- a/data/styles/symbols/maki/religious-muslim-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-30 -40)" color="#000">
-        <g>
-            <path d="m 40,1077.3622 c -3.390415,0 -6,2.6096 -6,6 0,3.3904 2.609585,6 6,6 1.89566,0 3.873911,-0.6497 5,-2 -0.7358,0.479 -2.056598,1 -3,1 -2.59267,0 -4.527778,-2.5462 -4.527778,-5.1389 0,-2.5927 1.935108,-4.8611 4.527778,-4.8611 0.943402,0 2.2642,0.5211 3,1 -1.126089,-1.3502 -3.10434,-2 -5,-2 z m 3.611111,2.6111 -0.722222,2.3889 -2.888889,0 2.527778,1.2222 L 41,1086.3622 43.611111,1084.6678 46,1086.3622 44.694444,1083.5844 47,1082.3622 l -2.666667,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 40,1077.3622 c -3.390415,0 -6,2.6096 -6,6 0,3.3904 2.609585,6 6,6 1.89566,0 3.873911,-0.6497 5,-2 -0.7358,0.479 -2.056598,1 -3,1 -2.59267,0 -4.527778,-2.5462 -4.527778,-5.1389 0,-2.5927 1.935108,-4.8611 4.527778,-4.8611 0.943402,0 2.2642,0.5211 3,1 -1.126089,-1.3502 -3.10434,-2 -5,-2 z m 3.611111,2.6111 -0.722222,2.3889 -2.888889,0 2.527778,1.2222 L 41,1086.3622 43.611111,1084.6678 46,1086.3622 44.694444,1083.5844 47,1082.3622 l -2.666667,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1074.362" x="30" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/religious-muslim-24.svg b/data/styles/symbols/maki/religious-muslim-24.svg
deleted file mode 100644
index b33e9378e9..0000000000
--- a/data/styles/symbols/maki/religious-muslim-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-6 -46)" color="#000">
-        <g>
-            <path d="m 18.5,1077.3622 c -4.69442,0 -8.5,3.8056 -8.5,8.5 0,4.6944 3.80558,8.5 8.5,8.5 2.624764,0 4.972051,-1.1929 6.53125,-3.0625 -1.018799,0.6632 -2.225004,1.0625 -3.53125,1.0625 -3.589851,0 -6.5,-2.9101 -6.5,-6.5 0,-3.5899 2.910149,-6.5 6.5,-6.5 1.306246,0 2.512451,0.3993 3.53125,1.0625 -1.559199,-1.8696 -3.906486,-3.0625 -6.53125,-3.0625 z m 5,4 -1,3 -3.5,0 3,2 -1.5,3.5 3,-2 3,2 -1.5,-3.5 3,-2 -3.5,0 -1,-3 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 18.5,1077.3622 c -4.69442,0 -8.5,3.8056 -8.5,8.5 0,4.6944 3.80558,8.5 8.5,8.5 2.624764,0 4.972051,-1.1929 6.53125,-3.0625 -1.018799,0.6632 -2.225004,1.0625 -3.53125,1.0625 -3.589851,0 -6.5,-2.9101 -6.5,-6.5 0,-3.5899 2.910149,-6.5 6.5,-6.5 1.306246,0 2.512451,0.3993 3.53125,1.0625 -1.559199,-1.8696 -3.906486,-3.0625 -6.53125,-3.0625 z m 5,4 -1,3 -3.5,0 3,2 -1.5,3.5 3,-2 3,2 -1.5,-3.5 3,-2 -3.5,0 -1,-3 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="6" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/restaurant-12.svg b/data/styles/symbols/maki/restaurant-12.svg
deleted file mode 100644
index c6df5d3990..0000000000
--- a/data/styles/symbols/maki/restaurant-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-360 -10)" color="#000">
-        <g>
-            <path d="m 363.5,1051.3622 -0.5,0 c 0,0.8333 0,2.1667 0,3 0,0.5 1,0.5 1,1 l 0,6 1,0 0,-6 c 0,-0.5 1,-0.5 1,-1 0,-0.8333 0,-2.1667 0,-3 l -0.5,0 0,2 -0.75,0 0,-2 -0.5,0 0,2 -0.75,0 z m 6.5,0 c -0.5,0 -1.43377,0.1176 -1.75,0.75 -0.25,0.5 -0.25,1.25 -0.25,2.25 l 0,2.5 1,0 0,4.5 1,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 363.5,1051.3622 -0.5,0 c 0,0.8333 0,2.1667 0,3 0,0.5 1,0.5 1,1 l 0,6 1,0 0,-6 c 0,-0.5 1,-0.5 1,-1 0,-0.8333 0,-2.1667 0,-3 l -0.5,0 0,2 -0.75,0 0,-2 -0.5,0 0,2 -0.75,0 z m 6.5,0 c -0.5,0 -1.43377,0.1176 -1.75,0.75 -0.25,0.5 -0.25,1.25 -0.25,2.25 l 0,2.5 1,0 0,4.5 1,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="12" height="12" x="360" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/restaurant-18.svg b/data/styles/symbols/maki/restaurant-18.svg
deleted file mode 100644
index e7c8ec2be5..0000000000
--- a/data/styles/symbols/maki/restaurant-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-342 -16)" color="#000">
-        <g>
-            <path d="m 348,1052.3622 -1,0 c 0,1.2963 0,3.2037 0,4.5 0,0.7777 1,0.7222 1,1.5 l 0,7 c 0,0.3889 0.5,1 1,1 0.5,0 1,-0.5 1,-1 l 0,-7 c 0,-0.7778 1,-0.7223 1,-1.5 0,-1.2963 0,-3.2037 0,-4.5 l -1,0 0,3 -0.5,0 0,-3 -1,0 0,3 -0.5,0 z m 8,0 c -0.77778,0 -2.00808,0.5162 -2.5,1.5 -0.38889,0.7777 -0.5,2.5 -0.5,3.5 l 0,3 c 0,0.5 0.61111,1 1,1 l 0,4 c 0,0.5 0.5,1 1,1 0.5,0 1,-0.5 1,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 348,1052.3622 -1,0 c 0,1.2963 0,3.2037 0,4.5 0,0.7777 1,0.7222 1,1.5 l 0,7 c 0,0.3889 0.5,1 1,1 0.5,0 1,-0.5 1,-1 l 0,-7 c 0,-0.7778 1,-0.7223 1,-1.5 0,-1.2963 0,-3.2037 0,-4.5 l -1,0 0,3 -0.5,0 0,-3 -1,0 0,3 -0.5,0 z m 8,0 c -0.77778,0 -2.00808,0.5162 -2.5,1.5 -0.38889,0.7777 -0.5,2.5 -0.5,3.5 l 0,3 c 0,0.5 0.61111,1 1,1 l 0,4 c 0,0.5 0.5,1 1,1 0.5,0 1,-0.5 1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1050.362" x="342" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/restaurant-24.svg b/data/styles/symbols/maki/restaurant-24.svg
deleted file mode 100644
index 2416f53598..0000000000
--- a/data/styles/symbols/maki/restaurant-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-318 -22)" color="#000">
-        <g>
-            <path transform="translate(0 -1) translate(-198 1027.362)" d="m 523.5,26 c -0.5,0 -0.5,0.5 -0.5,0.5 l 0,6 c 0,0.505147 0.5,1 1,1.5 0.5,0.5 0.52601,1.00584 0.5,1.5 l 0,1.5 -0.5,6.5 c -0.0383,0.4985 0.5,1.5 1.5,1.5 1,0 1.53846,-1 1.5,-1.5 l -0.5,-6.5 0,-1.5 c 0,-0.478617 0,-1 0.5,-1.5 0.46054,-0.460539 1,-0.978617 1,-1.5 l 0,-6 c 0,0 0,-0.5 -0.5,-0.5 -0.5,0 -0.5,0.5 -0.5,0.5 l 0,4.5 c 0,0 0,0.5 -0.5,0.5 C 526,31.5 526,31 526,31 l 0,-4.5 c 0,0 0,-0.5 -0.5,-0.5 -0.5,0 -0.5,0.5 -0.5,0.5 l 0,4.5 c 0,0 0,0.5 -0.5,0.5 C 524,31.5 524,31 524,31 l 0,-4.5 c 0,0 0,-0.5 -0.5,-0.5 z m 10.5,0 c -1,0 -2.86754,0.2351 -3.5,1.5 -0.5,1 -0.5,3.5 -0.5,4.5 l 0,5 c 0,0.5 0.5,1 1,1 l 1,0 0,6 c 0,0.5 0.5,1 1,1 0.5,0 1,-0.5 1,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 523.5,26 c -0.5,0 -0.5,0.5 -0.5,0.5 l 0,6 c 0,0.5 0.5,1 1,1.5 0.5,0.5 0.5,1 0.5,1.5 0,0 0,1 0,1.5 0,0.5 -0.5,6.5 -0.5,6.5 -0.0383,0.4985 0.5,1.5 1.5,1.5 1,0 1.53846,-1 1.5,-1.5 0,0 -0.5,-6 -0.5,-6.5 0,-0.5 0,-1.5 0,-1.5 0,-0.5 0,-1 0.5,-1.5 0.46054,-0.460539 1,-1 1,-1.5 l 0,-6 c 0,0 0,-0.5 -0.5,-0.5 -0.5,0 -0.5,0.5 -0.5,0.5 l 0,4.5 c 0,0 0,0.5 -0.5,0.5 C 526,31.5 526,31 526,31 l 0,-4.5 c 0,0 0,-0.5 -0.5,-0.5 -0.5,0 -0.5,0.5 -0.5,0.5 l 0,4.5 c 0,0 0,0.5 -0.5,0.5 C 524,31.5 524,31 524,31 l 0,-4.5 c 0,0 0,-0.5 -0.5,-0.5 z m 10.5,0 c -1,0 -2.86754,0.2351 -3.5,1.5 -0.5,1 -0.5,3.5 -0.5,4.5 l 0,5 c 0,0.5 0.5,1 1,1 l 1,0 0,6 c 0,0.5 0.5,1 1,1 0.5,0 1,-0.5 1,-1 z" transform="translate(0 -1) translate(-198 1027.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="318" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/roadblock-12.svg b/data/styles/symbols/maki/roadblock-12.svg
deleted file mode 100644
index afed65f73b..0000000000
--- a/data/styles/symbols/maki/roadblock-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-594 -34)" color="#000">
-        <g>
-            <path d="m 600.5,1075.3622 c -2.48528,0 -4.5,2.0147 -4.5,4.5 0,2.4853 2.01472,4.5 4.5,4.5 2.48528,0 4.5,-2.0147 4.5,-4.5 0,-2.4853 -2.01472,-4.5 -4.5,-4.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 600.5,1075.3622 c -2.48528,0 -4.5,2.0147 -4.5,4.5 0,2.4853 2.01472,4.5 4.5,4.5 2.48528,0 4.5,-2.0147 4.5,-4.5 0,-2.4853 -2.01472,-4.5 -4.5,-4.5 z m -2.5,4 5,0 0,1 -5,0 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="12" height="12" x="594" y="1074.362" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/roadblock-18.svg b/data/styles/symbols/maki/roadblock-18.svg
deleted file mode 100644
index 287ac608d0..0000000000
--- a/data/styles/symbols/maki/roadblock-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-108 -280)" color="#000">
-        <rect y="1314.362" x="108" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 117.5,1316.3622 c -3.58985,0 -6.5,2.9102 -6.5,6.5 0,3.5899 2.91015,6.5 6.5,6.5 3.58985,0 6.5,-2.9101 6.5,-6.5 0,-3.5898 -2.91015,-6.5 -6.5,-6.5 z m -3.5,6 7,0 0,2 -7,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 117.5,1316.3622 c -3.58985,0 -6.5,2.9102 -6.5,6.5 0,3.5899 2.91015,6.5 6.5,6.5 3.58985,0 6.5,-2.9101 6.5,-6.5 0,-3.5898 -2.91015,-6.5 -6.5,-6.5 z m -3.5,6 7,0 0,2 -7,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/roadblock-24.svg b/data/styles/symbols/maki/roadblock-24.svg
deleted file mode 100644
index d8b501d23e..0000000000
--- a/data/styles/symbols/maki/roadblock-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-552 -46)" color="#000">
-        <g>
-            <path d="m 564.5,1076.3622 c -4.69444,0 -8.5,3.8056 -8.5,8.5 0,4.6944 3.80556,8.5 8.5,8.5 4.69444,0 8.5,-3.8056 8.5,-8.5 0,-4.6944 -3.80556,-8.5 -8.5,-8.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 564.5,1076.3622 c -4.69444,0 -8.5,3.8056 -8.5,8.5 0,4.6944 3.80556,8.5 8.5,8.5 4.69444,0 8.5,-3.8056 8.5,-8.5 0,-4.6944 -3.80556,-8.5 -8.5,-8.5 z m -5.5,7 11,0 0,3 -11,0 0,-3 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="552" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/rocket-12.svg b/data/styles/symbols/maki/rocket-12.svg
deleted file mode 100644
index cff4692e4f..0000000000
--- a/data/styles/symbols/maki/rocket-12.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g>
-        <path transform="translate(0 -1040.362) translate(0 1040.362)" d="M 11 1 C 9 1 4 4 4 7 L 5 8 C 8 8 11 3 11 1 z M 8 3 L 9 3 L 9 4 L 8 4 L 8 3 z M 3 4 L 2 6 L 2 7.5 L 3 6 L 3.5 6 L 4.75 4 L 3 4 z M 8 7.25 L 6 8.5 L 6 9 L 4.5 10 L 6 10 L 8 9 L 8 7.25 z" stroke="#fff" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" opacity=".3" fill="none"/>
-        <path d="M 11 1 C 9 1 4 4 4 7 L 5 8 C 8 8 11 3 11 1 z M 8 3 L 9 3 L 9 4 L 8 4 L 8 3 z M 3 4 L 2 6 L 2 7.5 L 3 6 L 3.5 6 L 4.75 4 L 3 4 z M 8 7.25 L 6 8.5 L 6 9 L 4.5 10 L 6 10 L 8 9 L 8 7.25 z" transform="translate(0 -1040.362) translate(0 1040.362)" fill="#444"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/rocket-18.svg b/data/styles/symbols/maki/rocket-18.svg
deleted file mode 100644
index 16ed6a9842..0000000000
--- a/data/styles/symbols/maki/rocket-18.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g>
-        <path transform="translate(0 -1034.362) translate(0 1034.362)" d="M 16.53125 1 C 15.376152 0.95337344 12.042545 2.36375 9.53125 4.875 C 7.378712 7.0275 5.59375 10.25 5.59375 10.25 C 5.59375 10.9674 7.0324874 12.40625 7.75 12.40625 C 7.75 12.40625 10.784962 10.80885 12.9375 8.65625 C 15.80755 5.78625 17.413134 1.663 16.875 1.125 C 16.807733 1.057725 16.696264 1.0066609 16.53125 1 z M 12.5 4.25 C 13.190356 4.25 13.75 4.8096441 13.75 5.5 C 13.75 6.1903559 13.190356 6.75 12.5 6.75 C 11.809644 6.75 11.25 6.1903559 11.25 5.5 C 11.25 4.8096441 11.809644 4.25 12.5 4.25 z M 5 7 L 2 9.5 L 2 10 L 5 9 L 5.75 9 L 7 7 L 5 7 z M 11 11 L 9 12.25 L 9 13 L 8 16 L 8.5 16 L 11 13 L 11 11 z" stroke="#fff" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" opacity=".3" fill="none"/>
-        <path d="M 16.53125 1 C 15.376152 0.95337344 12.042545 2.36375 9.53125 4.875 C 7.378712 7.0275 5.59375 10.25 5.59375 10.25 C 5.59375 10.9674 7.0324874 12.40625 7.75 12.40625 C 7.75 12.40625 10.784962 10.80885 12.9375 8.65625 C 15.80755 5.78625 17.413134 1.663 16.875 1.125 C 16.807733 1.057725 16.696264 1.0066609 16.53125 1 z M 12.5 4.25 C 13.190356 4.25 13.75 4.8096441 13.75 5.5 C 13.75 6.1903559 13.190356 6.75 12.5 6.75 C 11.809644 6.75 11.25 6.1903559 11.25 5.5 C 11.25 4.8096441 11.809644 4.25 12.5 4.25 z M 5 7 L 2 9.5 L 2 10 L 5 9 L 5.75 9 L 7 7 L 5 7 z M 11 11 L 9 12.25 L 9 13 L 8 16 L 8.5 16 L 11 13 L 11 11 z" transform="translate(0 -1034.362) translate(0 1034.362)" fill="#444"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/rocket-24.svg b/data/styles/symbols/maki/rocket-24.svg
deleted file mode 100644
index 0d8000f706..0000000000
--- a/data/styles/symbols/maki/rocket-24.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g>
-        <path transform="translate(0 -1028.362) translate(0 1028.362)" d="M 22.75,1.25 C 22,0.5 16.5,2.5 12.5,6.5 9.5,9.5 7,14 7,14 c 0,1 2,3 3,3 0,0 4.5,-2.5 7.5,-5.5 4,-4 6,-9.5 5.25,-10.25 z M 16.5,6 C 17.328427,6 18,6.6715729 18,7.5 18,8.3284271 17.328427,9 16.5,9 15.671573,9 15,8.3284271 15,7.5 15,6.6715729 15.671573,6 16.5,6 z M 6,9 2,13 2,14 6,12 7.5,12 9,9 z m 9,6 -3,1.5 0,1.5 -2,4 1,0 4,-4 z" fill="#666" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" opacity=".3"/>
-        <path d="M 22.75,1.25 C 22,0.5 16.5,2.5 12.5,6.5 9.5,9.5 7,14 7,14 c 0,1 2,3 3,3 0,0 4.25,-2.25 7.25,-5.25 4,-4 6.25,-9.75 5.5,-10.5 z M 16.5,6 C 17.328427,6 18,6.6715729 18,7.5 18,8.3284271 17.328427,9 16.5,9 15.671573,9 15,8.3284271 15,7.5 15,6.6715729 15.671573,6 16.5,6 z M 6,9 l -4,4 0,1 4,-2 1.25,0 2,-3 z m 9,5.75 -3,2 0,1.25 -2,4 1,0 4,-4 z" transform="translate(0 -1028.362) translate(0 1028.362)" fill="#444"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/school-12.svg b/data/styles/symbols/maki/school-12.svg
deleted file mode 100644
index 7e0fb5b42c..0000000000
--- a/data/styles/symbols/maki/school-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-282 -10)" color="#000">
-        <g>
-            <path d="m 289,1051.8622 c -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z m -4,1 c -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z m 4.5,1.5 -0.5,0 -2,1 0,1 2,-1 0,1 0,1.5625 -1,3.4375 1,0 1,-3.5 c 0,0 0.25,1.4999 1.25,1.5 0.60093,10e-5 1.41667,0 1.75,0 l 0,-0.75 c -0.25,0 -1.25,-10e-5 -1.5,0 -0.53359,2e-4 -0.5,-0.8012 -0.5,-1.25 0,-0.7501 -0.5,-2 -0.5,-2 l 1.5,0.9375 c 0.4532,0.3021 0.84576,-0.2329 0.40625,-0.5625 l -1.65625,-1.125 c -0.30176,-0.2149 -0.39841,-0.2499 -0.75,-0.25 z m -4.75,1 c -0.25,0 -0.36824,0.1183 -0.5,0.25 l -1.0625,1.0625 c -0.1368,0.1368 -0.1875,0.2593 -0.1875,0.4375 0,0.25 0.38216,0.3678 0.59375,0.1563 l 0.90625,-0.9063 0.5,0 0,1 -1,2.75 c -0.20218,0.556 0.57214,0.7243 0.75,0.25 l 0.50463,-1.3 2.74537,0 0,-0.7 -1.5,0 0,-2 c 0,-0.5 -0.5,-1 -1,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 289,1051.8622 c -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z m -4,1 c -0.55228,0 -1,0.4477 -1,1 0,0.5523 0.44772,1 1,1 0.55228,0 1,-0.4477 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z m 4.5,1.5 -0.5,0 -2,1 0,1 2,-1 0,1 0,1.5625 -1,3.4375 1,0 1,-3.5 c 0,0 0.25,1.4999 1.25,1.5 0.60093,10e-5 1.41667,0 1.75,0 l 0,-0.75 c -0.25,0 -1.25,-10e-5 -1.5,0 -0.53359,2e-4 -0.5,-0.8012 -0.5,-1.25 0,-0.7501 -0.5,-2 -0.5,-2 l 1.5,0.9375 c 0.4532,0.3021 0.84576,-0.2329 0.40625,-0.5625 l -1.65625,-1.125 c -0.30176,-0.2149 -0.39841,-0.2499 -0.75,-0.25 z m -4.75,1 c -0.25,0 -0.36824,0.1183 -0.5,0.25 l -1.0625,1.0625 c -0.1368,0.1368 -0.1875,0.2593 -0.1875,0.4375 0,0.25 0.38216,0.3678 0.59375,0.1563 l 0.90625,-0.9063 0.5,0 0,1 -1,2.75 c -0.20218,0.556 0.57214,0.7243 0.75,0.25 l 0.50463,-1.3 2.74537,0 0,-0.7 -1.5,0 0,-2 c 0,-0.5 -0.5,-1 -1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="12" height="12" x="282" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/school-18.svg b/data/styles/symbols/maki/school-18.svg
deleted file mode 100644
index 3bdbb12549..0000000000
--- a/data/styles/symbols/maki/school-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-264 -16)" color="#000">
-        <g>
-            <path d="m 274.75,1053.3622 c -0.69036,0 -1.25,0.5596 -1.25,1.25 0,0.6904 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.5596 1.25,-1.25 0,-0.6904 -0.55964,-1.25 -1.25,-1.25 z m -5.6875,1 c -0.69036,0 -1.25,0.5596 -1.25,1.25 0,0.6904 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.5596 1.25,-1.25 0,-0.6904 -0.55964,-1.25 -1.25,-1.25 z m 6.6875,2 c -0.27951,0 -0.73981,0.1009 -1.125,0.375 l -2.4375,1.75 c -0.66135,0.4706 -0.0545,1.2832 0.5625,0.875 l 1.59375,-1.0625 c 0,0 0.43663,0.3561 0.65625,1.0625 l -0.0312,1.8438 -1.625,4.3437 c -0.18821,0.5019 0.16603,0.8175 0.53125,0.8125 0.23949,0 0.47639,-0.1604 0.59375,-0.4375 l 2.03125,-4.5625 c 0,0 0.375,1.9999 1.875,2 0.90139,10e-5 1.625,0 2.125,0 0.5,0 0.5,-0.5 0.5,-0.5 0,0 0,-0.5 -0.5,-0.5 -0.375,0 -1.625,-10e-5 -2,0 0,0 -0.5,0 -0.5,-1 0,-0.7037 -0.78022,-2.4984 -1,-3 l 0,-0.5 2.5,1.375 c 0.6798,0.4533 1.28427,-0.3492 0.625,-0.8437 l -2.625,-1.5313 c -0.51696,-0.2904 -1.08223,-0.5 -1.75,-0.5 z m -7.125,1 c -0.375,0 -0.55236,0.1774 -0.75,0.375 l -1.59375,1.5938 c -0.2052,0.2052 -0.28125,0.3888 -0.28125,0.6562 0,0.375 0.55763,0.5673 0.875,0.25 l 1.375,-1.375 c 0.3148,0 0.75,0.039 0.75,0.5 l 0,2.125 -1.125,3 c -0.3116,0.8309 0.8582,1.0865 1.125,0.375 l 1.125,-3 c 0,0 0.375,0.5 1.125,0.5 l 2.1875,0 c 0.75,0 0.75,-1 0,-1 l -1.9375,0 c 0,0 -0.5,0 -0.5,-0.5 l 0,-0.75 c 0,-1.5 -0.5,-2.75 -1.25,-2.75 l -1.125,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(0 -1)"/>
-            <path d="m 274.75,1053.3622 c -0.69036,0 -1.25,0.5596 -1.25,1.25 0,0.6904 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.5596 1.25,-1.25 0,-0.6904 -0.55964,-1.25 -1.25,-1.25 z m -5.6875,1 c -0.69036,0 -1.25,0.5596 -1.25,1.25 0,0.6904 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.5596 1.25,-1.25 0,-0.6904 -0.55964,-1.25 -1.25,-1.25 z m 6.6875,2 c -0.27951,0 -0.73981,0.1009 -1.125,0.375 l -2.4375,1.75 c -0.66135,0.4706 -0.0545,1.2832 0.5625,0.875 l 1.59375,-1.0625 c 0,0 0.43663,0.3561 0.65625,1.0625 l -0.0312,1.8438 -1.625,4.3437 c -0.18821,0.5019 0.16603,0.8175 0.53125,0.8125 0.23949,0 0.47639,-0.1604 0.59375,-0.4375 l 2.03125,-4.5625 c 0,0 0.375,1.9999 1.875,2 0.90139,10e-5 1.625,0 2.125,0 0.5,0 0.5,-0.5 0.5,-0.5 0,0 0,-0.5 -0.5,-0.5 -0.375,0 -1.625,-10e-5 -2,0 0,0 -0.5,0 -0.5,-1 0,-0.7037 -0.78022,-2.4984 -1,-3 l 0,-0.5 2.5,1.375 c 0.6798,0.4533 1.28427,-0.3492 0.625,-0.8437 l -2.625,-1.5313 c -0.51696,-0.2904 -1.08223,-0.5 -1.75,-0.5 z m -7.125,1 c -0.375,0 -0.55236,0.1774 -0.75,0.375 l -1.59375,1.5938 c -0.2052,0.2052 -0.28125,0.3888 -0.28125,0.6562 0,0.375 0.55763,0.5673 0.875,0.25 l 1.375,-1.375 c 0.3148,0 0.75,0.039 0.75,0.5 l 0,2.125 -1.125,3 c -0.3116,0.8309 0.8582,1.0865 1.125,0.375 l 1.125,-3 c 0,0 0.375,0.5 1.125,0.5 l 2.1875,0 c 0.75,0 0.75,-1 0,-1 l -1.9375,0 c 0,0 -0.5,0 -0.5,-0.5 l 0,-0.75 c 0,-1.5 -0.5,-2.75 -1.25,-2.75 l -1.125,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-        </g>
-        <rect y="1050.362" x="264" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/school-24.svg b/data/styles/symbols/maki/school-24.svg
deleted file mode 100644
index bdf22684be..0000000000
--- a/data/styles/symbols/maki/school-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-240 -22)">
-        <g>
-            <path d="m 254.75,1053.3622 c -0.9695,0 -1.75,0.7805 -1.75,1.75 0,0.9695 0.7805,1.75 1.75,1.75 0.9695,0 1.75,-0.7805 1.75,-1.75 0,-0.9695 -0.7805,-1.75 -1.75,-1.75 z m -8,2 c -0.9695,0 -1.75,0.7805 -1.75,1.75 0,0.9695 0.7805,1.75 1.75,1.75 0.9695,0 1.75,-0.7805 1.75,-1.75 0,-0.9695 -0.7805,-1.75 -1.75,-1.75 z m 9.25,2 c -0.37268,0 -0.98641,0.1345 -1.5,0.5 l -3.25,2.3125 c -0.8818,0.6275 -0.0727,1.7318 0.75,1.1875 l 2.125,-1.4062 c 0,0 1.40104,3.0042 0.875,4.4062 -0.0176,0.047 -0.0325,0.089 -0.0312,0.125 l -2.1875,5.8125 c -0.25094,0.6691 0.23179,1.0692 0.71875,1.0625 0.31932,0 0.62478,-0.193 0.78125,-0.5625 L 257,1064.3622 c 0,0 0.5,2.9998 2.5,3 1.20185,10e-5 2.08333,0 2.75,0 0.75,0 0.75,-0.75 0.75,-0.75 0,0 0,-0.75 -0.75,-0.75 -0.5,0 -1.75,-2e-4 -2.25,0 -1.06719,4e-4 -1,-1.6025 -1,-2.5 0,-1.5002 -1,-4 -1,-4 l 3,2 c 0.90639,0.6043 1.69152,-0.4657 0.8125,-1.125 l -3.3125,-2.375 c -0.60352,-0.4299 -0.79682,-0.4999 -1.5,-0.5 0,0 -0.5,0 -1,0 z m -10.5,2 c -0.5,0 -0.73648,0.2365 -1,0.5 l -2.125,2.125 c -0.2736,0.2736 -0.375,0.5185 -0.375,0.875 0,0.5 0.76433,0.7356 1.1875,0.3125 L 245,1061.3622 c 1,0 1.375,2.5 1,3.5 l -1.5,4 c -0.41546,1.1079 1.14426,1.4486 1.5,0.5 l 1.5,-4 c 0,0 0.5,1 1.5,1 l 3,0 c 1,0 1,-1.5 0,-1.5 l -2.5,0 c -0.5,0 -0.5,-1 -0.5,-1.5 0,-2 -1,-4 -2,-4 z" opacity=".3" color="#000" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="M 86.75,51 C 85.7805,51 85,51.7805 85,52.75 c 0,0.9695 0.7805,1.75 1.75,1.75 0.9695,0 1.75,-0.7805 1.75,-1.75 C 88.5,51.7805 87.7195,51 86.75,51 z m -8,2 C 77.7805,53 77,53.7805 77,54.75 c 0,0.9695 0.7805,1.75 1.75,1.75 0.9695,0 1.75,-0.7805 1.75,-1.75 C 80.5,53.7805 79.7195,53 78.75,53 z M 88,55 c -0.372678,0 -0.986408,0.1345 -1.5,0.5 l -3.25,2.3125 C 82.368196,58.44 83.17732,59.5443 84,59 l 2.125,-1.40625 c 0,0 1.401043,3.00425 0.875,4.40625 -0.01757,0.04683 -0.03251,0.08933 -0.03125,0.125 l -2.1875,5.8125 C 84.530309,68.606628 85.013036,69.006672 85.5,69 c 0.31932,-0.0044 0.624779,-0.193035 0.78125,-0.5625 L 89,62 c 0,0 0.5,2.9998 2.5,3 1.20185,1e-4 2.083333,0 2.75,0 C 95,65 95,64.25 95,64.25 c 0,0 0,-0.75 -0.75,-0.75 -0.5,0 -1.75,-2e-4 -2.25,0 -1.067187,4e-4 -1,-1.6025 -1,-2.5 0,-1.5002 -1,-4 -1,-4 l 3,2 c 0.906394,0.6043 1.691522,-0.4657 0.8125,-1.125 L 90.5,55.5 C 89.896477,55.0701 89.703177,55.0001 89,55 c 0,0 -0.5,0 -1,0 z m -10.5,2 c -0.5,0 -0.736476,0.2365 -1,0.5 l -2.125,2.125 C 74.1014,59.8986 74,60.1435 74,60.5 c 0,0.5 0.764327,0.7356 1.1875,0.3125 L 77,59 c 1,0 1.375,2.5 1,3.5 l -1.5,4 c -0.415461,1.1079 1.144264,1.4486 1.5,0.5 l 1.5,-4 c 0,0 0.5,1 1.5,1 l 3,0 c 1,0 1,-1.5 0,-1.5 l -2.5,0 C 81,62.5 81,61.5 81,61 81,59 80,57 79,57 z" transform="translate(168 1002.362)" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="240" y="1050.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/shop-12.svg b/data/styles/symbols/maki/shop-12.svg
deleted file mode 100644
index 0d52f3af35..0000000000
--- a/data/styles/symbols/maki/shop-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-360 -58)" color="#000">
-        <g>
-            <path d="m 365.17188,1099.8622 c -0.5,0 -0.92565,0.5056 -1,1 l -0.17188,1.5 -1,0 c -0.25,0 -0.5,0.25 -0.5,0.5 l -0.5,5 c 0,0.25 0.25,0.5 0.5,0.5 l 8,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l -0.5,-5 c 0,-0.25 -0.25,-0.5 -0.5,-0.5 l -1,0 -0.17187,-1.5 c -0.0569,-0.4967 -0.5,-1 -1,-1 z m 0,0.5 2.65625,0 c 0.25,0 0.4679,0.2199 0.5,0.5 l 0.17187,1.5 -4,0 0.17188,-1.5 c 0.0285,-0.2483 0.25,-0.5 0.5,-0.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 365.17188,1099.8622 c -0.5,0 -0.92565,0.5056 -1,1 l -0.17188,1.5 -1,0 c -0.25,0 -0.5,0.25 -0.5,0.5 l -0.5,5 c 0,0.25 0.25,0.5 0.5,0.5 l 8,0 c 0.25,0 0.5,-0.25 0.5,-0.5 l -0.5,-5 c 0,-0.25 -0.25,-0.5 -0.5,-0.5 l -1,0 -0.17187,-1.5 c -0.0569,-0.4967 -0.5,-1 -1,-1 z m 0,0.5 2.65625,0 c 0.25,0 0.4679,0.2199 0.5,0.5 l 0.17187,1.5 -4,0 0.17188,-1.5 c 0.0285,-0.2483 0.25,-0.5 0.5,-0.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="12" height="12" x="360" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/shop-18.svg b/data/styles/symbols/maki/shop-18.svg
deleted file mode 100644
index b38a91fbb6..0000000000
--- a/data/styles/symbols/maki/shop-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-342 -64)" color="#000">
-        <g>
-            <path d="m 350.26471,1100.3622 c -0.76471,0 -1.61475,0.7502 -1.76471,1.5 l -0.5,2.5 -1,0 c -0.38235,0 -1,0.6177 -1,1 l -1,8.2353 c 0,0.3823 0.5,0.7647 1,0.7647 l 11,0 c 0.5,0 1,-0.3824 1,-0.7647 l -1,-8.2353 c 0,-0.3823 -0.61765,-1 -1,-1 l -1,0 -0.5,-2.5 c -0.14996,-0.7498 -0.99999,-1.5 -1.7647,-1.5 z m 0,0.7647 2.47059,0 c 0.38236,0 0.92503,0.3604 1,0.7353 l 0.5,2.5 -5.4706,0 0.50001,-2.5 c 0.075,-0.3749 0.61764,-0.7353 1,-0.7353 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m 350.26471,1100.3622 c -0.76471,0 -1.61475,0.7502 -1.76471,1.5 l -0.5,2.5 -1,0 c -0.38235,0 -1,0.6177 -1,1 l -1,8.2353 c 0,0.3823 0.5,0.7647 1,0.7647 l 11,0 c 0.5,0 1,-0.3824 1,-0.7647 l -1,-8.2353 c 0,-0.3823 -0.61765,-1 -1,-1 l -1,0 -0.5,-2.5 c -0.14996,-0.7498 -0.99999,-1.5 -1.7647,-1.5 z m 0,0.7647 2.47059,0 c 0.38236,0 0.92503,0.3604 1,0.7353 l 0.5,2.5 -5.4706,0 0.50001,-2.5 c 0.075,-0.3749 0.61764,-0.7353 1,-0.7353 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1098.362" x="342" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/shop-24.svg b/data/styles/symbols/maki/shop-24.svg
deleted file mode 100644
index dce15182ad..0000000000
--- a/data/styles/symbols/maki/shop-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-318 -70)" color="#000">
-        <g>
-            <path d="m 330,1102.3622 c -1,0 -1.88616,1.0065 -2,2 l -0.34375,3 -1.65625,0 c -0.5,0 -1,0.5 -1,1 l -1,10 c 0,0.5 0.5,1 1,1 l 13,0 c 0.5,0 1,-0.5 1,-1 l -1,-10 c 0,-0.5 -0.5,-1 -1,-1 l -1.65625,0 -0.34375,-3 c -0.11384,-0.9935 -1,-2 -2,-2 z m 0,1 3,0 c 0.5,0 0.94308,0.5033 1,1 l 0.34375,3 -5.6875,0 0.34375,-3 c 0.0569,-0.4967 0.5,-1 1,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1 -1)"/>
-            <path d="m 330,1102.3622 c -1,0 -1.88616,1.0065 -2,2 l -0.34375,3 -1.65625,0 c -0.5,0 -1,0.5 -1,1 l -1,10 c 0,0.5 0.5,1 1,1 l 13,0 c 0.5,0 1,-0.5 1,-1 l -1,-10 c 0,-0.5 -0.5,-1 -1,-1 l -1.65625,0 -0.34375,-3 c -0.11384,-0.9935 -1,-2 -2,-2 z m 0,1 3,0 c 0.5,0 0.94308,0.5033 1,1 l 0.34375,3 -5.6875,0 0.34375,-3 c 0.0569,-0.4967 0.5,-1 1,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-        </g>
-        <rect width="24" height="24" x="318" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/skiing-12.svg b/data/styles/symbols/maki/skiing-12.svg
deleted file mode 100644
index 308e064eae..0000000000
--- a/data/styles/symbols/maki/skiing-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-516 -226)" color="#000">
-        <g>
-            <path d="m 522,1269.3622 c -0.5,0 -1,1 -1,1.5 l 0,2 -1.625,0.7813 -1.375,-0.7813 0,0.5 7,4 0,-0.5 -4.6875,-2.6875 1.6875,-0.625 0,-2.1875 0.5,0 0.5,0 1,1.5 0,1.5 1,1 1,0 0,-1 -1,0 0,-1.5 -0.5,-2.5 -1.5,-1 -1,0 z m 4.5,1.5 c -0.55227,0 -1,0.4477 -1,1 0,0.5523 0.44773,1 1,1 0.18732,0 0.35013,-0.067 0.5,-0.1562 l 0,-1.6875 c -0.14987,-0.09 -0.31268,-0.1563 -0.5,-0.1563 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(0 -1)"/>
-            <path d="m 522,1269.3622 c -0.5,0 -1,1 -1,1.5 l 0,2 -1.625,0.7813 -1.375,-0.7813 0,0.5 7,4 0,-0.5 -4.6875,-2.6875 1.6875,-0.625 0,-2.1875 0.5,0 0.5,0 1,1.5 0,1.5 1,1 1,0 0,-1 -1,0 0,-1.5 -0.5,-2.5 -1.5,-1 -1,0 z m 4.5,1.5 c -0.55227,0 -1,0.4477 -1,1 0,0.5523 0.44773,1 1,1 0.18732,0 0.35013,-0.067 0.5,-0.1562 l 0,-1.6875 c -0.14987,-0.09 -0.31268,-0.1563 -0.5,-0.1563 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-        </g>
-        <rect width="12" height="12" x="516" y="1266.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/skiing-18.svg b/data/styles/symbols/maki/skiing-18.svg
deleted file mode 100644
index 6ceaf46b6a..0000000000
--- a/data/styles/symbols/maki/skiing-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-498 -232)" color="#000">
-        <g>
-            <path d="m 506,1270.3622 c -1,0 -1.5,0.5 -1.5,1.5 0,0.3954 0.13581,0.6569 0.21875,1 l 0.78125,2 -2.8125,1.9688 -2.6875,-1.4688 0,1 11,6 1,0 1,-1 -0.5,-0.5 -0.5,-0.5 0,1 -1,0 -7,-3.8125 2.46875,-1.6562 c 0.24517,-0.168 0.60181,-0.2426 0.53125,-0.5313 l -0.53125,-1.4687 2.53125,1.4687 0.625,1.9688 c 0.0568,0.2121 0.20539,0.4114 0.40625,0.5 l 1.6875,0.7187 c 1.18342,0.5187 1.34713,-0.611 0.59375,-0.9375 l -1.375,-0.5937 -0.9375,-2.6563 0,-2 -2.5,-1.4062 c -0.57936,-0.3344 -1,-0.5938 -1.5,-0.5938 z m 6.5,1.5 c -0.8139,0 -1.5,0.6861 -1.5,1.5 0,0.814 0.6861,1.5 1.5,1.5 0.81389,0 1.5,-0.686 1.5,-1.5 0,-0.8139 -0.68611,-1.5 -1.5,-1.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(0 -1)"/>
-            <path d="m 626,220 c -1,0 -1.5,0.5 -1.5,1.5 0,0.3954 0.13581,0.6569 0.21875,1 l 0.78125,2 -2.8125,1.96875 L 620,225 l 0,1 11,6 1,0 1,-1 -0.5,-0.5 -0.5,-0.5 0,1 -1,0 -7,-3.8125 2.46875,-1.65625 C 626.71392,225.36325 627.07056,225.2887 627,225 L 626.46875,223.53125 629,225 l 0.625,1.96875 c 0.0568,0.2121 0.20539,0.4114 0.40625,0.5 l 1.6875,0.71875 c 1.18342,0.5187 1.34713,-0.611 0.59375,-0.9375 l -1.375,-0.59375 L 630,224 l 0,-2 -2.5,-1.40625 C 626.92064,220.25935 626.5,220 626,220 z m 6.5,1.5 c -0.8139,0 -1.5,0.6861 -1.5,1.5 0,0.814 0.6861,1.5 1.5,1.5 0.81389,0 1.5,-0.686 1.5,-1.5 0,-0.8139 -0.68611,-1.5 -1.5,-1.5 z" transform="translate(0 -1) translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1266.362" x="498" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/skiing-24.svg b/data/styles/symbols/maki/skiing-24.svg
deleted file mode 100644
index 1a7b5f4d89..0000000000
--- a/data/styles/symbols/maki/skiing-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-474 -238)">
-        <g>
-            <path d="m 487,1270.3622 c -1,0 -2,0.5 -2,2 0,0.5367 0.0437,0.6282 0.15625,1.0938 l 0.6875,2.8437 -3.71875,2.2813 -3.375,-1.9688 c -0.11232,-0.066 -0.25876,-0.068 -0.4375,-0.031 -0.17874,0.037 -0.31287,0.2487 -0.3125,0.4687 3.7e-4,0.22 0.0964,0.3474 0.25,0.4375 l 14.5,8.5 c 0.45557,0.263 0.86658,0.3689 1.25,0.375 0.26822,0 0.53178,-0.035 0.75,-0.125 0.53015,-0.2179 0.86186,-0.6118 1.09375,-0.8437 0.11619,-0.1163 0.15625,-0.2581 0.15625,-0.4063 0,-0.2115 -0.12877,-0.4362 -0.40625,-0.4687 -0.17906,-0.021 -0.32448,0.044 -0.4375,0.1875 -0.23474,0.2976 -0.52777,0.5208 -0.78125,0.625 -0.25348,0.1042 -0.53381,0.1225 -1.125,-0.2188 l -9.28125,-5.4375 3.59375,-2.0937 c 0.33273,-0.228 0.50201,-0.6708 0.40625,-1.0625 l -0.40625,-1.6563 3.5756,2.1048 0.6744,2.5707 c 0.0771,0.2878 0.2899,0.536 0.5625,0.6563 l 2.28125,1 c 1.60608,0.704 1.83495,-0.8259 0.8125,-1.269 l -1.875,-0.8125 -1.59375,-6.2495 -3.0625,-1.75 c -0.78627,-0.4539 -1.4375,-0.75 -1.9375,-0.75 z m 8,2 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z" opacity=".3" color="#000" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1)"/>
-            <path d="m 12,1007.3622 c -1,0 -2,0.5 -2,2 0,0.5367 0.04369,0.6282 0.15625,1.0938 l 0.6875,2.8437 -3.71875,2.2813 -3.375,-1.9688 c -0.1123178,-0.066 -0.2587622,-0.068 -0.4375,-0.031 -0.1787379,0.037 -0.3128705,0.2487 -0.3125,0.4687 3.705e-4,0.22 0.096351,0.3474 0.25,0.4375 l 14.5,8.5 c 0.455571,0.263 0.866584,0.3689 1.25,0.375 0.268224,0 0.531782,-0.035 0.75,-0.125 0.530152,-0.2179 0.861863,-0.6118 1.09375,-0.8437 0.116186,-0.1163 0.15625,-0.2581 0.15625,-0.4063 0,-0.2115 -0.128771,-0.4362 -0.40625,-0.4687 -0.179057,-0.021 -0.324481,0.044 -0.4375,0.1875 -0.234744,0.2976 -0.527766,0.5208 -0.78125,0.625 -0.253484,0.1042 -0.533815,0.1225 -1.125,-0.2188 l -9.28125,-5.4375 3.59375,-2.0937 c 0.332726,-0.228 0.502014,-0.6708 0.40625,-1.0625 l -0.40625,-1.6563 3.575597,2.1048 0.674403,2.5707 c 0.0771,0.2878 0.289901,0.536 0.5625,0.6563 l 2.28125,1 c 1.60608,0.704 1.834949,-0.8259 0.8125,-1.269 l -1.875,-0.8125 -1.59375,-6.2495 -3.0625,-1.75 c -0.786272,-0.4539 -1.4375,-0.75 -1.9375,-0.75 z m 8,2 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1) translate(475 263)"/>
-        </g>
-        <rect width="24" height="24" x="474" y="1266.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/slaughterhouse-12.svg b/data/styles/symbols/maki/slaughterhouse-12.svg
deleted file mode 100644
index d58a2df6b2..0000000000
--- a/data/styles/symbols/maki/slaughterhouse-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-518 -250)" color="#000">
-        <g>
-            <path transform="translate(2 -1) translate(-120 1050.362)" d="m 639,243 0.5,1 -1.5,0 0,1 1,0 1,1 c 10e-6,0.59553 2e-5,1.21287 0,1.53125 l 0,2.46875 0.5,0 0.5,-2 1,2 0.5,0 0,-2 c 0.94737,0 1.52631,-0.5 2,-0.5 l 0,1 c 0,0.4025 0.0312,1.5 0.0312,1.5 l 0.46875,0 1,-2 0.5,2 0.5,0 0,-2 0,-1 0,-1.09375 0,-0.90625 -1,-1 -4.99995,0 -0.375,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 639,243 0.5,1 -1.5,0 0,1 1,0 1,1 c 10e-6,0.59553 2e-5,1.21287 0,1.53125 l 0,2.46875 0.5,0 0.5,-2 1,2 0.5,0 0,-2 c 0.94737,0 1.52631,-0.5 2,-0.5 l 0,1 c 0,0.4025 0.0312,1.5 0.0312,1.5 l 0.46875,0 1,-2 0.5,2 0.5,0 0,-2 0,-1 0,-1.09375 0,-0.90625 -1,-1 -4.99995,0 -0.375,-1 z" transform="translate(2 -1) translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1290.362" x="518" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/slaughterhouse-18.svg b/data/styles/symbols/maki/slaughterhouse-18.svg
deleted file mode 100644
index 87a0bfa3c6..0000000000
--- a/data/styles/symbols/maki/slaughterhouse-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-500 -256)" color="#000">
-        <g>
-            <path d="m 500.68421,1295.3622 0.68421,0.7895 -1.36842,1.7105 0,0.5 2.05263,0.1842 c 0,1.0263 1.62539,1.384 1.94737,3.3158 l 0,3.5 0.5,0 0.99998,-3 1,3 0.5,0 0,-3 c 2.05263,0 1.63158,-0.5 3,-0.5 0,0 -0.079,1.208 -0.079,1.7895 0,0.5814 -0.3421,1.7105 -0.3421,1.7105 l 0.68421,0 1.02631,-2.7368 1.02632,2.7368 0.68421,0 c 0,0 7e-5,-2.0878 7e-5,-3 l -0.5,-1 0.5,-1 c 0,-0.1942 0,-2.6579 0,-3 l -1,-1 -8.5,0 -0.76323,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(2 -1)"/>
-            <path d="m 500.68421,1295.3622 0.68421,0.7895 -1.36842,1.7105 0,0.5 2.05263,0.1842 c 0,1.0263 1.62539,1.384 1.94737,3.3158 l 0,3.5 0.5,0 0.99998,-3 1,3 0.5,0 0,-3 c 2.05263,0 1.63158,-0.5 3,-0.5 0,0 -0.079,1.208 -0.079,1.7895 0,0.5814 -0.3421,1.7105 -0.3421,1.7105 l 0.68421,0 1.02631,-2.7368 1.02632,2.7368 0.68421,0 c 0,0 7e-5,-2.0878 7e-5,-3 l -0.5,-1 0.5,-1 c 0,-0.1942 0,-2.6579 0,-3 l -1,-1 -8.5,0 -0.76323,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(2 -1)"/>
-        </g>
-        <rect width="18" height="18" x="500" y="1290.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/slaughterhouse-24.svg b/data/styles/symbols/maki/slaughterhouse-24.svg
deleted file mode 100644
index cf34a6821d..0000000000
--- a/data/styles/symbols/maki/slaughterhouse-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-476 -262)" color="#000">
-        <g>
-            <path d="m 477,1295.3622 1,1 -2,2 0,1 3,0.5 c 0,1.5 2.52937,0.6765 2.99995,3.5 l 5e-5,5 1,0 1,-4 1,4 1,0 0,-4 c 2,0 3,-1 4,-1 0,0 0.5,1.6502 0.5,2.5 0,0.8498 -0.5,2.5 -0.5,2.5 l 1,0 1.5,-4 1.5,4 1,0 c 0,0 0,-2.6667 0,-4 0,-0.5 -1,-1 -1,-1.5 0,-1.4121 1,-1.5 1,-2.5 0,-0.2838 0,-2.5 0,-3 0,-0.5 -0.5,-1 -1,-1 l -13,0 -1,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(2)"/>
-            <path d="m 477,1295.3622 1,1 -2,2 0,1 3,0.5 c 0,1.5 2.52937,0.6765 2.99995,3.5 l 5e-5,5 1,0 1,-4 1,4 1,0 0,-4 c 2,0 3,-1 4,-1 0,0 0.5,1.6502 0.5,2.5 0,0.8498 -0.5,2.5 -0.5,2.5 l 1,0 1.5,-4 1.5,4 1,0 c 0,0 0,-2.6667 0,-4 0,-0.5 -1,-1 -1,-1.5 0,-1.4121 1,-1.5 1,-2.5 0,-0.2838 0,-2.5 0,-3 0,-0.5 -0.5,-1 -1,-1 l -13,0 -1,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(2)"/>
-        </g>
-        <rect y="1290.362" x="476" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/soccer-12.svg b/data/styles/symbols/maki/soccer-12.svg
deleted file mode 100644
index 374f13173c..0000000000
--- a/data/styles/symbols/maki/soccer-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-516 -34)" color="#000">
-        <g>
-            <path d="m 523.5,1076.3622 c -2.47936,0 -4.5,2.0207 -4.5,4.5 0,2.4793 2.02064,4.5 4.5,4.5 2.47936,0 4.5,-2.0207 4.5,-4.5 0,-2.4793 -2.02064,-4.5 -4.5,-4.5 z m 0,0.7941 c 1.41142,0 2.63307,0.7803 3.25919,1.9358 -0.59083,0.3919 -1.13389,0.5967 -1.14154,0.976 -0.005,0.2647 0,0.3394 0,0.5294 0,0.2647 0.1379,0.6053 0.52941,0.7941 l 0.92647,0.4467 c -0.10606,0.3922 -0.27657,0.7468 -0.49632,1.0754 l -0.69486,-0.4633 c -0.39706,-0.2647 -0.79411,-0.4411 -1.05882,-0.2647 l -0.79412,0.5294 c -0.36708,0.2448 -0.32875,0.5295 -0.2647,0.7942 l 0.24815,1.0257 c -0.16794,0.023 -0.33836,0.033 -0.51286,0.033 -0.36704,0 -0.72452,-0.051 -1.05882,-0.1489 l 0,-0.91 c 0,-0.5294 -0.26471,-0.7941 -0.52942,-1.0588 -0.2647,-0.2647 -0.52941,-0.5294 -1.05882,-0.5294 l -0.90993,0 c -0.0985,-0.3342 -0.14889,-0.6915 -0.14889,-1.0586 0,-2.053 1.65291,-3.7059 3.70588,-3.7059 z m -1.58824,1.853 -0.2647,1.0588 c -0.0751,0.3005 -0.27532,0.6106 0,0.7941 l 0.79412,0.5294 c 0.52941,0.353 0.76287,0.148 1.05882,0 l 0.52941,-0.2647 c 0.3946,-0.1973 0.52941,-0.2647 0.52941,-0.7941 l 0,-1.0588 c 0,-0.2647 0.004,-0.4227 -0.52941,-0.5294 l -1.32353,-0.2648 c -0.55443,-0.1108 -0.65877,-0.013 -0.79412,0.5295 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            <path d="m 523.5,1076.3622 c -2.47936,0 -4.5,2.0207 -4.5,4.5 0,2.4793 2.02064,4.5 4.5,4.5 2.47936,0 4.5,-2.0207 4.5,-4.5 0,-2.4793 -2.02064,-4.5 -4.5,-4.5 z m 0,0.7941 c 1.41142,0 2.63307,0.7803 3.25919,1.9358 -0.59083,0.3919 -1.13389,0.5967 -1.14154,0.976 -0.005,0.2647 0,0.3394 0,0.5294 0,0.2647 0.1379,0.6053 0.52941,0.7941 l 0.92647,0.4467 c -0.10606,0.3922 -0.27657,0.7468 -0.49632,1.0754 l -0.69486,-0.4633 c -0.39706,-0.2647 -0.79411,-0.4411 -1.05882,-0.2647 l -0.79412,0.5294 c -0.36708,0.2448 -0.32875,0.5295 -0.2647,0.7942 l 0.24815,1.0257 c -0.16794,0.023 -0.33836,0.033 -0.51286,0.033 -0.36704,0 -0.72452,-0.051 -1.05882,-0.1489 l 0,-0.91 c 0,-0.5294 -0.26471,-0.7941 -0.52942,-1.0588 -0.2647,-0.2647 -0.52941,-0.5294 -1.05882,-0.5294 l -0.90993,0 c -0.0985,-0.3342 -0.14889,-0.6915 -0.14889,-1.0586 0,-2.053 1.65291,-3.7059 3.70588,-3.7059 z m -1.58824,1.853 -0.2647,1.0588 c -0.0751,0.3005 -0.27532,0.6106 0,0.7941 l 0.79412,0.5294 c 0.52941,0.353 0.76287,0.148 1.05882,0 l 0.52941,-0.2647 c 0.3946,-0.1973 0.52941,-0.2647 0.52941,-0.7941 l 0,-1.0588 c 0,-0.2647 0.004,-0.4227 -0.52941,-0.5294 l -1.32353,-0.2648 c -0.55443,-0.1108 -0.65877,-0.013 -0.79412,0.5295 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-        </g>
-        <rect width="12" height="12" x="516" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/soccer-18.svg b/data/styles/symbols/maki/soccer-18.svg
deleted file mode 100644
index 048edb3c99..0000000000
--- a/data/styles/symbols/maki/soccer-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-498 -40)" color="#000">
-        <g>
-            <path d="m 507.5,1078.3622 c -3.58129,0 -6.5,2.9188 -6.5,6.5 0,3.5812 2.91871,6.5 6.5,6.5 3.58129,0 6.5,-2.9188 6.5,-6.5 0,-3.5812 -2.91871,-6.5 -6.5,-6.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 -2)"/>
-            <path d="m 507.5,1078.3622 c -3.58129,0 -6.5,2.9188 -6.5,6.5 0,3.5812 2.91871,6.5 6.5,6.5 3.58129,0 6.5,-2.9188 6.5,-6.5 0,-3.5812 -2.91871,-6.5 -6.5,-6.5 z m 0,1.1471 c 2.03872,0 3.80332,1.127 4.70772,2.796 -0.85343,0.5661 -1.63784,0.862 -1.64889,1.4098 -0.007,0.3825 0,0.4903 0,0.7647 0,0.3824 0.19918,0.8743 0.76471,1.147 l 1.33822,0.6453 c -0.15319,0.5666 -0.39949,1.0788 -0.7169,1.5533 l -1.00369,-0.6692 c -0.57352,-0.3823 -1.14704,-0.637 -1.52941,-0.3823 l -1.14705,0.7648 c -0.53024,0.3535 -0.47486,0.7648 -0.38236,1.147 l 0.35845,1.4817 c -0.24259,0.033 -0.48875,0.047 -0.7408,0.047 -0.53017,0 -1.04653,-0.074 -1.5294,-0.215 l 0,-1.3146 c 0,-0.7646 -0.38236,-1.147 -0.76473,-1.5293 -0.38233,-0.3824 -0.7647,-0.7647 -1.52941,-0.7647 l -1.31434,0 c -0.14227,-0.4827 -0.21506,-0.9988 -0.21506,-1.5291 0,-2.9655 2.38754,-5.353 5.35294,-5.353 z m -2.29413,2.6764 -0.38233,1.5294 c -0.10848,0.4342 -0.39769,0.882 0,1.1471 l 1.14706,0.7646 c 0.76469,0.5099 1.10192,0.2139 1.5294,0 l 0.76471,-0.3822 c 0.56998,-0.2851 0.76469,-0.3824 0.76469,-1.147 l 0,-1.5294 c 0,-0.3825 0.006,-0.6106 -0.76469,-0.7647 l -1.91177,-0.3826 c -0.80084,-0.16 -0.95156,-0.018 -1.14707,0.7648 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -2)"/>
-        </g>
-        <rect y="1074.362" x="498" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/soccer-24.svg b/data/styles/symbols/maki/soccer-24.svg
deleted file mode 100644
index 5830f66a13..0000000000
--- a/data/styles/symbols/maki/soccer-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-474 -46)" color="#000">
-        <g>
-            <path d="m 13.5,1007.8622 c -4.68324,0 -8.5,3.8168 -8.5,8.5 0,4.6832 3.81676,8.5 8.5,8.5 4.68324,0 8.5,-3.8168 8.5,-8.5 0,-4.6832 -3.81676,-8.5 -8.5,-8.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(473 69.5)"/>
-            <path d="m 13.5,1007.8622 c -4.68324,0 -8.5,3.8168 -8.5,8.5 0,4.6832 3.81676,8.5 8.5,8.5 4.68324,0 8.5,-3.8168 8.5,-8.5 0,-4.6832 -3.81676,-8.5 -8.5,-8.5 z m 0,1.5 c 2.66601,0 4.97358,1.4738 6.15625,3.6563 -1.116,0.7404 -2.14179,1.1273 -2.15625,1.8437 -0.0101,0.4999 0,0.6412 0,1 0,0.5 0.26049,1.1434 1,1.5 l 1.75,0.8438 c -0.20034,0.7408 -0.52239,1.4106 -0.9375,2.0312 L 18,1019.3622 c -0.75,-0.5 -1.5,-0.8333 -2,-0.5 l -1.5,1 c -0.69338,0.4623 -0.62097,1 -0.5,1.5 l 0.46875,1.9375 c -0.31724,0.044 -0.63913,0.062 -0.96875,0.062 -0.69329,0 -1.36854,-0.095 -2,-0.2812 l 0,-1.7188 c 0,-1 -0.5,-1.5 -1,-2 -0.5,-0.5 -1,-1 -2,-1 l -1.71875,0 C 6.59519,1017.7307 6.5,1017.0555 6.5,1016.3622 c 0,-3.8778 3.12216,-7 7,-7 z m -3,3.5 -0.5,2 c -0.1418893,0.5676 -0.52003,1.1533 0,1.5 l 1.5,1 c 1,0.6667 1.44098,0.2795 2,0 l 1,-0.5 c 0.74536,-0.3727 1,-0.5 1,-1.5 l 0,-2 c 0,-0.5 0.0082,-0.7984 -1,-1 l -2.5,-0.5 c -1.04726,-0.2095 -1.244345,-0.023 -1.5,1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(473 69.5)"/>
-        </g>
-        <rect width="24" height="24" x="474" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/square-12.svg b/data/styles/symbols/maki/square-12.svg
deleted file mode 100644
index c0183b52ab..0000000000
--- a/data/styles/symbols/maki/square-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(30 -82)" color="#000">
-        <g>
-            <path d="m -28.4375,1123.3622 7.875,0 c 0.311625,0 0.5625,0.2509 0.5625,0.5625 l 0,7.875 c 0,0.3116 -0.250875,0.5625 -0.5625,0.5625 l -7.875,0 c -0.311625,0 -0.5625,-0.2509 -0.5625,-0.5625 l 0,-7.875 c 0,-0.3116 0.250875,-0.5625 0.5625,-0.5625 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" fill="none" transform="translate(1)"/>
-            <path d="m -28.4375,1123.3622 7.875,0 c 0.311625,0 0.5625,0.2509 0.5625,0.5625 l 0,7.875 c 0,0.3116 -0.250875,0.5625 -0.5625,0.5625 l -7.875,0 c -0.311625,0 -0.5625,-0.2509 -0.5625,-0.5625 l 0,-7.875 c 0,-0.3116 0.250875,-0.5625 0.5625,-0.5625 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(1)"/>
-        </g>
-        <rect y="1122.362" x="-30" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/square-18.svg b/data/styles/symbols/maki/square-18.svg
deleted file mode 100644
index 0f58f049ab..0000000000
--- a/data/styles/symbols/maki/square-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(48 -88)" color="#000">
-        <g>
-            <rect ry="1" rx="1" y="1124.362" x="-45" height="13" width="13" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" fill="none"/>
-            <rect width="13" height="13" x="-45" y="1124.362" rx="1" ry="1" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="18" height="18" x="-48" y="1122.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/square-24.svg b/data/styles/symbols/maki/square-24.svg
deleted file mode 100644
index d9e6659412..0000000000
--- a/data/styles/symbols/maki/square-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(72 -94)" color="#000">
-        <g transform="translate(-32 118)">
-            <rect width="17" height="17" x="-36" y="1007.362" rx="1.125" ry="1.125" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" fill="none"/>
-            <rect ry="1.125" rx="1.125" y="1007.362" x="-36" height="17" width="17" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1122.362" x="-72" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/square-stroked-12.svg b/data/styles/symbols/maki/square-stroked-12.svg
deleted file mode 100644
index 3402b89c8a..0000000000
--- a/data/styles/symbols/maki/square-stroked-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(30 -58)" color="#000">
-        <g>
-            <path d="m -28.5,1099.3622 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,8 c 0,0.277 0.223,0.5 0.5,0.5 l 8,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-8 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 0.5,1 7,0 0,7 -7,0 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" fill="none" transform="translate(1)"/>
-            <path d="m -28.5,1099.3622 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,8 c 0,0.277 0.223,0.5 0.5,0.5 l 8,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-8 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 0.5,1 7,0 0,7 -7,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(1)"/>
-        </g>
-        <rect width="12" height="12" x="-30" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/square-stroked-18.svg b/data/styles/symbols/maki/square-stroked-18.svg
deleted file mode 100644
index 01128df699..0000000000
--- a/data/styles/symbols/maki/square-stroked-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(48 -64)" color="#000">
-        <g>
-            <path d="m -44,1100.3622 c -0.55401,0 -1,0.446 -1,1 l 0,11 c 0,0.554 0.44599,1 1,1 l 11,0 c 0.55401,0 1,-0.446 1,-1 l 0,-11 c 0,-0.554 -0.44599,-1 -1,-1 l -11,0 z m 1.4375,2 8.125,0 c 0.249309,0 0.4375,0.1882 0.4375,0.4375 l 0,8.125 c 0,0.2493 -0.188191,0.4375 -0.4375,0.4375 l -8.125,0 c -0.249309,0 -0.4375,-0.1882 -0.4375,-0.4375 l 0,-8.125 c 0,-0.2493 0.188191,-0.4375 0.4375,-0.4375 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="m -44,1100.3622 c -0.55401,0 -1,0.446 -1,1 l 0,11 c 0,0.554 0.44599,1 1,1 l 11,0 c 0.55401,0 1,-0.446 1,-1 l 0,-11 c 0,-0.554 -0.44599,-1 -1,-1 l -11,0 z m 1.4375,2 8.125,0 c 0.249309,0 0.4375,0.1882 0.4375,0.4375 l 0,8.125 c 0,0.2493 -0.188191,0.4375 -0.4375,0.4375 l -8.125,0 c -0.249309,0 -0.4375,-0.1882 -0.4375,-0.4375 l 0,-8.125 c 0,-0.2493 0.188191,-0.4375 0.4375,-0.4375 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1098.362" x="-48" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/square-stroked-24.svg b/data/styles/symbols/maki/square-stroked-24.svg
deleted file mode 100644
index e6fe70b879..0000000000
--- a/data/styles/symbols/maki/square-stroked-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(72 -70)" color="#000">
-        <g>
-            <path transform="translate(-72 94) translate(0 1004.362)" d="M 5,3 C 4.446,3 4,3.446 4,4 l 0,15 c 0,0.554 0.446,1 1,1 l 15,0 c 0.554,0 1,-0.446 1,-1 L 21,4 C 21,3.446 20.554,3 20,3 z m 1,2 13,0 0,13 -13,0 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" fill="none"/>
-            <path d="M 5,3 C 4.446,3 4,3.446 4,4 l 0,15 c 0,0.554 0.446,1 1,1 l 15,0 c 0.554,0 1,-0.446 1,-1 L 21,4 C 21,3.446 20.554,3 20,3 z m 1,2 13,0 0,13 -13,0 z" transform="translate(-72 94) translate(0 1004.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="-72" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/star-12.svg b/data/styles/symbols/maki/star-12.svg
deleted file mode 100644
index cf87ce6201..0000000000
--- a/data/styles/symbols/maki/star-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(30 -154)" color="#000">
-        <g>
-            <path d="m -23.5,1196.3622 -1.25,3 -3.25,0 2.5,2.5 -1.25,3.5 3.25,-2 3.25,2 -1.25,-3.5 2.5,-2.5 -3.25,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-            <path d="m -23.5,1196.3622 -1.25,3 -3.25,0 2.5,2.5 -1.25,3.5 3.25,-2 3.25,2 -1.25,-3.5 2.5,-2.5 -3.25,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-        </g>
-        <rect y="1194.362" x="-30" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/star-18.svg b/data/styles/symbols/maki/star-18.svg
deleted file mode 100644
index 3be8e92380..0000000000
--- a/data/styles/symbols/maki/star-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(48 -160)" color="#000">
-        <g>
-            <path d="m -38.5,1196.3622 -2.000003,4 -4.499997,0 3.499997,4 -1.694441,5 4.694444,-2.8889 4.694444,2.8889 -1.694447,-5 3.500003,-4 -4.500003,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m -38.5,1196.3622 -2.000003,4 -4.499997,0 3.499997,4 -1.694441,5 4.694444,-2.8889 4.694444,2.8889 -1.694447,-5 3.500003,-4 -4.500003,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="18" height="18" x="-48" y="1194.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/star-24.svg b/data/styles/symbols/maki/star-24.svg
deleted file mode 100644
index b6d1cc3f5b..0000000000
--- a/data/styles/symbols/maki/star-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(72 -166)">
-        <g color="#000" transform="translate(1)">
-            <path d="m 142.49314,204.36214 -2,6 -6.5,0 5,5 -2.5,7 6,-4 6,4 -2.5,-7 5,-5 -6,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-202.993 993)"/>
-            <path d="m 142.49314,204.36214 -2,6 -6.5,0 5,5 -2.5,7 6,-4 6,4 -2.5,-7 5,-5 -6,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-202.993 993)"/>
-        </g>
-        <rect y="1194.362" x="-72" height="24" width="24" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/star-stroked-12.svg b/data/styles/symbols/maki/star-stroked-12.svg
deleted file mode 100644
index e4c0fa0da7..0000000000
--- a/data/styles/symbols/maki/star-stroked-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(30 -178)" color="#000">
-        <g>
-            <path d="m -23.5,1220.3622 -1.25,3 -3.25,0 2.5,2.5 -1.25,3.5 3.25,-2 3.25,2 -1.25,-3.5 2.5,-2.5 -3.25,0 -1.25,-3 z m 0,2 1,2 1.5,0 -1.5,1.5 0.5,1.5 -1.5,-1 -1.5,1 0.5,-1.5 -1.5,-1.5 1.5,0 0.5,-1 0.5,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-            <path d="m -23.5,1220.3622 -1.25,3 -3.25,0 2.5,2.5 -1.25,3.5 3.25,-2 3.25,2 -1.25,-3.5 2.5,-2.5 -3.25,0 -1.25,-3 z m 0,2 1,2 1.5,0 -1.5,1.5 0.5,1.5 -1.5,-1 -1.5,1 0.5,-1.5 -1.5,-1.5 1.5,0 0.5,-1 0.5,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-        </g>
-        <rect y="1218.362" x="-30" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/star-stroked-18.svg b/data/styles/symbols/maki/star-stroked-18.svg
deleted file mode 100644
index 1cdd9f24cc..0000000000
--- a/data/styles/symbols/maki/star-stroked-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(48 -184)" color="#000">
-        <g>
-            <path d="m -38.5,1220.3622 -2,4 -4.5,0 3.5,4 -1.6875,5 4.6875,-2.875 4.6875,2.875 -1.6875,-5 3.5,-4 -4.5,0 z m 0,2.5 1,2.5 3,0 -2.5,3 1.15625,2.5 -2.65625,-2 -2.65625,2 1.15625,-2.5 -2.5,-3 3,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m -38.5,1220.3622 -2,4 -4.5,0 3.5,4 -1.6875,5 4.6875,-2.875 4.6875,2.875 -1.6875,-5 3.5,-4 -4.5,0 z m 0,2.5 1,2.5 3,0 -2.5,3 1.15625,2.5 -2.65625,-2 -2.65625,2 1.15625,-2.5 -2.5,-3 3,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="18" height="18" x="-48" y="1218.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/star-stroked-24.svg b/data/styles/symbols/maki/star-stroked-24.svg
deleted file mode 100644
index daafec5fbb..0000000000
--- a/data/styles/symbols/maki/star-stroked-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(72 -190)">
-        <g color="#000" transform="translate(-72 214)">
-            <path d="m 143.49314,204.36214 -2,6 -6.5,0 5,5 -2.5,7 6,-4 6,4 -2.5,-7 5,-5 -6.5,0 z m 0,4 1,3.5 4,0 -3.5,3.5 1.5,3.5 -3,-2.5 -3,2.5 1.5,-3.5 -3.5,-3.5 4,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(-130.993 803)"/>
-            <path d="m 143.49314,204.36214 -2,6 -6.5,0 5,5 -2.5,7 6,-4 6,4 -2.5,-7 5,-5 -6.5,0 -2,-6 z m 0,4 1,3.5 4,0 -3.5,3.5 1.5,3.5 -3,-2.5 -3,2.5 1.5,-3.5 -3.5,-3.5 4,0 1,-3.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-130.993 803)"/>
-        </g>
-        <rect y="1218.362" x="-72" height="24" width="24" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/swimming-12.svg b/data/styles/symbols/maki/swimming-12.svg
deleted file mode 100644
index 4d8d91cb73..0000000000
--- a/data/styles/symbols/maki/swimming-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-516 -178)" color="#000">
-        <g>
-            <path d="m 525.5,1221.3622 -0.5,0.3038 -2.21875,1.29 c -0.26621,0.126 -0.36307,0.5134 -0.1875,0.75 l 0.60937,0.8281 -2.20312,1.8281 1,0.2344 1.5,-0.4685 1.5,0.4685 1,-0.2344 -2.21875,-2.7812 2.23437,-1.3907 -0.0156,-0.8281 z m 1,2.047 c -0.55228,0 -1,0.4477 -1,1 0,0.5522 0.44772,1 1,1 0.55228,0 1,-0.4478 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z m -6,3.9531 -1.5,0.4685 0,1.0312 0.15625,-0.047 1.34375,-0.4531 1.5,0.4998 1.5,-0.4998 1.5,0.4998 1.5,-0.4998 1.5,0.5 0,-1.0312 -1.5,-0.4685 -1.5,0.4685 -1.5,-0.4685 -1.5,0.4685 -1.5,-0.4685 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1 -1)"/>
-            <path d="m 525.5,1221.3622 -0.5,0.3038 -2.21875,1.29 c -0.26621,0.126 -0.36307,0.5134 -0.1875,0.75 l 0.60937,0.8281 -2.20312,1.8281 1,0.2344 1.5,-0.4685 1.5,0.4685 1,-0.2344 -2.21875,-2.7812 2.23437,-1.3907 -0.0156,-0.8281 z m 1,2.047 c -0.55228,0 -1,0.4477 -1,1 0,0.5522 0.44772,1 1,1 0.55228,0 1,-0.4478 1,-1 0,-0.5523 -0.44772,-1 -1,-1 z m -6,3.9531 -1.5,0.4685 0,1.0312 0.15625,-0.047 1.34375,-0.4531 1.5,0.4998 1.5,-0.4998 1.5,0.4998 1.5,-0.4998 1.5,0.5 0,-1.0312 -1.5,-0.4685 -1.5,0.4685 -1.5,-0.4685 -1.5,0.4685 -1.5,-0.4685 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-        </g>
-        <rect width="12" height="12" x="516" y="1218.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/swimming-18.svg b/data/styles/symbols/maki/swimming-18.svg
deleted file mode 100644
index 3acdec73a6..0000000000
--- a/data/styles/symbols/maki/swimming-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-498 -184)" color="#000">
-        <g>
-            <path d="m 510.75,1223.9872 c -0.11423,0 -0.31333,0.048 -0.40625,0.094 l -2.875,1.4063 c -0.38453,0.182 -0.53485,0.7521 -0.28125,1.0937 l 0.875,1.1875 -3.71875,2.1563 2,0.8125 2.15625,-0.875 2.15625,0.875 0.84375,-0.875 -2.59375,-3.4688 2.1875,-1.125 c 0.43476,-0.2174 0.42006,-0.5902 0.375,-0.8125 -0.0427,-0.2107 -0.32173,-0.4687 -0.71875,-0.4687 z m 1.75,2.375 c -0.82843,0 -1.5,0.6716 -1.5,1.5 0,0.8284 0.67157,1.5 1.5,1.5 0.82843,0 1.5,-0.6716 1.5,-1.5 0,-0.8284 -0.67157,-1.5 -1.5,-1.5 z m -4,4.5 -2,1 -2.5,-0.9375 -2,0.9375 0,1.5 2,-1 2.5,1 2,-1.0625 2,1.0625 2,-1.0625 2.5,1.0625 0,-1.5 -2.5,-1 -2,1 -2,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none" transform="translate(-1 -2)"/>
-            <path d="m 510.75,1223.9872 c -0.11423,0 -0.31333,0.048 -0.40625,0.094 l -2.875,1.4063 c -0.38453,0.182 -0.53485,0.7521 -0.28125,1.0937 l 0.875,1.1875 -3.71875,2.1563 2,0.8125 2.15625,-0.875 2.15625,0.875 0.84375,-0.875 -2.59375,-3.4688 2.1875,-1.125 c 0.43476,-0.2174 0.42006,-0.5902 0.375,-0.8125 -0.0427,-0.2107 -0.32173,-0.4687 -0.71875,-0.4687 z m 1.75,2.375 c -0.82843,0 -1.5,0.6716 -1.5,1.5 0,0.8284 0.67157,1.5 1.5,1.5 0.82843,0 1.5,-0.6716 1.5,-1.5 0,-0.8284 -0.67157,-1.5 -1.5,-1.5 z m -4,4.5 -2,1 -2.5,-0.9375 -2,0.9375 0,1.5 2,-1 2.5,1 2,-1.0625 2,1.0625 2,-1.0625 2.5,1.0625 0,-1.5 -2.5,-1 -2,1 -2,-1 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -2)"/>
-        </g>
-        <rect y="1218.362" x="498" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/swimming-24.svg b/data/styles/symbols/maki/swimming-24.svg
deleted file mode 100644
index d3ed2f690d..0000000000
--- a/data/styles/symbols/maki/swimming-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-474 -190)">
-        <rect width="24" height="24" x="474" y="1218.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 489.125,1223.3622 c -0.15817,0 -0.43385,0.093 -0.5625,0.1563 l -4,1.9375 c -0.53242,0.2521 -0.72614,1.027 -0.375,1.5 l 1.21875,1.6562 -4.71875,3.6563 c 1.12895,0.229 1.9761,0.9379 2.8125,0.9375 1,5e-4 1.5,-1 3,-1 1.5,0 2,0.9995 3,1 0.4128,2e-4 0.83328,-0.1749 1.28125,-0.375 l -4.21875,-6.125 3.03125,-1.5313 c 0.60198,-0.301 0.56239,-0.8172 0.5,-1.125 -0.0591,-0.2918 -0.41903,-0.6875 -0.96875,-0.6875 z m 1.875,3 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m -11,8 c -0.69406,0 -1.33976,0.4049 -2,0.625 l 0,2.0313 c 0,0 1,-0.6558 2,-0.6563 1,-5e-4 2,1 3.5,1 1.5,0 1.97352,-0.9653 3,-1 1,5e-4 1.5,1 3,1 1.5,0 2.5,-1 3.5,-1 0.70165,0 2,0.6563 2,0.6563 l 0,-2.0313 c -0.6416,-0.2468 -1.34343,-0.625 -2,-0.625 -1.5,0 -2.5,1.0005 -3.5,1 -1,-5e-4 -1.5,-1 -3,-1 -1.5,0 -2,1.0005 -3,1 -1,5e-4 -2,-1 -3.5,-1 z" opacity=".3" color="#000" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 489.125,1223.3622 c -0.15817,0 -0.43385,0.093 -0.5625,0.1563 l -4,1.9375 c -0.53242,0.2521 -0.72614,1.027 -0.375,1.5 l 1.21875,1.6562 -4.71875,3.6563 c 1.12895,0.229 1.9761,0.9379 2.8125,0.9375 1,5e-4 1.5,-1 3,-1 1.5,0 2,0.9995 3,1 0.4128,2e-4 0.83328,-0.1749 1.28125,-0.375 l -4.21875,-6.125 3.03125,-1.5313 c 0.60198,-0.301 0.56239,-0.8172 0.5,-1.125 -0.0591,-0.2918 -0.41903,-0.6875 -0.96875,-0.6875 z m 1.875,3 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m -11,8 c -0.69406,0 -1.33976,0.4049 -2,0.625 l 0,2.0313 c 0,0 1,-0.6558 2,-0.6563 1,-5e-4 2,1 3.5,1 1.5,0 1.97352,-0.9653 3,-1 1,5e-4 1.5,1 3,1 1.5,0 2.5,-1 3.5,-1 0.70165,0 2,0.6563 2,0.6563 l 0,-2.0313 c -0.6416,-0.2468 -1.34343,-0.625 -2,-0.625 -1.5,0 -2.5,1.0005 -3.5,1 -1,-5e-4 -1.5,-1 -3,-1 -1.5,0 -2,1.0005 -3,1 -1,5e-4 -2,-1 -3.5,-1 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/telephone-12.svg b/data/styles/symbols/maki/telephone-12.svg
deleted file mode 100644
index 1a64dad3da..0000000000
--- a/data/styles/symbols/maki/telephone-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-360 -275)">
-        <path d="m 367.5,1317.3622 -5.5,5.5 0,2 1,1 1,0 1,-1 0,-1 -1,-1 3.5,-3.5 1,1 1,0 1,-1 0,-1 -1,-1 z" opacity=".3" color="#000" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <rect width="24" height="24" x="320" y="1314.362" color="#000" overflow="visible" enable-background="accumulate" fill="none" transform="matrix(.5 0 0 .5 200 658.18)"/>
-        <path d="m 367.5,1317.3622 -5.5,5.5 0,2 1,1 1,0 1,-1 0,-1 -1,-1 3.5,-3.5 1,1 1,0 1,-1 0,-1 -1,-1 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/telephone-18.svg b/data/styles/symbols/maki/telephone-18.svg
deleted file mode 100644
index 63bc85346a..0000000000
--- a/data/styles/symbols/maki/telephone-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="matrix(.75 0 0 .75 -240 -985.773)" color="#000">
-        <path transform="matrix(1.333 0 0 1.333 -295.999 961.029)" d="m 472.5,267 -8.5,8.5 0,2.5 1.3125,1.3125 3,-3 -0.8125,-0.8125 5,-5 0.8125,0.8125 3,-3 L 475,267 l -2.5,0 z m 4.1875,1.6875 -3,3 L 474,272 l 1,0 2,-2 0,-1 -0.3125,-0.3125 z m -8,8 -3,3 L 466,280 l 1,0 2,-2 0,-1 -0.3125,-0.3125 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 472.5,267 -8.5,8.5 0,2.5 1.3125,1.3125 3,-3 -0.8125,-0.8125 5,-5 0.8125,0.8125 3,-3 L 475,267 l -2.5,0 z m 4.1875,1.6875 -3,3 L 474,272 l 1,0 2,-2 0,-1 -0.3125,-0.3125 z m -8,8 -3,3 L 466,280 l 1,0 2,-2 0,-1 -0.3125,-0.3125 z" transform="matrix(1.333 0 0 1.333 -295.999 961.029)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect width="24" height="24" x="320" y="1314.362" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/telephone-24.svg b/data/styles/symbols/maki/telephone-24.svg
deleted file mode 100644
index b47aed2ffe..0000000000
--- a/data/styles/symbols/maki/telephone-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-320 -286)" color="#000">
-        <path d="m 336,1318.3622 c -1,0 -1.32629,0.3263 -2,1 l -8,8 c -0.5,0.5 -1,1 -1,2 0,0.8333 0,1 0,1.5 0,1 0.5,1.5 1,2 l 0.5625,0.5625 3.5,-3.5 -0.5625,-0.5625 c -0.50009,-0.5 0,-1 0,-1 l 5.5,-5.5 c 0,0 0.5,-0.5 1,0 l 0.5625,0.5625 3.5,-3.5 c 0,0 -0.375,-0.375 -0.5625,-0.5625 -0.5,-0.5 -1,-1 -2,-1 -0.5,0 -1.5,0 -1.5,0 z m 4.4375,1.9375 -3.5,3.5 0.5625,0.5625 c 0.35356,0.3535 1.14645,0.3536 1.5,0 l 2,-2 c 0.35359,-0.3537 0.35357,-1.1465 0,-1.5 z m -10,10 -3.5,3.5 0.5625,0.5625 c 0.35362,0.3537 1.1464,0.3534 1.5,0 l 2,-2 c 0.35372,-0.3536 0.35352,-1.1466 0,-1.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 336,1318.3622 c -1,0 -1.32629,0.3263 -2,1 l -8,8 c -0.5,0.5 -1,1 -1,2 0,0.8333 0,1 0,1.5 0,1 0.5,1.5 1,2 l 0.5625,0.5625 3.5,-3.5 -0.5625,-0.5625 c -0.50009,-0.5 0,-1 0,-1 l 5.5,-5.5 c 0,0 0.5,-0.5 1,0 l 0.5625,0.5625 3.5,-3.5 c 0,0 -0.375,-0.375 -0.5625,-0.5625 -0.5,-0.5 -1,-1 -2,-1 -0.5,0 -1.5,0 -1.5,0 z m 4.4375,1.9375 -3.5,3.5 0.5625,0.5625 c 0.35356,0.3535 1.14645,0.3536 1.5,0 l 2,-2 c 0.35359,-0.3537 0.35357,-1.1465 0,-1.5 z m -10,10 -3.5,3.5 0.5625,0.5625 c 0.35362,0.3537 1.1464,0.3534 1.5,0 l 2,-2 c 0.35372,-0.3536 0.35352,-1.1466 0,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect y="1314.362" x="320" height="24" width="24" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/tennis-12.svg b/data/styles/symbols/maki/tennis-12.svg
deleted file mode 100644
index 8c34267f0c..0000000000
--- a/data/styles/symbols/maki/tennis-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-516 -82)" color="#000">
-        <g>
-            <path d="m 519.00003,1127.3621 c 0,1.6569 1.34314,3 3,3 l 2.5,0 2.99997,3.0001 0.5,0 -3e-5,-0.4999 -2.99997,-3.0001 0,-2.5 c 0,-1.6569 -1.34315,-3 -2.99999,-3 -1.65684,-10e-5 -2.99998,1.343 -2.99998,2.9999 z m 4.99997,0.5001 0,1.5 -1.5,0 z m -4.24997,3 c -0.41422,0 -0.75,0.3358 -0.75,0.75 0,0.4142 0.33578,0.75 0.75,0.75 0.41421,0 0.75,-0.3358 0.75,-0.75 0,-0.4142 -0.33579,-0.75 -0.75,-0.75 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-            <path d="m 519.00003,1127.3621 c 0,1.6569 1.34314,3 3,3 l 2.5,0 2.99997,3.0001 0.5,0 -3e-5,-0.4999 -2.99997,-3.0001 0,-2.5 c 0,-1.6569 -1.34315,-3 -2.99999,-3 -1.65684,-10e-5 -2.99998,1.343 -2.99998,2.9999 z m 4.99997,0.5001 0,1.5 -1.5,0 z m -4.24997,3 c -0.41422,0 -0.75,0.3358 -0.75,0.75 0,0.4142 0.33578,0.75 0.75,0.75 0.41421,0 0.75,-0.3358 0.75,-0.75 0,-0.4142 -0.33579,-0.75 -0.75,-0.75 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(-1 -1)"/>
-        </g>
-        <rect y="1122.362" x="516" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/tennis-18.svg b/data/styles/symbols/maki/tennis-18.svg
deleted file mode 100644
index 5890c76f36..0000000000
--- a/data/styles/symbols/maki/tennis-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-498 -88)" color="#000">
-        <g>
-            <path d="m 505.5,1124.3622 c -2.53402,0 -4.5,1.966 -4.5,4.5 0,2.534 2.14246,4.4984 4.67648,4.5 l 3.32352,0 4,4 1,0 0,-1 -4,-4 0,-3.3236 c 0,-2.534 -1.96599,-4.6764 -4.5,-4.6764 z m 3.5,5.7058 0,2.2942 -2.5,0 z m -6.85294,3.2942 c -0.63351,0 -1.14706,0.5135 -1.14706,1.147 0,0.6335 0.51355,1.1471 1.14706,1.1471 0.6335,0 1.14706,-0.5136 1.14706,-1.1471 0,-0.6335 -0.51356,-1.147 -1.14706,-1.147 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-            <path d="m 505.5,1124.3622 c -2.53402,0 -4.5,1.966 -4.5,4.5 0,2.534 2.14246,4.4984 4.67648,4.5 l 3.32352,0 4,4 1,0 0,-1 -4,-4 0,-3.3236 c 0,-2.534 -1.96599,-4.6764 -4.5,-4.6764 z m 3.5,5.7058 0,2.2942 -2.5,0 z m -6.85294,3.2942 c -0.63351,0 -1.14706,0.5135 -1.14706,1.147 0,0.6335 0.51355,1.1471 1.14706,1.1471 0.6335,0 1.14706,-0.5136 1.14706,-1.1471 0,-0.6335 -0.51356,-1.147 -1.14706,-1.147 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="18" height="18" x="498" y="1122.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/tennis-24.svg b/data/styles/symbols/maki/tennis-24.svg
deleted file mode 100644
index d7f574d012..0000000000
--- a/data/styles/symbols/maki/tennis-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-474 -94)" color="#000">
-        <g>
-            <path d="m 484,1125.3622 c -3.31371,0 -6,2.6863 -6,6 0,3.3137 2.68629,6 6,6 l 5,0 4.5,4.5 c 0.31628,0.3163 0.50625,0.5 0.90625,0.5 0.125,0 0.28125,0 0.4375,-0.1562 0.1563,-0.1563 0.15625,-0.3125 0.15625,-0.4375 0,-0.4 -0.21788,-0.6242 -0.5,-0.9063 l -4.5,-4.5 0,-5 c 0,-3.3137 -2.68629,-6 -6,-6 z m 5,8 0,3 -3,0 z m -9.5,4 c -0.82843,0 -1.5,0.6716 -1.5,1.5 0,0.8284 0.67157,1.5 1.5,1.5 0.82843,0 1.5,-0.6716 1.5,-1.5 0,-0.8284 -0.67157,-1.5 -1.5,-1.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-            <path d="m 484,1125.3622 c -3.31371,0 -6,2.6863 -6,6 0,3.3137 2.68629,6 6,6 l 5,0 4.5,4.5 c 0.31628,0.3163 0.50625,0.5 0.90625,0.5 0.125,0 0.28125,0 0.4375,-0.1562 0.1563,-0.1563 0.15625,-0.3125 0.15625,-0.4375 0,-0.4 -0.21788,-0.6242 -0.5,-0.9063 l -4.5,-4.5 0,-5 c 0,-3.3137 -2.68629,-6 -6,-6 z m 5,8 0,3 -3,0 z m -9.5,4 c -0.82843,0 -1.5,0.6716 -1.5,1.5 0,0.8284 0.67157,1.5 1.5,1.5 0.82843,0 1.5,-0.6716 1.5,-1.5 0,-0.8284 -0.67157,-1.5 -1.5,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1122.362" x="474" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/theatre-12.svg b/data/styles/symbols/maki/theatre-12.svg
deleted file mode 100644
index 21aa10fa22..0000000000
--- a/data/styles/symbols/maki/theatre-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-360 -226)" color="#000">
-        <g>
-            <path d="m 362.5,1268.3622 c -0.25,0 -0.5,0.25 -0.5,0.5 l 0,3 c 0,1.108 0.5,2.5 2.5,2.5 0.17934,0 0.34309,-0.01 0.5,-0.031 l 0,-1.4688 -2,0 c 0,0 0.25,-1 1.5,-1 0.25,0 0.34826,0.037 0.5,0.094 l 0,-1.094 c 0,-0.4583 0.20224,-0.8116 0.45312,-1.0625 0.25089,-0.2509 0.58854,-0.4375 1.04688,-0.4375 l 0.5,0 0,-0.4998 c 0,-0.25 -0.2643,-0.4998 -0.5,-0.5 -0.5,-4e-4 -1,0.4996 -2,0.4996 -0.86663,0 -1.5,-0.5 -2,-0.5 z m 1,2 c 0.27614,0 0.5,0.2239 0.5,0.5 0,0.2761 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.2239 -0.5,-0.5 0,-0.2761 0.22386,-0.5 0.5,-0.5 z m 3,0 c -0.2357,0 -0.5,0.25 -0.5,0.5 l 0,3 c 0,1.108 0.5,2.5 2.5,2.5 2,0 2.5,-1.392 2.5,-2.5 l 0,-3 c 0,-0.25 -0.2643,-0.5 -0.5,-0.5 -0.5,0 -1.25464,0.5 -2,0.5 -0.74536,0 -1.5,-0.5 -2,-0.5 z m 1,2 c 0.27614,0 0.5,0.2239 0.5,0.5 0,0.2761 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.2239 -0.5,-0.5 0,-0.2761 0.22386,-0.5 0.5,-0.5 z m 2,0 c 0.27614,0 0.5,0.2239 0.5,0.5 0,0.2761 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.2239 -0.5,-0.5 0,-0.2761 0.22386,-0.5 0.5,-0.5 z m -2.5,2 3,0 c 0,0 -0.25,1 -1.5,1 -1.25,0 -1.5,-1 -1.5,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 362.5,1268.3622 c -0.25,0 -0.5,0.25 -0.5,0.5 l 0,3 c 0,1.108 0.5,2.5 2.5,2.5 0.17934,0 0.34309,-0.01 0.5,-0.031 l 0,-1.4688 -2,0 c 0,0 0.25,-1 1.5,-1 0.25,0 0.34826,0.037 0.5,0.094 l 0,-1.094 c 0,-0.4583 0.20224,-0.8116 0.45312,-1.0625 0.25089,-0.2509 0.58854,-0.4375 1.04688,-0.4375 l 0.5,0 0,-0.4998 c 0,-0.25 -0.2643,-0.4998 -0.5,-0.5 -0.5,-4e-4 -1,0.4996 -2,0.4996 -0.86663,0 -1.5,-0.5 -2,-0.5 z m 1,2 c 0.27614,0 0.5,0.2239 0.5,0.5 0,0.2761 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.2239 -0.5,-0.5 0,-0.2761 0.22386,-0.5 0.5,-0.5 z m 3,0 c -0.2357,0 -0.5,0.25 -0.5,0.5 l 0,3 c 0,1.108 0.5,2.5 2.5,2.5 2,0 2.5,-1.392 2.5,-2.5 l 0,-3 c 0,-0.25 -0.2643,-0.5 -0.5,-0.5 -0.5,0 -1.25464,0.5 -2,0.5 -0.74536,0 -1.5,-0.5 -2,-0.5 z m 1,2 c 0.27614,0 0.5,0.2239 0.5,0.5 0,0.2761 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.2239 -0.5,-0.5 0,-0.2761 0.22386,-0.5 0.5,-0.5 z m 2,0 c 0.27614,0 0.5,0.2239 0.5,0.5 0,0.2761 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.2239 -0.5,-0.5 0,-0.2761 0.22386,-0.5 0.5,-0.5 z m -2.5,2 3,0 c 0,0 -0.25,1 -1.5,1 -1.25,0 -1.5,-1 -1.5,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect transform="translate(-120 1050.362)" y="216" x="480" height="12" width="12" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/theatre-18.svg b/data/styles/symbols/maki/theatre-18.svg
deleted file mode 100644
index 5236316026..0000000000
--- a/data/styles/symbols/maki/theatre-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-342 -232)" color="#000">
-        <path d="m 345.78125,1268.3622 c -0.38889,0 -0.78125,0.3924 -0.78125,0.7813 l 0,5.5 c 0,1.7236 0.76389,3.7812 3.875,3.7812 0.27897,0 -0.11909,-0.027 0.125,-0.062 l 0,-2 -2.5,0 c 0,0 0.5555,-2 2.5,-2 l 0,-1.6562 c 0,-0.713 0.10973,-1.454 0.5,-1.8443 0.39026,-0.3903 0.86828,-1.267 2.5,-0.5005 l 1,0.5005 0,-1.7182 c 0,-0.3889 -0.39236,-0.7813 -0.78125,-0.7813 -0.72222,0 -2.21875,1 -3.21875,1 -1,0 -2.49653,-1 -3.21875,-1 z m 1.21875,2 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m 3.78125,1 c -0.36665,0 -0.78125,0.3924 -0.78125,0.7813 l 0,5.2187 c 0,1.7236 0.88889,4 4,4 3.11111,0 4,-2.2764 4,-4 l 0,-5.2187 c 0,-0.3889 -0.4146,-0.7813 -0.78125,-0.7813 -0.72222,0 -2.21875,1 -3.21875,1 -1,0 -2.49653,-1 -3.21875,-1 z m 1.21875,2 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m 4,0 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m -4.5,4 2.5625,0 2.4375,0 c 0,0 -0.55555,2 -2.5,2 -1.94444,0 -2.5,-2 -2.5,-2 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 345.78125,1268.3622 c -0.38889,0 -0.78125,0.3924 -0.78125,0.7813 l 0,5.5 c 0,1.7236 0.76389,3.7812 3.875,3.7812 0.27897,0 -0.11909,-0.027 0.125,-0.062 l 0,-2 -2.5,0 c 0,0 0.5555,-2 2.5,-2 l 0,-1.6562 c 0,-0.713 0.10973,-1.454 0.5,-1.8443 0.39026,-0.3903 0.88818,-1.308 2.5,-0.5005 l 1,0.5005 0,-1.7182 c 0,-0.3889 -0.39236,-0.7813 -0.78125,-0.7813 -0.72222,0 -2.21875,1 -3.21875,1 -1,0 -2.49653,-1 -3.21875,-1 z m 1.21875,2 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m 3.78125,1 c -0.36665,0 -0.78125,0.3924 -0.78125,0.7813 l 0,5.2187 c 0,1.7236 0.88889,4 4,4 3.11111,0 4,-2.2764 4,-4 l 0,-5.2187 c 0,-0.3889 -0.4146,-0.7813 -0.78125,-0.7813 -0.72222,0 -2.21875,1 -3.21875,1 -1,0 -2.49653,-1 -3.21875,-1 z m 1.21875,2 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m 4,0 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m -4.5,4 2.5625,0 2.4375,0 c 0,0 -0.55555,2 -2.5,2 -1.94444,0 -2.5,-2 -2.5,-2 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect y="1266.362" x="342" height="18" width="18" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/theatre-24.svg b/data/styles/symbols/maki/theatre-24.svg
deleted file mode 100644
index 055479f514..0000000000
--- a/data/styles/symbols/maki/theatre-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-318 -238)" color="#000">
-        <path d="m 323,1269.3622 c -0.4714,0 -1,0.5 -1,1 l 0,7 c 0,2.216 1,5 5,5 0.35868,0 0.68618,-0.017 1,-0.062 l 0,-2.9375 -4,0 c 0,0 0.5,-2 3,-2 0.5,0 0.69653,0.074 1,0.1875 l 0,-2.1875 c 0,-0.9167 0.36529,-1.6826 1,-2 1,-0.5 1.40372,-0.2981 2,0 1,0.5 1,0.5 1,0.5 l 0,-3.5 c 0,-0.5 -0.5286,-1 -1,-1 -1,0 -2,1 -4,1 -2,0 -3,-1 -4,-1 z m 7,5 c -0.4714,0 -1,0.5 -1,1 l 0,7 c 0,2.216 1,5 5,5 4,0 5,-2.784 5,-5 l 0,-7 c 0,-0.5 -0.5286,-1 -1,-1 -1,0 -2,1 -4,1 -2,0 -3,-1 -4,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <rect y="1266.362" x="318" height="24" width="24" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 323,1269.3622 c -0.4714,0 -1,0.5 -1,1 l 0,7 c 0,2.216 1,5 5,5 0.35868,0 0.68618,-0.017 1,-0.062 l 0,-2.9375 -4,0 c 0,0 0.5,-2 3,-2 0.5,0 0.69653,0.074 1,0.1875 l 0,-2.1875 c 0,-0.9167 0.36529,-1.6826 1,-2 1,-0.5 1.40372,-0.2981 2,0 1,0.5 1,0.5 1,0.5 l 0,-3.5 c 0,-0.5 -0.5286,-1 -1,-1 -1,0 -2,1 -4,1 -2,0 -3,-1 -4,-1 z m 1.75,3.5 c 0.69036,0 1.25,0.5596 1.25,1.25 0,0.6904 -0.55964,1.25 -1.25,1.25 -0.69036,0 -1.25,-0.5596 -1.25,-1.25 0,-0.6904 0.55964,-1.25 1.25,-1.25 z m 5.25,1.5 c -0.4714,0 -1,0.5 -1,1 l 0,7 c 0,2.216 1,5 5,5 4,0 5,-2.784 5,-5 l 0,-7 c 0,-0.5 -0.5286,-1 -1,-1 -1,0 -2,1 -4,1 -2,0 -3,-1 -4,-1 z m 1.75,3.5 c 0.69036,0 1.25,0.5596 1.25,1.25 0,0.6904 -0.55964,1.25 -1.25,1.25 -0.69036,0 -1.25,-0.5596 -1.25,-1.25 0,-0.6904 0.55964,-1.25 1.25,-1.25 z m 4.5,0 c 0.69036,0 1.25,0.5596 1.25,1.25 0,0.6904 -0.55964,1.25 -1.25,1.25 -0.69036,0 -1.25,-0.5596 -1.25,-1.25 0,-0.6904 0.55964,-1.25 1.25,-1.25 z m -5.25,5.5 6,0 c 0,0 -0.5,2 -3,2 -2.5,0 -3,-2 -3,-2 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/toilets-12.svg b/data/styles/symbols/maki/toilets-12.svg
deleted file mode 100644
index 5255e20328..0000000000
--- a/data/styles/symbols/maki/toilets-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="matrix(.5 0 0 .5 -159 -645.181)" color="#000">
-        <path transform="matrix(2 0 0 2 -642 810.362)" d="m 484,241 c -0.69036,0 -1.25,0.55964 -1.25,1.25 0,0.69036 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.55964 1.25,-1.25 0,-0.69036 -0.55964,-1.25 -1.25,-1.25 z m 5,0 c -0.69036,0 -1.25,0.55964 -1.25,1.25 0,0.69036 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.55964 1.25,-1.25 0,-0.69036 -0.55964,-1.25 -1.25,-1.25 z m -6,3 0,1.5 -1.5,2.5 1.5,0 0,2 2,0 0,-2 1.5,0 -1.5,-2.5 0,-1.5 -2,0 z m 4,0 1,3.5 0,2.5 2,0 0,-2.5 1,-3.5 -4,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 484,241 c -0.69036,0 -1.25,0.55964 -1.25,1.25 0,0.69036 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.55964 1.25,-1.25 0,-0.69036 -0.55964,-1.25 -1.25,-1.25 z m 5,0 c -0.69036,0 -1.25,0.55964 -1.25,1.25 0,0.69036 0.55964,1.25 1.25,1.25 0.69036,0 1.25,-0.55964 1.25,-1.25 0,-0.69036 -0.55964,-1.25 -1.25,-1.25 z m -6,3 0,1.5 -1.5,2.5 1.5,0 0,2 2,0 0,-2 1.5,0 -1.5,-2.5 0,-1.5 -2,0 z m 4,0 1,3.5 0,2.5 2,0 0,-2.5 1,-3.5 -4,0 z" transform="matrix(2 0 0 2 -642 810.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect y="1290.362" x="318" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/toilets-18.svg b/data/styles/symbols/maki/toilets-18.svg
deleted file mode 100644
index 1f6372fc56..0000000000
--- a/data/styles/symbols/maki/toilets-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-342 -256)" color="#000">
-        <path d="m 348.00001,1291.3622 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m 6.99999,0 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m -7.49999,5 -1.5,1.5 0,2.5 -1.5,2.5 0.5,0.5 2,0 0,3 2,0 0,-3 2,0 0.5,-0.5 -1.5,-2.5 0,-2.5 -1.5,-1.5 z m 5.49999,0 -0.99999,1 1.99999,4.5 0,4.5 2,0 0,-4.5 2.00001,-4.5 -1.00001,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 348.00001,1291.3622 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m 6.99999,0 c -1.10457,0 -2,0.8954 -2,2 0,1.1046 0.89543,2 2,2 1.10457,0 2,-0.8954 2,-2 0,-1.1046 -0.89543,-2 -2,-2 z m -7.49999,5 -1.5,1.5 0,2.5 -1.5,2.5 0.5,0.5 2,0 0,3 2,0 0,-3 2,0 0.5,-0.5 -1.5,-2.5 0,-2.5 -1.5,-1.5 z m 5.49999,0 -0.99999,1 1.99999,4.5 0,4.5 2,0 0,-4.5 2.00001,-4.5 -1.00001,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect y="1290.362" x="342" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/toilets-24.svg b/data/styles/symbols/maki/toilets-24.svg
deleted file mode 100644
index d84c0b05b3..0000000000
--- a/data/styles/symbols/maki/toilets-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-318 -262)" color="#000">
-        <path transform="translate(-120 1050.362)" d="m 446.5,242 c -1.38071,0 -2.5,1.11929 -2.5,2.5 0,1.38071 1.11929,2.5 2.5,2.5 1.38071,0 2.5,-1.11929 2.5,-2.5 0,-1.38071 -1.11929,-2.5 -2.5,-2.5 z m 8,0 c -1.38071,0 -2.5,1.11929 -2.5,2.5 0,1.38071 1.11929,2.5 2.5,2.5 1.38071,0 2.5,-1.11929 2.5,-2.5 0,-1.38071 -1.11929,-2.5 -2.5,-2.5 z m -8.5,6 c -1,0 -2,1 -2,2 l 0,2 -1.5,4.5 c 0,0.5 0.5,0.5 1,0.5 l 1.5,0 0,4 3,0 0,-4 1.5,0 c 0.5,0 1,0 1,-0.5 l -1.5,-4.5 0,-2 c 0,-1 -1,-2 -2,-2 z m 6,0 c -0.5,0 -1,0.5 -1,1 l 2,6 0,2 0,4 3,0 0,-4 0,-2 2,-6 c 0,-0.5 -0.5,-1 -1,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 446.5,242 c -1.38071,0 -2.5,1.11929 -2.5,2.5 0,1.38071 1.11929,2.5 2.5,2.5 1.38071,0 2.5,-1.11929 2.5,-2.5 0,-1.38071 -1.11929,-2.5 -2.5,-2.5 z m 8,0 c -1.38071,0 -2.5,1.11929 -2.5,2.5 0,1.38071 1.11929,2.5 2.5,2.5 1.38071,0 2.5,-1.11929 2.5,-2.5 0,-1.38071 -1.11929,-2.5 -2.5,-2.5 z m -8.5,6 c -1,0 -2,1 -2,2 l 0,2 -1.5,4.5 c 0,0.5 0.5,0.5 1,0.5 l 1.5,0 0,4 3,0 0,-4 1.5,0 c 0.5,0 1,0 1,-0.5 l -1.5,-4.5 0,-2 c 0,-1 -1,-2 -2,-2 z m 6,0 c -0.5,0 -1,0.5 -1,1 l 2,6 0,2 0,4 3,0 0,-4 0,-2 2,-6 c 0,-0.5 -0.5,-1 -1,-1 z" transform="translate(-120 1050.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect width="24" height="24" x="318" y="1290.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/town-12.svg b/data/styles/symbols/maki/town-12.svg
deleted file mode 100644
index b0a8991439..0000000000
--- a/data/styles/symbols/maki/town-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-672 -250)" color="#000">
-        <path d="m 676,1292.8622 -2,1.5 0,5 1.5,0 0,-1 1,0 0,1 1.5,0 0,-5 z m -1,2 2,0 0,0.5 -2,0 z m 4,0.5 0,5 1.5,0 0,-1 1,0 0,1 1.5,0 0,-5 -2,-1.5 z m 1,0.5 2,0 0,0.5 -2,0 z m -5,1 2,0 0,0.5 -2,0 z m 5,1 2,0 0,0.5 -2,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <rect y="1290.362" x="672" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 676,1292.8622 -2,1.5 0,5 1.5,0 0,-1 1,0 0,1 1.5,0 0,-5 z m -1,2 2,0 0,0.5 -2,0 z m 4,0.5 0,5 1.5,0 0,-1 1,0 0,1 1.5,0 0,-5 -2,-1.5 z m 1,0.5 2,0 0,0.5 -2,0 z m -5,1 2,0 0,0.5 -2,0 z m 5,1 2,0 0,0.5 -2,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/town-18.svg b/data/styles/symbols/maki/town-18.svg
deleted file mode 100644
index 93981d74cb..0000000000
--- a/data/styles/symbols/maki/town-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-654 -256)" color="#000">
-        <path d="m 660,1293.3622 -3,2 0,7 2,0 0,-2 2,0 0,2 2,0 0,-7 z m 4,4 0,7 2,0 0,-2 2,0 0,2 2,0 0,-7 -3,-2 z m -6,-1 1,0 0,1 -1,0 z m 3,0 1,0 0,1 -1,0 z m 4,2 1,0 0,1 -1,0 z m 3,0 1,0 0,1 -1,0 z m -10,0 1,0 0,1 -1,0 z m 3,0 1,0 0,1 -1,0 z m 4,2 1,0 0,1 -1,0 z m 3,0 1,0 0,1 -1,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <rect width="18" height="18" x="654" y="1290.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 660,1293.3622 -3,2 0,7 2,0 0,-2 2,0 0,2 2,0 0,-7 z m 4,4 0,7 2,0 0,-2 2,0 0,2 2,0 0,-7 -3,-2 z m -6,-1 1,0 0,1 -1,0 z m 3,0 1,0 0,1 -1,0 z m 4,2 1,0 0,1 -1,0 z m 3,0 1,0 0,1 -1,0 z m -10,0 1,0 0,1 -1,0 z m 3,0 1,0 0,1 -1,0 z m 4,2 1,0 0,1 -1,0 z m 3,0 1,0 0,1 -1,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/town-24.svg b/data/styles/symbols/maki/town-24.svg
deleted file mode 100644
index 25419bbd71..0000000000
--- a/data/styles/symbols/maki/town-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-630 -262)" color="#000">
-        <path d="m 638,1296.3622 -3,1.5 c -0.51116,0.2556 -1,1 -1,1.5 l 0,8 3,0 0,-3 2,0 0,3 3,0 0,-8 c 0,-0.5 -0.50201,-1.251 -1,-1.5 l -3,-1.5 z m 9,2 -3,1.5 c -0.51116,0.2556 -1,1 -1,1.5 l 0,8 3,0 0,-3 2,0 0,3 3,0 0,-8 c 0,-0.5 -0.50201,-1.251 -1,-1.5 l -3,-1.5 z m -12,2 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -4,2 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m 5,0 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -4,2 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 638,1296.3622 -3,1.5 c -0.51116,0.2556 -1,1 -1,1.5 l 0,8 3,0 0,-3 2,0 0,3 3,0 0,-8 c 0,-0.5 -0.50201,-1.251 -1,-1.5 l -3,-1.5 z m 9,2 -3,1.5 c -0.51116,0.2556 -1,1 -1,1.5 l 0,8 3,0 0,-3 2,0 0,3 3,0 0,-8 c 0,-0.5 -0.50201,-1.251 -1,-1.5 l -3,-1.5 z m -12,2 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -4,2 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m 5,0 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z m -4,2 2,0 0,1 -2,0 0,-1 z m 4,0 2,0 0,1 -2,0 0,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect y="1290.362" x="630" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/town-hall-12.svg b/data/styles/symbols/maki/town-hall-12.svg
deleted file mode 100644
index 52ebf75c44..0000000000
--- a/data/styles/symbols/maki/town-hall-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-438 -58)" color="#000">
-        <g>
-            <path d="m 448,1102.3622 -3.5,-2 -3.5,2 0,5 0,1 -1,1 9,0 -1,-1 0,-1 z m -6,2.5 0.5,-0.5 0.5,0.5 0,2.5 -1,0 z m 2,0 0.5,-0.5 0.5,0.5 0,2.5 -1,0 z m 2,0 0.5,-0.5 0.5,0.5 0,2.5 -1,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-            <path d="m 444.5,1100.3622 -3.5,2 7,0 z m -3,3 c -0.27701,0 -0.5,0.223 -0.5,0.5 l 0,3.5 0,1 -1,1 9,0 -1,-1 0,-1 0,-3.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 0.5,1.5 0.5,-0.5 0.5,0.5 0,2.5 -1,0 z m 2,0 0.5,-0.5 0.5,0.5 0,2.5 -1,0 z m 2,0 0.5,-0.5 0.5,0.5 0,2.5 -1,0 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -1)"/>
-        </g>
-        <rect width="12" height="12" x="438" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/town-hall-18.svg b/data/styles/symbols/maki/town-hall-18.svg
deleted file mode 100644
index 21c7adf8a2..0000000000
--- a/data/styles/symbols/maki/town-hall-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-420 -64)" color="#000">
-        <g>
-            <path d="m 435,1105.3622 -5.5,-3 -5.5,3 0,1.9375 0,5.0625 -1,2.5 c 0,0.3611 0.23397,0.5 0.5,0.5 l 12,0 c 0.25638,0 0.5,-0.1389 0.5,-0.5 l -1,-2.5 0,-5.0625 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(0 -2)"/>
-            <path d="m 429.5,1102.3622 -5.5,3 11,0 z m -4.5,4 c -0.5,0 -1,0.493 -1,0.9375 l 0,5.0625 -1,2.5 c 0,0.3611 0.23397,0.5 0.5,0.5 l 12,0 c 0.25638,0 0.5,-0.1389 0.5,-0.5 l -1,-2.5 0,-5.0625 c 0,-0.4445 -0.5,-0.9375 -1,-0.9375 z m 1.5,1 0.5,0.5 0,1.5 0,3 -1,0 0,-3 0,-1.5 z m 3,0 0.5,0.5 0,1.5 0,3 -1,0 0,-3 0,-1.5 z m 3,0 0.5,0.5 0,1.5 0,3 -1,0 0,-3 0,-1.5 z" fill="#444" overflow="visible" enable-background="accumulate" transform="translate(0 -2)"/>
-        </g>
-        <rect y="1098.362" x="420" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/town-hall-24.svg b/data/styles/symbols/maki/town-hall-24.svg
deleted file mode 100644
index db8f885b55..0000000000
--- a/data/styles/symbols/maki/town-hall-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-396 -70)" color="#000">
-        <g>
-            <path d="m 416,1106.3622 -7.5,-5 -7.5,5 0,2 0,7 -1.75,3 c -0.14834,0.2543 -0.25,0.3567 -0.25,0.5 0,0.5 0.63165,0.5 1,0.5 l 17,0 c 0.35499,0 1,0 1,-0.5 0,-0.1462 -0.0866,-0.2199 -0.25,-0.5 l -1.75,-3 0,-7 z m -12,3 c 0.554,0 0.90892,0.4535 1,1 l 0,6 -2,0 0,-2 0,-4 c 0,-0.554 0.446,-1 1,-1 z m 4.5,0 c 0.554,0 1.00866,0.4461 1,1 l 0,4 0,2 -2,0 0,-2 0,-4 c 0,-0.554 0.446,-1 1,-1 z m 4.5,0 c 0.554,0 1,0.446 1,1 l 0,6 -2,0 0,-2 0,-4 c 0,-0.554 0.446,-1 1,-1 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 408.5,1101.3622 -7.5,5 15,0 z m -6.5,6 c -0.55401,0 -1,0.446 -1,1 l 0,7 -1.75,3 c -0.14834,0.2543 -0.25,0.3567 -0.25,0.5 0,0.5 0.63165,0.5 1,0.5 l 17,0 c 0.35499,0 1,0 1,-0.5 0,-0.1462 -0.0866,-0.2199 -0.25,-0.5 l -1.75,-3 0,-7 c 0,-0.554 -0.44599,-1 -1,-1 z m 2,2 c 0.554,0 0.90892,0.4535 1,1 l 0,6 -2,0 0,-2 0,-4 c 0,-0.554 0.446,-1 1,-1 z m 4.5,0 c 0.554,0 1.00866,0.4461 1,1 l 0,4 0,2 -2,0 0,-2 0,-4 c 0,-0.554 0.446,-1 1,-1 z m 4.5,0 c 0.554,0 1,0.446 1,1 l 0,6 -2,0 0,-2 0,-4 c 0,-0.554 0.446,-1 1,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="396" y="1098.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/triangle-12.svg b/data/styles/symbols/maki/triangle-12.svg
deleted file mode 100644
index 7108c829e6..0000000000
--- a/data/styles/symbols/maki/triangle-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(30 -130)" color="#000">
-        <g fill="#444" font-family="Sans">
-            <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m -23.5,1172.3622 c -0.25,0 -0.363045,0.1197 -0.4375,0.25 l -4,7 c -0.04405,0.077 -0.0625,0.1637 -0.0625,0.25 0,0.375 0.25,0.5001 0.5,0.5 l 8,0 c 0.25,10e-5 0.5,-0.125 0.5,-0.5 0,-0.086 -0.01845,-0.1728 -0.0625,-0.25 l -4,-7 c -0.07446,-0.1303 -0.1875,-0.25 -0.4375,-0.25 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-            <path d="m -23.5,1172.3622 c -0.25,0 -0.363045,0.1197 -0.4375,0.25 l -4,7 c -0.04405,0.077 -0.0625,0.1637 -0.0625,0.25 0,0.375 0.25,0.5001 0.5,0.5 l 8,0 c 0.25,10e-5 0.5,-0.125 0.5,-0.5 0,-0.086 -0.01845,-0.1728 -0.0625,-0.25 l -4,-7 c -0.07446,-0.1303 -0.1875,-0.25 -0.4375,-0.25 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="12" height="12" x="-30" y="1170.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/triangle-18.svg b/data/styles/symbols/maki/triangle-18.svg
deleted file mode 100644
index 3625f70a9b..0000000000
--- a/data/styles/symbols/maki/triangle-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(48 -136)" color="#000">
-        <g fill="#444" font-family="Sans">
-            <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m -38.49998,1173.3622 c -0.36111,0 -0.52441,0.1729 -0.63195,0.361 l -5.77777,10.5557 c -0.0636,0.1112 -0.0903,0.2364 -0.0903,0.3611 0,0.5417 0.36111,0.7224 0.72222,0.7222 l 11.55556,0 c 0.36111,2e-4 0.72222,-0.1805 0.72222,-0.7222 0,-0.1243 -0.0267,-0.2496 -0.0903,-0.3611 l -5.77778,-10.5557 c -0.10761,-0.1881 -0.27083,-0.361 -0.63194,-0.361 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-            <path d="m -38.49998,1173.3622 c -0.36111,0 -0.52441,0.1729 -0.63195,0.361 l -5.77777,10.5557 c -0.0636,0.1112 -0.0903,0.2364 -0.0903,0.3611 0,0.5417 0.36111,0.7224 0.72222,0.7222 l 11.55556,0 c 0.36111,2e-4 0.72222,-0.1805 0.72222,-0.7222 0,-0.1243 -0.0267,-0.2496 -0.0903,-0.3611 l -5.77778,-10.5557 c -0.10761,-0.1881 -0.27083,-0.361 -0.63194,-0.361 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1170.362" x="-48" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/triangle-24.svg b/data/styles/symbols/maki/triangle-24.svg
deleted file mode 100644
index 7233c58936..0000000000
--- a/data/styles/symbols/maki/triangle-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(72 -142)" color="#000">
-        <g fill="#444" font-family="Sans">
-            <path d="m -96.375,1161.8622 c -0.5,-10e-5 -0.726094,0.2394 -0.875,0.5 l -8.5,14 c -0.0881,0.1543 -0.125,0.3274 -0.125,0.5 0,0.75 0.5,1.0002 1,1 l 17,0 c 0.5,2e-4 1,-0.25 1,-1 0,-0.1726 -0.03685,-0.3457 -0.125,-0.5 l -8.5,-14 c -0.148906,-0.2606 -0.375,-0.5001 -0.875,-0.5 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" transform="translate(36.875 12.5)"/>
-            <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m -96.375,1161.8622 c -0.5,-10e-5 -0.726094,0.2394 -0.875,0.5 l -8.5,14 c -0.0881,0.1543 -0.125,0.3274 -0.125,0.5 0,0.75 0.5,1.0002 1,1 l 17,0 c 0.5,2e-4 1,-0.25 1,-1 0,-0.1726 -0.03685,-0.3457 -0.125,-0.5 l -8.5,-14 c -0.148906,-0.2606 -0.375,-0.5001 -0.875,-0.5 z" overflow="visible" enable-background="accumulate" transform="translate(36.875 12.5)"/>
-        </g>
-        <rect width="24" height="24" x="-72" y="1170.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/triangle-stroked-12.svg b/data/styles/symbols/maki/triangle-stroked-12.svg
deleted file mode 100644
index 37b85a4bab..0000000000
--- a/data/styles/symbols/maki/triangle-stroked-12.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(30 -106)" color="#000">
-        <g fill="#444" font-family="Sans">
-            <path d="m -23.5,1148.3622 c -0.25,0 -0.363045,0.1197 -0.4375,0.25 l -4,7 c -0.04405,0.077 -0.0625,0.1637 -0.0625,0.25 0,0.375 0.25,0.5001 0.5,0.5 l 8,0 c 0.25,10e-5 0.5,-0.125 0.5,-0.5 0,-0.086 -0.01845,-0.1728 -0.0625,-0.25 l -4,-7 c -0.07446,-0.1303 -0.1875,-0.25 -0.4375,-0.25 z m 0,1.5 3,5.5 -6,0 3,-5.5 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-            <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m 96.5,98 c -0.25,0 -0.363045,0.1197 -0.4375,0.25 l -4,7 C 92.01845,105.327 92,105.4137 92,105.5 c 0,0.375 0.25,0.5001 0.5,0.5 l 8,0 c 0.25,1e-4 0.5,-0.125 0.5,-0.5 0,-0.086 -0.0185,-0.1728 -0.0625,-0.25 l -4,-7 C 96.86304,98.1197 96.75,98 96.5,98 z m 0,1.5 3,5.5 -6,0 3,-5.5 z" transform="translate(-120 1050.362)" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="12" height="12" x="-30" y="1146.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/triangle-stroked-18.svg b/data/styles/symbols/maki/triangle-stroked-18.svg
deleted file mode 100644
index d652f66eda..0000000000
--- a/data/styles/symbols/maki/triangle-stroked-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(48 -112)" color="#000">
-        <g fill="#444" font-family="Sans">
-            <path d="m -38.5,1149.3622 c -0.36111,0 -0.51746,0.1869 -0.625,0.375 l -5.78125,10.5313 c -0.0636,0.1112 -0.09375,0.2503 -0.09375,0.375 0,0.5417 0.35764,0.7189 0.71875,0.7187 l 11.5625,0 c 0.36111,2e-4 0.71875,-0.177 0.71875,-0.7187 0,-0.1243 -0.03015,-0.2635 -0.09375,-0.375 l -5.78125,-10.5313 c -0.10761,-0.1881 -0.26389,-0.375 -0.625,-0.375 z m 0,2 4.5,8.5 -9,0 4.5,-8.5 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate"/>
-            <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m -38.5,1149.3622 c -0.36111,0 -0.51746,0.1869 -0.625,0.375 l -5.78125,10.5313 c -0.0636,0.1112 -0.09375,0.2503 -0.09375,0.375 0,0.5417 0.35764,0.7189 0.71875,0.7187 l 11.5625,0 c 0.36111,2e-4 0.71875,-0.177 0.71875,-0.7187 0,-0.1243 -0.03015,-0.2635 -0.09375,-0.375 l -5.78125,-10.5313 c -0.10761,-0.1881 -0.26389,-0.375 -0.625,-0.375 z m 0,2 4.5,8.5 -9,0 4.5,-8.5 z" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1146.362" x="-48" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/triangle-stroked-24.svg b/data/styles/symbols/maki/triangle-stroked-24.svg
deleted file mode 100644
index d7dc66e621..0000000000
--- a/data/styles/symbols/maki/triangle-stroked-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(72 -118)" color="#000">
-        <g fill="#444" font-family="Sans">
-            <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m -56.375,1161.8622 c -0.5,-10e-5 -0.72609,0.2394 -0.875,0.5 l -8.5,14 c -0.0881,0.1543 -0.125,0.3274 -0.125,0.5 0,0.75 0.5,1.0002 1,1 l 17,0 c 0.5,2e-4 1,-0.25 1,-1 0,-0.1726 -0.0369,-0.3457 -0.125,-0.5 l -8.5,-14 c -0.14891,-0.2606 -0.375,-0.5001 -0.875,-0.5 z m 0,3 6.78125,11 -13.5625,0 z" opacity=".3" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" transform="translate(-3.125 -11.5)"/>
-            <path d="m -56.375,1161.8622 c -0.5,-10e-5 -0.72609,0.2394 -0.875,0.5 l -8.5,14 c -0.0881,0.1543 -0.125,0.3274 -0.125,0.5 0,0.75 0.5,1.0002 1,1 l 17,0 c 0.5,2e-4 1,-0.25 1,-1 0,-0.1726 -0.0369,-0.3457 -0.125,-0.5 l -8.5,-14 c -0.14891,-0.2606 -0.375,-0.5001 -0.875,-0.5 z m 0,3 6.78125,11 -13.5625,0 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" overflow="visible" enable-background="accumulate" transform="translate(-3.125 -11.5)"/>
-        </g>
-        <rect width="24" height="24" x="-72" y="1146.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/village-12.svg b/data/styles/symbols/maki/village-12.svg
deleted file mode 100644
index d1966a31bd..0000000000
--- a/data/styles/symbols/maki/village-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-672 -274)" color="#000">
-        <path d="m 676.5,1316.8622 -2.5,2.5 1,0 0,3 1,0 0,-1.5 1,0 0,1.5 1,0 0,-3 1,0 z m 4,2 -2,2 0,0.5 0.5,0 0,3 1,0 0,-1.5 1,0 0,1.5 1,0 0,-3 1,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <rect width="12" height="12" x="672" y="1314.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 676.5,1316.8622 -2.5,2.5 1,0 0,3 1,0 0,-1.5 1,0 0,1.5 1,0 0,-0.5 0,-0.5 0,-1.5 0,-0.5 1,0 -2.5,-2.5 z m 4,2 -2,2 0,0.5 0.5,0 0,3 1,0 0,-1.5 1,0 0,1.5 1,0 0,-3 1,0 -2.5,-2.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/village-18.svg b/data/styles/symbols/maki/village-18.svg
deleted file mode 100644
index e09d989526..0000000000
--- a/data/styles/symbols/maki/village-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-654 -280)" color="#000">
-        <path d="m 660.5,1318.8622 -3.5,2.5 0,1 1,0 0,4 2,0 0,-2 1,0 0,2 2,0 0,-4 1,0 0,-1 -3.5,-2.5 z m 6,2 -3,2.1563 0,1.3437 0.5,0 0,4 2,0 0,-2 1,0 0,2 2,0 0,-4 1,0 0,-1 -3.5,-2.5 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <rect y="1314.362" x="654" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path transform="translate(-120 1050.362)" d="m 780.5,268.5 -3.5,2.5 0,1 1,0 0,4 2,0 0,-2 1,0 0,2 2,0 0,-4 1,0 0,-1 -3.5,-2.5 z m 6,2 -3,2.15625 0,1.34375 0.5,0 0,4 2,0 0,-2 1,0 0,2 2,0 0,-4 1,0 0,-1 -3.5,-2.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/village-24.svg b/data/styles/symbols/maki/village-24.svg
deleted file mode 100644
index 49d1ddbe0d..0000000000
--- a/data/styles/symbols/maki/village-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-630 -286)" color="#000">
-        <path d="m 638,1319.3622 -4.5,4 c -0.5,0.5 0,1 0.5,1 l 1,0 0,5 1,0 1,0 0,-3 2,0 0,3 1,0 1,0 0,-5 1,0 c 0.5,0 1,-0.5 0.5,-1 l -4.5,-4 z m 9,3 -4.5,4 c -0.5,0.5 0,1 0.5,1 l 1,0 0,5 1,0 1,0 0,-3 2,0 0,3 1,0 1,0 0,-5 1,0 c 0.5,0 1,-0.5 0.5,-1 l -4.5,-4 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <rect width="24" height="24" x="630" y="1314.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path transform="translate(-120 1050.362)" d="m 758,269 -4.5,4 c -0.5,0.5 0,1 0.5,1 l 1,0 0,5 1,0 1,0 0,-3 2,0 0,3 1,0 1,0 0,-5 1,0 c 0.5,0 1,-0.5 0.5,-1 l -4.5,-4 z m 9,3 -4.5,4 c -0.5,0.5 0,1 0.5,1 l 1,0 0,5 1,0 1,0 0,-3 2,0 0,3 1,0 1,0 0,-5 1,0 c 0.5,0 1,-0.5 0.5,-1 l -4.5,-4 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/warehouse-12.svg b/data/styles/symbols/maki/warehouse-12.svg
deleted file mode 100644
index 15b37a16c0..0000000000
--- a/data/styles/symbols/maki/warehouse-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-672 -10)" color="#000">
-        <path d="m 679,1052.3622 -1,0 -4,3.3125 0,0.6875 1,0 0,4 2,0 0,-0.5 3,0 0,0.5 2,0 0,-4 1,0 0,-0.6875 z m -2,4.5 3,0 0,0.5 -3,0 z m 0,1 3,0 0,0.5 -3,0 z m 0,1 3,0 0,0.5 -3,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <rect y="1050.362" x="672" height="12" width="12" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 679,1052.3622 -1,0 -4,3.3125 0,0.6875 1,0 0,4 2,0 0,-0.5 3,0 0,0.5 2,0 0,-4 1,0 0,-0.6875 z m -2,4.5 3,0 0,0.5 -3,0 z m 0,1 3,0 0,0.5 -3,0 z m 0,1 3,0 0,0.5 -3,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/warehouse-18.svg b/data/styles/symbols/maki/warehouse-18.svg
deleted file mode 100644
index 30a2154f63..0000000000
--- a/data/styles/symbols/maki/warehouse-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-654 -16)" color="#000">
-        <rect width="18" height="18" x="654" y="1050.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 664,1053.3622 -1,0 -6,5 0,1 1,0 0,6 11,0 0,-6 1,0 0,-1 z m -3,6.5 5,0 0,0.5 -5,0 z m 0,2 5,0 0,0.5 -5,0 z m 0,2 5,0 0,0.5 -5,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 664,1053.3622 -1,0 -6,5 0,1 1,0 0,6 11,0 0,-6 1,0 0,-1 z m -3,6.5 5,0 0,0.5 -5,0 z m 0,2 5,0 0,0.5 -5,0 z m 0,2 5,0 0,0.5 -5,0 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/warehouse-24.svg b/data/styles/symbols/maki/warehouse-24.svg
deleted file mode 100644
index 3dd5dcde0a..0000000000
--- a/data/styles/symbols/maki/warehouse-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-630 -46)" color="#000">
-        <path transform="translate(-120 1074.362)" d="m 761,3 -7.5,6.5 c -0.36201,0.3017 -0.5,0.5 -0.5,0.75 0,0.4959 0.5,0.75 1,0.75 l 1,0 0,8 c 0,0.554 0.446,1 1,1 l 13,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 1,0 c 0.5,0 1,-0.2541 1,-0.75 C 772,10 771.86201,9.8017 771.5,9.5 L 764,3 z m -2,9 7,0 0,0.5 -7,0 z m 0,2 7,0 0,0.5 -7,0 z m 0,2 7,0 0,0.5 -7,0 z m 0,2 7,0 0,0.5 -7,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <rect width="24" height="24" x="630" y="1074.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 761,3 -7.5,6.5 c -0.36201,0.3017 -0.5,0.5 -0.5,0.75 0,0.4959 0.5,0.75 1,0.75 l 1,0 0,8 c 0,0.554 0.446,1 1,1 l 13,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 1,0 c 0.5,0 1,-0.2541 1,-0.75 C 772,10 771.86201,9.8017 771.5,9.5 L 764,3 z m -2,9 7,0 0,0.5 -7,0 z m 0,2 7,0 0,0.5 -7,0 z m 0,2 7,0 0,0.5 -7,0 z m 0,2 7,0 0,0.5 -7,0 z" transform="translate(-120 1074.362)" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/waste-basket-12.svg b/data/styles/symbols/maki/waste-basket-12.svg
deleted file mode 100644
index 57cbc9ce71..0000000000
--- a/data/styles/symbols/maki/waste-basket-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-360 -226)" color="#000">
-        <path d="m 364.5,1267.3622 0,2 -1.5,0 0,1 7,0 0,-1 -1.5,0 0,-2 z m 0.5,1 3,0 0,1 -2.98995,0 z m -2,2.5 1,6.5 0.32584,0 4.26315,0 0.41101,0 1,-6.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 364.5,1267.3622 0,2 -1.5,0 0,1 7,0 0,-1 -1.5,0 0,-2 z m 0.5,1 3,0 0,1 -2.98995,0 z m -2,2.5 1,6.5 0.32584,0 4.26315,0 0.41101,0 1,-6.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect width="12" height="12" x="360" y="1266.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/waste-basket-18.svg b/data/styles/symbols/maki/waste-basket-18.svg
deleted file mode 100644
index 9969dda9ef..0000000000
--- a/data/styles/symbols/maki/waste-basket-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-342 -232)" color="#000">
-        <path d="m 349.518,1268.3622 c -0.20411,0 -0.268,0.1643 -0.268,0.3684 l 0,1.6316 -2.51315,0 c -0.40822,0 -0.73685,0.092 -0.73685,0.5 0,0.4083 0.32863,0.5 0.73685,0.5 l 9.52631,0 c 0.40821,0 0.73684,-0.092 0.73684,-0.5 0,-0.4082 -0.32863,-0.5 -0.73684,-0.5 l -2.51316,0 0,-1.6316 c 0,-0.2041 -0.16389,-0.3684 -0.368,-0.3684 z m 0.482,0.7368 3,0 0,1.2632 -3,0 z m -3.26315,3.2632 c -0.40822,0 -0.78834,0.3343 -0.72122,0.7369 l 1.40542,8.5263 c 0.0664,0.4027 0.32863,0.7368 0.73685,0.7368 l 6.63157,0 c 0.40822,0 0.66972,-0.3342 0.73685,-0.7368 l 1.45805,-8.5263 c 0.0688,-0.4023 -0.313,-0.7369 -0.72121,-0.7369 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 349.518,1268.3622 c -0.20411,0 -0.268,0.1643 -0.268,0.3684 l 0,1.6316 -2.51315,0 c -0.40822,0 -0.73685,0.092 -0.73685,0.5 0,0.4083 0.32863,0.5 0.73685,0.5 l 9.52631,0 c 0.40821,0 0.73684,-0.092 0.73684,-0.5 0,-0.4082 -0.32863,-0.5 -0.73684,-0.5 l -2.51316,0 0,-1.6316 c 0,-0.2041 -0.16389,-0.3684 -0.368,-0.3684 z m 0.482,0.7368 3,0 0,1.2632 -3,0 z m -3.26315,3.2632 c -0.40822,0 -0.78834,0.3343 -0.72122,0.7369 l 1.40542,8.5263 c 0.0664,0.4027 0.32863,0.7368 0.73685,0.7368 l 6.63157,0 c 0.40822,0 0.66972,-0.3342 0.73685,-0.7368 l 1.45805,-8.5263 c 0.0688,-0.4023 -0.313,-0.7369 -0.72121,-0.7369 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect width="18" height="18" x="342" y="1266.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/waste-basket-24.svg b/data/styles/symbols/maki/waste-basket-24.svg
deleted file mode 100644
index 0f65ac413e..0000000000
--- a/data/styles/symbols/maki/waste-basket-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-318 -238)" color="#000">
-        <path d="m 328.5,1268.3622 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1.5 -4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 l 13,0 c 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 l -4,0 0,-1.5 c 0,-0.277 -0.22299,-0.5 -0.5,-0.5 z m 0.5,1 3,0 0,1 -3,0 z m -5,4 c -0.554,0 -1.07547,0.4536 -0.98437,1 l 1.98437,12 c 0.0904,0.5465 0.446,1 1,1 l 9,0 c 0.554,0 0.9089,-0.4536 1,-1 l 1.98437,-12 c 0.0904,-0.5465 -0.43037,-1 -0.98437,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 328.5,1268.3622 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1.5 -4,0 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 l 13,0 c 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 l -4,0 0,-1.5 c 0,-0.277 -0.22299,-0.5 -0.5,-0.5 z m 0.5,1 3,0 0,1 -3,0 z m -5,4 c -0.554,0 -1.07547,0.4536 -0.98437,1 l 1.98437,12 c 0.0904,0.5465 0.446,1 1,1 l 9,0 c 0.554,0 0.9089,-0.4536 1,-1 l 1.98437,-12 c 0.0904,-0.5465 -0.43037,-1 -0.98437,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect y="1266.362" x="318" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/water-12.svg b/data/styles/symbols/maki/water-12.svg
deleted file mode 100644
index 45d1e64a49..0000000000
--- a/data/styles/symbols/maki/water-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-282 -250)" color="#000">
-        <rect y="1290.362" x="282" height="12" width="12" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 288.5,1301.3622 c -1.61437,0 -3.5,-1 -3.5,-3.5 0,-1.75 2.75,-5.5 3.5,-6.5 0.75,1 3.5,4.75 3.5,6.5 0,2.5 -1.88563,3.5 -3.5,3.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 288.5,1301.3622 c -1.61437,0 -3.5,-1 -3.5,-3.5 0,-1.75 2.75,-5.5 3.5,-6.5 0.75,1 3.5,4.75 3.5,6.5 0,2.5 -1.88563,3.5 -3.5,3.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/water-18.svg b/data/styles/symbols/maki/water-18.svg
deleted file mode 100644
index d8cc572d15..0000000000
--- a/data/styles/symbols/maki/water-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-264 -256)" color="#000">
-        <path d="m 273.5,1305.3622 c -2.33186,0 -4.5,-2 -4.5,-4.5 0,-2.5278 3.41667,-7.0556 4.5,-8.5 1.08334,1.4444 4.5,5.9722 4.5,8.5 0,2.5 -2.16813,4.5 -4.5,4.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <rect width="18" height="18" x="264" y="1290.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 273.5,1305.3622 c -2.33186,0 -4.5,-2 -4.5,-4.5 0,-2.5278 3.41667,-7.0556 4.5,-8.5 1.08334,1.4444 4.5,5.9722 4.5,8.5 0,2.5 -2.16813,4.5 -4.5,4.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/water-24.svg b/data/styles/symbols/maki/water-24.svg
deleted file mode 100644
index f074a5327a..0000000000
--- a/data/styles/symbols/maki/water-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-240 -262)" color="#000">
-        <path d="m 259,1304.8622 c 0,-3.5 -5,-9.5 -6.5,-11.5 -1.5,2 -6.5,8 -6.5,11.5 0,3.5 3.27126,6.5 6.5,6.5 3.22874,0 6.5,-3 6.5,-6.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <rect y="1290.362" x="240" height="24" width="24" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 259,1304.8622 c 0,-3.5 -5,-9.5 -6.5,-11.5 -1.5,2 -6.5,8 -6.5,11.5 0,3.5 3.27126,6.5 6.5,6.5 3.22874,0 6.5,-3 6.5,-6.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/wetland-12.svg b/data/styles/symbols/maki/wetland-12.svg
deleted file mode 100644
index 7cb2352301..0000000000
--- a/data/styles/symbols/maki/wetland-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-282 -274)" color="#000">
-        <path d="m 411,266 -1.5,1.5 -1,2.5 0,1.5 1.5,0.5 0.53125,-0.1875 C 410.67042,271.08976 410.94593,270.26876 411,270 l 2,0 -1,-1 -1,0 -1,1 0.5,-2 1,-1 1,0 -1,-1 -0.5,0 z m -5,3 -1,1 2,0 0,2 1,-0.34375 0,-1.65625 -1,-1 -1,0 z m -0.5,3.5 -1.5,0.46875 0,1.03125 1.5,-0.5 1.5,0.5 1.5,-0.5 1.5,0.5 1.5,-0.5 1.5,0.5 0,-1.03125 -1.5,-0.46875 -1.5,0.5 -1.5,-0.5 -1.5,0.5 -1.5,-0.5 z" transform="translate(-120 1050.362)" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <rect width="12" height="12" x="282" y="1314.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path transform="translate(-120 1050.362)" d="m 411,266 -1.5,1.5 -1,2.5 0,1.5 1.5,0.5 0.53125,-0.1875 C 410.67042,271.08976 410.94593,270.26876 411,270 l 2,0 -1,-1 -1,0 -1,1 0.5,-2 1,-1 1,0 -1,-1 -0.5,0 z m -5,3 -1,1 2,0 0,2 1,-0.34375 0,-1.65625 -1,-1 -1,0 z m -0.5,3.5 -1.5,0.46875 0,1.03125 1.5,-0.5 1.5,0.5 1.5,-0.5 1.5,0.5 1.5,-0.5 1.5,0.5 0,-1.03125 -1.5,-0.46875 -1.5,0.5 -1.5,-0.5 -1.5,0.5 -1.5,-0.5 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/wetland-18.svg b/data/styles/symbols/maki/wetland-18.svg
deleted file mode 100644
index 7a2aef1276..0000000000
--- a/data/styles/symbols/maki/wetland-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-264 -280)" color="#000">
-        <path d="m 277,1317.3622 c -1,0 -2.78873,1.8029 -3.09375,3.4063 l -0.9375,4.875 0.53125,-0.2813 2,1 0.90625,-0.375 c 0.13935,-0.7507 0.46178,-2.4691 0.59375,-3.125 0.15329,-0.7618 0.8,-1.5 1.5,-1.5 l 1,0 -1,-1 -0.5,0 -1,0 -1,1 0,-1 c 0,-1 1.00625,-2 1.90625,-2 l 1.09375,0 -1,-1 -1,0 z m -8.5,3 -1,1 1,0 c 0.7,0 1.34671,0.7382 1.5,1.5 0.13324,0.6622 0.45816,2.4257 0.59375,3.1563 l 0.875,0.3437 0.84375,-0.4062 -0.8125,-3.5938 c -0.09,-0.4006 -0.20226,-0.6854 -0.5,-1 l -1,-1 -1,0 -0.5,0 z m 0.5,6 -2,1 0,1.5 2,-1 2.5,1 2,-1 2,1 2.5,-0.8437 2,0.8437 0,-1.5 -2,-1 -2.5,1 -2,-1 -2,1 -2.5,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 277,1317.3622 c -1,0 -2.78873,1.8029 -3.09375,3.4063 l -0.9375,4.875 0.53125,-0.2813 2,1 0.90625,-0.375 c 0.13935,-0.7507 0.46178,-2.4691 0.59375,-3.125 0.15329,-0.7618 0.8,-1.5 1.5,-1.5 l 1,0 -1,-1 -0.5,0 -1,0 -1,1 0,-1 c 0,-1 1.00625,-2 1.90625,-2 l 1.09375,0 -1,-1 -1,0 z m -8.5,3 -1,1 1,0 c 0.7,0 1.34671,0.7382 1.5,1.5 0.13324,0.6622 0.45816,2.4257 0.59375,3.1563 l 0.875,0.3437 0.84375,-0.4062 -0.8125,-3.5938 c -0.09,-0.4006 -0.20226,-0.6854 -0.5,-1 l -1,-1 -1,0 -0.5,0 z m 0.5,6 -2,1 0,1.5 2,-1 2.5,1 2,-1 2,1 2.5,-0.8437 2,0.8437 0,-1.5 -2,-1 -2.5,1 -2,-1 -2,1 -2.5,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect y="1314.362" x="264" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/wetland-24.svg b/data/styles/symbols/maki/wetland-24.svg
deleted file mode 100644
index afb24294ea..0000000000
--- a/data/styles/symbols/maki/wetland-24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-240 -286)" color="#000">
-        <rect width="24" height="24" x="240" y="1314.362" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 257,1318.3622 c -2,0 -3.59749,2 -4,4 l -1.125,5.5625 c 0.18718,-0.039 0.39682,-0.062 0.625,-0.062 1.5,0 2,0.9995 3,1 0.19687,1e-4 0.39306,-0.032 0.59375,-0.094 0.22556,-1.1217 0.7493,-3.6263 0.90625,-4.4063 0.19161,-0.9523 1,-2 2,-2 l 1,0 c 5e-5,-0.5 -0.49995,-1 -1,-1 l -1,0 c -0.83057,0 -1.60124,0.3065 -2.15625,0.75 l 0.15625,-0.75 c 0.1973,-0.9804 1,-2 2,-2 l 1,0 c 0,-0.5 -0.5,-1 -1,-1 l -1,0 z m -11,3 c -0.50005,0 -1.00005,0.5 -1,1 l 1,0 c 1,0 1.80839,1.0477 2,2 0.15208,0.7559 0.66263,3.2025 0.90625,4.4063 0.20069,0.062 0.39688,0.094 0.59375,0.094 0.56577,2e-4 0.98268,-0.3158 1.5,-0.5937 l -1,-4.9063 c -0.20125,-1 -1.50005,-2 -3,-2 l -1,0 z m 0,8 c -0.69406,0 -1.33976,0.4049 -2,0.625 l 0,2.0313 c 0,0 1,-0.6558 2,-0.6563 1,-5e-4 2,1 3.5,1 1.5,0 1.97352,-0.9653 3,-1 1,5e-4 1.5,1 3,1 1.5,0 2.5,-1 3.5,-1 0.70165,0 2,0.6563 2,0.6563 l 0,-2.0313 c -0.6416,-0.2468 -1.34343,-0.625 -2,-0.625 -1.5,0 -2.5,1.0005 -3.5,1 -1,-5e-4 -1.5,-1 -3,-1 -1.5,0 -2,1.0005 -3,1 -1,5e-4 -2,-1 -3.5,-1 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" fill="none"/>
-        <path d="m 257,1318.3622 c -2,0 -3.59749,2 -4,4 l -1.125,5.5625 c 0.18718,-0.039 0.39682,-0.062 0.625,-0.062 1.5,0 2,0.9995 3,1 0.19687,1e-4 0.39306,-0.032 0.59375,-0.094 0.22556,-1.1217 0.7493,-3.6263 0.90625,-4.4063 0.19161,-0.9523 1,-2 2,-2 l 1,0 c 5e-5,-0.5 -0.49995,-1 -1,-1 l -1,0 c -0.83057,0 -1.60124,0.3065 -2.15625,0.75 l 0.15625,-0.75 c 0.1973,-0.9804 1,-2 2,-2 l 1,0 c 0,-0.5 -0.5,-1 -1,-1 l -1,0 z m -11,3 c -0.50005,0 -1.00005,0.5 -1,1 l 1,0 c 1,0 1.80839,1.0477 2,2 0.15208,0.7559 0.66263,3.2025 0.90625,4.4063 0.20069,0.062 0.39688,0.094 0.59375,0.094 0.56577,2e-4 0.98268,-0.3158 1.5,-0.5937 l -1,-4.9063 c -0.20125,-1 -1.50005,-2 -3,-2 l -1,0 z m 0,8 c -0.69406,0 -1.33976,0.4049 -2,0.625 l 0,2.0313 c 0,0 1,-0.6558 2,-0.6563 1,-5e-4 2,1 3.5,1 1.5,0 1.97352,-0.9653 3,-1 1,5e-4 1.5,1 3,1 1.5,0 2.5,-1 3.5,-1 0.70165,0 2,0.6563 2,0.6563 l 0,-2.0313 c -0.6416,-0.2468 -1.34343,-0.625 -2,-0.625 -1.5,0 -2.5,1.0005 -3.5,1 -1,-5e-4 -1.5,-1 -3,-1 -1.5,0 -2,1.0005 -3,1 -1,5e-4 -2,-1 -3.5,-1 z" fill="#444" overflow="visible" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/zoo-12.svg b/data/styles/symbols/maki/zoo-12.svg
deleted file mode 100644
index 3f03de64bc..0000000000
--- a/data/styles/symbols/maki/zoo-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
-    <g transform="translate(0 -1040.362) translate(-204 -130)">
-        <path d="m 212.5,1171.3622 c -1,1.5 -0.89211,3.0026 -2,4 -1.05832,0.9528 -3.5,0.6257 -3.5,2 l 0,0.5 c 0,0.5 0.5,0.9758 0.5,1.5 l 0,0.5 c 0,0.75 -0.25,0.75 -0.5,1.5 l 0.5,0 1,-1.5 0,1.5 0.5,0 0,-3 1,0 0,3 0.5,0 0,-2.5 1,0 0.5,2.5 0.5,0 -0.5,-4 c 0,-0.466 0,-1 0,-1.5 l 1,-3.5 1,0 c 0,-0.1667 0,-0.8333 0,-1 z" opacity=".3" color="#000" fill="#444" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-        <path d="m 212.5,1171.3622 c -1,1.5 -0.89211,3.0026 -2,4 -1.05832,0.9528 -3.5,0.6257 -3.5,2 l 0,0.5 c 0,0.5 0.5,0.9758 0.5,1.5 l 0,0.5 c 0,0.75 -0.25,0.75 -0.5,1.5 l 0.5,0 1,-1.5 0,1.5 0.5,0 0,-3 1,0 0,3 0.5,0 0,-2.5 1,0 0.5,2.5 0.5,0 -0.5,-4 c 0,-0.466 0,-1 0,-1.5 l 1,-3.5 1,0 c 0,-0.1667 0,-0.8333 0,-1 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-        <rect width="12" height="12" x="204" y="1170.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/zoo-18.svg b/data/styles/symbols/maki/zoo-18.svg
deleted file mode 100644
index eae29cdac1..0000000000
--- a/data/styles/symbols/maki/zoo-18.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(0 -1034.362) translate(-186 -136)" color="#000">
-        <g fill="#444">
-            <path d="m 199,1172.3622 c -1.33333,2 -1.52281,3.6701 -3,5 -1.41109,1.2703 -4,0.8342 -4,2.6667 l 0,0.6666 c 0,0.6667 0.66667,1.301 0.66667,2 l 0,0.6667 c 0,1 -0.33334,1 -0.66667,2 l 0.66667,0 1.33333,-2 0,2 1,0 0,-4 1,0 0,4 1,0 0,-3 1,3 0.66667,0 -1.02084,-4.1875 c 0.393,-0.2398 0.35417,-0.6831 0.35417,-1.1458 0,-0.6214 0,-1.3334 0,-2 l 1.5,-3.6667 1.5,0.5 c 0,-0.047 -5.2e-4,-0.462 0,-0.5 0,0 -0.24351,-0.2435 -0.33333,-0.3333 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate"/>
-            <path d="m 199,1172.3622 c -1.33333,2 -1.52281,3.6701 -3,5 -1.41109,1.2703 -4,0.8342 -4,2.6667 l 0,0.6666 c 0,0.6667 0.66667,1.301 0.66667,2 l 0,0.6667 c 0,1 -0.33334,1 -0.66667,2 l 0.66667,0 1.33333,-2 0,2 1,0 0,-4 1,0 0,4 1,0 0,-3 1,3 0.66667,0 -1.02084,-4.1875 c 0.393,-0.2398 0.35417,-0.6831 0.35417,-1.1458 0,-0.6214 0,-1.3334 0,-2 l 1.5,-3.6667 1.5,0.5 c 0,-0.047 -5.2e-4,-0.462 0,-0.5 0,0 -0.24351,-0.2435 -0.33333,-0.3333 z" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect y="1170.362" x="186" height="18" width="18" opacity=".5" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/maki/zoo-24.svg b/data/styles/symbols/maki/zoo-24.svg
deleted file mode 100644
index 342f25ffc4..0000000000
--- a/data/styles/symbols/maki/zoo-24.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(0 -1028.362) translate(-162 -142)">
-        <g>
-            <path d="m 16.99997,1007.3622 c -2,3 -3.784213,5.0052 -6,7 -2.116627,1.9055 -6,1.2513 -6,4 l 0,1 c 0,1 1,1.9515 1,3 l 0,1 c 0,1.5 -0.5,1.5 -1,3 l 1,0 2,-3 0,3 1,0 0,-1.5 0,-4.5 2,0 0,6 1,0 0,-3 0,-1.5 1,1.5 1,3 1,0 -1.53125,-6.2812 c 0.589496,-0.3597 0.53125,-1.0247 0.53125,-1.7188 0,-0.932 0,-2 0,-3 l 4,-5.5 1.4375,0.4453 c 0.299758,0.093 0.5625,0.055 0.5625,-0.1953 0,-0.5 -0.326623,-0.6113 -0.5,-0.75 z" opacity=".3" color="#000" fill="#444" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" overflow="visible" enable-background="accumulate" transform="translate(162 165)"/>
-            <path transform="translate(159 1170.362)" d="m 20,2 c -2,3 -3.784213,5.0052 -6,7 -2.116627,1.9055 -6,1.2513 -6,4 l 0,1 c 0,1 1,1.9515 1,3 l 0,1 c 0,1.5 -0.5,1.5 -1,3 l 1,0 2,-3 0,3 1,0 0,-1.5 0,-4.5 2,0 0,6 1,0 0,-3 0,-1.5 1,1.5 1,3 1,0 -1.53125,-6.28125 C 17.058246,14.359058 17,13.694118 17,13 c 0,-0.932 0,-2 0,-3 l 4,-5.5 1.4375,0.4453125 C 22.737214,5.0381587 23,5 23,4.75 23,4.25 22.673378,4.1387024 22.5,4 z" color="#000" fill="#444" overflow="visible" enable-background="accumulate"/>
-        </g>
-        <rect width="24" height="24" x="162" y="1170.362" opacity=".5" color="#000" overflow="visible" enable-background="accumulate" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/man-made-halfpipe.svg b/data/styles/symbols/man-made-halfpipe.svg
index a2d20cba7b..1eaef3939e 100644
--- a/data/styles/symbols/man-made-halfpipe.svg
+++ b/data/styles/symbols/man-made-halfpipe.svg
@@ -1,3 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="27.96" viewBox="0 0 48 48" height="27.96">
-    <svg:path fill="#000" d="M 0,0 L 0,48 L 48,48 L 48,0 L 0,0 z M 1,1 L 47,1 L 47,47 L 1,47 L 1,1 z M 46,20 L 42,20 C 42,38 35,40 25,40 C 15,40 7,38 7,20 L 2,20 L 2,46 L 46,46 L 46,20 z"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="27.96" id="symbol-man-made-halfpipe" viewBox="0 0 48 48" height="27.96">
+   <svg:path fill="#000000" d="M 0,0 L 0,48 L 48,48 L 48,0 L 0,0 z M 1,1 L 47,1 L 47,47 L 1,47 L 1,1 z M 46,20 L 42,20 C 42,38 35,40 25,40 C 15,40 7,38 7,20 L 2,20 L 2,46 L 46,46 L 46,20 z"/>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/memorial.svg b/data/styles/symbols/memorial.svg
index a86f884459..00ed21cb18 100644
--- a/data/styles/symbols/memorial.svg
+++ b/data/styles/symbols/memorial.svg
@@ -1,6 +1,76 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g fill="#4d4d4d">
-        <path d="M 8 18 L 8 22 L 7 22 L 7 24 L 18 24 L 18 22 L 17 22 L 17 18 L 8 18 z" transform="translate(0 -1028.362) translate(0 1028.362)" fill-rule="evenodd"/>
-        <path d="m 10,17 1,-12 1,-2 1,0 1,2 1,12 -5,0" transform="translate(0 -1028.362) translate(0 1028.362)" stroke="#4d4d4d"/>
-    </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg3882"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="gate.svg">
+  <defs
+     id="defs3884" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="11.3506"
+     inkscape:cy="16.781288"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="992"
+     inkscape:window-height="663"
+     inkscape:window-x="20"
+     inkscape:window-y="20"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3890"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3887">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <path
+       style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="M 8 18 L 8 22 L 7 22 L 7 24 L 18 24 L 18 22 L 17 22 L 17 18 L 8 18 z "
+       transform="translate(0,1028.3622)"
+       id="rect4437" />
+    <path
+       style="fill:#4d4d4d;stroke:#4d4d4d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 10,17 1,-12 1,-2 1,0 1,2 1,12 -5,0"
+       id="path4439"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc"
+       transform="translate(0,1028.3622)" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/mosque.svg b/data/styles/symbols/mosque.svg
index c73000fa56..8e5eaeac26 100644
--- a/data/styles/symbols/mosque.svg
+++ b/data/styles/symbols/mosque.svg
@@ -1,3 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="18.64" viewBox="0 0 120 120" fill="#32cd32" height="18.64">
-    <svg:path d="M 4,60 C 11,75 60,107 84,73 C 103,40 76,22 50,7 C 76,6 130,35 103,84 C 72,124 8,97 4,60 z M 35,52 C 35,52 20,55 20,55 L 30,43 C 30,43 21,30 21,30 L 35,35 L 45,23 L 45,38 L 60,45 L 45,50 L 45,65 L 35,52 z"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="mosque" viewBox="0 0 120 120" fill="limegreen" height="18.64">
+   <svg:path d="M 4,60 C 11,75 60,107 84,73 C 103,40 76,22 50,7 C 76,6 130,35 103,84 C 72,124 8,97 4,60 z M 35,52 C 35,52 20,55 20,55 L 30,43 C 30,43 21,30 21,30 L 35,35 L 45,23 L 45,38 L 60,45 L 45,50 L 45,65 L 35,52 z"/>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/mountain_pass.svg b/data/styles/symbols/mountain_pass.svg
index 8db1c5ce63..b8543c7aa4 100644
--- a/data/styles/symbols/mountain_pass.svg
+++ b/data/styles/symbols/mountain_pass.svg
@@ -1,4 +1,20 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="133.596" height="133.596">
-    <path d="M 0.33000001,89.425454 L 25.078737,92.960988 L 92.960988,25.078737 L 89.425454,0.33000001" stroke="#000" stroke-width=".66" fill="none"/>
-    <path d="M 44.17062,133.26607 L 40.635086,108.51733 L 108.51734,40.635086 L 133.26608,44.17062" stroke="#000" stroke-width=".66" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="133.59608"
+   height="133.59607"
+   id="symbol-mountain-pass">
+  <defs
+     id="defs6" />
+  <path
+     d="M 0.33000001,89.425454 L 25.078737,92.960988 L 92.960988,25.078737 L 89.425454,0.33000001"
+     id="path2160"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.66000003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 44.17062,133.26607 L 40.635086,108.51733 L 108.51734,40.635086 L 133.26608,44.17062"
+     id="path3134"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.66000003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/museum.svg b/data/styles/symbols/museum.svg
index 7d62852b2b..8800cc153a 100644
--- a/data/styles/symbols/museum.svg
+++ b/data/styles/symbols/museum.svg
@@ -1,6 +1,76 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="0 0 257.51074 283.26181" height="24">
-    <title>
-        Museum Map Icon
-    </title>
-    <path d="M 12,1 3.0000001,8.0000003 5,8 l 1,0 0,10 -1,0 -1,0 0,2 -2,0 0,2 20,0 0,-2 -2,0 0,-2 -2,0 0,-10 3.000001,3e-7 z m -3,7 1.5,0 0,10 -1.5,0 z m 4.5,0 1.5,0 0,10 -1.5,0 z" transform="matrix(11.803 0 0 11.803 -12.876 0)" fill="#4d4d4d"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="symbol-museum"
+   viewBox="0 0 257.51074 283.26181"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="museum.svg">
+  <title
+     id="title3768">Museum Map Icon</title>
+  <metadata
+     id="metadata19">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Museum Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs17" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="973"
+     inkscape:window-height="641"
+     id="namedview15"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="12.660945"
+     inkscape:cx="11.927728"
+     inkscape:cy="12.018669"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-museum">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     d="M 12,1 3.0000001,8.0000003 5,8 l 1,0 0,10 -1,0 -1,0 0,2 -2,0 0,2 20,0 0,-2 -2,0 0,-2 -2,0 0,-10 3.000001,3e-7 z m -3,7 1.5,0 0,10 -1.5,0 z m 4.5,0 1.5,0 0,10 -1.5,0 z"
+     transform="matrix(11.802575,0,0,11.802575,-12.875535,0)"
+     id="path2985"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccccccccccccccccccccccc" />
 </svg>
diff --git a/data/styles/symbols/neta/bollard-18.svg b/data/styles/symbols/neta/bollard-18.svg
deleted file mode 100644
index d15d1c79cf..0000000000
--- a/data/styles/symbols/neta/bollard-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="36.0 794.3622 18.0 18.0">
-    <path d="m 44.53125,797.3622 -1.0625,1 0.53125,0.53125 0,3.46875 -1,0 0,1 3,0 0,-1 -1,0 0,-3.4375 0.53125,-0.5625 z" stroke="#fff" stroke-opacity=".502" fill="none"/>
-    <rect height="18" ry=".03" transform="translate(0 1028.362)" width="18" x="36" y="-234" opacity=".3" fill="none"/>
-    <path d="m 44.53125,797.3622 -1.0625,1 0.53125,0.53125 0,3.46875 -1,0 0,1 3,0 0,-1 -1,0 0,-3.4375 0.53125,-0.5625 z" fill="#444"/>
-</svg>
diff --git a/data/styles/symbols/neta/circle-24.svg b/data/styles/symbols/neta/circle-24.svg
deleted file mode 100644
index 3cc0ff4230..0000000000
--- a/data/styles/symbols/neta/circle-24.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="matrix(1.175 0 0 1.175 81.909 -1263.886)" color="#000">
-        <path transform="matrix(-1.03 0 0 1.03 -46.879 1073.241)" d="m 20.5,12.25 c 0,4.556349 -3.693651,8.25 -8.25,8.25 C 7.6936508,20.5 4,16.806349 4,12.25 4,7.6936508 7.6936508,4 12.25,4 c 4.556349,0 8.25,3.6936508 8.25,8.25 z" overflow="visible" opacity=".3" fill="#fff" stroke="#fff" stroke-width="1.941" enable-background="accumulate"/>
-        <path d="m 20.5,12.25 c 0,4.556349 -3.693651,8.25 -8.25,8.25 C 7.6936508,20.5 4,16.806349 4,12.25 4,7.6936508 7.6936508,4 12.25,4 c 4.556349,0 8.25,3.6936508 8.25,8.25 z" transform="matrix(-1.03 0 0 1.03 -46.879 1073.241)" overflow="visible" fill="#444" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/neta/entrance-18.svg b/data/styles/symbols/neta/entrance-18.svg
deleted file mode 100644
index b0e77fe92c..0000000000
--- a/data/styles/symbols/neta/entrance-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="36.0 794.3622 18.0 18.0">
-    <path d="m 43.533889,805.65655 -0.724259,-0.74383 5.042603,-4.9099 0.705444,0.72451 z m -1.529264,-1.22691 0,-1.03819 7.03811,0 0,1.01122 z m 0.0079,-2.0263 0,-1.03819 7.03811,0 0,1.01122 z" stroke="#fff" stroke-opacity=".502" fill="none"/>
-    <rect height="18" ry=".03" transform="translate(0 1028.362)" width="18" x="36" y="-234" opacity=".3" fill="none"/>
-    <path d="m 43.533889,805.65655 -0.724259,-0.74383 5.042603,-4.9099 0.705444,0.72451 z m -1.529264,-1.22691 0,-1.03819 7.03811,0 0,1.01122 z m 0.0079,-2.0263 0,-1.03819 7.03811,0 0,1.01122 z" fill="#444"/>
-</svg>
diff --git a/data/styles/symbols/neta/lift_gate-18.svg b/data/styles/symbols/neta/lift_gate-18.svg
deleted file mode 100644
index 2581a3f367..0000000000
--- a/data/styles/symbols/neta/lift_gate-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="36.0 794.3622 18.0 18.0">
-    <path transform="translate(36 794.362)" d="M 6,8 13,8 13,7 6,7 6,6 4,6 4,10 6,10 z" stroke="#fff" stroke-opacity=".502" fill="none"/>
-    <rect height="18" ry=".03" transform="translate(0 1028.362)" width="18" x="36" y="-234" opacity=".3" fill="none"/>
-    <path d="M 6,8 13,8 13,7 6,7 6,6 4,6 4,10 6,10 z" transform="translate(36 794.362)" fill="#444"/>
-</svg>
diff --git a/data/styles/symbols/neta/shoes-18.svg b/data/styles/symbols/neta/shoes-18.svg
deleted file mode 100644
index 5fe30e7b61..0000000000
--- a/data/styles/symbols/neta/shoes-18.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="102.0 776.3622 18.0 18.0">
-    <rect height="18" transform="translate(0 1028.362)" width="18" x="102" y="-252" opacity=".3" fill="none"/>
-    <path d="m 108,787.36219 c 0,0 0,10e-6 0,2.00001 2,-1 3.95873,-2.01644 5,-2.00001 3.99692,-0.0235 6,1.00001 6,1.00001 0,0 2e-5,2 -1,2 -4.02502,-0.0277 -6,2 -7,3 -2,-1 -4,-1 -6,0 0,0 -2,-3 -1,-6 z" transform="matrix(-.999 .032 -.032 -.999 247.67 1571.768)" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round" fill="none"/>
-    <path d="m 108,787.36219 c 0,0 0,10e-6 0,2.00001 2,-1 3.95873,-2.01644 5,-2.00001 3.99692,-0.0235 6,1.00001 6,1.00001 0,0 2e-5,2 -1,2 -4.02502,-0.0277 -6,2 -7,3 -2,-1 -4,-1 -6,0 0,0 -2,-3 -1,-6 z" transform="matrix(-.999 .032 -.032 -.999 247.67 1571.768)" fill="#747474"/>
-    <rect height="18" transform="translate(0 1028.362)" width="18" x="102" y="-252" opacity=".3" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/neta/square-18.svg b/data/styles/symbols/neta/square-18.svg
deleted file mode 100644
index 9a9ca1d6a5..0000000000
--- a/data/styles/symbols/neta/square-18.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g transform="translate(47.5 -1121.862)" color="#000">
-        <rect ry="1" rx="1" y="1124.362" x="-45" height="13" width="13" overflow="visible" opacity=".3" stroke="#fff" stroke-width="2" enable-background="accumulate" fill="none"/>
-        <rect width="13" height="13" x="-45" y="1124.362" rx="1" ry="1" overflow="visible" fill="#444" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/neta/square-24.svg b/data/styles/symbols/neta/square-24.svg
deleted file mode 100644
index 54243bd741..0000000000
--- a/data/styles/symbols/neta/square-24.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <g transform="translate(39.5 -1003.862)" color="#000">
-        <rect width="17" height="17" x="-36" y="1007.362" rx="1.125" ry="1.125" overflow="visible" opacity=".3" stroke="#fff" stroke-width="2" enable-background="accumulate" fill="none"/>
-        <rect ry="1.125" rx="1.125" y="1007.362" x="-36" height="17" width="17" overflow="visible" fill="#444" enable-background="accumulate"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/neta/subway-12.svg b/data/styles/symbols/neta/subway-12.svg
deleted file mode 100644
index a0a7a9885b..0000000000
--- a/data/styles/symbols/neta/subway-12.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 18 18">
-    <g font-size="14" font-weight="600" font-family="FreeSans" style="line-height:125%;-inkscape-font-specification:Saab" letter-spacing="0" word-spacing="0">
-        <path d="m 6.1242598,6.2079802 0,7.7929598 -2.1042,0 0,-10.0018798 3.142272,0 1.851696,7.9575998 1.7955842,-7.9575998 3.170328,0 0,10.0018798 -2.1042,0 0,-7.7929598 -1.809612,7.7929598 -2.1042002,0 -1.837668,-7.7929598" style="-inkscape-font-specification:FreeSans Semi-Bold" stroke="#fff" stroke-width="3" stroke-linejoin="round" stroke-opacity=".502" fill="none"/>
-        <path style="-inkscape-font-specification:FreeSans Semi-Bold" d="m 6.1183048,5.8530843 0,7.9519997 -2.1,0 0,-10.2059997 3.136,0 1.848,8.1199997 1.7920002,-8.1199997 3.164,0 0,10.2059997 -2.1,0 0,-7.9519997 -1.806,7.9519997 -2.1000002,0 -1.834,-7.9519997" fill="#444" transform="matrix(1.002 0 0 .98 -.004 .476)"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/neta/subway-18.svg b/data/styles/symbols/neta/subway-18.svg
deleted file mode 100644
index 35889c651e..0000000000
--- a/data/styles/symbols/neta/subway-18.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18">
-    <g font-size="14" font-weight="600" font-family="FreeSans" style="line-height:125%;-inkscape-font-specification:Saab" letter-spacing="0" word-spacing="0">
-        <path d="m 6.1183046,5.8530843 0,7.9519997 -2.1,0 0,-10.2059997 3.136,0 1.848,8.1199997 1.7920004,-8.1199997 3.164,0 0,10.2059997 -2.1,0 0,-7.9519997 -1.806,7.9519997 -2.1000004,0 -1.834,-7.9519997" style="-inkscape-font-specification:FreeSans Semi-Bold" stroke="#fff" stroke-width="2.019" stroke-linejoin="round" stroke-opacity=".502" transform="matrix(1.002 0 0 .98 -.004 .476)" fill="none"/>
-        <path style="-inkscape-font-specification:FreeSans Semi-Bold" d="m 6.1183048,5.8530843 0,7.9519997 -2.1,0 0,-10.2059997 3.136,0 1.848,8.1199997 1.7920002,-8.1199997 3.164,0 0,10.2059997 -2.1,0 0,-7.9519997 -1.806,7.9519997 -2.1000002,0 -1.834,-7.9519997" fill="#444" transform="matrix(1.002 0 0 .98 -.004 .476)"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/neta/tardis-18.svg b/data/styles/symbols/neta/tardis-18.svg
deleted file mode 100644
index 57e15455eb..0000000000
--- a/data/styles/symbols/neta/tardis-18.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 76.00 76.00" enable-background="new 0 0 76.00 76.00">
-    <path d="m 55.632763,26.923318 -3.397781,1.07e-4 -1.07e-4,37.375164 3.397888,0 0,3.397674 -33.97749,0 0,-3.397674 3.397781,0 0,-37.375164 -3.397674,-1.07e-4 0,-6.795455 3.397674,0 0,-3.397781 10.193237,0 0.849471,-5.521236 5.096618,-3.2e-5 0.849473,5.521268 10.193236,0 0,3.397781 3.397674,0 0,6.795455 z M 23.778899,21.8267 l 0,3.397781 29.730238,0 0,-3.397781 -29.730238,0 z m 4.671936,34.402172 0,6.370773 8.494292,0 0,-6.370773 -8.494292,0 z m 0,-8.494292 0,6.370773 8.494292,0 0,-6.370773 -8.494292,0 z m 0,-13.591017 0,2.973098 1.698838,0 0,-2.973098 -1.698838,0 z m 3.397674,0 0,2.972991 1.698945,0 0,-2.972991 -1.698945,0 z m 3.397782,0 0,2.973098 1.698836,0 0,-2.973098 -1.698836,0 z m -6.795456,-5.096618 0,2.972991 1.698838,0 0,-2.972991 -1.698838,0 z m 3.397674,0 0,2.972991 1.698945,0 0,-2.972991 -1.698945,0 z m 3.397782,0 0,2.972991 1.698836,0 0,-2.972991 -1.698836,0 z m -6.795456,10.193236 0,6.37088 8.494292,0 0,-6.37088 -8.494292,0 z m 1.698838,1.274262 5.09651,0 0,3.822463 -5.09651,0 0,-3.822463 z m 10.193128,15.714536 0,6.370774 8.4944,0 0,-6.370774 -8.4944,0 z m 0,-8.494399 0,6.370773 8.4944,0 0,-6.370773 -8.4944,0 z m 1.08e-4,-13.59091 -1.08e-4,2.972991 1.698944,0 0,-2.972991 -1.698836,0 z m 3.397673,-1.07e-4 0,2.973098 1.698838,0 1.07e-4,-2.973098 -1.698945,0 z m 3.397781,0 0,2.973098 1.698838,0 0,-2.973098 -1.698838,0 z m -6.795562,-5.096618 1.08e-4,2.973098 1.698836,0 0,-2.973098 -1.698944,0 z m 3.397781,1.06e-4 0,2.972992 1.698945,0 -1.07e-4,-2.972992 -1.698838,0 z m 3.397781,0 0,2.972992 1.698838,0 0,-2.972992 -1.698838,0 z m -6.795562,10.193237 0,6.370773 8.4944,0 0,-6.370773 -8.4944,0 z m 1.08e-4,-22.510206 -0.424683,-2.972992 -2.548416,0 -0.424683,2.972992 3.397782,0 z m -13.166228,1.698836 0,1.698945 22.934781,0 0,-1.698945 -22.934781,0 z" stroke-width="4.222" stroke="#fff" stroke-opacity=".502" stroke-linecap="square" fill="none"/>
-    <path d="m 55.632763,26.923318 -3.397781,1.07e-4 -1.07e-4,37.375164 3.397888,0 0,3.397674 -33.97749,0 0,-3.397674 3.397781,0 0,-37.375164 -3.397674,-1.07e-4 0,-6.795455 3.397674,0 0,-3.397781 10.193237,0 0.849471,-5.521236 5.096618,-3.2e-5 0.849473,5.521268 10.193236,0 0,3.397781 3.397674,0 0,6.795455 z M 23.778899,21.8267 l 0,3.397781 29.730238,0 0,-3.397781 -29.730238,0 z m 4.671936,34.402172 0,6.370773 8.494292,0 0,-6.370773 -8.494292,0 z m 0,-8.494292 0,6.370773 8.494292,0 0,-6.370773 -8.494292,0 z m 0,-13.591017 0,2.973098 1.698838,0 0,-2.973098 -1.698838,0 z m 3.397674,0 0,2.972991 1.698945,0 0,-2.972991 -1.698945,0 z m 3.397782,0 0,2.973098 1.698836,0 0,-2.973098 -1.698836,0 z m -6.795456,-5.096618 0,2.972991 1.698838,0 0,-2.972991 -1.698838,0 z m 3.397674,0 0,2.972991 1.698945,0 0,-2.972991 -1.698945,0 z m 3.397782,0 0,2.972991 1.698836,0 0,-2.972991 -1.698836,0 z m -6.795456,10.193236 0,6.37088 8.494292,0 0,-6.37088 -8.494292,0 z m 1.698838,1.274262 5.09651,0 0,3.822463 -5.09651,0 0,-3.822463 z m 10.193128,15.714536 0,6.370774 8.4944,0 0,-6.370774 -8.4944,0 z m 0,-8.494399 0,6.370773 8.4944,0 0,-6.370773 -8.4944,0 z m 1.08e-4,-13.59091 -1.08e-4,2.972991 1.698944,0 0,-2.972991 -1.698836,0 z m 3.397673,-1.07e-4 0,2.973098 1.698838,0 1.07e-4,-2.973098 -1.698945,0 z m 3.397781,0 0,2.973098 1.698838,0 0,-2.973098 -1.698838,0 z m -6.795562,-5.096618 1.08e-4,2.973098 1.698836,0 0,-2.973098 -1.698944,0 z m 3.397781,1.06e-4 0,2.972992 1.698945,0 -1.07e-4,-2.972992 -1.698838,0 z m 3.397781,0 0,2.972992 1.698838,0 0,-2.972992 -1.698838,0 z m -6.795562,10.193237 0,6.370773 8.4944,0 0,-6.370773 -8.4944,0 z m 1.08e-4,-22.510206 -0.424683,-2.972992 -2.548416,0 -0.424683,2.972992 3.397782,0 z m -13.166228,1.698836 0,1.698945 22.934781,0 0,-1.698945 -22.934781,0 z" fill="#444"/>
-</svg>
diff --git a/data/styles/symbols/nori/atm-18.svg b/data/styles/symbols/nori/atm-18.svg
deleted file mode 100644
index 567b23b633..0000000000
--- a/data/styles/symbols/nori/atm-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="72.0 992.362197 18.0 18.0">
-    <g transform="translate(36 36)">
-        <path d="m 37,959.3622 0,12 16,0 0,-12 z m 3,2 2,0 0,1 c 0.30464,0.3836 0.83184,0.6848 1,1.125 l 0,0.875 c -0.38366,-0.3046 -0.68481,-0.8319 -1.125,-1 l -1.875,0 3,3 0,1 c -0.30464,0.3836 -0.83184,0.6848 -1,1.125 l 0,0.875 -2,0 0,-1 c -0.30464,-0.3836 -0.83184,-0.6848 -1,-1.125 l 0,-0.875 c 0.38366,0.3046 0.68481,0.8319 1.125,1 l 1.875,0 -3,-3 0,-1 c 0.30464,-0.3836 0.83184,-0.6848 1,-1.125 z m 6,0 5,0 0,2 -5,0 z m 0,3 1,0 0,1 -1,0 z m 2,0 1,0 0,1 -1,0 z m 2,0 1,0 0,1 -1,0 z m -4,2 1,0 0,1 -1,0 z m 2,0 1,0 0,1 -1,0 z m 2,0 1,0 0,1 -1,0 z m -4,2 1,0 0,1 -1,0 z m 2,0 1,0 0,1 -1,0 z m 2,0 1,0 0,1 -1,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round" fill="none"/>
-        <path d="m 37,959.3622 0,12 16,0 0,-12 z m 3,2 2,0 0,1 c 0.30464,0.3836 0.83184,0.6848 1,1.125 l 0,0.875 c -0.38366,-0.3046 -0.68481,-0.8319 -1.125,-1 l -1.875,0 0,0.99998 2,1 1,1.00002 0,1 c -0.30464,0.3836 -0.83184,0.6848 -1,1.125 l 0,0.875 -2,0 0,-1 c -0.30464,-0.3836 -0.83184,-0.6848 -1,-1.125 l 0,-0.875 c 0.38366,0.3046 0.68481,0.8319 1.125,1 l 1.875,0 0,-1.00002 -2,-1 -1,-0.99998 0,-1 c 0.30464,-0.3836 0.83184,-0.6848 1,-1.125 z m 6,0 5,0 0,2 -5,0 z m 0,3 1,0 0,1 -1,0 z m 2,0 1,0 0,1 -1,0 z m 2,0 1,0 0,1 -1,0 z m -4,2 1,0 0,1 -1,0 z m 2,0 1,0 0,1 -1,0 z m 2,0 1,0 0,1 -1,0 z m -4,2 1,0 0,1 -1,0 z m 2,0 1,0 0,1 -1,0 z m 2,0 1,0 0,1 -1,0 z" fill="#747474"/>
-        <rect height="18" width="18" x="36" y="956.362" opacity=".3" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/bakery-18.svg b/data/styles/symbols/nori/bakery-18.svg
deleted file mode 100644
index 3650e1cca9..0000000000
--- a/data/styles/symbols/nori/bakery-18.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="72.0 902.362197 18.0 18.0">
-    <g fill="#747474">
-        <path d="m 9,-139.79988 0,3.76863 c 0,0.0183 -0.2245221,0.0312 -0.5,0.0312 -0.2754779,0 -0.5,-0.013 -0.5,-0.0312 l 0,-3.67488 c -0.6296026,0.0991 -1.3114304,0.0732 -2,0.33113 l 0,3.34375 c 0,0.0183 -0.2245221,0.0312 -0.5,0.0312 -0.2754779,0 -0.5,-0.013 -0.5,-0.0312 l 0,-2.9375 C 2,-138 1.0055673,-137.19071 1,-135 c 0,1.1435 0,3 0,3 l 16,0 c 0,0 0,-1.8702 0,-3 0,-2.21482 -2,-4 -5,-4.40625 l 0,3.375 c 0,0.0183 -0.224522,0.0312 -0.5,0.0312 -0.275478,0 -0.5,-0.013 -0.5,-0.0312 l 0,-3.6875 c -0.663107,-0.16754 -1.3337328,-0.0767 -2,-0.0811 z" transform="translate(72 18.91) translate(0 1028.362)" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round"/>
-        <path d="m 9,-139.79988 0,3.76863 c 0,0.0183 -0.2245221,0.0312 -0.5,0.0312 -0.2754779,0 -0.5,-0.013 -0.5,-0.0312 l 0,-3.67488 c -0.6296026,0.0991 -1.3114304,0.0732 -2,0.33113 l 0,3.34375 c 0,0.0183 -0.2245221,0.0312 -0.5,0.0312 -0.2754779,0 -0.5,-0.013 -0.5,-0.0312 l 0,-2.9375 C 2,-138 1.0055673,-137.19071 1,-135 c 0,1.1435 0,3 0,3 l 16,0 c 0,0 0,-1.8702 0,-3 0,-2.21482 -2,-4 -5,-4.40625 l 0,3.375 c 0,0.0183 -0.224522,0.0312 -0.5,0.0312 -0.275478,0 -0.5,-0.013 -0.5,-0.0312 l 0,-3.6875 c -0.663107,-0.16754 -1.3337328,-0.0767 -2,-0.0811 z" transform="translate(72 18.91) translate(0 1028.362)"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/beach_resort-18.svg b/data/styles/symbols/nori/beach_resort-18.svg
deleted file mode 100644
index 7082f4b7a9..0000000000
--- a/data/styles/symbols/nori/beach_resort-18.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="102.0 902.3622 18.0 18.0">
-    <g transform="translate(0 1028.362)">
-        <rect height="18" width="18" x="102" y="-126" opacity=".3" fill="none"/>
-        <path d="m 117.75,-124.9375 -1.59375,1.59375 c 0,0 -0.28405,0.26983 -0.5625,0.6875 C 115.3153,-122.23858 115,-121.66667 115,-121 l 0,4 -3,0 2,8 3,0 2,-8 -3,0 0,-4 c 0,-0.33333 0.1847,-0.76142 0.40625,-1.09375 0.22155,-0.33233 0.4375,-0.5625 0.4375,-0.5625 l 1.59375,-1.59375 -0.6875,-0.6875 z M 113,-116 l 2,0 0,2 -1.5,0 -0.5,-2 z m 3,0 2,0 -0.40625,2 -1.59375,0 0,-2 z m -9.59375,-6.28125 L 106,-122 l -0.40625,0.28125 0.1875,0.25 L 103,-115 107.96875,-118.15625 110,-115.5 l 0,6.5 1,0 0,-7 -2.1875,-2.6875 L 114,-122 l -7.40625,0 z" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-        <path d="m 117.75,-124.9375 -1.59375,1.59375 c 0,0 -0.28405,0.26983 -0.5625,0.6875 C 115.3153,-122.23858 115,-121.66667 115,-121 l 0,4 -3,0 2,8 3,0 2,-8 -3,0 0,-4 c 0,-0.33333 0.1847,-0.76142 0.40625,-1.09375 0.22155,-0.33233 0.4375,-0.5625 0.4375,-0.5625 l 1.59375,-1.59375 -0.6875,-0.6875 z M 113,-116 l 2,0 0,2 -1.5,0 -0.5,-2 z m 3,0 2,0 -0.40625,2 -1.59375,0 0,-2 z m -9.59375,-6.28125 L 106,-122 l -0.40625,0.28125 0.1875,0.25 L 103,-115 107.96875,-118.15625 110,-115.5 l 0,6.5 1,0 0,-7 -2.1875,-2.6875 L 114,-122 l -7.40625,0 z" fill="#747474"/>
-        <rect height="18" width="18" x="102" y="-126" opacity=".3" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/bench-18.svg b/data/styles/symbols/nori/bench-18.svg
deleted file mode 100644
index 9f2abfc69e..0000000000
--- a/data/styles/symbols/nori/bench-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="36.0 794.3622 18.0 18.0">
-    <path d="M 40 -230 L 40 -229 L 37 -229 L 37 -225 L 40 -225 L 40 -223.96875 L 37 -223.96875 L 37 -222 L 40 -222 L 40 -220 L 41 -220 L 41 -222 L 49 -222 L 49 -220 L 50 -220 L 50 -222 L 53 -222 L 53 -223.96875 L 50 -223.96875 L 50 -225 L 53 -225 L 53 -229 L 50 -229 L 50 -230 L 49 -230 L 49 -229 L 41 -229 L 41 -230 L 40 -230 z M 41 -225 L 49 -225 L 49 -223.96875 L 41 -223.96875 L 41 -225 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" transform="translate(0 -2) translate(0 1030.362)" color="#000" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" font-family="Sans" stroke-linejoin="round" opacity=".3" fill="none"/>
-    <path d="M 40 -230 L 40 -229 L 37 -229 L 37 -225 L 40 -225 L 40 -223.96875 L 37 -223.96875 L 37 -222 L 40 -222 L 40 -220 L 41 -220 L 41 -222 L 49 -222 L 49 -220 L 50 -220 L 50 -222 L 53 -222 L 53 -223.96875 L 50 -223.96875 L 50 -225 L 53 -225 L 53 -229 L 50 -229 L 50 -230 L 49 -230 L 49 -229 L 41 -229 L 41 -230 L 40 -230 z M 41 -225 L 49 -225 L 49 -223.96875 L 41 -223.96875 L 41 -225 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" transform="translate(0 -2) translate(0 1030.362)" color="#000" fill="#747474" overflow="visible" enable-background="accumulate" font-family="Sans"/>
-    <rect height="18" ry=".03" transform="translate(0 1028.362)" width="18" x="36" y="-234" opacity=".3" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/beverages-18.svg b/data/styles/symbols/nori/beverages-18.svg
deleted file mode 100644
index b48993521f..0000000000
--- a/data/styles/symbols/nori/beverages-18.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0.0 956.36218 18.0 18.0">
-    <g>
-        <path d="m 7,959.3622 -2,1.5 8,0 -2,-1.5 z m -2,3 0,7 8,0 0,-7 z m 0,8.5 2,1.5 4,0 2,-1.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round" fill="none" transform="translate(0 -.5)"/>
-        <path d="m 7,959.3622 -2,1.5 8,0 -2,-1.5 z m -2,3 0,7 8,0 0,-7 z m 0,8.5 2,1.5 4,0 2,-1.5 z" fill="#747474" transform="translate(0 -.5)"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/border_control-12.svg b/data/styles/symbols/nori/border_control-12.svg
deleted file mode 100644
index bc50606cd5..0000000000
--- a/data/styles/symbols/nori/border_control-12.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="150.0 836.36218 12.0 12.0">
-    <path d="m 153,837.3622 0,4 -2,0 0,2 2,0 0,1 -1,0 2,3 2,-3 -1,0 0,-1 2,0 0,4 2,0 0,-4 2,0 0,-2 -2,0 0,-1 1,0 -2,-3 -2,3 1,0 0,1 -2,0 0,-4 z" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-    <path d="m 153,837.3622 0,4 -2,0 0,2 2,0 0,1 -1,0 2,3 2,-3 -1,0 0,-1 2,0 0,4 2,0 0,-4 2,0 0,-2 -2,0 0,-1 1,0 -2,-3 -2,3 1,0 0,1 -2,0 0,-4 z" fill="#525252"/>
-    <rect height="12" width="12" x="150" y="836.362" opacity=".3" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/border_control-18.svg b/data/styles/symbols/nori/border_control-18.svg
deleted file mode 100644
index b301bc8bc7..0000000000
--- a/data/styles/symbols/nori/border_control-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="132.0 830.3622 18.0 18.0">
-    <g transform="translate(0 1028.362)">
-        <rect height="18" width="18" x="132" y="-198" opacity=".5" fill="none"/>
-        <path d="M 136 -197 L 136 -190 L 133 -190 L 133 -188 L 136 -188 L 136 -185 L 134 -185 L 137 -181 L 140 -185 L 138 -185 L 138 -188 L 144 -188 L 144 -181 L 146 -181 L 146 -188 L 149 -188 L 149 -190 L 146 -190 L 146 -193 L 148 -193 L 145 -197 L 142 -193 L 144 -193 L 144 -190 L 138 -190 L 138 -197 L 136 -197 z" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-        <path d="M 136 -197 L 136 -190 L 133 -190 L 133 -188 L 136 -188 L 136 -185 L 134 -185 L 137 -181 L 140 -185 L 138 -185 L 138 -188 L 144 -188 L 144 -181 L 146 -181 L 146 -188 L 149 -188 L 149 -190 L 146 -190 L 146 -193 L 148 -193 L 145 -197 L 142 -193 L 144 -193 L 144 -190 L 138 -190 L 138 -197 L 136 -197 z" fill="#747474"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/bucket-18.svg b/data/styles/symbols/nori/bucket-18.svg
deleted file mode 100644
index 0f69a010fc..0000000000
--- a/data/styles/symbols/nori/bucket-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0.0 902.362196 18.0 18.0">
-    <g transform="translate(-72 -17.943)">
-        <path d="m 81,-107.0625 c -1.583333,0 -3.225195,0.39462 -4.46875,1.5 -1.243555,1.10538 -2.03125,2.9 -2.03125,5.5 l 1.03125,0 2.46875,9 6,0 2.46875,-9 1.03125,0 c 0,-2.6 -0.787695,-4.39462 -2.03125,-5.5 -1.243555,-1.10538 -2.885417,-1.5 -4.46875,-1.5 z m 0,1 c 1.416667,0 2.774805,0.35538 3.78125,1.25 0.685875,0.60967 1.21968,1.49799 1.5,2.75 l -10.5625,0 c 0.28032,-1.25201 0.814125,-2.14033 1.5,-2.75 1.006445,-0.89462 2.364583,-1.25 3.78125,-1.25 z m -5,5 10,0 -0.28125,1 -9.46875,0 -0.25,-1 z m 2,8 6,0 -0.28125,1 -5.4375,0 -0.28125,-1 z" transform="translate(0 1028.362)" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round" fill="none"/>
-        <path d="m 81,-107.0625 c -1.583333,0 -3.225195,0.39462 -4.46875,1.5 -1.243555,1.10538 -2.03125,2.9 -2.03125,5.5 l 1.03125,0 2.46875,9 6,0 2.46875,-9 1.03125,0 c 0,-2.6 -0.787695,-4.39462 -2.03125,-5.5 -1.243555,-1.10538 -2.885417,-1.5 -4.46875,-1.5 z m 0,1 c 1.416667,0 2.774805,0.35538 3.78125,1.25 0.685875,0.60967 1.21968,1.49799 1.5,2.75 l -10.5625,0 c 0.28032,-1.25201 0.814125,-2.14033 1.5,-2.75 1.006445,-0.89462 2.364583,-1.25 3.78125,-1.25 z m -5,5 10,0 -0.28125,1 -9.46875,0 -0.25,-1 z m 2,8 6,0 -0.28125,1 -5.4375,0 -0.28125,-1 z" transform="translate(0 1028.362)" fill="#747474"/>
-        <rect height="18" width="18" x="72" y="920.305" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/bureau_de_change-18.svg b/data/styles/symbols/nori/bureau_de_change-18.svg
deleted file mode 100644
index 28415668ad..0000000000
--- a/data/styles/symbols/nori/bureau_de_change-18.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="72.0 974.36218 18.0 18.0">
-    <rect height="18" width="18" x="72" y="974.362" fill="none"/>
-    <rect height="18" width="18" x="72" y="974.362" opacity=".3" fill="none"/>
-    <path d="M 73 -51 L 73 -39 L 89 -39 L 89 -51 L 73 -51 z M 75 -49 L 77 -49 L 77 -48 C 77.30464 -47.6164 77.83184 -47.3152 78 -46.875 L 78 -46 C 77.61634 -46.3046 77.31519 -46.8319 76.875 -47 L 75 -47 L 75 -46 L 77 -45 L 78 -44 L 78 -43 C 77.69536 -42.6164 77.16816 -42.3152 77 -41.875 L 77 -41 L 75 -41 L 75 -42 C 74.69536 -42.3836 74.16816 -42.6848 74 -43.125 L 74 -44 C 74.38366 -43.6954 74.68481 -43.1681 75.125 -43 L 77 -43 L 77 -44 L 75 -45 L 74 -46 L 74 -47 C 74.30464 -47.3836 74.83184 -47.6848 75 -48.125 L 75 -49 z M 85 -49 L 87 -49 L 88 -48 L 88 -47 L 87 -48 L 86 -48 L 85 -47 L 85 -46 L 86 -46 L 87 -44 L 85 -44 L 85 -43 L 86 -42 L 87 -42 L 88 -43 L 88 -42 L 87 -41 L 85 -41 L 84 -43 L 84 -44 L 83 -44 L 83 -46 L 84 -46 L 84 -47 L 85 -49 z M 79 -46 L 81.96875 -46 L 81.96875 -45 L 79 -45 L 79 -46 z M 79 -44 L 82 -44 L 82 -43 L 79 -43 L 79 -44 z" transform="translate(0 1028.362)" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-    <path d="M 73 -51 L 73 -39 L 89 -39 L 89 -51 L 73 -51 z M 75 -49 L 77 -49 L 77 -48 C 77.30464 -47.6164 77.83184 -47.3152 78 -46.875 L 78 -46 C 77.61634 -46.3046 77.31519 -46.8319 76.875 -47 L 75 -47 L 75 -46 L 77 -45 L 78 -44 L 78 -43 C 77.69536 -42.6164 77.16816 -42.3152 77 -41.875 L 77 -41 L 75 -41 L 75 -42 C 74.69536 -42.3836 74.16816 -42.6848 74 -43.125 L 74 -44 C 74.38366 -43.6954 74.68481 -43.1681 75.125 -43 L 77 -43 L 77 -44 L 75 -45 L 74 -46 L 74 -47 C 74.30464 -47.3836 74.83184 -47.6848 75 -48.125 L 75 -49 z M 85 -49 L 87 -49 L 88 -48 L 88 -47 L 87 -48 L 86 -48 L 85 -47 L 85 -46 L 86 -46 L 87 -44 L 85 -44 L 85 -43 L 86 -42 L 87 -42 L 88 -43 L 88 -42 L 87 -41 L 85 -41 L 84 -43 L 84 -44 L 83 -44 L 83 -46 L 84 -46 L 84 -47 L 85 -49 z M 79 -46 L 81.96875 -46 L 81.96875 -45 L 79 -45 L 79 -46 z M 79 -44 L 82 -44 L 82 -43 L 79 -43 L 79 -44 z" transform="translate(0 1028.362)" fill="#747474"/>
-</svg>
diff --git a/data/styles/symbols/nori/butcher-18.svg b/data/styles/symbols/nori/butcher-18.svg
deleted file mode 100644
index f7f49812a8..0000000000
--- a/data/styles/symbols/nori/butcher-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="102.0 884.3622 18.0 18.0">
-    <g transform="translate(0 1028.362)">
-        <path d="m 114.5,-141.875 c -0.95537,0 -1.91074,0.28574 -2.5,0.875 -0.94281,0.94281 -0.29903,2.8658 -1,4 -1.56743,2.53615 -5.52243,1.05707 -6,4 -0.37755,2.32659 1.8224,4.09801 4,5 1.84776,0.76537 4.43992,1.25145 6,0 2.39721,-1.92297 1.66466,-5.94517 2,-9 0.14549,-1.32537 0.94281,-3.05719 0,-4 -0.58926,-0.58925 -1.54463,-0.875 -2.5,-0.875 z m 0,1.125 c 0.49975,0 0.9995,0.24951 1.5,0.75 0.80077,0.80081 0.12354,1.87432 0,3 -0.28489,2.59469 1,6 -2,8 -1.41338,0.94226 -3.43059,0.65005 -5,0 -1.84958,-0.76609 -3.32068,-2.02386 -3,-4 0.99998,-2.00007 5,-1 6,-4 0.35811,-1.07432 0.19928,-2.19919 1,-3 0.50051,-0.5005 1.00025,-0.75 1.5,-0.75 z m 0,0.59375 c -0.18674,0.005 -0.3648,0.0588 -0.5,0.15625 -0.79666,0.57421 -0.13289,0.95956 -0.84375,2.625 l 1.84375,0.75 c 0.002,-0.12413 -0.008,-0.24927 0,-0.375 0.0621,-0.99807 0.70711,-2.29289 0,-3 -0.11785,-0.11785 -0.31326,-0.16135 -0.5,-0.15625 z m -1.8125,3.6875 C 110.61362,-133.10311 107,-133.90352 107,-132 c 0,2 5,4 7,2 1.625,-1.625 1.17345,-3.46165 1.03125,-5.53125 l -2.34375,-0.9375 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round" fill="none"/>
-        <path d="m 114.5,-141.875 c -0.95537,0 -1.91074,0.28574 -2.5,0.875 -0.94281,0.94281 -0.29903,2.8658 -1,4 -1.56743,2.53615 -5.52243,1.05707 -6,4 -0.37755,2.32659 1.8224,4.09801 4,5 1.84776,0.76537 4.43992,1.25145 6,0 2.39721,-1.92297 1.66466,-5.94517 2,-9 0.14549,-1.32537 0.94281,-3.05719 0,-4 -0.58926,-0.58925 -1.54463,-0.875 -2.5,-0.875 z m 0,1.125 c 0.49975,0 0.9995,0.24951 1.5,0.75 0.80077,0.80081 0.12354,1.87432 0,3 -0.28489,2.59469 1,6 -2,8 -1.41338,0.94226 -3.43059,0.65005 -5,0 -1.84958,-0.76609 -3.32068,-2.02386 -3,-4 0.99998,-2.00007 5,-1 6,-4 0.35811,-1.07432 0.19928,-2.19919 1,-3 0.50051,-0.5005 1.00025,-0.75 1.5,-0.75 z m 0,0.59375 c -0.18674,0.005 -0.3648,0.0588 -0.5,0.15625 -0.79666,0.57421 -0.13289,0.95956 -0.84375,2.625 l 1.84375,0.75 c 0.002,-0.12413 -0.008,-0.24927 0,-0.375 0.0621,-0.99807 0.70711,-2.29289 0,-3 -0.11785,-0.11785 -0.31326,-0.16135 -0.5,-0.15625 z m -1.8125,3.6875 C 110.61362,-133.10311 107,-133.90352 107,-132 c 0,2 5,4 7,2 1.625,-1.625 1.17345,-3.46165 1.03125,-5.53125 l -2.34375,-0.9375 z" fill="#747474"/>
-        <rect height="18" width="18" x="102" y="-144" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/camp_site-18.svg b/data/styles/symbols/nori/camp_site-18.svg
deleted file mode 100644
index fe7f737ef7..0000000000
--- a/data/styles/symbols/nori/camp_site-18.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="36.0 794.3622 18.0 18.0">
-    <path d="M 100,97 56.25,15.75 62.5,-3 56.25,-3 50,9.5 43.75,-3 37.5,-3 43.75,15.75 0,97 z m -50,-43.75 18.75,37.5 -37.5,0 z" stroke="#fff" stroke-width="12.5" stroke-linejoin="round" transform="matrix(.16 0 0 .16 37 795.842)" opacity=".3" fill="none"/>
-    <path d="M 100,97 56.25,15.75 62.5,-3 56.25,-3 50,9.5 43.75,-3 37.5,-3 43.75,15.75 0,97 z m -50,-43.75 18.75,37.5 -37.5,0 z" fill="#747474" transform="matrix(.16 0 0 .16 37 795.842)"/>
-</svg>
diff --git a/data/styles/symbols/nori/car_parts-18.svg b/data/styles/symbols/nori/car_parts-18.svg
deleted file mode 100644
index 881b0375e2..0000000000
--- a/data/styles/symbols/nori/car_parts-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="36.0 902.3622 18.0 18.0">
-    <path d="m 40,-122 0,2 -2,0 0,10 14,0 0,-10 -2,0 0,-2 -2,0 0,2 -6,0 0,-2 -2,0 z m 1,4 1,0 0,2 2,0 0,1 -2,0 0,2 -1,0 0,-2 -2,0 0,-1 2,0 0,-2 z m 5,2 5,0 0,1 -5,0 0,-1 z" transform="translate(0 -1) translate(0 1028.362)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round"/>
-    <path d="m 40,-122 0,2 -2,0 0,10 14,0 0,-10 -2,0 0,-2 -2,0 0,2 -6,0 0,-2 -2,0 z m 1,4 1,0 0,2 2,0 0,1 -2,0 0,2 -1,0 0,-2 -2,0 0,-1 2,0 0,-2 z m 5,2 5,0 0,1 -5,0 0,-1 z" transform="translate(0 -1) translate(0 1028.362)" fill="#747474"/>
-    <rect height="18" transform="translate(0 1028.362)" width="18" x="36" y="-126" opacity=".3" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/car_rental-18.svg b/data/styles/symbols/nori/car_rental-18.svg
deleted file mode 100644
index 2227ab4e4d..0000000000
--- a/data/styles/symbols/nori/car_rental-18.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0.0 812.3622 18.0 18.0">
-    <g>
-        <path d="M 5.8230674,815.72765"/>
-        <path d="M 4.2801914,824.44411"/>
-        <g fill="#747474" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round">
-            <path d="m 6.19275,813.3622 c -1.364157,-0.003 -2.46571,1.12512 -2.46875,2.5 0.003,1.37792 1.104593,2.49776 2.46875,2.5 0.9023143,-10e-4 1.6957214,-0.51786 2.125,-1.25 l 1.03125,0 0.78125,-0.8125 0.59375,0.625 0.59375,-0.59375 0.59375,0.59375 0.59375,-0.59375 0.625,0.59375 1.03125,-1.03125 c 0.1496,-0.15584 0.15328,-0.25137 0,-0.40625 l -0.84375,-0.875 -5,0 c -0.4270202,-0.74001 -1.2158614,-1.25192 -2.125,-1.25 z m -1.0625,1.8125 c 0.358559,-0.002 0.65353,0.28857 0.65625,0.65625 -0.0026,0.36256 -0.297531,0.68414 -0.65625,0.6875 -0.36464,-0.003 -0.65961,-0.32494 -0.65625,-0.6875 -0.0034,-0.36768 0.29161,-0.65801 0.65625,-0.65625 z"/>
-            <path d="m 13.910978,822.7569 -0.98392,-2.54447 c -0.183686,-0.48704 -0.58588,-0.90144 -1.346822,-0.90496 H 10.193164 7.8223307 6.4111392 c -0.7572671,0.003 -1.1593008,0.41776 -1.3466615,0.90496 l -0.9839208,2.54447 c -0.3905333,0.0504 -1.0818329,0.51024 -1.0805551,1.38128 v 3.23951 H 3.959644 v 1.03392 c -0.0022,1.27504 1.79869,1.25984 1.7982108,0 v -1.03392 h 3.2418271 3.2338401 v 1.03392 c 0.004,1.25984 1.805079,1.27504 1.806197,0 v -1.03392 H 15 v -3.23951 c -0.0032,-0.87104 -0.695133,-1.33088 -1.089022,-1.38128 z m -9.0239568,2.6656 c -0.4600148,0.002 -0.8326596,-0.38304 -0.8305832,-0.85584 -0.0021,-0.476 0.3705684,-0.86064 0.8305832,-0.8568 0.4587371,-0.004 0.8312211,0.38096 0.8305822,0.8568 7.987e-4,0.4728 -0.3718451,0.85728 -0.8305822,0.85584 z m 4.1128204,-2.68976 h -0.00819 -3.8869663 l 0.7419343,-2.00351 c 0.089447,-0.28432 0.2285694,-0.48784 0.5564894,-0.4928 h 2.5885426 0.00819 2.5966874 c 0.323288,0.005 0.46257,0.20848 0.55617,0.4928 l 0.742254,2.00351 H 8.9998416 z m 4.1128194,2.68976 c -0.463369,0.002 -0.836013,-0.38304 -0.838888,-0.85584 0.0029,-0.476 0.375519,-0.86064 0.838888,-0.8568 0.455223,-0.004 0.827707,0.38096 0.830423,0.8568 -0.0027,0.4728 -0.3752,0.85728 -0.830423,0.85584 z"/>
-        </g>
-        <g fill="#747474">
-            <path d="m 6.19275,813.3622 c -1.364157,-0.003 -2.46571,1.12512 -2.46875,2.5 0.003,1.37792 1.104593,2.49776 2.46875,2.5 0.9023143,-10e-4 1.6957214,-0.51786 2.125,-1.25 l 1.03125,0 0.78125,-0.8125 0.59375,0.625 0.59375,-0.59375 0.59375,0.59375 0.59375,-0.59375 0.625,0.59375 1.03125,-1.03125 c 0.1496,-0.15584 0.15328,-0.25137 0,-0.40625 l -0.84375,-0.875 -5,0 c -0.4270202,-0.74001 -1.2158614,-1.25192 -2.125,-1.25 z m -1.0625,1.8125 c 0.358559,-0.002 0.65353,0.28857 0.65625,0.65625 -0.0026,0.36256 -0.297531,0.68414 -0.65625,0.6875 -0.36464,-0.003 -0.65961,-0.32494 -0.65625,-0.6875 -0.0034,-0.36768 0.29161,-0.65801 0.65625,-0.65625 z"/>
-            <path d="m 13.910978,822.7569 -0.98392,-2.54447 c -0.183686,-0.48704 -0.58588,-0.90144 -1.346822,-0.90496 H 10.193164 7.8223307 6.4111392 c -0.7572671,0.003 -1.1593008,0.41776 -1.3466615,0.90496 l -0.9839208,2.54447 c -0.3905333,0.0504 -1.0818329,0.51024 -1.0805551,1.38128 v 3.23951 H 3.959644 v 1.03392 c -0.0022,1.27504 1.79869,1.25984 1.7982108,0 v -1.03392 h 3.2418271 3.2338401 v 1.03392 c 0.004,1.25984 1.805079,1.27504 1.806197,0 v -1.03392 H 15 v -3.23951 c -0.0032,-0.87104 -0.695133,-1.33088 -1.089022,-1.38128 z m -9.0239568,2.6656 c -0.4600148,0.002 -0.8326596,-0.38304 -0.8305832,-0.85584 -0.0021,-0.476 0.3705684,-0.86064 0.8305832,-0.8568 0.4587371,-0.004 0.8312211,0.38096 0.8305822,0.8568 7.987e-4,0.4728 -0.3718451,0.85728 -0.8305822,0.85584 z m 4.1128204,-2.68976 h -0.00819 -3.8869663 l 0.7419343,-2.00351 c 0.089447,-0.28432 0.2285694,-0.48784 0.5564894,-0.4928 h 2.5885426 0.00819 2.5966874 c 0.323288,0.005 0.46257,0.20848 0.55617,0.4928 l 0.742254,2.00351 H 8.9998416 z m 4.1128194,2.68976 c -0.463369,0.002 -0.836013,-0.38304 -0.838888,-0.85584 0.0029,-0.476 0.375519,-0.86064 0.838888,-0.8568 0.455223,-0.004 0.827707,0.38096 0.830423,0.8568 -0.0027,0.4728 -0.3752,0.85728 -0.830423,0.85584 z"/>
-        </g>
-        <path d="M 12.519853,824.44411"/>
-        <path d="M 4.7406704,815.71949"/>
-        <rect height="18" rx=".497" ry=".033" transform="translate(0 1028.362)" width="18" y="-216" opacity=".3" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/car_repair-18.svg b/data/styles/symbols/nori/car_repair-18.svg
deleted file mode 100644
index 0ecddb0a29..0000000000
--- a/data/styles/symbols/nori/car_repair-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="36.0 812.36218 18.0 18.0">
-    <g>
-        <path d="m 42.75,-212.21875 c -0.836862,0 -1.5,0.66314 -1.5,1.5 0,0.0735 0.02113,0.14801 0.03125,0.21875 L 39,-209 l -2,3 0,5 2,0 0,-5 2.71875,-3.625 c 0.271328,0.25594 0.628818,0.4375 1.03125,0.4375 0.836862,0 1.53125,-0.69439 1.53125,-1.53125 0,-0.83686 -0.694388,-1.5 -1.53125,-1.5 z M 45,-215 l -1,1 7,5 -9,2 0,2 c -1,0 -1,2 0,2 l 2,0 c 1,-2 1,-2 3,-2 2,0 2,0 3,2 l 3,0 0,-6 0,-2 -1.013246,1.24007 z m 4.156178,12.92191 c 0,1.14769 -0.930392,2.07809 -2.078089,2.07809 C 45.930392,-200 45,-200.9304 45,-202.07809 c 0,-1.1477 0.930392,-2.07809 2.078089,-2.07809 1.147697,0 2.078089,0.93039 2.078089,2.07809 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" transform="translate(0 1028.362)" color="#000" fill="#747474" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" font-family="Sans" stroke-linejoin="round" opacity=".3"/>
-        <path d="m 42.75,-212.21875 c -0.836862,0 -1.5,0.66314 -1.5,1.5 0,0.0735 0.02113,0.14801 0.03125,0.21875 L 39,-209 l -2,3 0,5 2,0 0,-5 2.71875,-3.625 c 0.271328,0.25594 0.628818,0.4375 1.03125,0.4375 0.836862,0 1.53125,-0.69439 1.53125,-1.53125 0,-0.83686 -0.694388,-1.5 -1.53125,-1.5 z M 45,-215 l -1,1 7,5 -9,2 0,2 c -1,0 -1,2 0,2 l 2,0 c 1,-2 1,-2 3,-2 2,0 2,0 3,2 l 3,0 0,-6 0,-2 -1.013246,1.24007 z m 4.156178,12.92191 c 0,1.14769 -0.930392,2.07809 -2.078089,2.07809 C 45.930392,-200 45,-200.9304 45,-202.07809 c 0,-1.1477 0.930392,-2.07809 2.078089,-2.07809 1.147697,0 2.078089,0.93039 2.078089,2.07809 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" transform="translate(0 1028.362)" color="#000" fill="#747474" overflow="visible" enable-background="accumulate" font-family="Sans"/>
-        <rect height="18" rx=".497" ry=".033" width="18" x="36" y="812.362" opacity=".3" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/carpenter-18.svg b/data/styles/symbols/nori/carpenter-18.svg
deleted file mode 100644
index e4623308ea..0000000000
--- a/data/styles/symbols/nori/carpenter-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="102.0 812.3622 18.0 18.0">
-    <g transform="translate(30 36)">
-        <rect height="18" transform="translate(0 1028.362)" width="18" x="72" y="-252" fill="none"/>
-        <path d="m 75,782.3622 4,-4 c 2,0 3,0 5,-1 l 1,1 -3,3 7,7 -2,2 -7,-7 -2,2 z m -2,4 4,0 0,2 -1,0 -0.5,5 -1,0 -0.5,-5 -1,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round" fill="none"/>
-        <path d="m 75,782.3622 4,-4 c 2,0 3,0 5,-1 l 1,1 -3,3 7,7 -2,2 -7,-7 -2,2 z m -2,4 4,0 0,2 -1,0 -0.5,5 -1,0 -0.5,-5 -1,0 z" fill="#747474"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/clothes-18.svg b/data/styles/symbols/nori/clothes-18.svg
deleted file mode 100644
index 7256fbb1fa..0000000000
--- a/data/styles/symbols/nori/clothes-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="36.0 848.3622 18.0 18.0">
-    <g transform="translate(0 1028.362)">
-        <path d="M 41.0625 -177 L 37 -175 L 38 -171 L 41 -173 L 41 -165 L 49 -165 L 49 -173 L 52 -171 L 53 -175 L 49.0625 -177 L 47.9375 -177 C 47.921414 -175.30242 46.607126 -173.9375 45 -173.9375 C 43.392874 -173.9375 42.078586 -175.30242 42.0625 -177 L 41.0625 -177 z" fill="#fff" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round"/>
-        <path d="M 41.0625 -177 L 37 -175 L 38 -171 L 41 -173 L 41 -165 L 49 -165 L 49 -173 L 52 -171 L 53 -175 L 49.0625 -177 L 47.9375 -177 C 47.921414 -175.30242 46.607126 -173.9375 45 -173.9375 C 43.392874 -173.9375 42.078586 -175.30242 42.0625 -177 L 41.0625 -177 z" fill="#747474"/>
-        <rect height="18" width="18" x="36" y="-180" opacity=".3" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/communication-tower-18.svg b/data/styles/symbols/nori/communication-tower-18.svg
deleted file mode 100644
index ff374fdf19..0000000000
--- a/data/styles/symbols/nori/communication-tower-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0.0 794.36218 18.0 18.0">
-    <path d="M 6.90625 -232.625 C 6.1256874 -232.337 5.4097385 -231.87382 4.78125 -231.25 C 2.7270462 -229.21106 2.4736736 -226.02368 4 -223.6875 L 4.84375 -224.25 C 3.5617972 -226.20114 3.7501706 -228.85669 5.46875 -230.5625 C 5.9923717 -231.08223 6.599363 -231.4464 7.25 -231.6875 L 6.90625 -232.625 z M 11.09375 -232.59375 L 10.75 -231.65625 C 11.408875 -231.41079 12.035628 -231.06208 12.5625 -230.53125 C 14.268313 -228.81267 14.454552 -226.16032 13.15625 -224.21875 L 14 -223.65625 C 15.543536 -225.98099 15.288949 -229.16455 13.25 -231.21875 C 12.618898 -231.85457 11.882386 -232.30047 11.09375 -232.59375 z M 10.40625 -230.75 L 10.0625 -229.78125 C 10.463586 -229.62964 10.838 -229.39565 11.15625 -229.0625 C 12.143784 -228.02875 12.253072 -226.48778 11.5 -225.34375 L 12.3125 -224.78125 C 13.3324 -226.31056 13.220937 -228.40504 11.90625 -229.78125 C 11.477687 -230.22987 10.954419 -230.54871 10.40625 -230.75 z M 7.59375 -230.71875 C 7.0956695 -230.53294 6.6246755 -230.26278 6.21875 -229.875 C 4.7968471 -228.51667 4.5998196 -226.35941 5.65625 -224.78125 L 6.53125 -225.34375 C 5.7315618 -226.53057 5.8634685 -228.13023 6.9375 -229.15625 C 7.2380823 -229.44339 7.573803 -229.64015 7.9375 -229.78125 L 7.59375 -230.71875 z M 9 -229 C 7.8954306 -229 7 -228.10456 7 -227 C 7 -226.00184 7.7314899 -225.18138 8.6875 -225.03125 L 6 -217 L 7 -217 L 8 -219 L 10 -219 L 11.15625 -217 L 12 -217 L 9.3125 -225.03125 C 10.26851 -225.18138 11 -226.00184 11 -227 C 11 -228.10456 10.104569 -229 9 -229 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" transform="translate(0 1028.362)" color="#000" fill="#747474" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" font-family="Sans" stroke-linejoin="round" opacity=".3"/>
-    <path d="M 6.90625 -232.625 C 6.1256874 -232.337 5.4097385 -231.87382 4.78125 -231.25 C 2.7270462 -229.21106 2.4736736 -226.02368 4 -223.6875 L 4.84375 -224.25 C 3.5617972 -226.20114 3.7501706 -228.85669 5.46875 -230.5625 C 5.9923717 -231.08223 6.599363 -231.4464 7.25 -231.6875 L 6.90625 -232.625 z M 11.09375 -232.59375 L 10.75 -231.65625 C 11.408875 -231.41079 12.035628 -231.06208 12.5625 -230.53125 C 14.268313 -228.81267 14.454552 -226.16032 13.15625 -224.21875 L 14 -223.65625 C 15.543536 -225.98099 15.288949 -229.16455 13.25 -231.21875 C 12.618898 -231.85457 11.882386 -232.30047 11.09375 -232.59375 z M 10.40625 -230.75 L 10.0625 -229.78125 C 10.463586 -229.62964 10.838 -229.39565 11.15625 -229.0625 C 12.143784 -228.02875 12.253072 -226.48778 11.5 -225.34375 L 12.3125 -224.78125 C 13.3324 -226.31056 13.220937 -228.40504 11.90625 -229.78125 C 11.477687 -230.22987 10.954419 -230.54871 10.40625 -230.75 z M 7.59375 -230.71875 C 7.0956695 -230.53294 6.6246755 -230.26278 6.21875 -229.875 C 4.7968471 -228.51667 4.5998196 -226.35941 5.65625 -224.78125 L 6.53125 -225.34375 C 5.7315618 -226.53057 5.8634685 -228.13023 6.9375 -229.15625 C 7.2380823 -229.44339 7.573803 -229.64015 7.9375 -229.78125 L 7.59375 -230.71875 z M 9 -229 C 7.8954306 -229 7 -228.10456 7 -227 C 7 -226.00184 7.7314899 -225.18138 8.6875 -225.03125 L 6 -217 L 7 -217 L 8 -219 L 10 -219 L 11.15625 -217 L 12 -217 L 9.3125 -225.03125 C 10.26851 -225.18138 11 -226.00184 11 -227 C 11 -228.10456 10.104569 -229 9 -229 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" transform="translate(0 1028.362)" color="#000" fill="#747474" overflow="visible" enable-background="accumulate" font-family="Sans"/>
-    <rect height="18" width="18" y="794.362" opacity=".3" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/community_centre-18.svg b/data/styles/symbols/nori/community_centre-18.svg
deleted file mode 100644
index 62be74810f..0000000000
--- a/data/styles/symbols/nori/community_centre-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="72.0 776.36218 18.0 18.0">
-    <rect height="18" width="18" x="72" y="776.362" fill="none"/>
-    <path d="M 81 -251 L 73 -248 L 73 -247 L 81 -249.875 L 89 -247 L 89 -248 L 81 -251 z M 77 -246.5 C 76.171573 -246.5 75.5 -245.82843 75.5 -245 C 75.5 -244.2752 76.003975 -243.67115 76.6875 -243.53125 L 76.65625 -243.3125 L 74 -240 L 75 -240 L 76.3125 -241.5625 L 75 -235 L 76 -235 L 77 -238 L 78 -235 L 79 -235 L 77.6875 -241.625 L 79 -240 L 80 -240 L 77.34375 -243.375 L 77.3125 -243.53125 C 77.996025 -243.67115 78.5 -244.2752 78.5 -245 C 78.5 -245.82843 77.828427 -246.5 77 -246.5 z M 85 -246.5 C 84.171573 -246.5 83.5 -245.82843 83.5 -245 C 83.5 -244.2751 84.003975 -243.67115 84.6875 -243.53125 L 84.65625 -243.3125 L 82 -240 L 83 -240 L 84.3125 -241.5625 L 83 -235 L 84 -235 L 85 -238 L 86 -235 L 87 -235 L 85.6875 -241.625 L 87 -240 L 88 -240 L 85.34375 -243.375 L 85.3125 -243.53125 C 85.996025 -243.67115 86.5 -244.2751 86.5 -245 C 86.5 -245.82843 85.828427 -246.5 85 -246.5 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" transform="translate(0 1028.362)" color="#000" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" font-family="Sans" opacity=".3" fill="none"/>
-    <path d="M 81 -251 L 73 -248 L 73 -247 L 81 -249.875 L 89 -247 L 89 -248 L 81 -251 z M 77 -246.5 C 76.171573 -246.5 75.5 -245.82843 75.5 -245 C 75.5 -244.2752 76.003975 -243.67115 76.6875 -243.53125 L 76.65625 -243.3125 L 74 -240 L 75 -240 L 76.3125 -241.5625 L 75 -235 L 76 -235 L 77 -238 L 78 -235 L 79 -235 L 77.6875 -241.625 L 79 -240 L 80 -240 L 77.34375 -243.375 L 77.3125 -243.53125 C 77.996025 -243.67115 78.5 -244.2752 78.5 -245 C 78.5 -245.82843 77.828427 -246.5 77 -246.5 z M 85 -246.5 C 84.171573 -246.5 83.5 -245.82843 83.5 -245 C 83.5 -244.2751 84.003975 -243.67115 84.6875 -243.53125 L 84.65625 -243.3125 L 82 -240 L 83 -240 L 84.3125 -241.5625 L 83 -235 L 84 -235 L 85 -238 L 86 -235 L 87 -235 L 85.6875 -241.625 L 87 -240 L 88 -240 L 85.34375 -243.375 L 85.3125 -243.53125 C 85.996025 -243.67115 86.5 -244.2751 86.5 -245 C 86.5 -245.82843 85.828427 -246.5 85 -246.5 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" transform="translate(0 1028.362)" color="#000" fill="#747474" overflow="visible" enable-background="accumulate" font-family="Sans"/>
-</svg>
diff --git a/data/styles/symbols/nori/computer-18.svg b/data/styles/symbols/nori/computer-18.svg
deleted file mode 100644
index 9b1e838a61..0000000000
--- a/data/styles/symbols/nori/computer-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="36.0 884.36218 18.0 18.0">
-    <g>
-        <path d="m 50.007921,886.36188 -10.014259,0 C 39.626241,886.36188 39,886.99772 39,887.3622 l 0,7 c 0,0.36448 0.62608,1.03296 0.993501,1.03296 l 10.014259,0 c 0.367422,0 0.99224,-0.66848 0.99224,-1.03296 l 0,-7 c 1.6e-4,-0.36448 -0.624658,-1.00032 -0.992079,-1.00032 z M 49,893.3622 l -8,0 0,-5 8,0 z m 2,7 -12,0 c 0,0 -1,0 -1,-1 2,-3 2,-3 2,-3 l 10,0 c 0,0 0,0 2,3 0,1 -1,1 -1,1 z" stroke="#fff" opacity=".3" fill="none"/>
-        <path d="m 50.007921,886.36188 -10.014259,0 C 39.626241,886.36188 39,886.99772 39,887.3622 l 0,7 c 0,0.36448 0.62608,1.03296 0.993501,1.03296 l 10.014259,0 c 0.367422,0 0.99224,-0.66848 0.99224,-1.03296 l 0,-7 c 1.6e-4,-0.36448 -0.624658,-1.00032 -0.992079,-1.00032 z M 49,893.3622 l -8,0 0,-5 8,0 z m 2,7 -12,0 c 0,0 -1,0 -1,-1 2,-3 2,-3 2,-3 l 10,0 c 0,0 0,0 2,3 0,1 -1,1 -1,1 z" fill="#747474"/>
-        <rect height="18" width="18" x="36" y="884.362" opacity=".3" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/courthouse-18.svg b/data/styles/symbols/nori/courthouse-18.svg
deleted file mode 100644
index 27b07132b2..0000000000
--- a/data/styles/symbols/nori/courthouse-18.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="72.0 956.3622 18.0 18.0">
-    <g>
-        <g stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none">
-            <path d="m 80.9051,18.775188 -25,0 0,68.75 25,0 0,6.25 -62.5,0 0,-6.25 25,0 0,-68.75 -25,0 0,-6.25 25,0 0,-12.5000005 12.5,0 0,12.5000005 25,0 z" transform="matrix(.16 0 0 .16 73.055 957.358)" stroke-width="12.5"/>
-            <path d="m 76,960.3622 -3,6 c 0,0.8022 1.61664,2 3,2 1.38432,0 3,-1.1978 3,-2 z m -2.58432,6 2.58432,-5.02912 2.58432,5.02912 z" stroke-width="2"/>
-            <path d="m 86,960.3622 -3,6 c 0,0.8022 1.61568,2 3,2 1.38336,0 3,-1.1978 3,-2 z m -2.58448,6 2.58432,-5.02912 2.58448,5.02912 z" stroke-width="2"/>
-        </g>
-        <g fill="#747474">
-            <path d="m 80.9051,18.775188 -25,0 0,68.75 25,0 0,6.25 -62.5,0 0,-6.25 25,0 0,-68.75 -25,0 0,-6.25 25,0 0,-12.5000005 12.5,0 0,12.5000005 25,0 z" transform="matrix(.16 0 0 .16 73.055 957.358)"/>
-            <path d="m 76,960.3622 -3,6 c 0,0.8022 1.61664,2 3,2 1.38432,0 3,-1.1978 3,-2 z m -2.58432,6 2.58432,-5.02912 2.58432,5.02912 z"/>
-            <path d="m 86,960.3622 -3,6 c 0,0.8022 1.61568,2 3,2 1.38336,0 3,-1.1978 3,-2 z m -2.58448,6 2.58432,-5.02912 2.58448,5.02912 z"/>
-        </g>
-        <rect height="18" transform="translate(0 1028.362)" width="18" x="72" y="-72" opacity=".3" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/craft-18.svg b/data/styles/symbols/nori/craft-18.svg
deleted file mode 100644
index ee7578ec96..0000000000
--- a/data/styles/symbols/nori/craft-18.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="36.0 794.3622 18.0 18.0">
-    <g transform="translate(36 -54)">
-        <g transform="matrix(1.009 0 0 .999 -.073 1.02)" opacity=".3" fill="#fff" stroke="#fff" stroke-width="1.992" stroke-linejoin="round">
-            <g stroke-width="12.433">
-                <path d="m 9.29,85.522 c 0.761,0.755 1.905,0.843 2.556,0.198 L 45.352,52.407 c 0.652,-0.646 0.563,-1.783 -0.198,-2.54 C 44.393,49.111 43.25,49.023 42.599,49.67 L 9.092,82.983 c -0.651,0.644 -0.563,1.784 0.198,2.539 z" transform="matrix(.16 0 0 .16 1.063 849.487)"/>
-                <path d="M 49.756,56.789 16.251,90.1 c -0.651,0.646 -0.562,1.784 0.198,2.543 0.76,0.753 1.905,0.844 2.556,0.195 L 52.513,59.526 c 0.65,-0.646 0.561,-1.784 -0.197,-2.541 -0.763,-0.755 -1.907,-0.845 -2.56,-0.196 z" transform="matrix(.16 0 0 .16 1.063 849.487)"/>
-            </g>
-            <path d="m 13.95696,862.3058 c -0.567341,0.56413 -0.567341,1.47884 0,2.04329 0.567981,0.56413 1.487647,0.56413 2.05563,0 0.567341,-0.5643 0.567341,-1.47948 0,-2.04329 -0.567983,-0.56446 -1.487808,-0.56446 -2.05563,0 z" stroke-width="1.992"/>
-            <path d="m 13.717911,862.06754 c 0.593616,-0.59073 0.593616,-1.54788 0,-2.13846 l -5.8318693,-5.7971 c -0.5939378,-0.59072 -1.5570248,-0.59072 -2.1509615,0 -0.5939379,0.59057 -0.5939379,1.5479 0,2.13847 l 5.8310688,5.79727 c 0.594738,0.59025 1.557183,0.59025 2.151762,0 z m -7.6961962,-5.791 c -0.5692641,-0.5659 -0.6115622,-1.44071 -0.095171,-1.95421 0.5165514,-0.51367 1.3964828,-0.47121 1.9657469,0.0946 l 5.5870513,5.55421 c 0.568944,0.56606 0.611882,1.44055 0.09549,1.95452 -0.51703,0.51351 -1.396642,0.47073 -1.965906,-0.0951 l -5.587212,-5.55388 z" stroke-width="1.992"/>
-            <path d="m 92.153,3.526 -22.703,15.835 -2.206,8.176 -9.893,9.836 7.535,7.489 9.892,-9.836 8.224,-2.191 15.926,-22.571 z M 21.046004,36.940945 79.430008,94.980988 c 4.447999,4.423027 11.661996,4.423027 16.110002,0 4.446987,-4.420967 4.446987,-11.591955 0,-16.015981 L 37.157006,20.925026 c 0.711999,-5.508031 -1.041,-11.2700247 -5.296,-15.5000054 -5.107003,-5.07799903 -12.434005,-6.5840477 -18.872001,-4.5490408 3.752001,3.7269866 6.652006,6.6790417 7.565001,7.5849802 3.262,3.24409 4.035005,7.733026 1.728,10.026052 l -3.683999,3.66295 C 16.291002,24.442988 11.775008,23.674985 8.5130076,20.432018 7.6020105,19.525019 4.6330094,16.642992 0.88200462,12.911012 -1.1649964,19.312998 0.34998186,26.59602 5.4580089,31.674019 9.71301,35.904936 15.507007,37.64797 21.046004,36.940945 z m 72.261003,55.820042 c -3.545006,3.520958 -9.285005,3.520958 -12.829999,0 -3.540999,-3.52202 -3.540999,-9.232022 0,-12.752981 3.544994,-3.522019 9.284993,-3.522019 12.829999,0 3.540999,3.517963 3.540999,9.230025 0,12.752981 z m -72.411,5.841072 29.442997,-29.272081 -17.60097,-17.4985 -29.4429981,29.272018 c -2.85100308,2.832033 -1.220003,9.045966 3.6409977,13.876993 4.8599984,4.833024 11.1089964,6.455041 13.9600004,3.622006 z" transform="matrix(.16 0 0 .16 1.063 849.487)" stroke-width="12.433"/>
-        </g>
-        <g transform="matrix(1.009 0 0 .999 -.073 1.02)">
-            <g fill="none">
-                <path d="m 9.29,85.522 c 0.761,0.755 1.905,0.843 2.556,0.198 L 45.352,52.407 c 0.652,-0.646 0.563,-1.783 -0.198,-2.54 C 44.393,49.111 43.25,49.023 42.599,49.67 L 9.092,82.983 c -0.651,0.644 -0.563,1.784 0.198,2.539 z" transform="matrix(.16 0 0 .16 1.063 849.487)"/>
-                <path d="M 49.756,56.789 16.251,90.1 c -0.651,0.646 -0.562,1.784 0.198,2.543 0.76,0.753 1.905,0.844 2.556,0.195 L 52.513,59.526 c 0.65,-0.646 0.561,-1.784 -0.197,-2.541 -0.763,-0.755 -1.907,-0.845 -2.56,-0.196 z" transform="matrix(.16 0 0 .16 1.063 849.487)"/>
-            </g>
-            <path d="m 13.95696,862.3058 c -0.567341,0.56413 -0.567341,1.47884 0,2.04329 0.567981,0.56413 1.487647,0.56413 2.05563,0 0.567341,-0.5643 0.567341,-1.47948 0,-2.04329 -0.567983,-0.56446 -1.487808,-0.56446 -2.05563,0 z" fill="none"/>
-            <path d="m 13.717911,862.06754 c 0.593616,-0.59073 0.593616,-1.54788 0,-2.13846 l -5.8318693,-5.7971 c -0.5939378,-0.59072 -1.5570248,-0.59072 -2.1509615,0 -0.5939379,0.59057 -0.5939379,1.5479 0,2.13847 l 5.8310688,5.79727 c 0.594738,0.59025 1.557183,0.59025 2.151762,0 z m -7.6961962,-5.791 c -0.5692641,-0.5659 -0.6115622,-1.44071 -0.095171,-1.95421 0.5165514,-0.51367 1.3964828,-0.47121 1.9657469,0.0946 l 5.5870513,5.55421 c 0.568944,0.56606 0.611882,1.44055 0.09549,1.95452 -0.51703,0.51351 -1.396642,0.47073 -1.965906,-0.0951 l -5.587212,-5.55388 z" fill="none"/>
-            <path d="m 92.153,3.526 -22.703,15.835 -2.206,8.176 -9.893,9.836 7.535,7.489 9.892,-9.836 8.224,-2.191 15.926,-22.571 z M 21.046004,36.940945 79.430008,94.980988 c 4.447999,4.423027 11.661996,4.423027 16.110002,0 4.446987,-4.420967 4.446987,-11.591955 0,-16.015981 L 37.157006,20.925026 c 0.711999,-5.508031 -1.041,-11.2700247 -5.296,-15.5000054 -5.107003,-5.07799903 -12.434005,-6.5840477 -18.872001,-4.5490408 3.752001,3.7269866 6.652006,6.6790417 7.565001,7.5849802 3.262,3.24409 4.035005,7.733026 1.728,10.026052 l -3.683999,3.66295 C 16.291002,24.442988 11.775008,23.674985 8.5130076,20.432018 7.6020105,19.525019 4.6330094,16.642992 0.88200462,12.911012 -1.1649964,19.312998 0.34998186,26.59602 5.4580089,31.674019 9.71301,35.904936 15.507007,37.64797 21.046004,36.940945 z m 72.261003,55.820042 c -3.545006,3.520958 -9.285005,3.520958 -12.829999,0 -3.540999,-3.52202 -3.540999,-9.232022 0,-12.752981 3.544994,-3.522019 9.284993,-3.522019 12.829999,0 3.540999,3.517963 3.540999,9.230025 0,12.752981 z m -72.411,5.841072 29.442997,-29.272081 -17.60097,-17.4985 -29.4429981,29.272018 c -2.85100308,2.832033 -1.220003,9.045966 3.6409977,13.876993 4.8599984,4.833024 11.1089964,6.455041 13.9600004,3.622006 z" transform="matrix(.16 0 0 .16 1.063 849.487)" fill="#747474"/>
-        </g>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/dentist-18.svg b/data/styles/symbols/nori/dentist-18.svg
deleted file mode 100644
index 3ea55aa7d4..0000000000
--- a/data/styles/symbols/nori/dentist-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="72.0 830.3622 18.0 18.0">
-    <path d="m 80.837056,839.93983 c 1.04748,0 1.533421,0.79506 1.635621,1.9243 0.02436,0.2702 -0.0011,0.66402 -0.0357,1.12015 -0.11774,1.5155 -0.25312,3.37792 0.756001,3.37792 0.853441,0 1.291922,-1.6373 1.544902,-3.50379 0.244301,-1.84758 -0.01442,-2.7671 0.112841,-3.5875 0.24262,-1.55442 1.599502,-2.94812 1.180341,-4.92997 -0.23212,-1.09942 -0.837481,-1.61658 -1.437242,-1.834 -1.381522,-0.50288 -2.273463,0.46606 -3.756764,0.46606 -1.483302,0 -2.375244,-0.96894 -3.757466,-0.46606 -0.599201,0.21742 -1.204561,0.73458 -1.437242,1.834 -0.4186,1.98185 0.937722,3.37555 1.180902,4.92997 0.12712,0.8204 -0.13146,1.73978 0.11284,3.5875 0.25298,1.86635 0.691601,3.50379 1.544902,3.50379 1.008702,0 0.873882,-1.86242 0.756001,-3.37778 -0.03472,-0.45613 -0.05992,-0.84995 -0.0357,-1.12015 0.101781,-1.12938 0.594161,-1.92444 1.635763,-1.92444 z" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-    <path d="m 80.837056,839.93983 c 1.04748,0 1.533421,0.79506 1.635621,1.9243 0.02436,0.2702 -0.0011,0.66402 -0.0357,1.12015 -0.11774,1.5155 -0.25312,3.37792 0.756001,3.37792 0.853441,0 1.291922,-1.6373 1.544902,-3.50379 0.244301,-1.84758 -0.01442,-2.7671 0.112841,-3.5875 0.24262,-1.55442 1.599502,-2.94812 1.180341,-4.92997 -0.23212,-1.09942 -0.837481,-1.61658 -1.437242,-1.834 -1.381522,-0.50288 -2.273463,0.46606 -3.756764,0.46606 -1.483302,0 -2.375244,-0.96894 -3.757466,-0.46606 -0.599201,0.21742 -1.204561,0.73458 -1.437242,1.834 -0.4186,1.98185 0.937722,3.37555 1.180902,4.92997 0.12712,0.8204 -0.13146,1.73978 0.11284,3.5875 0.25298,1.86635 0.691601,3.50379 1.544902,3.50379 1.008702,0 0.873882,-1.86242 0.756001,-3.37778 -0.03472,-0.45613 -0.05992,-0.84995 -0.0357,-1.12015 0.101781,-1.12938 0.594161,-1.92444 1.635763,-1.92444 z" fill="#747474"/>
-    <rect height="18" transform="translate(0 1028.362)" width="18" x="72" y="-198" opacity=".3" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/drinking_water-18.svg b/data/styles/symbols/nori/drinking_water-18.svg
deleted file mode 100644
index b8aa74d434..0000000000
--- a/data/styles/symbols/nori/drinking_water-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0.0 866.36218 18.0 18.0">
-    <rect height="18" width="18" y="866.362" opacity=".3" fill="none"/>
-    <path d="m 3,875.3622 1,8 4,0 1,-8 z m 1,1 4,0 -0.3,2 -3.4,0 m 0.7,-4 0,-2 c 0,-1 0.9999999,-2 2,-2 l 3,0 0,-2 -2,0 c -1,0 -1,-1 0,-1 l 5,0 c 1,0 1,1 0,1 l -2,0 0,2 4,0 0,2 c 0,0 -3.933324,0 -7,0 -0.518943,0 -0.939744,0.3005 -0.939744,0.8196 L 7,874.3622 z" fill="#fff" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round"/>
-    <path d="m 3,875.3622 1,8 4,0 1,-8 z m 1,1 4,0 -0.3,2 -3.4,0 m 0.7,-4 0,-2 c 0,-1 0.9999999,-2 2,-2 l 3,0 0,-2 -2,0 c -1,0 -1,-1 0,-1 l 5,0 c 1,0 1,1 0,1 l -2,0 0,2 4,0 0,2 c 0,0 -3.933324,0 -7,0 -0.518943,0 -0.939744,0.3005 -0.939744,0.8196 L 7,874.3622 z" fill="#747474"/>
-</svg>
diff --git a/data/styles/symbols/nori/drinking_water_well-18.svg b/data/styles/symbols/nori/drinking_water_well-18.svg
deleted file mode 100644
index e00206c37a..0000000000
--- a/data/styles/symbols/nori/drinking_water_well-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0.0 848.36218 18.0 18.0">
-    <rect height="18" width="18" y="848.362" opacity=".3" fill="none"/>
-    <path d="m 3,857.3622 1,7 4,0 1,-7 z m 1,1 4,0 -0.3,2 -3.4,0 m 0.7000007,-3.9805 0,-2 c 0,-1 1,-2 2,-2 l 3.0000003,0 -4.03e-5,-2.01948 L 8,850.3622 c -0.99996,0 -0.99996,-1 0,-1 l 5,0 c 1.00004,0 1.00004,1 0,1 l -2.00004,2e-5 4e-5,2.01948 3,-0.0195 0,11.95125 2,0.0293 0,1 -14.0000593,0.0195 0,-1 L 12,864.3622 l 0,-9.99998 c 0,0 -0.93338,0.0195 -4.0000593,0.0195 -0.51894,0 -0.93974,0.3005 -0.93974,0.8196 l -0.0602,1.18036 z" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-    <path d="m 3,857.3622 1,7 4,0 1,-7 z m 1,1 4,0 -0.3,2 -3.4,0 m 0.7000007,-3.9805 0,-2 c 0,-1 1,-2 2,-2 l 3.0000003,0 -4.03e-5,-2.01948 L 8,850.3622 c -0.99996,0 -0.99996,-1 0,-1 l 5,0 c 1.00004,0 1.00004,1 0,1 l -2.00004,2e-5 4e-5,2.01948 3,-0.0195 0,11.95125 2,0.0293 0,1 -14.0000593,0.0195 0,-1 L 12,864.3622 l 0,-9.99998 c 0,0 -0.93338,0.0195 -4.0000593,0.0195 -0.51894,0 -0.93974,0.3005 -0.93974,0.8196 l -0.0602,1.18036 z" fill="#747474"/>
-</svg>
diff --git a/data/styles/symbols/nori/dry_cleaning-18.svg b/data/styles/symbols/nori/dry_cleaning-18.svg
deleted file mode 100644
index 206ca54d35..0000000000
--- a/data/styles/symbols/nori/dry_cleaning-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="72.0 812.36218 18.0 18.0">
-    <rect height="18" width="18" x="72" y="812.362" opacity=".3" fill="none"/>
-    <path d="m 79,-205 c 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 l -4,0 z m -4,-5 0,10 12,0 0,-10 -12,0 z m 6,2 c 1.656854,0 3,1.34315 3,3 0,1.65685 -1.343146,3 -3,3 -1.656854,0 -3,-1.34315 -3,-3 0,-1.65685 1.343146,-3 3,-3 z m -5.5625,-6 C 75.015625,-213.9531 75,-213.75 75,-213 l 0,2 12,0 0,-2 c 0,-1 0,-1 -1,-1 -3.214405,5.4e-4 -6.785524,-6.2e-4 -10,0 -0.25,0 -0.421875,-0.0156 -0.5625,0 z M 77,-213.5 c 0.552284,0 1,0.44772 1,1 0,0.55228 -0.447716,1 -1,1 -0.552284,0 -1,-0.44772 -1,-1 0,-0.55228 0.447716,-1 1,-1 z m 3,0 c 0.552284,0 1,0.44772 1,1 0,0.55228 -0.447716,1 -1,1 -0.552284,0 -1,-0.44772 -1,-1 0,-0.55228 0.447716,-1 1,-1 z" transform="translate(0 1028.362)" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-    <path d="m 79,-205 c 0,1.10457 0.895431,2 2,2 1.104569,0 2,-0.89543 2,-2 l -4,0 z m -4,-5 0,10 12,0 0,-10 -12,0 z m 6,2 c 1.656854,0 3,1.34315 3,3 0,1.65685 -1.343146,3 -3,3 -1.656854,0 -3,-1.34315 -3,-3 0,-1.65685 1.343146,-3 3,-3 z m -5.5625,-6 C 75.015625,-213.9531 75,-213.75 75,-213 l 0,2 12,0 0,-2 c 0,-1 0,-1 -1,-1 -3.214405,5.4e-4 -6.785524,-6.2e-4 -10,0 -0.25,0 -0.421875,-0.0156 -0.5625,0 z M 77,-213.5 c 0.552284,0 1,0.44772 1,1 0,0.55228 -0.447716,1 -1,1 -0.552284,0 -1,-0.44772 -1,-1 0,-0.55228 0.447716,-1 1,-1 z m 3,0 c 0.552284,0 1,0.44772 1,1 0,0.55228 -0.447716,1 -1,1 -0.552284,0 -1,-0.44772 -1,-1 0,-0.55228 0.447716,-1 1,-1 z" transform="translate(0 1028.362)" fill="#747474"/>
-</svg>
diff --git a/data/styles/symbols/nori/fire_hydrant-18.svg b/data/styles/symbols/nori/fire_hydrant-18.svg
deleted file mode 100644
index 02debcf3d6..0000000000
--- a/data/styles/symbols/nori/fire_hydrant-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="72.0 866.36218 18.0 18.0">
-    <path d="m 79,869.3622 c 0,1 10e-7,0.99999 10e-7,0.99999 l -1.000001,0 c -1,1.00001 -1,1.00001 0,2 l 1,0 c 0,0 0,1.45877 0,2 -1,0 -1,0 -2,1 l -1,0 0,2 1,0 c 1,1 1,1 2,1 0,4 -4e-6,3 -4e-6,3 l -2,1 0,1 8,10e-6 0,-1 -2,-1.00001 c 0,0 -0.01546,-1.28303 4e-6,-3 1,0 1,0 2,-1 1,0 1,0 1,0 l 0,-2 c 0,0 0,0 -1,0 -1,-1 -1,-1 -2,-1 l 0,-2 1,10e-6 c 1,-1 1,-1 0,-2 l -1,-10e-6 c 0,-1 0,10e-6 0,-0.99999 -1,-2 -3,-2 -4,0 z" stroke="#fff" stroke-width="2" opacity=".3" stroke-linejoin="round" fill="none"/>
-    <path d="m 79,869.3622 c 0,1 10e-7,0.99999 10e-7,0.99999 l -1.000001,0 c -1,1.00001 -1,1.00001 0,2 l 1,0 c 0,0 0,1.45877 0,2 -1,0 -1,0 -2,1 l -1,0 0,2 1,0 c 1,1 1,1 2,1 0,4 -4e-6,3 -4e-6,3 l -2,1 0,1 8,10e-6 0,-1 -2,-1.00001 c 0,0 -0.01546,-1.28303 4e-6,-3 1,0 1,0 2,-1 1,0 1,0 1,0 l 0,-2 c 0,0 0,0 -1,0 -1,-1 -1,-1 -2,-1 l 0,-2 1,10e-6 c 1,-1 1,-1 0,-2 l -1,-10e-6 c 0,-1 0,10e-6 0,-0.99999 -1,-2 -3,-2 -4,0 z" fill="#747474" stroke="#000" stroke-width=".004"/>
-    <rect height="18" width="18" x="72" y="866.362" opacity=".3" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/funeral_directors-18.svg b/data/styles/symbols/nori/funeral_directors-18.svg
deleted file mode 100644
index f7e6303337..0000000000
--- a/data/styles/symbols/nori/funeral_directors-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="36.0 956.3622 18.0 18.0">
-    <g transform="translate(-36 -36) translate(0 1028.362)">
-        <path d="m 79,-35 -3,4 3,12 3,0 3,-12 -3,-4 -3,0 z m 1,2 1,0 0,2 2,0 0,1 -2,0 0,5 -1,0 0,-5 -2,0 0,-1 2,0 0,-2 z" opacity=".3" fill="#747474" stroke="#fff" stroke-width="2" stroke-linejoin="round"/>
-        <path d="m 79,-35 -3,4 3,12 3,0 3,-12 -3,-4 -3,0 z m 1,2 1,0 0,2 2,0 0,1 -2,0 0,5 -1,0 0,-5 -2,0 0,-1 2,0 0,-2 z" fill="#747474"/>
-        <rect height="18" width="18" x="72" y="-36" opacity=".3" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/gambling-18.svg b/data/styles/symbols/nori/gambling-18.svg
deleted file mode 100644
index 00cac53d3d..0000000000
--- a/data/styles/symbols/nori/gambling-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0.0 920.36218 18.0 18.0">
-    <path d="m 6,-105 c -2,0 -3,1 -3,3 l 0,6 c 0,2 1,3 3,3 l 6,0 c 2,0 3,-1 3,-3 l 0,-6 c 0,-2 -1,-3 -3,-3 z m 6,2 c 0.828427,0 1,0.17157 1,1 0,0.82843 -0.171573,1 -1,1 -0.828427,0 -1,-0.17157 -1,-1 0,-0.82843 0.171573,-1 1,-1 z m -3,3 c 0.8284271,0 1,0.171573 1,1 0,0.828427 -0.1715729,1 -1,1 -0.8284271,0 -1,-0.171573 -1,-1 0,-0.828427 0.1715729,-1 1,-1 z m -3,3 c 0.8284271,0 1,0.171573 1,1 0,0.828427 -0.1715729,1 -1,1 -0.8284271,0 -1,-0.171573 -1,-1 0,-0.828427 0.1715729,-1 1,-1 z" transform="translate(0 1028.362)" stroke="#fff" stroke-width="2" stroke-linejoin="round" opacity=".3" fill="none"/>
-    <path d="m 6,-105 c -2,0 -3,1 -3,3 l 0,6 c 0,2 1,3 3,3 l 6,0 c 2,0 3,-1 3,-3 l 0,-6 c 0,-2 -1,-3 -3,-3 z m 6,2 c 0.828427,0 1,0.17157 1,1 0,0.82843 -0.171573,1 -1,1 -0.828427,0 -1,-0.17157 -1,-1 0,-0.82843 0.171573,-1 1,-1 z m -3,3 c 0.8284271,0 1,0.171573 1,1 0,0.828427 -0.1715729,1 -1,1 -0.8284271,0 -1,-0.171573 -1,-1 0,-0.828427 0.1715729,-1 1,-1 z m -3,3 c 0.8284271,0 1,0.171573 1,1 0,0.828427 -0.1715729,1 -1,1 -0.8284271,0 -1,-0.171573 -1,-1 0,-0.828427 0.1715729,-1 1,-1 z" transform="translate(0 1028.362)" fill="#747474"/>
-    <rect height="18" rx=".995" ry=".033" width="18" y="920.362" opacity=".3" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/generator-18.svg b/data/styles/symbols/nori/generator-18.svg
deleted file mode 100644
index 2c91e0004f..0000000000
--- a/data/styles/symbols/nori/generator-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="132.0 956.36218 18.0 18.0">
-    <path d="M 141 -70 C 140.75838 -70 140.51657 -69.99295 140.28125 -69.96875 L 139.75 -68.5 C 139.12195 -68.35696 138.52901 -68.11444 138 -67.78125 L 136.59375 -68.4375 C 136.22345 -68.13578 135.86422 -67.77655 135.5625 -67.40625 L 136.21875 -66 C 135.88556 -65.47099 135.64304 -64.87805 135.5 -64.25 L 134.03125 -63.71875 C 134.00735 -63.48343 134 -63.24162 134 -63 C 134 -62.75837 134.00705 -62.51657 134.03125 -62.28125 L 135.5 -61.75 C 135.64304 -61.12195 135.88556 -60.52901 136.21875 -60 L 135.5625 -58.59375 C 135.86422 -58.22345 136.22345 -57.86422 136.59375 -57.5625 L 138 -58.21875 C 138.52901 -57.88556 139.12195 -57.64304 139.75 -57.5 L 140.28125 -56.03125 C 140.51657 -56.00735 140.75838 -56 141 -56 C 141.24162 -56 141.48343 -56.00705 141.71875 -56.03125 L 142.25 -57.5 C 142.87805 -57.64304 143.47099 -57.88556 144 -58.21875 L 145.40625 -57.5625 C 145.77655 -57.86422 146.13578 -58.22345 146.4375 -58.59375 L 145.78125 -60 C 146.11444 -60.52901 146.35696 -61.12195 146.5 -61.75 L 147.96875 -62.28125 C 147.99265 -62.51657 148 -62.75837 148 -63 C 148 -63.24162 147.99295 -63.48343 147.96875 -63.71875 L 146.5 -64.25 C 146.35696 -64.87805 146.11444 -65.47099 145.78125 -66 L 146.4375 -67.40625 C 146.13578 -67.77655 145.77655 -68.13578 145.40625 -68.4375 L 144 -67.78125 C 143.47099 -68.11444 142.87805 -68.35696 142.25 -68.5 L 141.71875 -69.96875 C 141.48343 -69.99265 141.24162 -70 141 -70 z M 141 -67.5 C 143.48528 -67.5 145.5 -65.485281 145.5 -63 C 145.5 -60.514719 143.48528 -58.5 141 -58.5 C 138.51472 -58.5 136.5 -60.514719 136.5 -63 C 136.5 -65.485281 138.51472 -67.5 141 -67.5 z M 140 -66 L 138 -63 L 141 -63 L 140 -59 L 144 -64 L 141 -64 L 142 -66 L 140 -66 z" transform="translate(0 1028.362)" stroke="#fff" stroke-width="2" stroke-linejoin="round" opacity=".3" fill="none"/>
-    <path d="M 141 -70 C 140.75838 -70 140.51657 -69.99295 140.28125 -69.96875 L 139.75 -68.5 C 139.12195 -68.35696 138.52901 -68.11444 138 -67.78125 L 136.59375 -68.4375 C 136.22345 -68.13578 135.86422 -67.77655 135.5625 -67.40625 L 136.21875 -66 C 135.88556 -65.47099 135.64304 -64.87805 135.5 -64.25 L 134.03125 -63.71875 C 134.00735 -63.48343 134 -63.24162 134 -63 C 134 -62.75837 134.00705 -62.51657 134.03125 -62.28125 L 135.5 -61.75 C 135.64304 -61.12195 135.88556 -60.52901 136.21875 -60 L 135.5625 -58.59375 C 135.86422 -58.22345 136.22345 -57.86422 136.59375 -57.5625 L 138 -58.21875 C 138.52901 -57.88556 139.12195 -57.64304 139.75 -57.5 L 140.28125 -56.03125 C 140.51657 -56.00735 140.75838 -56 141 -56 C 141.24162 -56 141.48343 -56.00705 141.71875 -56.03125 L 142.25 -57.5 C 142.87805 -57.64304 143.47099 -57.88556 144 -58.21875 L 145.40625 -57.5625 C 145.77655 -57.86422 146.13578 -58.22345 146.4375 -58.59375 L 145.78125 -60 C 146.11444 -60.52901 146.35696 -61.12195 146.5 -61.75 L 147.96875 -62.28125 C 147.99265 -62.51657 148 -62.75837 148 -63 C 148 -63.24162 147.99295 -63.48343 147.96875 -63.71875 L 146.5 -64.25 C 146.35696 -64.87805 146.11444 -65.47099 145.78125 -66 L 146.4375 -67.40625 C 146.13578 -67.77655 145.77655 -68.13578 145.40625 -68.4375 L 144 -67.78125 C 143.47099 -68.11444 142.87805 -68.35696 142.25 -68.5 L 141.71875 -69.96875 C 141.48343 -69.99265 141.24162 -70 141 -70 z M 141 -67.5 C 143.48528 -67.5 145.5 -65.485281 145.5 -63 C 145.5 -60.514719 143.48528 -58.5 141 -58.5 C 138.51472 -58.5 136.5 -60.514719 136.5 -63 C 136.5 -65.485281 138.51472 -67.5 141 -67.5 z M 140 -66 L 138 -63 L 141 -63 L 140 -59 L 144 -64 L 141 -64 L 142 -66 L 140 -66 z" transform="translate(0 1028.362)" fill="#747474"/>
-    <rect height="18" width="18" x="132" y="956.362" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/generator_nuclear-18.svg b/data/styles/symbols/nori/generator_nuclear-18.svg
deleted file mode 100644
index dd3673a788..0000000000
--- a/data/styles/symbols/nori/generator_nuclear-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="132.0 920.3622 18.0 18.0">
-    <g transform="translate(0 1028.362)">
-        <path d="M 137.5 -105.0625 C 135.33419 -103.81206 134 -101.50086 134 -99 L 138.5 -99 C 138.5 -99.925343 139.00276 -100.72398 139.75 -101.15625 L 137.5 -105.0625 z M 144.5 -105.0625 L 142.25 -101.15625 C 142.99724 -100.72398 143.5 -99.925343 143.5 -99 L 148 -99 C 148 -101.50086 146.66581 -103.81207 144.5 -105.0625 z M 141 -100.5 C 140.17157 -100.5 139.5 -99.828427 139.5 -99 C 139.5 -98.171573 140.17157 -97.5 141 -97.5 C 141.82843 -97.5 142.5 -98.171573 142.5 -99 C 142.5 -99.828427 141.82843 -100.5 141 -100.5 z M 139.75 -96.84375 L 137.5 -92.9375 C 139.66581 -91.687071 142.33419 -91.687071 144.5 -92.9375 L 142.25 -96.84375 C 141.88228 -96.631028 141.45537 -96.5 141 -96.5 C 140.54463 -96.5 140.11772 -96.631028 139.75 -96.84375 z" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-        <path d="M 137.5 -105.0625 C 135.33419 -103.81206 134 -101.50086 134 -99 L 138.5 -99 C 138.5 -99.925343 139.00276 -100.72398 139.75 -101.15625 L 137.5 -105.0625 z M 144.5 -105.0625 L 142.25 -101.15625 C 142.99724 -100.72398 143.5 -99.925343 143.5 -99 L 148 -99 C 148 -101.50086 146.66581 -103.81207 144.5 -105.0625 z M 141 -100.5 C 140.17157 -100.5 139.5 -99.828427 139.5 -99 C 139.5 -98.171573 140.17157 -97.5 141 -97.5 C 141.82843 -97.5 142.5 -98.171573 142.5 -99 C 142.5 -99.828427 141.82843 -100.5 141 -100.5 z M 139.75 -96.84375 L 137.5 -92.9375 C 139.66581 -91.687071 142.33419 -91.687071 144.5 -92.9375 L 142.25 -96.84375 C 141.88228 -96.631028 141.45537 -96.5 141 -96.5 C 140.54463 -96.5 140.11772 -96.631028 139.75 -96.84375 z" fill="#747474"/>
-        <rect height="18" width="18" x="132" y="-108" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/generator_solar-18.svg b/data/styles/symbols/nori/generator_solar-18.svg
deleted file mode 100644
index 5df6074185..0000000000
--- a/data/styles/symbols/nori/generator_solar-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="132.0 902.36218 18.0 18.0">
-    <path d="M 141 -124 L 140.1875 -121.65625 C 140.44966 -121.70126 140.7251 -121.75 141 -121.75 C 141.2749 -121.75 141.55034 -121.70126 141.8125 -121.65625 L 141 -124 z M 136.0625 -121.9375 L 137.125 -119.71875 C 137.44127 -120.1684 137.8316 -120.55873 138.28125 -120.875 L 136.0625 -121.9375 z M 145.9375 -121.9375 L 143.71875 -120.875 C 144.1684 -120.55873 144.55873 -120.1684 144.875 -119.71875 L 145.9375 -121.9375 z M 141 -120.75 C 138.923 -120.75 137.25 -119.077 137.25 -117 C 137.25 -114.923 138.923 -113.25 141 -113.25 C 143.077 -113.25 144.75 -114.923 144.75 -117 C 144.75 -119.077 143.077 -120.75 141 -120.75 z M 140 -120 L 142 -120 L 141 -118 L 144 -118 L 140 -114 L 141 -117 L 139 -117 L 140 -120 z M 136.34375 -117.8125 L 134 -117 L 136.34375 -116.1875 C 136.29874 -116.44966 136.25 -116.7251 136.25 -117 C 136.25 -117.2749 136.29874 -117.55034 136.34375 -117.8125 z M 145.65625 -117.8125 C 145.70126 -117.55034 145.75 -117.2749 145.75 -117 C 145.75 -116.7251 145.70126 -116.44966 145.65625 -116.1875 L 148 -117 L 145.65625 -117.8125 z M 137.125 -114.28125 L 136.0625 -112.0625 L 138.28125 -113.125 C 137.8316 -113.44127 137.44127 -113.8316 137.125 -114.28125 z M 144.875 -114.28125 C 144.55873 -113.8316 144.1684 -113.44127 143.71875 -113.125 L 145.9375 -112.0625 L 144.875 -114.28125 z M 140.1875 -112.34375 L 141 -110 L 141.8125 -112.34375 C 141.55034 -112.29874 141.2749 -112.25 141 -112.25 C 140.7251 -112.25 140.44966 -112.29874 140.1875 -112.34375 z" transform="translate(0 1028.362)" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-    <path d="M 141 -124 L 140.1875 -121.65625 C 140.44966 -121.70126 140.7251 -121.75 141 -121.75 C 141.2749 -121.75 141.55034 -121.70126 141.8125 -121.65625 L 141 -124 z M 136.0625 -121.9375 L 137.125 -119.71875 C 137.44127 -120.1684 137.8316 -120.55873 138.28125 -120.875 L 136.0625 -121.9375 z M 145.9375 -121.9375 L 143.71875 -120.875 C 144.1684 -120.55873 144.55873 -120.1684 144.875 -119.71875 L 145.9375 -121.9375 z M 141 -120.75 C 138.923 -120.75 137.25 -119.077 137.25 -117 C 137.25 -114.923 138.923 -113.25 141 -113.25 C 143.077 -113.25 144.75 -114.923 144.75 -117 C 144.75 -119.077 143.077 -120.75 141 -120.75 z M 140 -120 L 142 -120 L 141 -118 L 144 -118 L 140 -114 L 141 -117 L 139 -117 L 140 -120 z M 136.34375 -117.8125 L 134 -117 L 136.34375 -116.1875 C 136.29874 -116.44966 136.25 -116.7251 136.25 -117 C 136.25 -117.2749 136.29874 -117.55034 136.34375 -117.8125 z M 145.65625 -117.8125 C 145.70126 -117.55034 145.75 -117.2749 145.75 -117 C 145.75 -116.7251 145.70126 -116.44966 145.65625 -116.1875 L 148 -117 L 145.65625 -117.8125 z M 137.125 -114.28125 L 136.0625 -112.0625 L 138.28125 -113.125 C 137.8316 -113.44127 137.44127 -113.8316 137.125 -114.28125 z M 144.875 -114.28125 C 144.55873 -113.8316 144.1684 -113.44127 143.71875 -113.125 L 145.9375 -112.0625 L 144.875 -114.28125 z M 140.1875 -112.34375 L 141 -110 L 141.8125 -112.34375 C 141.55034 -112.29874 141.2749 -112.25 141 -112.25 C 140.7251 -112.25 140.44966 -112.29874 140.1875 -112.34375 z" transform="translate(0 1028.362)" fill="#747474"/>
-    <rect height="18" width="18" x="132" y="902.362" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/generator_wind-18.svg b/data/styles/symbols/nori/generator_wind-18.svg
deleted file mode 100644
index 4b6dc01ebb..0000000000
--- a/data/styles/symbols/nori/generator_wind-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="132.0 938.3622 18.0 18.0">
-    <g transform="translate(0 1028.362)">
-        <path d="m 146.78125,-88.71875 c -1.91821,0.639399 -3.28625,1.891723 -5.09375,3.6875 -0.0402,-0.0032 -0.084,0 -0.125,0 -0.35086,0 -0.68201,0.110674 -0.9375,0.3125 -1.51704,-0.389462 -2.81872,-0.661796 -4.0625,-0.65625 -0.53445,0.0024 -1.07733,0.04418 -1.625,0.15625 1.43797,1.275132 3.10564,1.843117 5.375,2.46875 0.16857,0.263461 0.39794,0.471276 0.6875,0.59375 0.003,0.0097 -0.003,0.02157 0,0.03125 l 0,7.125 -1,2 3,0 -1,-2 0,-4.09375 c 0.38185,0.890244 0.85094,1.674299 1.5,2.40625 0.4009,-1.959119 0.0134,-3.735136 -0.625,-6.15625 0.10419,-0.20546 0.1875,-0.440298 0.1875,-0.6875 0,-0.02051 8.2e-4,-0.04219 0,-0.0625 1.81318,-1.823699 3.07559,-3.195501 3.71875,-5.125 z" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-        <path d="m 146.78125,-88.71875 c -1.91821,0.639399 -3.28625,1.891723 -5.09375,3.6875 -0.0402,-0.0032 -0.084,0 -0.125,0 -0.35086,0 -0.68201,0.110674 -0.9375,0.3125 -1.51704,-0.389462 -2.81872,-0.661796 -4.0625,-0.65625 -0.53445,0.0024 -1.07733,0.04418 -1.625,0.15625 1.43797,1.275132 3.10564,1.843117 5.375,2.46875 0.16857,0.263461 0.39794,0.471276 0.6875,0.59375 0.003,0.0097 -0.003,0.02157 0,0.03125 l 0,7.125 -1,2 3,0 -1,-2 0,-4.09375 c 0.38185,0.890244 0.85094,1.674299 1.5,2.40625 0.4009,-1.959119 0.0134,-3.735136 -0.625,-6.15625 0.10419,-0.20546 0.1875,-0.440298 0.1875,-0.6875 0,-0.02051 8.2e-4,-0.04219 0,-0.0625 1.81318,-1.823699 3.07559,-3.195501 3.71875,-5.125 z" fill="#747474"/>
-        <rect height="18" width="18" x="132" y="-90" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/government-12.svg b/data/styles/symbols/nori/government-12.svg
deleted file mode 100644
index 804cee5ef7..0000000000
--- a/data/styles/symbols/nori/government-12.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="120.0 998.36218 12.0 12.0">
-    <path d="m 126.5,1002.3622 0,-1 3.5,0 -2,-1 2,-1 -4.5,0 0,3 c 0,0 -2.5,0 -2.5,2 l 6,0 c 0,-2 -2.5,-2 -2.5,-2 z m -5.5,3 10,0 0,4 -3,0 0,-1 -4,0 0,1 -3,0 z" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-    <path d="m 126.5,1002.3622 0,-1 3.5,0 -2,-1 2,-1 -4.5,0 0,3 c 0,0 -2.5,0 -2.5,2 l 6,0 c 0,-2 -2.5,-2 -2.5,-2 z m -5.5,3 10,0 0,4 -3,0 0,-1 -4,0 0,1 -3,0 z" fill="#525252"/>
-    <rect height="12" width="12" x="120" y="998.362" opacity=".3" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/government-18.svg b/data/styles/symbols/nori/government-18.svg
deleted file mode 100644
index 6920def383..0000000000
--- a/data/styles/symbols/nori/government-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="102.0 992.3622 18.0 18.0">
-    <path d="m 115,1001.3622 c 0,-2 -3.5,-2.5 -3.5,-2.5 l 0,-1.5 4.5,0 -1.5,-1.5 1.5,-1.5 -4.5,0 0,-1 -1,0 0,5.5 c 0,0 -3.5,0.5 -3.5,2.5 0,0 -1,0 -1,1 l 10,0 c 0,-1 -1,-1 -1,-1 z m -11,2 14,0 0,6 -5,0 0,-1 -4,0 0,1 -5,0 z" stroke="#fff" stroke-width="2" stroke-linejoin="round" opacity=".3" fill="none"/>
-    <path d="m 115,1001.3622 c 0,-2 -3.5,-2.5 -3.5,-2.5 l 0,-1.5 4.5,0 -1.5,-1.5 1.5,-1.5 -4.5,0 0,-1 -1,0 0,5.5 c 0,0 -3.5,0.5 -3.5,2.5 0,0 -1,0 -1,1 l 10,0 c 0,-1 -1,-1 -1,-1 z m -11,2 14,0 0,6 -5,0 0,-1 -4,0 0,1 -5,0 z" fill="#747474"/>
-    <rect height="18" transform="translate(0 1028.362)" width="18" x="102" y="-36" opacity=".3" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/grave_yard-18.svg b/data/styles/symbols/nori/grave_yard-18.svg
deleted file mode 100644
index f5fc3a5d5f..0000000000
--- a/data/styles/symbols/nori/grave_yard-18.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="36.0 794.3622 18.0 18.0">
-    <path d="m 8.96875,831.3622 c -1.9347185,0 -3.6794342,1.2873 -4.96875,3 l 0,10 -3,0 0,3 16,0 0,-3 -3,0 0,-10 c -1.3055,-1.7453 -3.078667,-3.0054 -5.03125,-3 z m -0.96875,2 2,0 0,2 2,0 0,2 -2,0 0,6 -2,0 0,-6 -2,0 0,-2 2,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" transform="translate(36 -36)"/>
-    <path d="m 8.96875,-197 c -1.9347185,0.005 -3.6794342,1.28729 -4.96875,3 l 0,10 -3,0 0,3 16,0 0,-3 -3,0 0,-10 c -1.3055,-1.74534 -3.078667,-3.00538 -5.03125,-3 z M 8,-195 l 2,0 0,2 2,0 0,2 -2,0 0,6 -2,0 0,-6 -2,0 0,-2 2,0 z" transform="translate(36 -36) translate(0 1028.362)" fill="#747474"/>
-</svg>
diff --git a/data/styles/symbols/nori/hairdresser-18.svg b/data/styles/symbols/nori/hairdresser-18.svg
deleted file mode 100644
index 5402f95f0f..0000000000
--- a/data/styles/symbols/nori/hairdresser-18.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0.0 938.3622 18.0 18.0">
-    <g transform="translate(-.001 .222)">
-        <path d="m 6,939.35893 0,11.0938 c -0.419737,-0.3189 -0.935466,-0.5313 -1.5,-0.5313 -1.374789,0 -2.5,1.1252 -2.5,2.5 0,1.3748 1.125211,2.5 2.5,2.5 1.288865,0 2.340096,-0.9936 2.46875,-2.25 l 0.03125,0 c 0.0172,0 0.01427,0 0.03125,0 0.156724,1.227 1.201035,2.1875 2.46875,2.1875 1.37479,0 2.5,-1.1252 2.5,-2.5 0,-1.3748 -1.12521,-2.5 -2.5,-2.5 -0.564535,0 -1.080263,0.2124 -1.5,0.5313 l 0,-11.0313 z m 3.5,11.5 c 0.834349,0 1.5,0.6657 1.5,1.5 0,0.8343 -0.665651,1.5 -1.5,1.5 -0.834349,0 -1.5,-0.6657 -1.5,-1.5 0,-0.8343 0.665651,-1.5 1.5,-1.5 z m -5,0.062 c 0.834349,0 1.5,0.6657 1.5,1.5 0,0.8343 -0.665651,1.5 -1.5,1.5 -0.834349,0 -1.5,-0.6657 -1.5,-1.5 0,-0.8343 0.665651,-1.5 1.5,-1.5 z m 5.499965,-11.56 8e-6,1.9995 4.000665,0 5e-6,0.9998 -4.000665,0 4e-6,0.9997 4.000665,0 5e-6,0.9998 -4.000665,0 4e-6,0.9997 4.000665,0 4e-6,0.9998 -4.000664,0 4e-6,0.9997 4.000665,0 -0.0016,6.9986 1.99934,0 c -0.0058,-10.7928 0.0074,-10.845 0.0016,-14.9966 l -1.99934,0 -4.000665,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round"/>
-        <path d="m 6,939.3622 0,11.0938 c -0.419737,-0.3189 -0.935466,-0.5313 -1.5,-0.5313 -1.374789,0 -2.5,1.1252 -2.5,2.5 0,1.3748 1.125211,2.5 2.5,2.5 1.288865,0 2.340096,-0.9936 2.46875,-2.25 l 0.03125,0 c 0.0172,0 0.01427,0 0.03125,0 0.156724,1.227 1.201035,2.1875 2.46875,2.1875 1.37479,0 2.5,-1.1252 2.5,-2.5 0,-1.3748 -1.12521,-2.5 -2.5,-2.5 -0.564535,0 -1.080263,0.2124 -1.5,0.5313 l 0,-11.0313 z m 3.5,11.5 c 0.834349,0 1.5,0.6657 1.5,1.5 0,0.8343 -0.665651,1.5 -1.5,1.5 -0.834349,0 -1.5,-0.6657 -1.5,-1.5 0,-0.8343 0.665651,-1.5 1.5,-1.5 z m -5,0.062 c 0.834349,0 1.5,0.6657 1.5,1.5 0,0.8343 -0.665651,1.5 -1.5,1.5 -0.834349,0 -1.5,-0.6657 -1.5,-1.5 0,-0.8343 0.665651,-1.5 1.5,-1.5 z m 5.499965,-11.56 8e-6,1.9995 4.000665,-0.002 5e-6,0.9998 -4.000665,0.002 4e-6,0.9997 4.000665,-0.002 5e-6,0.9998 -4.000665,0.002 4e-6,0.9997 4.000665,-0.002 4e-6,0.9998 -4.000664,0.002 4e-6,0.9997 4.000665,-0.002 -0.0016,6.9986 1.99934,0 c -0.0058,-10.7928 0.0074,-10.845 0.0016,-14.9966 l -1.99934,0 L 10,939.3642 z" fill="#747474"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/hardware-18.svg b/data/styles/symbols/nori/hardware-18.svg
deleted file mode 100644
index 9f9422b809..0000000000
--- a/data/styles/symbols/nori/hardware-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="132.0 992.36218 18.0 18.0">
-    <path d="M 135 -34 L 135 -31 L 137 -31 L 137 -30 L 140 -29 L 140 -31 L 142 -31 L 142 -34 L 135 -34 z M 145 -34 L 144 -32 L 144 -21 L 142 -19 L 148 -19 L 146 -21 L 146 -32 L 145 -34 z M 137 -29 L 137 -27 L 140 -26 L 140 -28 L 137 -29 z M 137 -26 L 137 -24 L 140 -23 L 140 -25 L 137 -26 z M 137 -23 L 137 -20 L 138 -19 L 139 -19 L 140 -20 L 140 -22 L 137 -23 z" transform="translate(0 1028.362)" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-    <path d="M 135 -34 L 135 -31 L 137 -31 L 137 -30 L 140 -29 L 140 -31 L 142 -31 L 142 -34 L 135 -34 z M 145 -34 L 144 -32 L 144 -21 L 142 -19 L 148 -19 L 146 -21 L 146 -32 L 145 -34 z M 137 -29 L 137 -27 L 140 -26 L 140 -28 L 137 -29 z M 137 -26 L 137 -24 L 140 -23 L 140 -25 L 137 -26 z M 137 -23 L 137 -20 L 138 -19 L 139 -19 L 140 -20 L 140 -22 L 137 -23 z" transform="translate(0 1028.362)" fill="#747474"/>
-    <rect height="18" width="18" x="132" y="992.362" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/hindu-18.svg b/data/styles/symbols/nori/hindu-18.svg
deleted file mode 100644
index b14b294d38..0000000000
--- a/data/styles/symbols/nori/hindu-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="72.0 938.3622 18.0 18.0">
-    <path d="m 79.646721,941.95454 c 0,0 2.566848,2.9751 5.311596,0.26817 0.165193,0.68955 1.143645,2.13234 1.143645,2.13234 0,0 -4.676238,2.68138 -6.455241,-2.40051 z m -5.246403,2.3242 c 0.407335,0.71025 0.814668,1.42048 1.222004,2.13073 0.67337,-0.84862 1.698832,-1.55754 2.804684,-1.5313 0.645252,0.0151 1.28169,0.74687 1.125977,1.34901 -0.275412,1.06492 -1.562918,0.93038 -2.457404,1.07147 0,0 0.239832,1.16484 0.359748,1.7472 1.498119,-0.29017 2.404827,0.9875 2.038556,1.8245 -0.693939,1.58591 -4.77511,1.43915 -6.493883,-1.5086 0.003,1.66644 0.639152,3.46612 2.121039,4.35733 1.53804,0.91887 3.763073,0.9006 5.04519,-0.36384 0.900115,-0.88778 0.954255,-2.3544 0.721492,-3.56908 0.595204,0.63354 1.685639,1.20712 2.422948,0.57056 1.03406,-0.89282 1.425173,-2.726 2.816518,-3.00892 2.631108,-0.53502 2.24551,3.66163 1.09658,4.57463 -1.51708,1.20551 -4.268329,0.29684 -4.988247,-1.03472 0.209989,2.32935 2.433217,3.68544 4.370734,2.97409 2.523288,-1.1618 2.786929,-4.32201 2.001892,-6.49077 -0.778176,-1.59852 -2.4277,-2.40061 -4.008119,-1.90081 -1.220703,0.38605 -1.682307,1.71671 -2.403208,2.67028 -0.376502,0.46166 -0.739535,1.10417 -1.456931,0.88354 -0.977821,-0.30076 -0.67413,-0.83267 -1.434243,-1.076 1.415017,-1.03231 1.750267,-3.02163 0.543638,-4.08674 -1.586117,-1.40009 -4.123401,-0.69642 -5.448965,0.41744 z m 6.813459,-2.60248 1.307749,-1.31406 1.321377,1.32775 -1.30775,1.31406 z" fill="#747474" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round"/>
-    <path d="m 79.646721,941.95454 c 0,0 2.566848,2.9751 5.311596,0.26817 0.165193,0.68955 1.143645,2.13234 1.143645,2.13234 0,0 -4.676238,2.68138 -6.455241,-2.40051 z m -5.246403,2.3242 c 0.407335,0.71025 0.814668,1.42048 1.222004,2.13073 0.67337,-0.84862 1.698832,-1.55754 2.804684,-1.5313 0.645252,0.0151 1.28169,0.74687 1.125977,1.34901 -0.275412,1.06492 -1.562918,0.93038 -2.457404,1.07147 0,0 0.239832,1.16484 0.359748,1.7472 1.498119,-0.29017 2.404827,0.9875 2.038556,1.8245 -0.693939,1.58591 -4.77511,1.43915 -6.493883,-1.5086 0.003,1.66644 0.639152,3.46612 2.121039,4.35733 1.53804,0.91887 3.763073,0.9006 5.04519,-0.36384 0.900115,-0.88778 0.954255,-2.3544 0.721492,-3.56908 0.595204,0.63354 1.685639,1.20712 2.422948,0.57056 1.03406,-0.89282 1.425173,-2.726 2.816518,-3.00892 2.631108,-0.53502 2.24551,3.66163 1.09658,4.57463 -1.51708,1.20551 -4.268329,0.29684 -4.988247,-1.03472 0.209989,2.32935 2.433217,3.68544 4.370734,2.97409 2.523288,-1.1618 2.786929,-4.32201 2.001892,-6.49077 -0.778176,-1.59852 -2.4277,-2.40061 -4.008119,-1.90081 -1.220703,0.38605 -1.682307,1.71671 -2.403208,2.67028 -0.376502,0.46166 -0.739535,1.10417 -1.456931,0.88354 -0.977821,-0.30076 -0.67413,-0.83267 -1.434243,-1.076 1.415017,-1.03231 1.750267,-3.02163 0.543638,-4.08674 -1.586117,-1.40009 -4.123401,-0.69642 -5.448965,0.41744 z m 6.813459,-2.60248 1.307749,-1.31406 1.321377,1.32775 -1.30775,1.31406 z" fill="#747474"/>
-    <rect height="18" transform="translate(0 1028.362)" width="18" x="72" y="-90" opacity=".3" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/hospital-12.svg b/data/styles/symbols/nori/hospital-12.svg
deleted file mode 100644
index a30bdf1a3b..0000000000
--- a/data/styles/symbols/nori/hospital-12.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="18.0 980.36218 12.0 12.0">
-    <path d="m 21.014342,990.3622 0,-8 1.985658,0 0,3 2,0 0,-3 2.043027,0 0,8 -2.043027,0 0,-3 -2,0 0,3 z" fill="#fff" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round"/>
-    <path d="m 21.014342,990.3622 0,-8 1.985658,0 0,3 2,0 0,-3 2.043027,0 0,8 -2.043027,0 0,-3 -2,0 0,3 z" fill="#525252"/>
-    <rect height="12" width="12" x="18" y="980.362" opacity=".3" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/hospital-18.svg b/data/styles/symbols/nori/hospital-18.svg
deleted file mode 100644
index 76047fcded..0000000000
--- a/data/styles/symbols/nori/hospital-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0.0 974.36218 18.0 18.0">
-    <path d="m 4,990.3622 0,-13 2.982763,0 0.04022,5 3.977017,0 -0.04022,-5 3.04022,0 0,13 -3.04022,0 0.04022,-5 -3.977017,0 -0.04022,5 z" fill="#fff" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round"/>
-    <path d="m 4,990.3622 0,-13 2.982763,0 0.04022,5 3.977017,0 -0.04022,-5 3.04022,0 0,13 -3.04022,0 0.04022,-5 -3.977017,0 -0.04022,5 z" fill="#747474"/>
-    <rect height="18" width="18" y="974.362" opacity=".3" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/information-18.svg b/data/styles/symbols/nori/information-18.svg
deleted file mode 100644
index 854668cc2a..0000000000
--- a/data/styles/symbols/nori/information-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0.0 776.3622 18.0 18.0">
-    <g transform="translate(0 1028.362)">
-        <path d="M 9 -249 C 5.6862915 -249 3 -246.31371 3 -243 C 3 -239.6863 5.6862915 -237 9 -237 C 12.313709 -237 15 -239.6863 15 -243 C 15 -246.31371 12.313709 -249 9 -249 z M 8 -247 L 10 -247 L 10 -245 L 8 -245 L 8 -247 z M 7 -244 L 8 -244 L 10 -244 L 10 -240 L 11 -240 L 11 -239 L 8 -239 L 7 -239 L 7 -240 L 8 -240 L 8 -243 L 7 -243 L 7 -244 z" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-        <path d="M 9 -249 C 5.6862915 -249 3 -246.31371 3 -243 C 3 -239.6863 5.6862915 -237 9 -237 C 12.313709 -237 15 -239.6863 15 -243 C 15 -246.31371 12.313709 -249 9 -249 z M 8 -247 L 10 -247 L 10 -245 L 8 -245 L 8 -247 z M 7 -244 L 8 -244 L 10 -244 L 10 -240 L 11 -240 L 11 -239 L 8 -239 L 7 -239 L 7 -240 L 8 -240 L 8 -243 L 7 -243 L 7 -244 z" fill="#747474"/>
-        <rect height="18" width="18" y="-252" opacity=".3" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/kindergarten-18.svg b/data/styles/symbols/nori/kindergarten-18.svg
deleted file mode 100644
index 4bf081e259..0000000000
--- a/data/styles/symbols/nori/kindergarten-18.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="36.0 974.3622 18.0 18.0">
-    <path d="M 44.627348,977.6214"/>
-    <path d="m 42.620241,985.49799 1.796629,1.79646 -1.315353,1.31536 1.351993,1.35231 c 0.794714,0.79632 -0.304959,1.93663 -1.125594,1.11631 l -2.141587,-2.22319 c -0.457116,-0.47023 -0.583836,-1.33439 -0.09056,-1.82382 0,-0.004 1.524471,-1.53343 1.524471,-1.53343 l 0,0 z m 2.380001,-0.88928 -2.354242,0 0,-1.73359 -2.145026,1.84223 c -0.881155,0.8264 -2.074,-0.23168 -1.190114,-1.06159 l 3.221805,-3.03087 c 0.263068,-0.24127 0.549336,-0.39615 1.006377,-0.39951 l 1.4612,0 0,0 1.431856,0 c 0.451411,0.003 0.757812,0.1536 1.025486,0.39951 l 3.260701,3.06703 c 0.838846,0.78335 -0.386241,1.85167 -1.190115,1.05248 l -2.20317,-1.87824 0,1.74239 -2.324758,0 z m -8.2e-5,-4.72797 c 1.247352,-0.002 2.259346,-1.01279 2.259346,-2.25934 0,-1.25023 -1.011834,-2.26191 -2.259346,-2.25919 -1.248953,-0.003 -2.260626,1.00896 -2.259666,2.25919 -9.25e-4,1.24655 1.010713,2.25806 2.259666,2.25934 l 0,0 z m 2.374771,5.61725 -1.796309,1.79646 1.324472,1.31536 -1.351672,1.35231 c -0.800155,0.79632 0.299678,1.93663 1.124633,1.11631 l 2.132467,-2.22319 c 0.461917,-0.47023 0.588476,-1.33439 0.100159,-1.82382 -0.0049,-0.004 -1.53375,-1.53343 -1.53375,-1.53343 l 0,0 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round"/>
-    <path d="m 42.620241,985.49799 1.796629,1.79646 -1.315353,1.31536 1.351993,1.35231 c 0.794714,0.79632 -0.304959,1.93663 -1.125594,1.11631 l -2.141587,-2.22319 c -0.457116,-0.47023 -0.583836,-1.33439 -0.09056,-1.82382 0,-0.004 1.524471,-1.53343 1.524471,-1.53343 l 0,0 z m 2.380001,-0.88928 -2.354242,0 0,-1.73359 -2.145026,1.84223 c -0.881155,0.8264 -2.074,-0.23168 -1.190114,-1.06159 l 3.221805,-3.03087 c 0.263068,-0.24127 0.549336,-0.39615 1.006377,-0.39951 l 1.4612,0 0,0 1.431856,0 c 0.451411,0.003 0.757812,0.1536 1.025486,0.39951 l 3.260701,3.06703 c 0.838846,0.78335 -0.386241,1.85167 -1.190115,1.05248 l -2.20317,-1.87824 0,1.74239 -2.324758,0 z m -8.2e-5,-4.72797 c 1.247352,-0.002 2.259346,-1.01279 2.259346,-2.25934 0,-1.25023 -1.011834,-2.26191 -2.259346,-2.25919 -1.248953,-0.003 -2.260626,1.00896 -2.259666,2.25919 -9.25e-4,1.24655 1.010713,2.25806 2.259666,2.25934 l 0,0 z m 2.374771,5.61725 -1.796309,1.79646 1.324472,1.31536 -1.351672,1.35231 c -0.800155,0.79632 0.299678,1.93663 1.124633,1.11631 l 2.132467,-2.22319 c 0.461917,-0.47023 0.588476,-1.33439 0.100159,-1.82382 -0.0049,-0.004 -1.53375,-1.53343 -1.53375,-1.53343 l 0,0 z" fill="#747474"/>
-    <rect height="18" transform="translate(0 1028.362)" width="18" x="36" y="-54" opacity=".3" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/mobile_phone-18.svg b/data/styles/symbols/nori/mobile_phone-18.svg
deleted file mode 100644
index 073fbfd429..0000000000
--- a/data/styles/symbols/nori/mobile_phone-18.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="36.0 938.36218 18.0 18.0">
-    <g>
-        <path d="m 47,941.3622 -2,0 0,-2 -2,0 0,2 c -1.1185,0.0818 -2,0.90528 -2,2 l 0,10 c 0,1.1488 0.803333,2 2,2 l 4,0 c 1.196667,0 2,-0.8512 2,-2 l 0,-10 c 0,-1.1488 -0.803333,-2 -2,-2 z m 1,9 -6,0 0,-7 6,0 z" fill="#fff" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round"/>
-        <path d="m 47,941.3622 -2,0 0,-2 -2,0 0,2 c -1.1185,0.0818 -2,0.90528 -2,2 l 0,10 c 0,1.1488 0.803333,2 2,2 l 4,0 c 1.196667,0 2,-0.8512 2,-2 l 0,-10 c 0,-1.1488 -0.803333,-2 -2,-2 z m 1,9 -6,0 0,-7 6,0 z" fill="#747474"/>
-        <rect height="18" width="18" x="36" y="938.362" opacity=".3" fill="none"/>
-        <path d="m 47,941.3622 -2,0 0,-2 -2,0 0,2 c -1.1185,0.0818 -2,0.90528 -2,2 l 0,10 c 0,1.1488 0.803333,2 2,2 l 4,0 c 1.196667,0 2,-0.8512 2,-2 l 0,-10 c 0,-1.1488 -0.803333,-2 -2,-2 z m 1,9 -6,0 0,-7 6,0 z" fill="#fff" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round"/>
-        <path d="m 47,941.3622 -2,0 0,-2 -2,0 0,2 c -1.1185,0.0818 -2,0.90528 -2,2 l 0,10 c 0,1.1488 0.803333,2 2,2 l 4,0 c 1.196667,0 2,-0.8512 2,-2 l 0,-10 c 0,-1.1488 -0.803333,-2 -2,-2 z m 1,9 -6,0 0,-7 6,0 z" fill="#747474"/>
-        <rect height="18" width="18" x="36" y="938.362" opacity=".3" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/money_transfer-18.svg b/data/styles/symbols/nori/money_transfer-18.svg
deleted file mode 100644
index ab4b1eb7b5..0000000000
--- a/data/styles/symbols/nori/money_transfer-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="72.0 1010.3622 18.0 18.0">
-    <path d="m 74,-15 0,12 11,0 -4,-6 4,-6 z m 11,0 0,12 4,-6 z m -8,2 2,0 0,1 c 0.304638,0.3836 0.831839,0.6848 1,1.125 L 80,-10 c -0.383659,-0.3046 -0.68481,-0.8319 -1.125,-1 l -1.875,0 3,3 0,1 c -0.304638,0.3836 -0.831839,0.6848 -1,1.125 L 79,-5 77,-5 77,-6 C 76.695362,-6.3836 76.168161,-6.6848 76,-7.125 L 76,-8 c 0.383659,0.3046 0.68481,0.8319 1.125,1 l 1.875,0 -3,-3 0,-1 c 0.304638,-0.3836 0.831839,-0.6848 1,-1.125 z" transform="translate(0 1028.362)" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-    <path d="m 74,-15 0,12 11,0 -4,-6 4,-6 z m 11,0 0,12 4,-6 z m -8,2 2,0 0,1 c 0.304638,0.3836 0.831839,0.6848 1,1.125 L 80,-10 c -0.383659,-0.3046 -0.68481,-0.8319 -1.125,-1 l -1.875,0 0,1 2,1 1,1 0,1 c -0.304638,0.3836 -0.831839,0.6848 -1,1.125 L 79,-5 77,-5 77,-6 C 76.695362,-6.3836 76.168161,-6.6848 76,-7.125 L 76,-8 c 0.383659,0.3046 0.68481,0.8319 1.125,1 l 1.875,0 0,-1 -2,-1 -1,-1 0,-1 c 0.304638,-0.3836 0.831839,-0.6848 1,-1.125 z" transform="translate(0 1028.362)" fill="#747474"/>
-    <rect height="18" width="18" x="72" y="1010.362" opacity=".3" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/motorcycle-18.svg b/data/styles/symbols/nori/motorcycle-18.svg
deleted file mode 100644
index a9dfed2408..0000000000
--- a/data/styles/symbols/nori/motorcycle-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="132.0 884.3622 18.0 18.0">
-    <rect height="18" transform="translate(0 1028.362)" width="18" x="132" y="-144" opacity=".3" fill="none"/>
-    <path d="m 139,887.3622 -0.78125,0.78125 -3.21875,3.21875 0,2 1.5,0 -0.53125,1.0625 c -0.15299,-0.0296 -0.30748,-0.0625 -0.46875,-0.0625 -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-0.72861 -0.34201,-1.35444 -0.84375,-1.8125 L 138,893.3622 c 1.38481,3.95499 2.8595,4.0957 5.96875,4.03125 0.24534,1.12192 1.27612,1.96875 2.46875,1.96875 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-0.67107 -0.28439,-1.26845 -0.71875,-1.71875 L 149,894.3622 l 0,-1 -6,0 c -1.58167,-2.08421 -2.54453,-2 -5,-2 l 1,-4 z m -3.5,8 -0.5,1 1,1 0.6875,-1.40625 c 0.19227,0.2521 0.3125,0.56147 0.3125,0.90625 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z m 12.03125,0.46875 c 0.2526,0.26794 0.40625,0.63003 0.40625,1.03125 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.66135,0 -1.23563,-0.41105 -1.4375,-1 0.34976,-0.007 0.60994,0 1,0 l 1.53125,-1.53125 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" opacity=".3" color="#000" stroke="#fff" stroke-width="2" stroke-linejoin="round" overflow="visible" enable-background="accumulate" font-family="Sans" fill="none"/>
-    <path d="m 139,887.3622 -0.78125,0.78125 -3.21875,3.21875 0,2 1.5,0 -0.53125,1.0625 c -0.15299,-0.0296 -0.30748,-0.0625 -0.46875,-0.0625 -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-0.72861 -0.34201,-1.35444 -0.84375,-1.8125 L 138,893.3622 c 1.38481,3.95499 2.8595,4.0957 5.96875,4.03125 0.24534,1.12192 1.27612,1.96875 2.46875,1.96875 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-0.67107 -0.28439,-1.26845 -0.71875,-1.71875 L 149,894.3622 l 0,-1 -6,0 c -1.58167,-2.08421 -2.54453,-2 -5,-2 l 1,-4 z m -3.5,8 -0.5,1 1,1 0.6875,-1.40625 c 0.19227,0.2521 0.3125,0.56147 0.3125,0.90625 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z m 12.03125,0.46875 c 0.2526,0.26794 0.40625,0.63003 0.40625,1.03125 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.66135,0 -1.23563,-0.41105 -1.4375,-1 0.34976,-0.007 0.60994,0 1,0 l 1.53125,-1.53125 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" color="#000" fill="#747474" overflow="visible" enable-background="accumulate" font-family="Sans"/>
-</svg>
diff --git a/data/styles/symbols/nori/ngo-18.svg b/data/styles/symbols/nori/ngo-18.svg
deleted file mode 100644
index 95bc65f1dd..0000000000
--- a/data/styles/symbols/nori/ngo-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="36.0 992.3622 18.0 18.0">
-    <path d="M 44 -35 L 44 -29 L 41 -29 L 41 -28 L 38 -28 L 38 -19 L 43 -19 L 43 -20 L 47 -20 L 47 -19 L 52 -19 L 52 -28 L 49 -28 L 49 -29 L 45 -29 L 45 -31 L 49 -31 L 47 -32.5 L 49 -34 L 45 -34 L 45.03125 -35 L 44 -35 z M 44.9375 -25.96875 C 45.41254 -25.96875 45.7937 -25.8865 46.0625 -25.6875 C 46.32922 -25.4875 46.48554 -25.19595 46.5625 -24.84375 L 45.8125 -24.71875 C 45.75826 -24.90745 45.64992 -25.04705 45.5 -25.15625 C 45.35216 -25.26465 45.160539 -25.3125 44.9375 -25.3125 C 44.600059 -25.3125 44.322921 -25.2147 44.125 -25 C 43.92292 -24.7865 43.84375 -24.45315 43.84375 -24.03125 C 43.84375 -23.57605 43.954171 -23.25735 44.15625 -23.03125 C 44.358331 -22.80305 44.608379 -22.6875 44.9375 -22.6875 C 45.09798 -22.6875 45.27302 -22.71625 45.4375 -22.78125 C 45.60006 -22.84325 45.72711 -22.9104 45.84375 -23 L 45.84375 -23.5 L 44.96875 -23.5 L 44.96875 -24.125 L 46.625 -24.125 L 46.625 -22.59375 C 46.46244 -22.43645 46.21249 -22.3063 45.90625 -22.1875 C 45.59793 -22.0688 45.31456 -22 45 -22 C 44.599999 -22 44.235421 -22.081 43.9375 -22.25 C 43.639581 -22.4177 43.43117 -22.6875 43.28125 -23 C 43.131331 -23.3125 43.03125 -23.6332 43.03125 -24 C 43.03125 -24.4 43.11469 -24.7521 43.28125 -25.0625 C 43.44797 -25.3729 43.708371 -25.61555 44.03125 -25.78125 C 44.277171 -25.90825 44.570939 -25.96875 44.9375 -25.96875 z M 49.03125 -25.96875 C 49.59589 -25.96875 50.06657 -25.7874 50.40625 -25.4375 C 50.74369 -25.0864 50.90625 -24.6241 50.90625 -24 C 50.90609 -23.3812 50.74369 -22.88015 50.40625 -22.53125 C 50.07073 -22.18115 49.593811 -22 49.03125 -22 C 48.46053 -22 48.0227 -22.18215 47.6875 -22.53125 C 47.350059 -22.87815 47.1875 -23.35935 47.1875 -23.96875 C 47.1875 -24.35935 47.22711 -24.70405 47.34375 -24.96875 C 47.43127 -25.16345 47.56675 -25.31355 47.71875 -25.46875 C 47.868829 -25.62395 48.03955 -25.7376 48.21875 -25.8125 C 48.458269 -25.9147 48.71877 -25.96875 49.03125 -25.96875 z M 39.3125 -25.90625 L 40.0625 -25.90625 L 41.625 -23.34375 L 41.625 -25.90625 L 42.34375 -25.90625 L 42.34375 -22.09375 L 41.59375 -22.09375 L 40.03125 -24.5625 L 40.03125 -22.09375 L 39.3125 -22.09375 L 39.3125 -25.90625 z M 49.03125 -25.3125 C 48.712531 -25.3125 48.475009 -25.2176 48.28125 -25 C 48.08541 -24.7802 47.96875 -24.4416 47.96875 -24 C 47.96875 -23.5667 48.08125 -23.2229 48.28125 -23 C 48.481249 -22.7751 48.722771 -22.6875 49.03125 -22.6875 C 49.339571 -22.6875 49.614579 -22.779 49.8125 -23 C 50.01042 -23.2228 50.09375 -23.5563 50.09375 -24 C 50.09375 -24.4395 50.00434 -24.7843 49.8125 -25 C 49.618899 -25.2155 49.350131 -25.3125 49.03125 -25.3125 z" transform="translate(1) translate(-1 1028.362)" fill="#fff" stroke="#fff" stroke-width="2" stroke-linejoin="round" opacity=".3"/>
-    <path d="M 44 -35 L 44 -29 L 41 -29 L 41 -28 L 38 -28 L 38 -19 L 43 -19 L 43 -20 L 47 -20 L 47 -19 L 52 -19 L 52 -28 L 49 -28 L 49 -29 L 45 -29 L 45 -31 L 49 -31 L 47 -32.5 L 49 -34 L 45 -34 L 45.03125 -35 L 44 -35 z M 44.9375 -25.96875 C 45.41254 -25.96875 45.7937 -25.8865 46.0625 -25.6875 C 46.32922 -25.4875 46.48554 -25.19595 46.5625 -24.84375 L 45.8125 -24.71875 C 45.75826 -24.90745 45.64992 -25.04705 45.5 -25.15625 C 45.35216 -25.26465 45.160539 -25.3125 44.9375 -25.3125 C 44.600059 -25.3125 44.322921 -25.2147 44.125 -25 C 43.92292 -24.7865 43.84375 -24.45315 43.84375 -24.03125 C 43.84375 -23.57605 43.954171 -23.25735 44.15625 -23.03125 C 44.358331 -22.80305 44.608379 -22.6875 44.9375 -22.6875 C 45.09798 -22.6875 45.27302 -22.71625 45.4375 -22.78125 C 45.60006 -22.84325 45.72711 -22.9104 45.84375 -23 L 45.84375 -23.5 L 44.96875 -23.5 L 44.96875 -24.125 L 46.625 -24.125 L 46.625 -22.59375 C 46.46244 -22.43645 46.21249 -22.3063 45.90625 -22.1875 C 45.59793 -22.0688 45.31456 -22 45 -22 C 44.599999 -22 44.235421 -22.081 43.9375 -22.25 C 43.639581 -22.4177 43.43117 -22.6875 43.28125 -23 C 43.131331 -23.3125 43.03125 -23.6332 43.03125 -24 C 43.03125 -24.4 43.11469 -24.7521 43.28125 -25.0625 C 43.44797 -25.3729 43.708371 -25.61555 44.03125 -25.78125 C 44.277171 -25.90825 44.570939 -25.96875 44.9375 -25.96875 z M 49.03125 -25.96875 C 49.59589 -25.96875 50.06657 -25.7874 50.40625 -25.4375 C 50.74369 -25.0864 50.90625 -24.6241 50.90625 -24 C 50.90609 -23.3812 50.74369 -22.88015 50.40625 -22.53125 C 50.07073 -22.18115 49.593811 -22 49.03125 -22 C 48.46053 -22 48.0227 -22.18215 47.6875 -22.53125 C 47.350059 -22.87815 47.1875 -23.35935 47.1875 -23.96875 C 47.1875 -24.35935 47.22711 -24.70405 47.34375 -24.96875 C 47.43127 -25.16345 47.56675 -25.31355 47.71875 -25.46875 C 47.868829 -25.62395 48.03955 -25.7376 48.21875 -25.8125 C 48.458269 -25.9147 48.71877 -25.96875 49.03125 -25.96875 z M 39.3125 -25.90625 L 40.0625 -25.90625 L 41.625 -23.34375 L 41.625 -25.90625 L 42.34375 -25.90625 L 42.34375 -22.09375 L 41.59375 -22.09375 L 40.03125 -24.5625 L 40.03125 -22.09375 L 39.3125 -22.09375 L 39.3125 -25.90625 z M 49.03125 -25.3125 C 48.712531 -25.3125 48.475009 -25.2176 48.28125 -25 C 48.08541 -24.7802 47.96875 -24.4416 47.96875 -24 C 47.96875 -23.5667 48.08125 -23.2229 48.28125 -23 C 48.481249 -22.7751 48.722771 -22.6875 49.03125 -22.6875 C 49.339571 -22.6875 49.614579 -22.779 49.8125 -23 C 50.01042 -23.2228 50.09375 -23.5563 50.09375 -24 C 50.09375 -24.4395 50.00434 -24.7843 49.8125 -25 C 49.618899 -25.2155 49.350131 -25.3125 49.03125 -25.3125 z" transform="translate(1) translate(-1 1028.362)" fill="#747474"/>
-    <rect height="18" transform="translate(0 1028.362)" width="18" x="36" y="-36" opacity=".3" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/oxfam-18.svg b/data/styles/symbols/nori/oxfam-18.svg
deleted file mode 100644
index ca5cad70b7..0000000000
--- a/data/styles/symbols/nori/oxfam-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="102.0 1010.3622 18.0 18.0">
-    <path d="m 110.875,1014.331 c -1.75445,0 -3.22476,1.3372 -3.46875,3.0312 l 2.09375,0 c 0.19707,-0.5851 0.70978,-1 1.375,-1 0.66522,0 1.20918,0.4149 1.40625,1 l 2.09375,0 c -0.24399,-1.694 -1.74555,-3.0312 -3.5,-3.0312 z m -3.46875,4.0312 c 0.1561,1.0369 0.76605,1.9322 1.625,2.4688 -0.86952,0.5423 -1.47373,1.4809 -1.625,2.5312 l 2.09375,0 c 0.19707,-0.5851 0.70978,-1 1.375,-1 0.66522,0 1.20918,0.4149 1.40625,1 l 2.09375,0 c -0.15036,-1.0439 -0.78586,-1.9565 -1.65625,-2.5 0.87713,-0.5353 1.4991,-1.4562 1.65625,-2.5 l -2.09375,0 c -0.19707,0.5851 -0.74104,0.9688 -1.40625,0.9688 -0.66521,0 -1.17793,-0.3837 -1.375,-0.9688 l -2.09375,0 z m 3.59375,-7 c -4.41038,0 -8,3.5897 -8,8 0,4.4104 3.58962,8 8,8 4.41038,0 8,-3.5896 8,-8 0,-4.4103 -3.58962,-8 -8,-8 z m 0,1.3334 c 3.68979,0 6.66667,2.9768 6.66667,6.6666 0,3.6898 -2.97688,6.6667 -6.66667,6.6667 -3.68979,0 -6.66667,-2.9769 -6.66667,-6.6667 0,-3.6898 2.97688,-6.6666 6.66667,-6.6666 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" color="#000" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" font-family="Sans" opacity=".3" stroke-linejoin="round" fill="none"/>
-    <path d="m 110.875,1014.331 c -1.75445,0 -3.22476,1.3372 -3.46875,3.0312 l 2.09375,0 c 0.19707,-0.5851 0.70978,-1 1.375,-1 0.66522,0 1.20918,0.4149 1.40625,1 l 2.09375,0 c -0.24399,-1.694 -1.74555,-3.0312 -3.5,-3.0312 z m -3.46875,4.0312 c 0.1561,1.0369 0.76605,1.9322 1.625,2.4688 -0.86952,0.5423 -1.47373,1.4809 -1.625,2.5312 l 2.09375,0 c 0.19707,-0.5851 0.70978,-1 1.375,-1 0.66522,0 1.20918,0.4149 1.40625,1 l 2.09375,0 c -0.15036,-1.0439 -0.78586,-1.9565 -1.65625,-2.5 0.87713,-0.5353 1.4991,-1.4562 1.65625,-2.5 l -2.09375,0 c -0.19707,0.5851 -0.74104,0.9688 -1.40625,0.9688 -0.66521,0 -1.17793,-0.3837 -1.375,-0.9688 l -2.09375,0 z m 3.59375,-7 c -4.41038,0 -8,3.5897 -8,8 0,4.4104 3.58962,8 8,8 4.41038,0 8,-3.5896 8,-8 0,-4.4103 -3.58962,-8 -8,-8 z m 0,1.3334 c 3.68979,0 6.66667,2.9768 6.66667,6.6666 0,3.6898 -2.97688,6.6667 -6.66667,6.6667 -3.68979,0 -6.66667,-2.9769 -6.66667,-6.6667 0,-3.6898 2.97688,-6.6666 6.66667,-6.6666 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" color="#000" fill="#747474" overflow="visible" enable-background="accumulate" font-family="Sans"/>
-    <rect height="18" transform="translate(0 1028.362)" width="18" x="102" y="-18" opacity=".3" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/pharmacy-18.svg b/data/styles/symbols/nori/pharmacy-18.svg
deleted file mode 100644
index 92049ed272..0000000000
--- a/data/styles/symbols/nori/pharmacy-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="102.0 848.3622 18.0 18.0">
-    <g transform="translate(0 1028.362)">
-        <path d="m 108,-174 -2,1.9375 0,8.0625 10,0 0,-8.25 -2,-1.75 -6,0 z m 2,2 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 0,-2 z m -2,-6 0,3 6,0 0,-3 z" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-        <path d="m 108,-174 -2,1.9375 0,8.0625 10,0 0,-8.25 -2,-1.75 -6,0 z m 2,2 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 0,-2 z m -2,-6 0,3 6,0 0,-3 z" fill="#747474"/>
-        <rect height="18" width="18" x="102" y="-180" opacity=".3" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/photo-18.svg b/data/styles/symbols/nori/photo-18.svg
deleted file mode 100644
index 01e45f4ef6..0000000000
--- a/data/styles/symbols/nori/photo-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="72.0 920.362197 18.0 18.0">
-    <g transform="translate(72 18)">
-        <path d="m 6.9980387,906.36219 -0.9989009,1.99822 -1.9978019,0 c -0.9989007,0 -1.9978019,0.99911 -1.9978019,1.99823 0.0038,2.15238 -0.00959,2.06236 0,3.99644 0,0.99912 0.9989012,1.99823 1.9978019,1.99823 3.8656009,0 6.1236521,0.02 9.9890091,0 0.998901,0 1.997802,-0.99911 1.997802,-1.99823 0.03117,-6.65038 -0.01016,-1.74954 0,-3.99644 0,-0.99912 -0.998901,-1.99823 -1.997802,-1.99823 l -1.997801,0 -0.998901,-1.99822 -3.9956043,0 z m 1.9978019,2.99733 c 1.3791944,0 2.4972524,1.1183 2.4972524,2.49778 0,1.37949 -1.118058,2.49778 -2.4972524,2.49778 -1.3791944,0 -2.4972523,-1.11829 -2.4972523,-2.49778 0,-1.37948 1.1180579,-2.49778 2.4972523,-2.49778 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round" fill="none"/>
-        <path d="m 6.9980387,906.36219 -0.9989009,1.99822 -1.9978019,0 c -0.9989007,0 -1.9978019,0.99911 -1.9978019,1.99823 0.0038,2.15238 -0.00959,2.06236 0,3.99644 0,0.99912 0.9989012,1.99823 1.9978019,1.99823 3.8656009,0 6.1236521,0.02 9.9890091,0 0.998901,0 1.997802,-0.99911 1.997802,-1.99823 0.03117,-6.65038 -0.01016,-1.74954 0,-3.99644 0,-0.99912 -0.998901,-1.99823 -1.997802,-1.99823 l -1.997801,0 -0.998901,-1.99822 -3.9956043,0 z m 1.9978019,2.99733 c 1.3791944,0 2.4972524,1.1183 2.4972524,2.49778 0,1.37949 -1.118058,2.49778 -2.4972524,2.49778 -1.3791944,0 -2.4972523,-1.11829 -2.4972523,-2.49778 0,-1.37948 1.1180579,-2.49778 2.4972523,-2.49778 z" fill="#747474"/>
-        <rect height="18" rx=".995" ry=".033" width="18" y="902.362" opacity=".3" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/playground-18.svg b/data/styles/symbols/nori/playground-18.svg
deleted file mode 100644
index ac88df62fd..0000000000
--- a/data/styles/symbols/nori/playground-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="72.0 884.3622 18.0 18.0">
-    <g transform="translate(-30 90) translate(0 1028.362)">
-        <path d="m 116,-233 c -0.82842,0 -1.5,0.67158 -1.5,1.5 0,0.64548 0.39681,1.1947 0.96875,1.40625 l -1.34375,4.65625 -6.5,3.5 -1.25,-3.125 c 0.64946,-0.1648 1.125,-0.73679 1.125,-1.4375 0,-0.82843 -0.67157,-1.5 -1.5,-1.5 -0.82843,0 -1.5,0.67157 -1.5,1.5 0,0.72488 0.50398,1.32888 1.1875,1.46875 L 104,-220 l 1,1 6.78125,-3.65625 L 111,-218 l 3,0 -0.90625,-5.375 L 118,-226 l -1.375,-4.125 c 0.52408,-0.23387 0.875,-0.76404 0.875,-1.375 0,-0.82842 -0.67158,-1.5 -1.5,-1.5 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round" fill="none"/>
-        <path d="m 116,-233 c -0.82842,0 -1.5,0.67158 -1.5,1.5 0,0.64548 0.39681,1.1947 0.96875,1.40625 l -1.34375,4.65625 -6.5,3.5 -1.25,-3.125 c 0.64946,-0.1648 1.125,-0.73679 1.125,-1.4375 0,-0.82843 -0.67157,-1.5 -1.5,-1.5 -0.82843,0 -1.5,0.67157 -1.5,1.5 0,0.72488 0.50398,1.32888 1.1875,1.46875 L 104,-220 l 1,1 6.78125,-3.65625 L 111,-218 l 3,0 -0.90625,-5.375 L 118,-226 l -1.375,-4.125 c 0.52408,-0.23387 0.875,-0.76404 0.875,-1.375 0,-0.82842 -0.67158,-1.5 -1.5,-1.5 z" fill="#747474"/>
-        <rect height="18" width="18" x="102" y="-234" opacity=".3" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/power_tower-12.svg b/data/styles/symbols/nori/power_tower-12.svg
deleted file mode 100644
index c78d50388c..0000000000
--- a/data/styles/symbols/nori/power_tower-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="150.0 980.3622 12.0 12.0">
-    <g transform="translate(0 1028.362)">
-        <path d="M 152 -47 L 152 -45 L 153 -45 L 153 -46 L 155 -46 L 155 -44 L 152 -44 L 152 -43 L 152 -42 L 153 -42 L 153 -43 L 155 -43 C 155 -43 153.64038 -39.021162 153 -37 L 154 -37 L 154.65625 -39 L 157.34375 -39 L 158 -37 L 159 -37 C 158.00916 -38.981683 157 -43 157 -43 L 159 -43 L 159 -42 L 160 -42 L 160 -44 L 157 -44 L 157 -46 L 159 -46 L 159 -45 L 160 -45 L 160 -47 L 157 -47 L 155 -47 L 152 -47 z M 156 -43 L 157 -40 L 155 -40 L 156 -43 z" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-        <path d="M 152 -47 L 152 -45 L 153 -45 L 153 -46 L 155 -46 L 155 -44 L 152 -44 L 152 -43 L 152 -42 L 153 -42 L 153 -43 L 155 -43 C 155 -43 153.64038 -39.021162 153 -37 L 154 -37 L 154.65625 -39 L 157.34375 -39 L 158 -37 L 159 -37 C 158.00916 -38.981683 157 -43 157 -43 L 159 -43 L 159 -42 L 160 -42 L 160 -44 L 157 -44 L 157 -46 L 159 -46 L 159 -45 L 160 -45 L 160 -47 L 157 -47 L 155 -47 L 152 -47 z M 156 -43 L 157 -40 L 155 -40 L 156 -43 z" fill="#747474"/>
-        <rect height="12" width="12" x="150" y="-48" opacity=".3" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/pub-18.svg b/data/styles/symbols/nori/pub-18.svg
deleted file mode 100644
index ed316d6b67..0000000000
--- a/data/styles/symbols/nori/pub-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="132.0 1010.3622 18.0 18.0">
-    <g transform="translate(0 1028.362)">
-        <rect height="18" width="18" x="132" y="-18" fill="none"/>
-        <path d="M 137 -16 C 136 -16 135 -15 135 -14 L 135 -4 L 134 -2 L 145 -2 L 144 -4 L 147 -4 C 148 -4 148 -5 148 -5 L 148 -11 C 148 -12 147 -13 146 -13 L 144 -13 L 144 -14 C 144 -15 143 -16 142 -16 L 137 -16 z M 138 -15 L 141 -15 C 143 -15 143 -14 143 -14 C 140 -14 137.85459 -13.80227 138 -11 C 138 -9 136 -9 136 -11 L 136 -13 C 136 -14 137 -15 138 -15 z M 144 -12 L 145 -12 C 146 -12 147 -12 147 -10 L 147 -5 L 144 -5 L 144 -12 z M 136 -4 L 143 -4 L 143 -3 L 136 -3 L 136 -4 z" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-        <path d="M 137 -16 C 136 -16 135 -15 135 -14 L 135 -4 L 134 -2 L 145 -2 L 144 -4 L 147 -4 C 148 -4 148 -5 148 -5 L 148 -11 C 148 -12 147 -13 146 -13 L 144 -13 L 144 -14 C 144 -15 143 -16 142 -16 L 137 -16 z M 138 -15 L 141 -15 C 143 -15 143 -14 143 -14 C 140 -14 137.85459 -13.80227 138 -11 C 138 -9 136 -9 136 -11 L 136 -13 C 136 -14 137 -15 138 -15 z M 144 -12 L 145 -12 C 146 -12 147 -12 147 -10 L 147 -5 L 144 -5 L 144 -12 z M 136 -4 L 143 -4 L 143 -3 L 136 -3 L 136 -4 z" fill="#747474"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/pump-manual-18.svg b/data/styles/symbols/nori/pump-manual-18.svg
deleted file mode 100644
index 39a850805a..0000000000
--- a/data/styles/symbols/nori/pump-manual-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="-18.0 884.36218 18.0 18.0">
-    <g transform="translate(-18)">
-        <path d="m 10,885.3622 c -2.417618,-0.56606 -3.217033,1.73467 -2,3 l 1,1 0,1 c 0,0 0,0 -5,0 -1,0 -2,1 -2,2 0,2 0,2 0,2 l -1,0 0,1 4,0 0,-1 -1,0 0,-2 c 0,0 2.688722,0 4,-2e-5 l 0,7.00002 -2,1 -5,0 0,1 16,0 0,-1 -5,0 -2,-1 0,-11 1,-1 c 0,0 3,1 3,4 0,3 3,4 3,4 l 0,-1 c 0,0 -2,0 -2,-3 0,-5 -5,-6 -5,-6 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round" fill="none"/>
-        <path d="m 10,885.3622 c -2.417618,-0.56606 -3.217033,1.73467 -2,3 l 1,1 0,1 c 0,0 0,0 -5,0 -1,0 -2,1 -2,2 0,2 0,2 0,2 l -1,0 0,1 4,0 0,-1 -1,0 0,-2 c 0,0 2.688722,0 4,-2e-5 l 0,7.00002 -2,1 -5,0 0,1 16,0 0,-1 -5,0 -2,-1 0,-11 1,-1 c 0,0 3,1 3,4 0,3 3,4 3,4 l 0,-1 c 0,0 -2,0 -2,-3 0,-5 -5,-6 -5,-6 z" fill="#747474"/>
-        <rect height="18" transform="scale(-1 1)" width="18" x="-18" y="884.362" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/pump-powered-18.svg b/data/styles/symbols/nori/pump-powered-18.svg
deleted file mode 100644
index 171d453cab..0000000000
--- a/data/styles/symbols/nori/pump-powered-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0.0 830.36218 18.0 18.0">
-    <path d="m 4,834.36219 c -1,0 -2,1 -2,2 0,2 0,2 0,2 l -1,1 0,2 4,0 0,-2 -1,-1 0,-2 c 0,0 4.68872,-1e-5 6,-3e-5 l 0,4.00003 c -3,1.00001 -3,5.00001 -1,6.00001 l -8,0 0,1 16,-10e-6 0,-1 -4,0 0,-1 4,10e-6 0,-1 -4,0 0,-1 4,0 0,-1 -5,-2.00001 0,-4 c 0,-1 -1,-2 -2,-2 l -2,0 0,-2 2,0 c 1,0 1,-1 0,-1 l -5,0 c -1,0 -1,1 0,1 l 2,0 0,2 z" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-    <path d="m 4,834.36219 c -1,0 -2,1 -2,2 0,2 0,2 0,2 l -1,1 0,2 4,0 0,-2 -1,-1 0,-2 c 0,0 4.68872,-1e-5 6,-3e-5 l 0,4.00003 c -3,1.00001 -3,5.00001 -1,6.00001 l -8,0 0,1 16,-10e-6 0,-1 -4,0 0,-1 4,10e-6 0,-1 -4,0 0,-1 4,0 0,-1 -5,-2.00001 0,-4 c 0,-1 -1,-2 -2,-2 l -2,0 0,-2 2,0 c 1,0 1,-1 0,-1 l -5,0 c -1,0 -1,1 0,1 l 2,0 0,2 z" fill="#747474"/>
-    <rect height="18" width="18" y="830.362" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/recycling-18.svg b/data/styles/symbols/nori/recycling-18.svg
deleted file mode 100644
index db90635dbf..0000000000
--- a/data/styles/symbols/nori/recycling-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="102.0 938.3622 18.0 18.0">
-    <path d="m 115.47284,949.59033 h 1.6355 c 0.39152,0 0.79759,-0.17088 1.21823,-0.5128 0.44895,-0.35615 0.67343,-0.73391 0.67343,-1.13326 0,-0.18464 -0.0611,-0.36656 -0.18192,-0.54496 l -1.94494,-2.97117 -3.34588,1.94558 1.94558,3.21661 0,0 z m 1.06863,4.02956 2.45837,-4.46764 c -0.36336,0.4136 -0.75887,0.69152 -1.18623,0.83375 -0.34207,0.11424 -0.83087,0.17104 -1.46462,0.17104 h -2.73598 v -0.56671 c 0,-0.22064 -0.0536,-0.33136 -0.16047,-0.33136 -0.0786,0 -0.13584,0.0291 -0.17088,0.0856 l -1.73119,3.00333 1.79551,2.75773 c 0.13552,0.20672 0.25263,0.28848 0.35263,0.24544 0.0994,-0.0283 0.14976,-0.0814 0.14976,-0.16 v -0.94079 h 1.51759 c 0.55583,0 0.94751,-0.20992 1.17551,-0.63039 l 0,0 z m -1.68831,-8.39016 1.68847,-2.84317 c 0.0568,-0.0994 0.0854,-0.20304 0.0854,-0.30976 0,-0.12831 -0.0427,-0.19247 -0.128,-0.19247 0.0134,0 -0.0429,0.0214 -0.17104,0.0642 l -0.76959,0.35263 -0.70528,-1.39998 c -0.31391,-0.62688 -0.94063,-0.94063 -1.88126,-0.94063 h -4.39259 c 0.53423,0.16415 0.89743,0.32431 1.0899,0.48095 0.44912,0.35648 0.90848,1.02607 1.37871,2.00926 l 0.87663,1.83854 -0.65231,0.31008 c -0.064,0.0288 -0.096,0.0854 -0.096,0.17088 0,0.10688 0.0674,0.168 0.20304,0.18176 l 3.47388,0.27775 0,0 z m -7.81304,8.97767 h 3.7942 v -3.94364 H 107.179 c -0.44896,0.64112 -0.73055,1.07647 -0.84431,1.30399 -0.1856,0.3632 -0.27776,0.73423 -0.27776,1.11119 0,1.01935 0.32736,1.52846 0.98319,1.52846 l 0,0 z m 1.60318,-8.25079 1.96654,-3.04605 c -0.73439,-1.67423 -1.51454,-2.51198 -2.34077,-2.51198 -0.49904,0 -0.83327,0.13936 -1.00431,0.4168 l -1.86014,2.97165 3.23868,2.16958 0,0 z m -0.91919,2.42605 0.716,0.43808 c 0.12079,0 0.18175,-0.0499 0.18175,-0.14976 0,-0.0638 -0.0291,-0.15264 -0.0854,-0.26704 l -1.5819,-2.97133 -3.50588,0.0858 c -0.1568,0.007 -0.23504,0.0891 -0.23504,0.24576 0,0.0357 0.0498,0.0854 0.1496,0.1496 l 0.72687,0.43807 -0.76959,1.19679 c -0.2136,0.3422 -0.32048,0.62411 -0.32048,0.84475 0,0.2 0.0707,0.42432 0.2136,0.67343 l 2.38349,4.1574 c -0.0571,-0.26335 -0.0854,-0.51295 -0.0854,-0.74831 0,-0.41968 0.13136,-0.83343 0.3952,-1.23967 l 1.81726,-2.85357 0,0 z" stroke="#fff" stroke-width="2" stroke-linejoin="round" opacity=".3" fill="none"/>
-    <path d="m 115.47284,949.59033 h 1.6355 c 0.39152,0 0.79759,-0.17088 1.21823,-0.5128 0.44895,-0.35615 0.67343,-0.73391 0.67343,-1.13326 0,-0.18464 -0.0611,-0.36656 -0.18192,-0.54496 l -1.94494,-2.97117 -3.34588,1.94558 1.94558,3.21661 0,0 z m 1.06863,4.02956 2.45837,-4.46764 c -0.36336,0.4136 -0.75887,0.69152 -1.18623,0.83375 -0.34207,0.11424 -0.83087,0.17104 -1.46462,0.17104 h -2.73598 v -0.56671 c 0,-0.22064 -0.0536,-0.33136 -0.16047,-0.33136 -0.0786,0 -0.13584,0.0291 -0.17088,0.0856 l -1.73119,3.00333 1.79551,2.75773 c 0.13552,0.20672 0.25263,0.28848 0.35263,0.24544 0.0994,-0.0283 0.14976,-0.0814 0.14976,-0.16 v -0.94079 h 1.51759 c 0.55583,0 0.94751,-0.20992 1.17551,-0.63039 l 0,0 z m -1.68831,-8.39016 1.68847,-2.84317 c 0.0568,-0.0994 0.0854,-0.20304 0.0854,-0.30976 0,-0.12831 -0.0427,-0.19247 -0.128,-0.19247 0.0134,0 -0.0429,0.0214 -0.17104,0.0642 l -0.76959,0.35263 -0.70528,-1.39998 c -0.31391,-0.62688 -0.94063,-0.94063 -1.88126,-0.94063 h -4.39259 c 0.53423,0.16415 0.89743,0.32431 1.0899,0.48095 0.44912,0.35648 0.90848,1.02607 1.37871,2.00926 l 0.87663,1.83854 -0.65231,0.31008 c -0.064,0.0288 -0.096,0.0854 -0.096,0.17088 0,0.10688 0.0674,0.168 0.20304,0.18176 l 3.47388,0.27775 0,0 z m -7.81304,8.97767 h 3.7942 v -3.94364 H 107.179 c -0.44896,0.64112 -0.73055,1.07647 -0.84431,1.30399 -0.1856,0.3632 -0.27776,0.73423 -0.27776,1.11119 0,1.01935 0.32736,1.52846 0.98319,1.52846 l 0,0 z m 1.60318,-8.25079 1.96654,-3.04605 c -0.73439,-1.67423 -1.51454,-2.51198 -2.34077,-2.51198 -0.49904,0 -0.83327,0.13936 -1.00431,0.4168 l -1.86014,2.97165 3.23868,2.16958 0,0 z m -0.91919,2.42605 0.716,0.43808 c 0.12079,0 0.18175,-0.0499 0.18175,-0.14976 0,-0.0638 -0.0291,-0.15264 -0.0854,-0.26704 l -1.5819,-2.97133 -3.50588,0.0858 c -0.1568,0.007 -0.23504,0.0891 -0.23504,0.24576 0,0.0357 0.0498,0.0854 0.1496,0.1496 l 0.72687,0.43807 -0.76959,1.19679 c -0.2136,0.3422 -0.32048,0.62411 -0.32048,0.84475 0,0.2 0.0707,0.42432 0.2136,0.67343 l 2.38349,4.1574 c -0.0571,-0.26335 -0.0854,-0.51295 -0.0854,-0.74831 0,-0.41968 0.13136,-0.83343 0.3952,-1.23967 l 1.81726,-2.85357 0,0 z" fill="#747474"/>
-    <rect height="18" transform="translate(0 1028.362)" width="18" x="102" y="-90" opacity=".3" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/seafood-18.svg b/data/styles/symbols/nori/seafood-18.svg
deleted file mode 100644
index 79ab03ebbb..0000000000
--- a/data/styles/symbols/nori/seafood-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="102.0 866.3622 18.0 18.0">
-    <g transform="translate(0 1028.362)">
-        <path d="M 109 -159 L 110 -156 C 107 -155 106.58356 -154.79178 105 -154 L 103 -157 L 104 -153.5 L 103 -150 L 105 -153 C 106.39122 -152.30439 108.31421 -152.35902 110 -152 C 110.3319 -151.9293 109.69858 -149.9864 110 -150 C 110.36852 -150.0166 111.66512 -152 112 -152 C 114 -152 118.62724 -153 119 -154 C 118.44087 -155 114.43248 -156 112 -156 L 109 -159 z M 115.625 -155.21875 C 116.03921 -155.21875 116.375 -154.88296 116.375 -154.46875 C 116.375 -154.05454 116.03921 -153.71875 115.625 -153.71875 C 115.21079 -153.71875 114.875 -154.05454 114.875 -154.46875 C 114.875 -154.88296 115.21079 -155.21875 115.625 -155.21875 z" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-        <path d="M 109 -159 L 110 -156 C 107 -155 106.58356 -154.79178 105 -154 L 103 -157 L 104 -153.5 L 103 -150 L 105 -153 C 106.39122 -152.30439 108.31421 -152.35902 110 -152 C 110.3319 -151.9293 109.69858 -149.9864 110 -150 C 110.36852 -150.0166 111.66512 -152 112 -152 C 114 -152 118.62724 -153 119 -154 C 118.44087 -155 114.43248 -156 112 -156 L 109 -159 z M 115.625 -155.21875 C 116.03921 -155.21875 116.375 -154.88296 116.375 -154.46875 C 116.375 -154.05454 116.03921 -153.71875 115.625 -153.71875 C 115.21079 -153.71875 114.875 -154.05454 114.875 -154.46875 C 114.875 -154.88296 115.21079 -155.21875 115.625 -155.21875 z" fill="#747474"/>
-        <rect height="18" width="18" x="102" y="-162" opacity=".3" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/shoemaker-18.svg b/data/styles/symbols/nori/shoemaker-18.svg
deleted file mode 100644
index e973aad788..0000000000
--- a/data/styles/symbols/nori/shoemaker-18.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="102.0 776.3622 18.0 18.0">
-    <g>
-        <rect height="18" transform="translate(0 1028.362)" width="18" x="102" y="-252" opacity=".3" fill="none"/>
-        <g stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none">
-            <path d="M 104.00027,785.36219 104,781.3622 c 1.41422,-1.41421 1.29289,-1.87868 2,-4 l 1,0 0,4 11,0 -2.7e-4,2.00001 -10.99973,-10e-6 0,2 z"/>
-            <path d="m 108,787.36219 c 0,0 0,10e-6 0,2.00001 2,-1 3.95873,-2.01644 5,-2.00001 3.99692,-0.0235 6,1.00001 6,1.00001 0,0 2e-5,2 -1,2 -4.02502,-0.0277 -6,2 -7,3 -2,-1 -4,-1 -6,0 0,0 -2,-3 -1,-6 z"/>
-        </g>
-        <g fill="#747474">
-            <path d="M 104.00027,785.36219 104,781.3622 c 1.41422,-1.41421 1.29289,-1.87868 2,-4 l 1,0 0,4 11,0 -2.7e-4,2.00001 -10.99973,-10e-6 0,2 z"/>
-            <path d="m 108,787.36219 c 0,0 0,10e-6 0,2.00001 2,-1 3.95873,-2.01644 5,-2.00001 3.99692,-0.0235 6,1.00001 6,1.00001 0,0 2e-5,2 -1,2 -4.02502,-0.0277 -6,2 -7,3 -2,-1 -4,-1 -6,0 0,0 -2,-3 -1,-6 z"/>
-        </g>
-        <rect height="18" transform="translate(0 1028.362)" width="18" x="102" y="-252" opacity=".3" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/shop-18.svg b/data/styles/symbols/nori/shop-18.svg
deleted file mode 100644
index 45157ecc7a..0000000000
--- a/data/styles/symbols/nori/shop-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0.0 1010.3622 18.0 18.0">
-    <path d="m 9,1013.3622 c -2.8674418,0 -4.8543401,3.2331 -5,7 l -2,0 3,6 8,0 3,-6 -2,0 c -0.01616,-3.6882 -2.132558,-7 -5,-7 z m 0,1.3125 c 2.259432,0 3.566238,2.7163 3.6875,5.6875 l -7.375,0 c 0.088871,-2.8665 1.4280676,-5.6875 3.6875,-5.6875 z" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-    <path d="m 9,1013.3622 c -2.8674418,0 -4.8543401,3.2331 -5,7 l -2,0 3,6 8,0 3,-6 -2,0 c -0.01616,-3.6882 -2.132558,-7 -5,-7 z m 0,1.3125 c 2.259432,0 3.566238,2.7163 3.6875,5.6875 l -7.375,0 c 0.088871,-2.8665 1.4280676,-5.6875 3.6875,-5.6875 z" fill="#747474"/>
-    <rect height="18" transform="translate(0 1028.362)" width="18" y="-18" opacity=".3" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/shower-18.svg b/data/styles/symbols/nori/shower-18.svg
deleted file mode 100644
index c51fc9376a..0000000000
--- a/data/styles/symbols/nori/shower-18.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="36.0 776.3622 18.0 18.0">
-    <g>
-        <g stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none">
-            <path d="m 45.48896,786.20988 c 1.01808,0 1.84208,-0.824 1.84208,-1.84208 0,-1.01808 -0.82384,-1.84192 -1.84208,-1.84192 -1.01824,0 -1.84384,0.824 -1.84384,1.84208 -1.6e-4,1.01808 0.8256,1.84192 1.84384,1.84192 z" stroke-width="2"/>
-            <path d="m 45,791.3622 c 1,0 1,0 1,-1 l 0,-1 c 0,-1 0,-1 -1,-1 -1,0 -1,0 -0.990105,0.75592 0.886443,0.19056 0.876419,1.36838 -0.01634,1.54773 C 44,791.3622 44,791.3622 45,791.3622 z m -2.01968,-4.56288 C 43.17808,786.60908 43.70688,786.3622 44,786.3622 l 3,0 4,-3 c 0.78208,-0.78736 1.78368,0.21264 1,1 l -4,3 0.04496,6 -5.04496,0 0,-2.66608 -1.93664,0 c -0.45232,0 -0.82032,-0.36624 -0.82032,-0.82032 0,-0.19408 0.06592,-0.36992 0.1776,-0.5128 z" stroke-width="2"/>
-            <path d="M 18.75,6.25 12.5,0 6.25,0 0,0 0,6.25 0,12.5 6.25,18.75 z" transform="matrix(.16 0 0 .16 37 777.362)" stroke-width="12.5"/>
-            <path d="m 40.49184,786.6494 c -0.04224,0.27088 0.14464,0.51632 0.41008,0.55296 0.26736,0.0438 0.52,-0.15008 0.55296,-0.41008 0.04032,-0.27088 -0.14288,-0.51648 -0.412,-0.55312 -0.26544,-0.0402 -0.51616,0.14304 -0.55104,0.41024 z" stroke-width="2"/>
-            <path d="m 40.91472,785.53612 c 0.03664,-0.25632 -0.13728,-0.49072 -0.39184,-0.52736 -0.25456,-0.0366 -0.48896,0.1392 -0.5256,0.39184 -0.03664,0.26 0.1392,0.48688 0.39184,0.52384 0.2528,0.0403 0.49088,-0.13904 0.5256,-0.38832 z" stroke-width="2"/>
-            <path d="m 40.37456,784.27996 c 0.03296,-0.24176 -0.12992,-0.46512 -0.37168,-0.50176 -0.24176,-0.033 -0.46336,0.13184 -0.49808,0.37344 -0.03472,0.24544 0.12992,0.46144 0.36992,0.49808 0.24176,0.0405 0.46688,-0.13536 0.49984,-0.36976 z" stroke-width="2"/>
-            <path d="m 39.83456,783.02396 c 0.03296,-0.22704 -0.12272,-0.43952 -0.35168,-0.47248 -0.23072,-0.033 -0.43952,0.12448 -0.47248,0.35152 -0.03296,0.23072 0.12448,0.43584 0.35152,0.47248 0.22704,0.0366 0.44144,-0.12816 0.47264,-0.35152 z" stroke-width="2"/>
-            <path d="m 39.29424,781.7678 c 0.0312,-0.216 -0.11712,-0.41744 -0.33136,-0.44672 -0.21792,-0.0293 -0.41376,0.11712 -0.44496,0.33328 -0.0312,0.21984 0.11536,0.41008 0.3296,0.44672 0.216,0.033 0.41744,-0.12096 0.44672,-0.33328 z" stroke-width="2"/>
-            <path d="m 38.223287,780.6051 c -0.03104,0.20512 0.10992,0.38448 0.31136,0.41744 0.20144,0.033 0.39008,-0.11344 0.41936,-0.3112 0.02928,-0.20144 -0.10992,-0.39184 -0.31136,-0.41744 -0.20704,-0.0293 -0.39184,0.10976 -0.41936,0.3112 z" stroke-width="2"/>
-            <path d="m 42.31008,784.87692 c 0.01296,-0.26368 0.24,-0.47248 0.50544,-0.45776 0.26736,0.0147 0.47056,0.23808 0.45776,0.50912 -0.0093,0.26736 -0.23808,0.4688 -0.50544,0.45408 -0.2656,-0.007 -0.47248,-0.2344 -0.45776,-0.50544 z" stroke-width="2"/>
-            <path d="m 42.00608,784.35324 c -0.25264,-0.0109 -0.4504,-0.22336 -0.43584,-0.48336 0.0128,-0.2528 0.22896,-0.44672 0.4816,-0.43584 0.25456,0.0146 0.44688,0.22704 0.43584,0.48336 -0.01104,0.25648 -0.22704,0.44688 -0.4816,0.43584 z" stroke-width="2"/>
-            <path d="m 41.24624,783.3206 c -0.23984,-0.011 -0.42672,-0.21248 -0.41376,-0.45408 0.01296,-0.2416 0.216,-0.42848 0.45776,-0.41376 0.23984,0.011 0.4248,0.21616 0.41392,0.45776 -0.0094,0.23792 -0.21616,0.42464 -0.45792,0.41008 z" stroke-width="2"/>
-            <path d="m 40.48448,782.29148 c -0.22704,-0.0109 -0.40464,-0.20144 -0.39184,-0.43216 0.0128,-0.22704 0.20512,-0.40288 0.43392,-0.39184 0.22704,0.011 0.40288,0.20512 0.39184,0.43216 -0.0091,0.22704 -0.20496,0.4064 -0.43392,0.39184 z" stroke-width="2"/>
-            <path d="m 39.72464,781.26236 c -0.21424,-0.0109 -0.38272,-0.19408 -0.36992,-0.41008 0.01104,-0.21248 0.19232,-0.37712 0.40832,-0.36992 0.21424,0.0109 0.3808,0.19408 0.36992,0.41008 -0.0093,0.21248 -0.19424,0.38096 -0.40832,0.36992 z" stroke-width="2"/>
-            <path d="m 38.814647,780.04846 c 0.01088,-0.20144 0.18128,-0.35888 0.38448,-0.34784 0.20144,0.007 0.35888,0.17952 0.34784,0.3808 -0.0091,0.20144 -0.1832,0.36256 -0.38448,0.34784 -0.20144,-0.0109 -0.35872,-0.17936 -0.34784,-0.3808 z" stroke-width="2"/>
-            <path d="m 43.63024,782.80412 c -0.26736,0.0147 -0.49984,-0.1904 -0.50912,-0.45776 -0.01472,-0.27104 0.196,-0.49808 0.46336,-0.50912 0.26192,-0.011 0.49072,0.1904 0.50176,0.46512 0.01648,0.26016 -0.18864,0.49072 -0.456,0.50176 z" stroke-width="2"/>
-            <path d="m 43.04992,781.54076 c 0.0128,0.24544 -0.1776,0.45776 -0.42848,0.4688 -0.25088,0.011 -0.46688,-0.17952 -0.47792,-0.42848 -0.01088,-0.2528 0.1832,-0.46144 0.43392,-0.47616 0.2472,-0.011 0.45952,0.17952 0.47248,0.43584 z" stroke-width="2"/>
-            <path d="m 42.01344,780.779 c 0.01104,0.23072 -0.16848,0.42848 -0.40288,0.43952 -0.2344,0.0109 -0.4376,-0.16848 -0.44672,-0.3992 -0.01104,-0.23808 0.17216,-0.43584 0.40656,-0.44672 0.23072,-0.011 0.43024,0.16832 0.44304,0.4064 z" stroke-width="2"/>
-            <path d="m 40.97696,780.01724 c 0.0093,0.216 -0.15744,0.40288 -0.37536,0.41008 -0.21792,0.0109 -0.40656,-0.15744 -0.41568,-0.3736 -0.0093,-0.21968 0.16112,-0.40288 0.37904,-0.41376 0.21424,-0.0109 0.40112,0.1576 0.412,0.37728 z" stroke-width="2"/>
-            <path d="m 39.407927,779.49182 c -0.01104,-0.20512 0.14832,-0.37712 0.34976,-0.38448 0.19968,-0.0109 0.3736,0.14656 0.38272,0.34784 0.0093,0.20144 -0.1464,0.3736 -0.34784,0.38096 -0.20144,0.0109 -0.37728,-0.14656 -0.38464,-0.34432 z" stroke-width="2"/>
-            <path d="m 40.314327,778.51406 c 0.19968,-0.0293 0.39008,0.11008 0.41936,0.31136 0.02944,0.20144 -0.10992,0.39184 -0.31312,0.41744 -0.20144,0.033 -0.39008,-0.10992 -0.4192,-0.31136 -0.02752,-0.20144 0.11328,-0.38816 0.31296,-0.41744 z" stroke-width="2"/>
-            <path d="m 41.85584,779.16396 c 0.0312,0.21232 -0.11712,0.41008 -0.3296,0.43952 -0.21248,0.033 -0.412,-0.11712 -0.44128,-0.32592 -0.02944,-0.21248 0.11904,-0.41376 0.3296,-0.44336 0.21072,-0.0291 0.41024,0.11744 0.44128,0.32976 z" stroke-width="2"/>
-            <path d="m 43.17792,779.69868 c 0.03296,0.22704 -0.12272,0.43216 -0.34608,0.46512 -0.22336,0.033 -0.43392,-0.12448 -0.46512,-0.34432 -0.03104,-0.22336 0.12448,-0.43216 0.34608,-0.46512 0.2216,-0.033 0.43216,0.12096 0.46512,0.34432 z" stroke-width="2"/>
-            <path d="m 44.49824,780.23692 c 0.03472,0.2344 -0.12816,0.4504 -0.36256,0.48704 -0.23264,0.033 -0.45408,-0.12816 -0.48528,-0.36256 -0.03296,-0.2344 0.12816,-0.45408 0.36064,-0.48704 0.2344,-0.0365 0.45424,0.12832 0.4872,0.36256 z" stroke-width="2"/>
-            <path d="m 45.82048,780.77532 c 0.03472,0.24544 -0.13568,0.47248 -0.37904,0.50912 -0.24352,0.0366 -0.4744,-0.13552 -0.5072,-0.37728 -0.03504,-0.24528 0.13344,-0.476 0.37696,-0.51264 0.24544,-0.033 0.47248,0.13536 0.50928,0.3808 z" stroke-width="2"/>
-            <path d="m 47.1424,781.31372 c 0.0384,0.25632 -0.14096,0.4944 -0.39568,0.53104 -0.2544,0.0366 -0.49616,-0.14288 -0.53088,-0.39552 -0.03664,-0.25632 0.13904,-0.49808 0.39376,-0.53472 0.25616,-0.0366 0.496,0.14272 0.5328,0.3992 z" stroke-width="2"/>
-            <path d="m 47.9096,781.43452 c 0.26736,-0.0366 0.51648,0.15008 0.55488,0.41744 0.04032,0.26368 -0.14832,0.5128 -0.412,0.55312 -0.26528,0.0402 -0.51808,-0.14656 -0.55296,-0.41376 -0.0384,-0.26752 0.14448,-0.51648 0.41008,-0.5568 z" stroke-width="2"/>
-        </g>
-        <g fill="#747474">
-            <path d="m 45.48896,786.20988 c 1.01808,0 1.84208,-0.824 1.84208,-1.84208 0,-1.01808 -0.82384,-1.84192 -1.84208,-1.84192 -1.01824,0 -1.84384,0.824 -1.84384,1.84208 -1.6e-4,1.01808 0.8256,1.84192 1.84384,1.84192 z"/>
-            <path d="m 45,791.3622 c 1,0 1,0 1,-1 l 0,-1 c 0,-1 0,-1 -1,-1 -1,0 -1,0 -0.990105,0.75592 0.886443,0.19056 0.876419,1.36838 -0.01634,1.54773 C 44,791.3622 44,791.3622 45,791.3622 z m -2.01968,-4.56288 C 43.17808,786.60908 43.70688,786.3622 44,786.3622 l 3,0 4,-3 c 0.78208,-0.78736 1.78368,0.21264 1,1 l -4,3 0.04496,6 -5.04496,0 0,-2.66608 -1.93664,0 c -0.45232,0 -0.82032,-0.36624 -0.82032,-0.82032 0,-0.19408 0.06592,-0.36992 0.1776,-0.5128 z"/>
-            <path d="M 18.75,6.25 12.5,0 6.25,0 0,0 0,6.25 0,12.5 6.25,18.75 z" transform="matrix(.16 0 0 .16 37 777.362)"/>
-            <path d="m 40.49184,786.6494 c -0.04224,0.27088 0.14464,0.51632 0.41008,0.55296 0.26736,0.0438 0.52,-0.15008 0.55296,-0.41008 0.04032,-0.27088 -0.14288,-0.51648 -0.412,-0.55312 -0.26544,-0.0402 -0.51616,0.14304 -0.55104,0.41024 z"/>
-            <path d="m 40.91472,785.53612 c 0.03664,-0.25632 -0.13728,-0.49072 -0.39184,-0.52736 -0.25456,-0.0366 -0.48896,0.1392 -0.5256,0.39184 -0.03664,0.26 0.1392,0.48688 0.39184,0.52384 0.2528,0.0403 0.49088,-0.13904 0.5256,-0.38832 z"/>
-            <path d="m 40.37456,784.27996 c 0.03296,-0.24176 -0.12992,-0.46512 -0.37168,-0.50176 -0.24176,-0.033 -0.46336,0.13184 -0.49808,0.37344 -0.03472,0.24544 0.12992,0.46144 0.36992,0.49808 0.24176,0.0405 0.46688,-0.13536 0.49984,-0.36976 z"/>
-            <path d="m 39.83456,783.02396 c 0.03296,-0.22704 -0.12272,-0.43952 -0.35168,-0.47248 -0.23072,-0.033 -0.43952,0.12448 -0.47248,0.35152 -0.03296,0.23072 0.12448,0.43584 0.35152,0.47248 0.22704,0.0366 0.44144,-0.12816 0.47264,-0.35152 z"/>
-            <path d="m 39.29424,781.7678 c 0.0312,-0.216 -0.11712,-0.41744 -0.33136,-0.44672 -0.21792,-0.0293 -0.41376,0.11712 -0.44496,0.33328 -0.0312,0.21984 0.11536,0.41008 0.3296,0.44672 0.216,0.033 0.41744,-0.12096 0.44672,-0.33328 z"/>
-            <path d="m 38.223287,780.6051 c -0.03104,0.20512 0.10992,0.38448 0.31136,0.41744 0.20144,0.033 0.39008,-0.11344 0.41936,-0.3112 0.02928,-0.20144 -0.10992,-0.39184 -0.31136,-0.41744 -0.20704,-0.0293 -0.39184,0.10976 -0.41936,0.3112 z"/>
-            <path d="m 42.31008,784.87692 c 0.01296,-0.26368 0.24,-0.47248 0.50544,-0.45776 0.26736,0.0147 0.47056,0.23808 0.45776,0.50912 -0.0093,0.26736 -0.23808,0.4688 -0.50544,0.45408 -0.2656,-0.007 -0.47248,-0.2344 -0.45776,-0.50544 z"/>
-            <path d="m 42.00608,784.35324 c -0.25264,-0.0109 -0.4504,-0.22336 -0.43584,-0.48336 0.0128,-0.2528 0.22896,-0.44672 0.4816,-0.43584 0.25456,0.0146 0.44688,0.22704 0.43584,0.48336 -0.01104,0.25648 -0.22704,0.44688 -0.4816,0.43584 z"/>
-            <path d="m 41.24624,783.3206 c -0.23984,-0.011 -0.42672,-0.21248 -0.41376,-0.45408 0.01296,-0.2416 0.216,-0.42848 0.45776,-0.41376 0.23984,0.011 0.4248,0.21616 0.41392,0.45776 -0.0094,0.23792 -0.21616,0.42464 -0.45792,0.41008 z"/>
-            <path d="m 40.48448,782.29148 c -0.22704,-0.0109 -0.40464,-0.20144 -0.39184,-0.43216 0.0128,-0.22704 0.20512,-0.40288 0.43392,-0.39184 0.22704,0.011 0.40288,0.20512 0.39184,0.43216 -0.0091,0.22704 -0.20496,0.4064 -0.43392,0.39184 z"/>
-            <path d="m 39.72464,781.26236 c -0.21424,-0.0109 -0.38272,-0.19408 -0.36992,-0.41008 0.01104,-0.21248 0.19232,-0.37712 0.40832,-0.36992 0.21424,0.0109 0.3808,0.19408 0.36992,0.41008 -0.0093,0.21248 -0.19424,0.38096 -0.40832,0.36992 z"/>
-            <path d="m 38.814647,780.04846 c 0.01088,-0.20144 0.18128,-0.35888 0.38448,-0.34784 0.20144,0.007 0.35888,0.17952 0.34784,0.3808 -0.0091,0.20144 -0.1832,0.36256 -0.38448,0.34784 -0.20144,-0.0109 -0.35872,-0.17936 -0.34784,-0.3808 z"/>
-            <path d="m 43.63024,782.80412 c -0.26736,0.0147 -0.49984,-0.1904 -0.50912,-0.45776 -0.01472,-0.27104 0.196,-0.49808 0.46336,-0.50912 0.26192,-0.011 0.49072,0.1904 0.50176,0.46512 0.01648,0.26016 -0.18864,0.49072 -0.456,0.50176 z"/>
-            <path d="m 43.04992,781.54076 c 0.0128,0.24544 -0.1776,0.45776 -0.42848,0.4688 -0.25088,0.011 -0.46688,-0.17952 -0.47792,-0.42848 -0.01088,-0.2528 0.1832,-0.46144 0.43392,-0.47616 0.2472,-0.011 0.45952,0.17952 0.47248,0.43584 z"/>
-            <path d="m 42.01344,780.779 c 0.01104,0.23072 -0.16848,0.42848 -0.40288,0.43952 -0.2344,0.0109 -0.4376,-0.16848 -0.44672,-0.3992 -0.01104,-0.23808 0.17216,-0.43584 0.40656,-0.44672 0.23072,-0.011 0.43024,0.16832 0.44304,0.4064 z"/>
-            <path d="m 40.97696,780.01724 c 0.0093,0.216 -0.15744,0.40288 -0.37536,0.41008 -0.21792,0.0109 -0.40656,-0.15744 -0.41568,-0.3736 -0.0093,-0.21968 0.16112,-0.40288 0.37904,-0.41376 0.21424,-0.0109 0.40112,0.1576 0.412,0.37728 z"/>
-            <path d="m 39.407927,779.49182 c -0.01104,-0.20512 0.14832,-0.37712 0.34976,-0.38448 0.19968,-0.0109 0.3736,0.14656 0.38272,0.34784 0.0093,0.20144 -0.1464,0.3736 -0.34784,0.38096 -0.20144,0.0109 -0.37728,-0.14656 -0.38464,-0.34432 z"/>
-            <path d="m 40.314327,778.51406 c 0.19968,-0.0293 0.39008,0.11008 0.41936,0.31136 0.02944,0.20144 -0.10992,0.39184 -0.31312,0.41744 -0.20144,0.033 -0.39008,-0.10992 -0.4192,-0.31136 -0.02752,-0.20144 0.11328,-0.38816 0.31296,-0.41744 z"/>
-            <path d="m 41.85584,779.16396 c 0.0312,0.21232 -0.11712,0.41008 -0.3296,0.43952 -0.21248,0.033 -0.412,-0.11712 -0.44128,-0.32592 -0.02944,-0.21248 0.11904,-0.41376 0.3296,-0.44336 0.21072,-0.0291 0.41024,0.11744 0.44128,0.32976 z"/>
-            <path d="m 43.17792,779.69868 c 0.03296,0.22704 -0.12272,0.43216 -0.34608,0.46512 -0.22336,0.033 -0.43392,-0.12448 -0.46512,-0.34432 -0.03104,-0.22336 0.12448,-0.43216 0.34608,-0.46512 0.2216,-0.033 0.43216,0.12096 0.46512,0.34432 z"/>
-            <path d="m 44.49824,780.23692 c 0.03472,0.2344 -0.12816,0.4504 -0.36256,0.48704 -0.23264,0.033 -0.45408,-0.12816 -0.48528,-0.36256 -0.03296,-0.2344 0.12816,-0.45408 0.36064,-0.48704 0.2344,-0.0365 0.45424,0.12832 0.4872,0.36256 z"/>
-            <path d="m 45.82048,780.77532 c 0.03472,0.24544 -0.13568,0.47248 -0.37904,0.50912 -0.24352,0.0366 -0.4744,-0.13552 -0.5072,-0.37728 -0.03504,-0.24528 0.13344,-0.476 0.37696,-0.51264 0.24544,-0.033 0.47248,0.13536 0.50928,0.3808 z"/>
-            <path d="m 47.1424,781.31372 c 0.0384,0.25632 -0.14096,0.4944 -0.39568,0.53104 -0.2544,0.0366 -0.49616,-0.14288 -0.53088,-0.39552 -0.03664,-0.25632 0.13904,-0.49808 0.39376,-0.53472 0.25616,-0.0366 0.496,0.14272 0.5328,0.3992 z"/>
-            <path d="m 47.9096,781.43452 c 0.26736,-0.0366 0.51648,0.15008 0.55488,0.41744 0.04032,0.26368 -0.14832,0.5128 -0.412,0.55312 -0.26528,0.0402 -0.51808,-0.14656 -0.55296,-0.41376 -0.0384,-0.26752 0.14448,-0.51648 0.41008,-0.5568 z"/>
-        </g>
-        <rect height="18" transform="translate(0 1028.362)" width="18" x="36" y="-252" opacity=".3" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/social_facility-18.svg b/data/styles/symbols/nori/social_facility-18.svg
deleted file mode 100644
index e6b6257887..0000000000
--- a/data/styles/symbols/nori/social_facility-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0.0 992.3622 18.0 18.0">
-    <rect height="18" transform="translate(0 1028.362)" width="18" y="-36" fill="none"/>
-    <path d="m 9,993.3622 -8,3 0,1 8,-2.875 8,2.875 0,-1 z m -3,4.5 c -0.8284271,0 -1.5,0.67157 -1.5,1.5 0,0.7248 0.5039753,1.3289 1.1875,1.4688 l -0.03125,0.2187 -3.65625,3.3125 1,0 2.3125,-1.5625 -1.3125,6.5625 1,0 1,-3 1,3 1,0 -1.3125,-6.625 1.75,1.2188 0.5625,0.4062 0,0 0,0 0.5625,-0.375 1.75,-1.1875 -1.3125,6.5625 1,0 1,-3 1,3 1,0 -1.3125,-6.625 2.3125,1.625 1,0 -3.65625,-3.375 -0.03125,-0.1562 c 0.683525,-0.1399 1.1875,-0.7439 1.1875,-1.4688 0,-0.82843 -0.671573,-1.5 -1.5,-1.5 -0.828427,0 -1.5,0.67157 -1.5,1.5 0,0.7249 0.503975,1.3289 1.1875,1.4688 l -0.03125,0.2187 L 9,1003.456 6.34375,1000.9872 6.3125,1000.831 c 0.6835247,-0.1399 1.1875,-0.744 1.1875,-1.4688 0,-0.82843 -0.6715729,-1.5 -1.5,-1.5 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" color="#000" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" font-family="Sans" opacity=".3" stroke-linejoin="round" fill="none"/>
-    <path d="m 9,993.3622 -8,3 0,1 8,-2.875 8,2.875 0,-1 z m -3,4.5 c -0.8284271,0 -1.5,0.67157 -1.5,1.5 0,0.7248 0.5039753,1.3289 1.1875,1.4688 l -0.03125,0.2187 -3.65625,3.3125 1,0 2.3125,-1.5625 -1.3125,6.5625 1,0 1,-3 1,3 1,0 -1.3125,-6.625 1.75,1.2188 0.5625,0.4062 0,0 0,0 0.5625,-0.375 1.75,-1.1875 -1.3125,6.5625 1,0 1,-3 1,3 1,0 -1.3125,-6.625 2.3125,1.625 1,0 -3.65625,-3.375 -0.03125,-0.1562 c 0.683525,-0.1399 1.1875,-0.7439 1.1875,-1.4688 0,-0.82843 -0.671573,-1.5 -1.5,-1.5 -0.828427,0 -1.5,0.67157 -1.5,1.5 0,0.7249 0.503975,1.3289 1.1875,1.4688 l -0.03125,0.2187 L 9,1003.456 6.34375,1000.9872 6.3125,1000.831 c 0.6835247,-0.1399 1.1875,-0.744 1.1875,-1.4688 0,-0.82843 -0.6715729,-1.5 -1.5,-1.5 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" color="#000" fill="#747474" overflow="visible" enable-background="accumulate" font-family="Sans"/>
-</svg>
diff --git a/data/styles/symbols/nori/split.py b/data/styles/symbols/nori/split.py
deleted file mode 100644
index 336235ce5f..0000000000
--- a/data/styles/symbols/nori/split.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import pprint
-from xml.dom import minidom
-
-dom = minidom.parse("_nori.svg")
-
-groups = [(a.getAttribute("inkscape:label"), 
-           (float(a.getElementsByTagName("rect")[0].getAttribute("width")), float(a.getElementsByTagName("rect")[0].getAttribute("height")), float(a.getElementsByTagName("rect")[0].getAttribute("x")), float(a.getElementsByTagName("rect")[0].getAttribute("y"))),
-           a) for a in dom.getElementsByTagName("g") if a.getAttribute("inkscape:label") and a.getElementsByTagName("rect")]
-
-pprint.pprint([groups, len(groups)])
-for name, bbox, v in groups:
-    print name
-    dx, dy = 0, 0
-    rt = v.getElementsByTagName("rect")[0].getAttribute("transform")
-    if rt and 'translate' in rt:
-        dy =  1028.3622
-    rt = v.getAttribute("transform")
-    if rt and "translate" in rt:
-        dx += float(rt.split("(")[1].split(",")[0])
-        dy += float(rt.split("(")[1].split(",")[1].strip(")"))
-    open(name+".svg", 'w').write(
-        '<svg width="%s" height="%s" viewBox="%s %s %s %s">'%(bbox[0], bbox[1], bbox[2]+dx, bbox[3]+dy, bbox[0], bbox[1])+
-        v.toxml() +
-        '</svg>')
diff --git a/data/styles/symbols/nori/storage_tank-18.svg b/data/styles/symbols/nori/storage_tank-18.svg
deleted file mode 100644
index cc7275ba25..0000000000
--- a/data/styles/symbols/nori/storage_tank-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="132.0 866.3622 18.0 18.0">
-    <path d="m 146,872.3622 c 3,1 3,6 0,7 l -1,0 0,2 -2,0 0,-2 -4,0 0,2 -2,0 0,-2 -1,0 c -3,-1 -3,-6 0,-7 l 2,0 0,-1 -1,0 0,-1 5,0 0,1 -1,0 0,1 c 0,0 4.50977,0 5,0 z" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-    <path d="m 146,872.3622 c 3,1 3,6 0,7 l -1,0 0,2 -2,0 0,-2 -4,0 0,2 -2,0 0,-2 -1,0 c -3,-1 -3,-6 0,-7 l 2,0 0,-1 -1,0 0,-1 5,0 0,1 -1,0 0,1 c 0,0 4.50977,0 5,0 z" fill="#747474"/>
-    <rect height="18" transform="translate(0 1028.362)" width="18" x="132" y="-162" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/street_lamp-18.svg b/data/styles/symbols/nori/street_lamp-18.svg
deleted file mode 100644
index aa8b6f49a8..0000000000
--- a/data/styles/symbols/nori/street_lamp-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="72.0 848.3622 18.0 18.0">
-    <g transform="translate(0 1028.362)">
-        <path d="m 81,-179 c -1,0 -2,1.5 -3,4 l -1,0 0,1 1,0 1,4 1,1 0,1 -2,0 0,1 2,0 0,4 2,0 0,-4 2,0 0,-1 -2,0 0,-1 1,-1 1,-4 1,0 0,-1 -1,0 c -1,-2.5 -2,-4 -3,-4 z m -2,5 4,0 -1,4 -2,0 z" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-        <path d="m 81,-179 c -1,0 -2,1.5 -3,4 l -1,0 0,1 1,0 1,4 1,1 0,1 -2,0 0,1 2,0 0,4 2,0 0,-4 2,0 0,-1 -2,0 0,-1 1,-1 1,-4 1,0 0,-1 -1,0 c -1,-2.5 -2,-4 -3,-4 z m -2,5 4,0 -1,4 -2,0 z" fill="#747474"/>
-        <rect height="18" width="18" x="72" y="-180" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/studio-18.svg b/data/styles/symbols/nori/studio-18.svg
deleted file mode 100644
index 2a91d6abf6..0000000000
--- a/data/styles/symbols/nori/studio-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="36.0 830.3622 18.0 18.0">
-    <path d="m 48.874894,838.2902 0,1.08596 c 0,2.15285 -1.750979,3.90383 -3.90383,3.90383 -2.152851,0 -3.90383,-1.75098 -3.90383,-3.90383 l 0,-1.08596 -1.067234,0 0,1.08596 c 0,2.56085 1.946383,4.67489 4.437447,4.94213 l 0,1.97651 L 41,846.3622 l 0,1 8,0 0,-1 -3.495149,-0.0674 0,-1.97651 c 2.491064,-0.26707 4.437447,-2.38111 4.437447,-4.94213 l 0,-1.08596 z M 45,842.3622 c 2,0 3,-1.52936 3,-3 l 0,-5 c -1.7e-4,-1.47013 -1,-3 -3,-3 -2,0 -3,1.52987 -3,3 l 0,5 c -1.7e-4,1.47064 1,3 3,3 z" fill="#747474" stroke="#fff" stroke-width="2" stroke-linejoin="round" opacity=".3"/>
-    <path d="m 48.874894,838.2902 0,1.08596 c 0,2.15285 -1.750979,3.90383 -3.90383,3.90383 -2.152851,0 -3.90383,-1.75098 -3.90383,-3.90383 l 0,-1.08596 -1.067234,0 0,1.08596 c 0,2.56085 1.946383,4.67489 4.437447,4.94213 l 0,1.97651 L 41,846.3622 l 0,1 8,0 0,-1 -3.495149,-0.0674 0,-1.97651 c 2.491064,-0.26707 4.437447,-2.38111 4.437447,-4.94213 l 0,-1.08596 z M 45,842.3622 c 2,0 3,-1.52936 3,-3 l 0,-5 c -1.7e-4,-1.47013 -1,-3 -3,-3 -2,0 -3,1.52987 -3,3 l 0,5 c -1.7e-4,1.47064 1,3 3,3 z" fill="#747474"/>
-    <rect height="18" rx=".497" ry=".033" transform="translate(0 1028.362)" width="18" x="36" y="-198" opacity=".3" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/tailor-18.svg b/data/styles/symbols/nori/tailor-18.svg
deleted file mode 100644
index 3d7b26b541..0000000000
--- a/data/styles/symbols/nori/tailor-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="36.0 920.3622 18.0 18.0">
-    <g transform="translate(0 1028.362)">
-        <path d="m 45,-104 c -2.761423,0 -5,2.23857 -5,5 0,2.761424 2.238577,5 5,5 2.761423,0 5,-2.238576 5,-5 0,-2.76143 -2.238577,-5 -5,-5 z m -2,2 c 0.552285,0 1,0.44772 1,1 0,0.55228 -0.447715,1 -1,1 -0.552285,0 -1,-0.44772 -1,-1 0,-0.55228 0.447715,-1 1,-1 z m 4,0 c 0.552285,0 1,0.44772 1,1 0,0.55228 -0.447715,1 -1,1 -0.552285,0 -1,-0.44772 -1,-1 0,-0.55228 0.447715,-1 1,-1 z m -0.125,3.84375 c 0.552285,0 1,0.447715 1,1 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 z M 43,-98 c 0.552285,0 1,0.447715 1,1 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 z m 2,-8 c -3.860071,0 -7,3.13993 -7,7 0,3.86007 3.139929,7 7,7 3.860071,0 7,-3.13993 7,-7 0,-3.86007 -3.139929,-7 -7,-7 z m 0,1 c 3.319631,0 6,2.68037 6,6 0,3.31963 -2.680369,6 -6,6 -3.319631,0 -6,-2.68037 -6,-6 0,-3.31963 2.680369,-6 6,-6 z" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-        <path d="m 45,-104 c -2.761423,0 -5,2.23857 -5,5 0,2.761424 2.238577,5 5,5 2.761423,0 5,-2.238576 5,-5 0,-2.76143 -2.238577,-5 -5,-5 z m -2,2 c 0.552285,0 1,0.44772 1,1 0,0.55228 -0.447715,1 -1,1 -0.552285,0 -1,-0.44772 -1,-1 0,-0.55228 0.447715,-1 1,-1 z m 4,0 c 0.552285,0 1,0.44772 1,1 0,0.55228 -0.447715,1 -1,1 -0.552285,0 -1,-0.44772 -1,-1 0,-0.55228 0.447715,-1 1,-1 z m -0.125,3.84375 c 0.552285,0 1,0.447715 1,1 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 z M 43,-98 c 0.552285,0 1,0.447715 1,1 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 z m 2,-8 c -3.860071,0 -7,3.13993 -7,7 0,3.86007 3.139929,7 7,7 3.860071,0 7,-3.13993 7,-7 0,-3.86007 -3.139929,-7 -7,-7 z m 0,1 c 3.319631,0 6,2.68037 6,6 0,3.31963 -2.680369,6 -6,6 -3.319631,0 -6,-2.68037 -6,-6 0,-3.31963 2.680369,-6 6,-6 z" fill="#747474"/>
-        <rect height="18" rx=".995" ry=".033" width="18" x="36" y="-108" opacity=".3" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/taxi-12.svg b/data/styles/symbols/nori/taxi-12.svg
deleted file mode 100644
index 5c7c7918af..0000000000
--- a/data/styles/symbols/nori/taxi-12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="54.0 872.36218 12.0 12.0">
-    <path d="M 56.348799,879.4593"/>
-    <path d="m 64,877.3622 -0.725501,-1.7094 C 63.122698,875.22944 62.6324,874.36018 62,874.3622 l -1,0 0,-1 -2,0 0,1 -1,0 c -0.6294,-0.002 -1.1196,0.86724 -1.2745,1.2906 L 56,877.3622 c -0.3239,0.0416 -0.9971,0.23765 -1,1 l 0,3 1,0 0,1 c -0.0022,1.11669 2.001699,1.10357 2,0 l 0,-1 2.003001,0 1.996999,0 0,1 c 0.0018,1.10357 1.9996,1.11669 2,0 l 0,-1 1,0 0,-3 c 6e-4,-0.76235 -0.6731,-0.9584 -1,-1 z m -7,3 c -0.471405,0 -1,-0.5286 -1,-1 0,-0.4714 0.528595,-1 1,-1 0.471405,0 1,0.5286 1,1 0,0.4714 -0.528595,1 -1,1 z m 0.3,-3 0.7,-2 4,0 0.7,2 z m 5.7,3 c -0.471405,0 -1,-0.5286 -1,-1 0,-0.4714 0.528595,-1 1,-1 0.471405,0 1,0.5286 1,1 0,0.4714 -0.528595,1 -1,1 z" stroke="#fff" opacity=".3" stroke-width="2" stroke-linejoin="round" fill="none"/>
-    <path d="m 64,877.3622 -0.725501,-1.7094 C 63.122698,875.22944 62.6324,874.36018 62,874.3622 l -1,0 0,-1 -2,0 0,1 -1,0 c -0.6294,-0.002 -1.1196,0.86724 -1.2745,1.2906 L 56,877.3622 c -0.3239,0.0416 -0.9971,0.23765 -1,1 l 0,3 1,0 0,1 c -0.0022,1.11669 2.001699,1.10357 2,0 l 0,-1 2.003001,0 1.996999,0 0,1 c 0.0018,1.10357 1.9996,1.11669 2,0 l 0,-1 1,0 0,-3 c 6e-4,-0.76235 -0.6731,-0.9584 -1,-1 z m -7,3 c -0.471405,0 -1,-0.5286 -1,-1 0,-0.4714 0.528595,-1 1,-1 0.471405,0 1,0.5286 1,1 0,0.4714 -0.528595,1 -1,1 z m 0.3,-3 0.7,-2 4,0 0.7,2 z m 5.7,3 c -0.471405,0 -1,-0.5286 -1,-1 0,-0.4714 0.528595,-1 1,-1 0.471405,0 1,0.5286 1,1 0,0.4714 -0.528595,1 -1,1 z" fill="#525252"/>
-    <path d="M 63.657705,879.4593"/>
-    <rect height="12" width="12" x="54" y="872.362" opacity=".3" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/taxi-18.svg b/data/styles/symbols/nori/taxi-18.svg
deleted file mode 100644
index cb43f492ff..0000000000
--- a/data/styles/symbols/nori/taxi-18.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="36.0 866.3622 18.0 18.0">
-    <path d="M 50.742994,874.31107 49.59005,871.3636 c -0.212787,-0.55637 -0.682515,-1.01621 -1.568986,-1.01355 l -1.268869,0 0,-1.55858 -3.50439,0 0,1.55858 -1.26887,0 c -0.882265,-0.003 -1.351854,0.45718 -1.568986,1.01355 l -1.153085,2.94747 c -0.454029,0.0547 -1.26158,0.58481 -1.265646,1.58665 l 10e-7,3.40692 1.126732,0 -10e-7,1.53412 c -0.0029,1.46751 2.100532,1.45026 2.098149,0 l 10e-7,-1.53412 3.788107,0 3.779554,0 -10e-7,1.53412 c 0.0025,1.45026 2.106138,1.46751 2.106699,0 l 10e-7,-1.53412 1.118322,0 -10e-7,-3.40692 c 8.4e-4,-1.00184 -0.807552,-1.53198 -1.265787,-1.58665 z m -10.541206,3.04292 c -0.538134,-1.3e-4 -0.973379,-0.44378 -0.970997,-0.98809 -0.0025,-0.55131 0.432723,-0.99524 0.970997,-0.99706 0.534911,0.002 0.969875,0.44589 0.970856,0.99706 -9.63e-4,0.54431 -0.435945,0.98796 -0.970856,0.98809 z m 0.417724,-3.30594 0.700335,-2.08618 c 0.106252,-0.32382 0.268856,-0.55847 0.650275,-0.56351 6.534269,0.0213 0.401585,0.0213 6.068184,0 0.377073,0.005 0.539676,0.23969 0.650275,0.56351 l 0.691907,2.08618 z m 9.18725,3.30594 c -0.539396,-1.3e-4 -0.974642,-0.44378 -0.971137,-0.98809 -0.0035,-0.55131 0.431741,-0.99524 0.971137,-0.99706 0.533929,0.002 0.968614,0.44589 0.971277,0.99706 -0.0026,0.54431 -0.437489,0.98796 -0.971277,0.98809 z" opacity=".3" fill="#fff" stroke="#fff" stroke-width="1.752" stroke-linejoin="round"/>
-    <path d="M 50.742994,874.31107 49.59005,871.3636 c -0.212787,-0.55637 -0.682515,-1.01621 -1.568986,-1.01355 l -1.268869,0 0,-1.55858 -3.50439,0 0,1.55858 -1.26887,0 c -0.882265,-0.003 -1.351854,0.45718 -1.568986,1.01355 l -1.153085,2.94747 c -0.454029,0.0547 -1.26158,0.58481 -1.265646,1.58665 l 10e-7,3.40692 1.126732,0 -10e-7,1.53412 c -0.0029,1.46751 2.100532,1.45026 2.098149,0 l 10e-7,-1.53412 3.788107,0 3.779554,0 -10e-7,1.53412 c 0.0025,1.45026 2.106138,1.46751 2.106699,0 l 10e-7,-1.53412 1.118322,0 -10e-7,-3.40692 c 8.4e-4,-1.00184 -0.807552,-1.53198 -1.265787,-1.58665 z m -10.541206,3.04292 c -0.538134,-1.3e-4 -0.973379,-0.44378 -0.970997,-0.98809 -0.0025,-0.55131 0.432723,-0.99524 0.970997,-0.99706 0.534911,0.002 0.969875,0.44589 0.970856,0.99706 -9.63e-4,0.54431 -0.435945,0.98796 -0.970856,0.98809 z m 0.417724,-3.30594 0.700335,-2.08618 c 0.106252,-0.32382 0.268856,-0.55847 0.650275,-0.56351 6.534269,0.0213 0.401585,0.0213 6.068184,0 0.377073,0.005 0.539676,0.23969 0.650275,0.56351 l 0.691907,2.08618 z m 9.18725,3.30594 c -0.539396,-1.3e-4 -0.974642,-0.44378 -0.971137,-0.98809 -0.0035,-0.55131 0.431741,-0.99524 0.971137,-0.99706 0.533929,0.002 0.968614,0.44589 0.971277,0.99706 -0.0026,0.54431 -0.437489,0.98796 -0.971277,0.98809 z" fill="#747474"/>
-</svg>
diff --git a/data/styles/symbols/nori/tyres-18.svg b/data/styles/symbols/nori/tyres-18.svg
deleted file mode 100644
index 9044ca3316..0000000000
--- a/data/styles/symbols/nori/tyres-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="132.0 848.3622 18.0 18.0">
-    <path d="m 141,850.3622 c -3.84823,0 -7,3.1518 -7,7 0,3.8482 3.15177,7 7,7 3.84823,0 7,-3.1518 7,-7 0,-3.8482 -3.15177,-7 -7,-7 z m -0.46875,3.0313 L 140,855.081 c -0.37495,0.1659 -0.7178,0.4008 -0.96875,0.7187 l -1.6875,-0.031 c 0.55548,-1.2824 1.74053,-2.2072 3.1875,-2.375 z m 0.9375,0 c 1.45187,0.1684 2.6658,1.0858 3.21875,2.375 l -1.71875,0.062 C 142.71577,855.5037 142.38286,855.2504 142,855.081 l -0.53125,-1.6875 z M 141,856.3622 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m -3.96875,0.4688 1.5,0.9062 c 0.0406,0.2674 0.13166,0.5175 0.25,0.75 l -0.6875,1.625 C 137.41519,859.3949 137,858.4355 137,857.3622 c 0,-0.1817 0.008,-0.3561 0.0312,-0.5312 z m 7.9375,0 c 0.023,0.1751 0.0312,0.3495 0.0312,0.5312 0,1.0819 -0.40552,2.0623 -1.09375,2.7813 l -0.6875,-1.6563 c 0.11834,-0.2325 0.20935,-0.4826 0.25,-0.75 l 1.5,-0.9062 z m -4.625,2.9375 c 0.21084,0.058 0.42709,0.094 0.65625,0.094 0.22916,0 0.44541,-0.036 0.65625,-0.094 l 1.4375,1 c -0.61079,0.3749 -1.3194,0.5937 -2.09375,0.5937 -0.78448,0 -1.50915,-0.2097 -2.125,-0.5937 l 1.46875,-1 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" color="#000" stroke="#fff" stroke-width="2" overflow="visible" enable-background="accumulate" font-family="Sans" stroke-linejoin="round" opacity=".3" fill="none"/>
-    <rect height="18" transform="translate(0 1028.362)" width="18" x="132" y="-180" fill="none"/>
-    <path d="m 141,850.3622 c -3.84823,0 -7,3.1518 -7,7 0,3.8482 3.15177,7 7,7 3.84823,0 7,-3.1518 7,-7 0,-3.8482 -3.15177,-7 -7,-7 z m -0.46875,3.0313 L 140,855.081 c -0.37495,0.1659 -0.7178,0.4008 -0.96875,0.7187 l -1.6875,-0.031 c 0.55548,-1.2824 1.74053,-2.2072 3.1875,-2.375 z m 0.9375,0 c 1.45187,0.1684 2.6658,1.0858 3.21875,2.375 l -1.71875,0.062 C 142.71577,855.5037 142.38286,855.2504 142,855.081 l -0.53125,-1.6875 z M 141,856.3622 c 0.55228,0 1,0.4477 1,1 0,0.5523 -0.44772,1 -1,1 -0.55228,0 -1,-0.4477 -1,-1 0,-0.5523 0.44772,-1 1,-1 z m -3.96875,0.4688 1.5,0.9062 c 0.0406,0.2674 0.13166,0.5175 0.25,0.75 l -0.6875,1.625 C 137.41519,859.3949 137,858.4355 137,857.3622 c 0,-0.1817 0.008,-0.3561 0.0312,-0.5312 z m 7.9375,0 c 0.023,0.1751 0.0312,0.3495 0.0312,0.5312 0,1.0819 -0.40552,2.0623 -1.09375,2.7813 l -0.6875,-1.6563 c 0.11834,-0.2325 0.20935,-0.4826 0.25,-0.75 l 1.5,-0.9062 z m -4.625,2.9375 c 0.21084,0.058 0.42709,0.094 0.65625,0.094 0.22916,0 0.44541,-0.036 0.65625,-0.094 l 1.4375,1 c -0.61079,0.3749 -1.3194,0.5937 -2.09375,0.5937 -0.78448,0 -1.50915,-0.2097 -2.125,-0.5937 l 1.46875,-1 z" style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" color="#000" fill="#747474" overflow="visible" enable-background="accumulate" font-family="Sans"/>
-</svg>
diff --git a/data/styles/symbols/nori/viewpoint-18.svg b/data/styles/symbols/nori/viewpoint-18.svg
deleted file mode 100644
index 2dd453e2dc..0000000000
--- a/data/styles/symbols/nori/viewpoint-18.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="72.0 794.3622 18.0 18.0">
-    <path d="M 59.16,86.315 23.844,61.35 26.987,55.883 66.232,74.068 z M 31.208,100 16.367,66.524 21.823,63.359 43.444,92.928 z M 59.16,13.679 23.844,38.646 26.987,44.118 66.232,25.932 z M 31.208,0 16.367,33.47 21.823,36.636 43.444,7.072 z m 49.494,42.928 -52.986,3.912 0,6.32 52.986,3.912 z M 20.891,50 c 0,5.759 -4.681,10.44 -10.451,10.44 C 4.681,60.44 0,55.759 0,50 0,44.23 4.681,39.555 10.44,39.555 c 5.77,0 10.451,4.675 10.451,10.445 z" stroke="#fff" stroke-width="12.5" stroke-linejoin="round" transform="matrix(.16 0 0 .16 74.616 795.34)" opacity=".3" fill="none"/>
-    <path d="M 59.16,86.315 23.844,61.35 26.987,55.883 66.232,74.068 z M 31.208,100 16.367,66.524 21.823,63.359 43.444,92.928 z M 59.16,13.679 23.844,38.646 26.987,44.118 66.232,25.932 z M 31.208,0 16.367,33.47 21.823,36.636 43.444,7.072 z m 49.494,42.928 -52.986,3.912 0,6.32 52.986,3.912 z M 20.891,50 c 0,5.759 -4.681,10.44 -10.451,10.44 C 4.681,60.44 0,55.759 0,50 0,44.23 4.681,39.555 10.44,39.555 c 5.77,0 10.451,4.675 10.451,10.445 z" fill="#747474" transform="matrix(.16 0 0 .16 74.616 795.34)"/>
-    <rect height="18" transform="translate(0 1028.362)" width="18" x="72" y="-234" fill="none"/>
-</svg>
diff --git a/data/styles/symbols/nori/waste_basket-18.svg b/data/styles/symbols/nori/waste_basket-18.svg
deleted file mode 100644
index c0478fc5b2..0000000000
--- a/data/styles/symbols/nori/waste_basket-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="36.0 1010.3622 18.0 18.0">
-    <g transform="translate(0 1028.362)">
-        <path d="M 45 -17 C 44.373382 -17 43.845756 -16.48865 43.84375 -15.84375 L 43.34375 -15.84375 C 40.584916 -15.84375 39.999378 -14.5736 40 -14 L 50 -14 C 49.9974 -14.5753 49.412768 -15.84455 46.65625 -15.84375 L 46.125 -15.84375 C 46.124408 -16.15585 45.995783 -16.43535 45.78125 -16.65625 C 45.564563 -16.87765 45.307217 -16.9966 45 -17 z M 40.03125 -13 L 40.875 -2.21875 C 40.875 -1.55195 42.719635 -1 45 -1 C 47.280366 -1 49.125 -1.55195 49.125 -2.21875 L 50 -13 L 40.03125 -13 z M 42.1875 -12.1875 C 42.584647 -12.2065 42.978864 -12.056 43 -11.875 L 43.90625 -2.6875 C 43.921759 -2.5067 43.585113 -2.35135 43.15625 -2.34375 C 42.743255 -2.34375 42.328353 -2.48145 42.3125 -2.65625 L 41.40625 -11.84375 C 41.390257 -12.02445 41.763934 -12.1797 42.1875 -12.1875 z M 47.40625 -12.15625 C 47.503844 -12.170328 47.630696 -12.162425 47.75 -12.15625 C 48.17904 -12.14525 48.521409 -11.9921 48.5 -11.8125 L 47.5625 -2.65625 C 47.54113 -2.48105 47.199587 -2.34375 46.78125 -2.34375 L 46.71875 -2.34375 C 46.289708 -2.35475 45.978587 -2.5068 46 -2.6875 L 46.90625 -11.84375 C 46.922277 -11.979275 47.113468 -12.114016 47.40625 -12.15625 z" fill="#fff" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round"/>
-        <path d="M 45 -17 C 44.373382 -17 43.845756 -16.48865 43.84375 -15.84375 L 43.34375 -15.84375 C 40.584916 -15.84375 39.999378 -14.5736 40 -14 L 50 -14 C 49.9974 -14.5753 49.412768 -15.84455 46.65625 -15.84375 L 46.125 -15.84375 C 46.124408 -16.15585 45.995783 -16.43535 45.78125 -16.65625 C 45.564563 -16.87765 45.307217 -16.9966 45 -17 z M 40.03125 -13 L 40.875 -2.21875 C 40.875 -1.55195 42.719635 -1 45 -1 C 47.280366 -1 49.125 -1.55195 49.125 -2.21875 L 50 -13 L 40.03125 -13 z M 42.1875 -12.1875 C 42.584647 -12.2065 42.978864 -12.056 43 -11.875 L 43.90625 -2.6875 C 43.921759 -2.5067 43.585113 -2.35135 43.15625 -2.34375 C 42.743255 -2.34375 42.328353 -2.48145 42.3125 -2.65625 L 41.40625 -11.84375 C 41.390257 -12.02445 41.763934 -12.1797 42.1875 -12.1875 z M 47.40625 -12.15625 C 47.503844 -12.170328 47.630696 -12.162425 47.75 -12.15625 C 48.17904 -12.14525 48.521409 -11.9921 48.5 -11.8125 L 47.5625 -2.65625 C 47.54113 -2.48105 47.199587 -2.34375 46.78125 -2.34375 L 46.71875 -2.34375 C 46.289708 -2.35475 45.978587 -2.5068 46 -2.6875 L 46.90625 -11.84375 C 46.922277 -11.979275 47.113468 -12.114016 47.40625 -12.15625 z" fill="#747474"/>
-        <rect height="18" width="18" x="36" y="-18" opacity=".3" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/water_tower-18.svg b/data/styles/symbols/nori/water_tower-18.svg
deleted file mode 100644
index b703d8bd6e..0000000000
--- a/data/styles/symbols/nori/water_tower-18.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="102.0 920.36218 18.0 18.0">
-    <g transform="translate(30 -54)">
-        <path d="m 81,975.3622 -4.03125,2 0.03125,5 -1,9 1,0 0.25,-2 7.5,0 0.25,2 1,0 -1,-9 -0.03125,-5 z m -3,8.125 c 1.767164,1.50313 4.233192,1.49991 6,0 l 0.53125,3.875 -6.984375,0 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round" fill="none"/>
-        <path d="m 81,975.3622 -4.03125,2 0.03125,5 -1,9 1,0 0.25,-2 7.5,0 0.25,2 1,0 -1,-9 -0.03125,-5 z m -3,8.125 c 1.767164,1.50313 4.233192,1.49991 6,0 l 0.53125,3.875 -6.984375,0 z" fill="#747474"/>
-        <rect height="18" width="18" x="72" y="974.362" fill="none"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/nori/watermill-18.svg b/data/styles/symbols/nori/watermill-18.svg
deleted file mode 100644
index 71152f985c..0000000000
--- a/data/styles/symbols/nori/watermill-18.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="36.0 794.3622 18.0 18.0">
-    <g>
-        <path d="m 103,969.6122 c 1.39218,-0.97803 3.05954,-1.80578 4.80927,-1.54461 0.54728,0.11962 1.36072,0.0393 1.66812,0.57907 0.39654,0.78018 0.79307,1.56036 1.18961,2.34054 0.23444,-0.12683 0.47013,-0.39128 0.70379,-0.43175 0.17642,0.19309 0.59637,0.26078 0.54621,0.57054 0.0318,0.24995 -0.13683,0.69005 0.2708,0.58351 1.22907,0.0649 2.45813,0.1298 3.6872,0.1947 0.0714,-0.24724 -0.0875,-0.63851 0.16019,-0.77545 0.24689,-0.0821 0.50216,-0.4466 0.73887,-0.1863 0.24417,0.2038 0.47368,0.34022 0.58829,-0.0515 0.53222,-0.82891 1.06443,-1.65783 1.59665,-2.48674 -0.14037,1.95387 -1.18845,4.05042 -3.15882,4.69144 -1.4622,0.45061 -3.12468,0.34711 -4.49796,-0.33548 -1.14496,-0.55194 -1.69178,-1.76706 -2.62676,-2.55677 -0.8398,-0.5854 -1.94882,-0.3255 -2.86188,-0.0726 -1.22866,0.41136 -2.26672,1.35093 -2.81358,2.52339 0,-1.014 0,-2.028 0,-3.042 z m 0,-7.203 c 0,0.347 0,0.694 0,1.041 0.66,-0.0183 1.32,-0.0367 1.98,-0.055 0.008,1.318 0.0167,2.636 0.025,3.954 1.0026,-0.28562 2.06486,-0.65565 3.10718,-0.33565 0.46814,-0.0612 1.36143,0.69389 1.50501,0.10239 0.1401,-0.2958 -0.3647,-0.34215 -0.52992,-0.51985 -0.35847,-0.11489 0.10206,-0.42903 0.15812,-0.64476 0.59887,-0.98638 1.19774,-1.97275 1.79661,-2.95913 0.27899,0.14617 0.549,0.40618 0.83353,0.48216 0.36016,-0.0269 0.24952,-0.39429 0.29684,-0.64745 -0.0466,-0.35083 0.0895,-0.50377 0.44339,-0.42094 1.16741,-0.009 2.33483,-0.0185 3.50224,-0.0278 -2.00633,-1.672 -4.01267,-3.344 -6.019,-5.016 -0.33333,0 -0.66667,0 -1,0 m 7.599,9.359 c 0.48067,-0.26067 0.96133,-0.52133 1.442,-0.782 -0.33633,-0.577 -0.67267,-1.154 -1.009,-1.731 -0.49667,0.26 -0.99333,0.52 -1.49,0.78 -0.31371,-0.0905 -0.4726,-0.27467 -0.387,-0.60675 0.004,-0.40675 0.008,-0.8135 0.012,-1.22025 -0.65767,-0.0183 -1.31533,-0.0367 -1.973,-0.055 -0.0163,0.573 -0.0327,1.146 -0.049,1.719 -0.24571,0.20758 -0.48301,0.20948 -0.7107,-0.0241 -0.35077,-0.22429 -0.70153,-0.44858 -1.0523,-0.67287 -0.343,0.57433 -0.686,1.14867 -1.029,1.723 0.46533,0.29233 0.93067,0.58467 1.396,0.877 0.0846,0.34232 -0.2071,0.44175 -0.4607,0.56578 -0.34543,0.18607 -0.69087,0.37215 -1.0363,0.55822 0.29833,0.59867 0.59667,1.19733 0.895,1.796 0.476,-0.261 0.952,-0.522 1.428,-0.783 0.19326,0.17525 0.54278,0.27466 0.42861,0.59913 -0.009,0.46262 -0.0184,0.92525 -0.0276,1.38787 0.66333,0.0297 1.32667,0.0593 1.99,0.089 0.0253,-0.54767 0.0507,-1.09533 0.076,-1.643 0.2469,-0.13859 0.49554,-0.38727 0.73574,-0.10304 0.38042,0.23635 0.76084,0.47269 1.14126,0.70904 0.35367,-0.575 0.70733,-1.15 1.061,-1.725 -0.46633,-0.28067 -0.93267,-0.56133 -1.399,-0.842 0.006,-0.20533 0.012,-0.41067 0.018,-0.616 z m -2.45,1.725 c -1.09304,0.0503 -1.88307,-1.27807 -1.31907,-2.21524 0.49738,-1.03143 2.14076,-1.03143 2.63814,0 0.55838,0.95152 -0.2154,2.25344 -1.31907,2.21524 z" opacity=".3" stroke="#fff" stroke-width="2" stroke-linejoin="round" fill="none" transform="translate(-66 -162.007)"/>
-        <path d="m 103,969.6122 c 1.39218,-0.97803 3.05954,-1.80578 4.80927,-1.54461 0.54728,0.11962 1.36072,0.0393 1.66812,0.57907 0.39654,0.78018 0.79307,1.56036 1.18961,2.34054 0.23444,-0.12683 0.47013,-0.39128 0.70379,-0.43175 0.17642,0.19309 0.59637,0.26078 0.54621,0.57054 0.0318,0.24995 -0.13683,0.69005 0.2708,0.58351 1.22907,0.0649 2.45813,0.1298 3.6872,0.1947 0.0714,-0.24724 -0.0875,-0.63851 0.16019,-0.77545 0.24689,-0.0821 0.50216,-0.4466 0.73887,-0.1863 0.24417,0.2038 0.47368,0.34022 0.58829,-0.0515 0.53222,-0.82891 1.06443,-1.65783 1.59665,-2.48674 -0.14037,1.95387 -1.18845,4.05042 -3.15882,4.69144 -1.4622,0.45061 -3.12468,0.34711 -4.49796,-0.33548 -1.14496,-0.55194 -1.69178,-1.76706 -2.62676,-2.55677 -0.8398,-0.5854 -1.94882,-0.3255 -2.86188,-0.0726 -1.22866,0.41136 -2.26672,1.35093 -2.81358,2.52339 0,-1.014 0,-2.028 0,-3.042 z m 0,-7.203 c 0,0.347 0,0.694 0,1.041 0.66,-0.0183 1.32,-0.0367 1.98,-0.055 0.008,1.318 0.0167,2.636 0.025,3.954 1.0026,-0.28562 2.06486,-0.65565 3.10718,-0.33565 0.46814,-0.0612 1.36143,0.69389 1.50501,0.10239 0.1401,-0.2958 -0.3647,-0.34215 -0.52992,-0.51985 -0.35847,-0.11489 0.10206,-0.42903 0.15812,-0.64476 0.59887,-0.98638 1.19774,-1.97275 1.79661,-2.95913 0.27899,0.14617 0.549,0.40618 0.83353,0.48216 0.36016,-0.0269 0.24952,-0.39429 0.29684,-0.64745 -0.0466,-0.35083 0.0895,-0.50377 0.44339,-0.42094 1.16741,-0.009 2.33483,-0.0185 3.50224,-0.0278 -2.00633,-1.672 -4.01267,-3.344 -6.019,-5.016 -0.33333,0 -0.66667,0 -1,0 m 7.599,9.359 c 0.48067,-0.26067 0.96133,-0.52133 1.442,-0.782 -0.33633,-0.577 -0.67267,-1.154 -1.009,-1.731 -0.49667,0.26 -0.99333,0.52 -1.49,0.78 -0.31371,-0.0905 -0.4726,-0.27467 -0.387,-0.60675 0.004,-0.40675 0.008,-0.8135 0.012,-1.22025 -0.65767,-0.0183 -1.31533,-0.0367 -1.973,-0.055 -0.0163,0.573 -0.0327,1.146 -0.049,1.719 -0.24571,0.20758 -0.48301,0.20948 -0.7107,-0.0241 -0.35077,-0.22429 -0.70153,-0.44858 -1.0523,-0.67287 -0.343,0.57433 -0.686,1.14867 -1.029,1.723 0.46533,0.29233 0.93067,0.58467 1.396,0.877 0.0846,0.34232 -0.2071,0.44175 -0.4607,0.56578 -0.34543,0.18607 -0.69087,0.37215 -1.0363,0.55822 0.29833,0.59867 0.59667,1.19733 0.895,1.796 0.476,-0.261 0.952,-0.522 1.428,-0.783 0.19326,0.17525 0.54278,0.27466 0.42861,0.59913 -0.009,0.46262 -0.0184,0.92525 -0.0276,1.38787 0.66333,0.0297 1.32667,0.0593 1.99,0.089 0.0253,-0.54767 0.0507,-1.09533 0.076,-1.643 0.2469,-0.13859 0.49554,-0.38727 0.73574,-0.10304 0.38042,0.23635 0.76084,0.47269 1.14126,0.70904 0.35367,-0.575 0.70733,-1.15 1.061,-1.725 -0.46633,-0.28067 -0.93267,-0.56133 -1.399,-0.842 0.006,-0.20533 0.012,-0.41067 0.018,-0.616 z m -2.45,1.725 c -1.09304,0.0503 -1.88307,-1.27807 -1.31907,-2.21524 0.49738,-1.03143 2.14076,-1.03143 2.63814,0 0.55838,0.95152 -0.2154,2.25344 -1.31907,2.21524 z" fill="#747474" transform="translate(-66 -162.007)"/>
-    </g>
-</svg>
diff --git a/data/styles/symbols/park_and_ride-permissive.svg b/data/styles/symbols/park_and_ride-permissive.svg
index a171de32ec..03c9baa89c 100644
--- a/data/styles/symbols/park_and_ride-permissive.svg
+++ b/data/styles/symbols/park_and_ride-permissive.svg
@@ -1,6 +1,30 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="36" height="18" viewBox="0 0 72 36">
-    <g>
-        <rect width="72" height="36" rx="2" ry="2" fill="#aaa"/>
-        <path d="M 48.1,2.5 C 47.8,2.5 47.5,2.8 47.5,3.1 L 47.5,41.9 C 47.5,42.2 47.8,42.5 48.1,42.5 L 86.9,42.5 C 87.2,42.5 87.5,42.2 87.5,41.9 L 87.5,3.1 C 87.5,2.8 87.2,2.5 86.9,2.5 L 48.1,2.5 z M 50,5 L 85,5 L 85,9.4 L 76.2,9.4 C 75.6,9.4 75,9.9 75,10.6 L 75,11.9 L 73.7,11.9 C 73.1,11.9 72.5,12.4 72.5,13.1 L 72.5,31.2 C 72.5,31.9 73.1,32.5 73.7,32.5 L 75,32.5 L 75,34.4 C 74.5,35.1 75.6,35.6 76.2,35.6 L 78.7,35.6 C 79.4,35.6 80,35.1 80,34.4 L 80,32.5 L 85,32.5 L 85,40 L 50,40 L 50,32.5 L 55,32.5 L 55,34.4 C 55,35.1 55.6,35.6 56.2,35.6 L 58.7,35.6 C 59.4,35.6 60,35.1 60,34.4 L 60,32.5 L 61.2,32.5 C 61.9,32.5 62.5,31.9 62.5,31.2 L 62.5,26.2 C 62.5,25.6 61.9,25 61.2,25 L 60,25 L 60,18.8 C 60,18.1 59.4,17.5 58.7,17.5 L 50,17.5 L 50,5 z M 11.1,6.3 L 11.1,38.3 L 21.1,38.3 L 21.1,26.7 L 26.6,26.7 C 30.2,26.7 33,25.7 35.1,23.8 C 37.3,22 38.3,19.5 38.3,16.5 C 38.3,14.5 37.8,12.7 36.75,11.1 C 35.7,9.5 34.3,8.3 32.5,7.5 C 30.8,6.7 28.2,6.3 24.7,6.3 L 11.1,6.3 z M 78.75,11.9 L 85,11.9 L 85,14.4 L 78.7,14.3 C 78.1,14.4 77.5,13.8 77.5,13.1 C 77.5,12.4 78.1,11.9 78.7,11.9 L 78.75,11.9 z M 20.9,13.6 L 24.5,13.6 C 27.2,13.6 28.5,14.6 28.5,16.6 C 28.5,18.7 27.1,19.8 24.2,19.8 L 20.9,19.8 L 20.9,13.6 z M 76.25,16.9 L 85,16.9 L 85,25 L 76.2,25 C 75.6,25 75,24.4 75,23.7 L 75,18.1 C 75.5,17.4 75.6,16.9 76.3,16.9 L 76.25,16.9 z M 67.5,17.4 L 65,17.5 L 65,20 L 62.5,20 L 62.5,22.5 L 65,22.5 L 65,25 L 67.5,25 L 67.5,22.5 L 70,22.5 L 70,20 L 67.5,20 L 67.5,17.4 z M 50,20 L 56.2,20 C 56.9,20 57.5,20.6 57.5,21.2 L 57.5,23.7 C 57.5,24.4 56.9,25 56.2,25 L 50,25 L 50,20 z M 57.5,27.2 C 58.4,27.2 59.1,27.9 59.1,28.7 C 59.1,29.6 58.4,30.3 57.5,30.3 C 56.6,30.3 55.9,29.6 55.9,28.7 C 55.9,27.9 56.6,27.2 57.5,27.2 z M 76.6,27.5 C 77.4,27.5 78.1,28.2 78.1,29.1 C 78.1,29.9 77.4,30.6 76.6,30.6 C 75.7,30.6 75,29.9 75,29.1 C 75,28.2 75.7,27.5 76.6,27.5 z" transform="scale(.8)" fill="#fff"/>
-    </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="36"
+   height="18"
+   viewBox="0 0 72 36"
+   id="park_and_ride-permissive">
+  <defs
+     id="defs8" />
+  <g
+     id="g2162">
+    <rect
+       width="72"
+       height="36"
+       rx="2"
+       ry="2"
+       x="0"
+       y="0"
+       style="fill:#aaaaaa"
+       id="rect3" />
+    <path
+       d="M 48.1,2.5 C 47.8,2.5 47.5,2.8 47.5,3.1 L 47.5,41.9 C 47.5,42.2 47.8,42.5 48.1,42.5 L 86.9,42.5 C 87.2,42.5 87.5,42.2 87.5,41.9 L 87.5,3.1 C 87.5,2.8 87.2,2.5 86.9,2.5 L 48.1,2.5 z M 50,5 L 85,5 L 85,9.4 L 76.2,9.4 C 75.6,9.4 75,9.9 75,10.6 L 75,11.9 L 73.7,11.9 C 73.1,11.9 72.5,12.4 72.5,13.1 L 72.5,31.2 C 72.5,31.9 73.1,32.5 73.7,32.5 L 75,32.5 L 75,34.4 C 74.5,35.1 75.6,35.6 76.2,35.6 L 78.7,35.6 C 79.4,35.6 80,35.1 80,34.4 L 80,32.5 L 85,32.5 L 85,40 L 50,40 L 50,32.5 L 55,32.5 L 55,34.4 C 55,35.1 55.6,35.6 56.2,35.6 L 58.7,35.6 C 59.4,35.6 60,35.1 60,34.4 L 60,32.5 L 61.2,32.5 C 61.9,32.5 62.5,31.9 62.5,31.2 L 62.5,26.2 C 62.5,25.6 61.9,25 61.2,25 L 60,25 L 60,18.8 C 60,18.1 59.4,17.5 58.7,17.5 L 50,17.5 L 50,5 z M 11.1,6.3 L 11.1,38.3 L 21.1,38.3 L 21.1,26.7 L 26.6,26.7 C 30.2,26.7 33,25.7 35.1,23.8 C 37.3,22 38.3,19.5 38.3,16.5 C 38.3,14.5 37.8,12.7 36.75,11.1 C 35.7,9.5 34.3,8.3 32.5,7.5 C 30.8,6.7 28.2,6.3 24.7,6.3 L 11.1,6.3 z M 78.75,11.9 L 85,11.9 L 85,14.4 L 78.7,14.3 C 78.1,14.4 77.5,13.8 77.5,13.1 C 77.5,12.4 78.1,11.9 78.7,11.9 L 78.75,11.9 z M 20.9,13.6 L 24.5,13.6 C 27.2,13.6 28.5,14.6 28.5,16.6 C 28.5,18.7 27.1,19.8 24.2,19.8 L 20.9,19.8 L 20.9,13.6 z M 76.25,16.9 L 85,16.9 L 85,25 L 76.2,25 C 75.6,25 75,24.4 75,23.7 L 75,18.1 C 75.5,17.4 75.6,16.9 76.3,16.9 L 76.25,16.9 z M 67.5,17.4 L 65,17.5 L 65,20 L 62.5,20 L 62.5,22.5 L 65,22.5 L 65,25 L 67.5,25 L 67.5,22.5 L 70,22.5 L 70,20 L 67.5,20 L 67.5,17.4 z M 50,20 L 56.2,20 C 56.9,20 57.5,20.6 57.5,21.2 L 57.5,23.7 C 57.5,24.4 56.9,25 56.2,25 L 50,25 L 50,20 z M 57.5,27.2 C 58.4,27.2 59.1,27.9 59.1,28.7 C 59.1,29.6 58.4,30.3 57.5,30.3 C 56.6,30.3 55.9,29.6 55.9,28.7 C 55.9,27.9 56.6,27.2 57.5,27.2 z M 76.6,27.5 C 77.4,27.5 78.1,28.2 78.1,29.1 C 78.1,29.9 77.4,30.6 76.6,30.6 C 75.7,30.6 75,29.9 75,29.1 C 75,28.2 75.7,27.5 76.6,27.5 z "
+       transform="scale(0.8,0.8)"
+       style="fill:#ffffff"
+       id="path5" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/park_and_ride.svg b/data/styles/symbols/park_and_ride.svg
index f61b1f7ed0..c342ace4cb 100644
--- a/data/styles/symbols/park_and_ride.svg
+++ b/data/styles/symbols/park_and_ride.svg
@@ -1,6 +1,30 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="36" height="18" viewBox="0 0 72 36">
-    <g>
-        <rect width="72" height="36" rx="2" ry="2" fill="#00f"/>
-        <path d="M 48.1,2.5 C 47.8,2.5 47.5,2.8 47.5,3.1 L 47.5,41.9 C 47.5,42.2 47.8,42.5 48.1,42.5 L 86.9,42.5 C 87.2,42.5 87.5,42.2 87.5,41.9 L 87.5,3.1 C 87.5,2.8 87.2,2.5 86.9,2.5 L 48.1,2.5 z M 50,5 L 85,5 L 85,9.4 L 76.2,9.4 C 75.6,9.4 75,9.9 75,10.6 L 75,11.9 L 73.7,11.9 C 73.1,11.9 72.5,12.4 72.5,13.1 L 72.5,31.2 C 72.5,31.9 73.1,32.5 73.7,32.5 L 75,32.5 L 75,34.4 C 74.5,35.1 75.6,35.6 76.2,35.6 L 78.7,35.6 C 79.4,35.6 80,35.1 80,34.4 L 80,32.5 L 85,32.5 L 85,40 L 50,40 L 50,32.5 L 55,32.5 L 55,34.4 C 55,35.1 55.6,35.6 56.2,35.6 L 58.7,35.6 C 59.4,35.6 60,35.1 60,34.4 L 60,32.5 L 61.2,32.5 C 61.9,32.5 62.5,31.9 62.5,31.2 L 62.5,26.2 C 62.5,25.6 61.9,25 61.2,25 L 60,25 L 60,18.8 C 60,18.1 59.4,17.5 58.7,17.5 L 50,17.5 L 50,5 z M 11.1,6.3 L 11.1,38.3 L 21.1,38.3 L 21.1,26.7 L 26.6,26.7 C 30.2,26.7 33,25.7 35.1,23.8 C 37.3,22 38.3,19.5 38.3,16.5 C 38.3,14.5 37.8,12.7 36.75,11.1 C 35.7,9.5 34.3,8.3 32.5,7.5 C 30.8,6.7 28.2,6.3 24.7,6.3 L 11.1,6.3 z M 78.75,11.9 L 85,11.9 L 85,14.4 L 78.7,14.3 C 78.1,14.4 77.5,13.8 77.5,13.1 C 77.5,12.4 78.1,11.9 78.7,11.9 L 78.75,11.9 z M 20.9,13.6 L 24.5,13.6 C 27.2,13.6 28.5,14.6 28.5,16.6 C 28.5,18.7 27.1,19.8 24.2,19.8 L 20.9,19.8 L 20.9,13.6 z M 76.25,16.9 L 85,16.9 L 85,25 L 76.2,25 C 75.6,25 75,24.4 75,23.7 L 75,18.1 C 75.5,17.4 75.6,16.9 76.3,16.9 L 76.25,16.9 z M 67.5,17.4 L 65,17.5 L 65,20 L 62.5,20 L 62.5,22.5 L 65,22.5 L 65,25 L 67.5,25 L 67.5,22.5 L 70,22.5 L 70,20 L 67.5,20 L 67.5,17.4 z M 50,20 L 56.2,20 C 56.9,20 57.5,20.6 57.5,21.2 L 57.5,23.7 C 57.5,24.4 56.9,25 56.2,25 L 50,25 L 50,20 z M 57.5,27.2 C 58.4,27.2 59.1,27.9 59.1,28.7 C 59.1,29.6 58.4,30.3 57.5,30.3 C 56.6,30.3 55.9,29.6 55.9,28.7 C 55.9,27.9 56.6,27.2 57.5,27.2 z M 76.6,27.5 C 77.4,27.5 78.1,28.2 78.1,29.1 C 78.1,29.9 77.4,30.6 76.6,30.6 C 75.7,30.6 75,29.9 75,29.1 C 75,28.2 75.7,27.5 76.6,27.5 z" transform="scale(.8)" fill="#fff"/>
-    </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="36"
+   height="18"
+   viewBox="0 0 72 36"
+   id="park_and_ride">
+  <defs
+     id="defs8" />
+  <g
+     id="g2162">
+    <rect
+       width="72"
+       height="36"
+       rx="2"
+       ry="2"
+       x="0"
+       y="0"
+       style="fill:#0000ff"
+       id="rect3" />
+    <path
+       d="M 48.1,2.5 C 47.8,2.5 47.5,2.8 47.5,3.1 L 47.5,41.9 C 47.5,42.2 47.8,42.5 48.1,42.5 L 86.9,42.5 C 87.2,42.5 87.5,42.2 87.5,41.9 L 87.5,3.1 C 87.5,2.8 87.2,2.5 86.9,2.5 L 48.1,2.5 z M 50,5 L 85,5 L 85,9.4 L 76.2,9.4 C 75.6,9.4 75,9.9 75,10.6 L 75,11.9 L 73.7,11.9 C 73.1,11.9 72.5,12.4 72.5,13.1 L 72.5,31.2 C 72.5,31.9 73.1,32.5 73.7,32.5 L 75,32.5 L 75,34.4 C 74.5,35.1 75.6,35.6 76.2,35.6 L 78.7,35.6 C 79.4,35.6 80,35.1 80,34.4 L 80,32.5 L 85,32.5 L 85,40 L 50,40 L 50,32.5 L 55,32.5 L 55,34.4 C 55,35.1 55.6,35.6 56.2,35.6 L 58.7,35.6 C 59.4,35.6 60,35.1 60,34.4 L 60,32.5 L 61.2,32.5 C 61.9,32.5 62.5,31.9 62.5,31.2 L 62.5,26.2 C 62.5,25.6 61.9,25 61.2,25 L 60,25 L 60,18.8 C 60,18.1 59.4,17.5 58.7,17.5 L 50,17.5 L 50,5 z M 11.1,6.3 L 11.1,38.3 L 21.1,38.3 L 21.1,26.7 L 26.6,26.7 C 30.2,26.7 33,25.7 35.1,23.8 C 37.3,22 38.3,19.5 38.3,16.5 C 38.3,14.5 37.8,12.7 36.75,11.1 C 35.7,9.5 34.3,8.3 32.5,7.5 C 30.8,6.7 28.2,6.3 24.7,6.3 L 11.1,6.3 z M 78.75,11.9 L 85,11.9 L 85,14.4 L 78.7,14.3 C 78.1,14.4 77.5,13.8 77.5,13.1 C 77.5,12.4 78.1,11.9 78.7,11.9 L 78.75,11.9 z M 20.9,13.6 L 24.5,13.6 C 27.2,13.6 28.5,14.6 28.5,16.6 C 28.5,18.7 27.1,19.8 24.2,19.8 L 20.9,19.8 L 20.9,13.6 z M 76.25,16.9 L 85,16.9 L 85,25 L 76.2,25 C 75.6,25 75,24.4 75,23.7 L 75,18.1 C 75.5,17.4 75.6,16.9 76.3,16.9 L 76.25,16.9 z M 67.5,17.4 L 65,17.5 L 65,20 L 62.5,20 L 62.5,22.5 L 65,22.5 L 65,25 L 67.5,25 L 67.5,22.5 L 70,22.5 L 70,20 L 67.5,20 L 67.5,17.4 z M 50,20 L 56.2,20 C 56.9,20 57.5,20.6 57.5,21.2 L 57.5,23.7 C 57.5,24.4 56.9,25 56.2,25 L 50,25 L 50,20 z M 57.5,27.2 C 58.4,27.2 59.1,27.9 59.1,28.7 C 59.1,29.6 58.4,30.3 57.5,30.3 C 56.6,30.3 55.9,29.6 55.9,28.7 C 55.9,27.9 56.6,27.2 57.5,27.2 z M 76.6,27.5 C 77.4,27.5 78.1,28.2 78.1,29.1 C 78.1,29.9 77.4,30.6 76.6,30.6 C 75.7,30.6 75,29.9 75,29.1 C 75,28.2 75.7,27.5 76.6,27.5 z "
+       transform="scale(0.8,0.8)"
+       style="fill:#ffffff"
+       id="path5" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/parking-mini.svg b/data/styles/symbols/parking-mini.svg
index 04d970fab5..7e0def8079 100644
--- a/data/styles/symbols/parking-mini.svg
+++ b/data/styles/symbols/parking-mini.svg
@@ -1,12 +1,96 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <title>
-        Parking Map Icon
-    </title>
-    <rect ry="3.2" rx="3.2" y="4" x="4" height="16" width="16" fill="#f2f2f2"/>
-    <rect width="14" height="14" x="5" y="5" rx="2.8" ry="2.8" fill="#0044d8"/>
-    <text style="line-height:125%" x="6.969" y="16.843" transform="scale(.991 1.009)" font-size="43.871" letter-spacing="0" word-spacing="0" fill="#fff" font-family="Sans">
-        <tspan x="6.969" y="16.843" style="-inkscape-font-specification:Sans Bold" font-size="13.161" font-weight="bold" fill="#fff">
-            P
-        </tspan>
-    </text>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   id="symbol-parking"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="parking.svg">
+  <title
+     id="title2985">Parking Map Icon</title>
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Parking Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1310"
+     inkscape:window-height="796"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="16.026026"
+     inkscape:cx="15.149227"
+     inkscape:cy="21.445301"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-parking">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <rect
+     ry="3.1999998"
+     rx="3.1999998"
+     y="4"
+     x="4"
+     height="16"
+     width="16"
+     id="rect2987"
+     style="fill:#f2f2f2;fill-opacity:1;stroke:none" />
+  <rect
+     style="fill:#0044d8;fill-opacity:1;stroke:none"
+     id="rect2985"
+     width="14"
+     height="14"
+     x="5"
+     y="5"
+     rx="2.8000002"
+     ry="2.8000002" />
+  <text
+     xml:space="preserve"
+     style="font-size:43.87097549px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+     x="6.9688764"
+     y="16.843079"
+     id="text2986"
+     sodipodi:linespacing="125%"
+     transform="scale(0.99076934,1.0093167)"><tspan
+       sodipodi:role="line"
+       id="tspan2988"
+       x="6.9688764"
+       y="16.843079"
+       style="font-size:13.16129303px;font-weight:bold;fill:#ffffff;-inkscape-font-specification:Sans Bold">P</tspan></text>
 </svg>
diff --git a/data/styles/symbols/parking-permissive.svg b/data/styles/symbols/parking-permissive.svg
index d6386eb8f1..3be6ab30d0 100644
--- a/data/styles/symbols/parking-permissive.svg
+++ b/data/styles/symbols/parking-permissive.svg
@@ -1,4 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" baseProfile="full" width="20" height="20">
-    <rect width="20" height="20" rx="2" ry="2" fill="#aaa"/>
-    <path d="M4,17 L4,3 10,3 C14,3 16,5 16,7.5 C16,10 14,12 10,12 L8.5,12 8.5,17 z M8.5,9 L10,9 C13,9 13,6 10,6 L8.5,6 8.5,9 z" fill="#fff"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" version="1.1" baseProfile="full"
+   width="20" height="20" id="symbol-parking-permissive">
+ <rect x="0" y="0" width="20" height="20" rx="2" ry="2" style="stroke-width:0;fill:#aaaaaa" />
+ <path d="M4,17 L4,3 10,3 C14,3 16,5 16,7.5 C16,10 14,12 10,12 L8.5,12 8.5,17 z M8.5,9 L10,9 C13,9 13,6 10,6 L8.5,6 8.5,9 z" style="stroke-width:0;fill:#ffffff" />
 </svg>
diff --git a/data/styles/symbols/parking-private.svg b/data/styles/symbols/parking-private.svg
index e88771afe2..68db8873cc 100644
--- a/data/styles/symbols/parking-private.svg
+++ b/data/styles/symbols/parking-private.svg
@@ -1,4 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" baseProfile="full" width="20" height="20">
-    <rect x=".5" y=".5" width="19" height="19" rx="2" ry="2" stroke="#aaa" fill="#fff"/>
-    <path d="M4,17 L4,3 10,3 C14,3 16,5 16,7.5 C16,10 14,12 10,12 L8.5,12 8.5,17 z M8.5,9 L10,9 C13,9 13,6 10,6 L8.5,6 8.5,9 z" fill="#aaa"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" version="1.1" baseProfile="full"
+   width="20" height="20" id="symbol-parking-private">
+ <rect x="0.5" y="0.5" width="19" height="19" rx="2" ry="2" style="stroke:#aaaaaa;stroke-width:1;fill:#ffffff" />
+ <path d="M4,17 L4,3 10,3 C14,3 16,5 16,7.5 C16,10 14,12 10,12 L8.5,12 8.5,17 z M8.5,9 L10,9 C13,9 13,6 10,6 L8.5,6 8.5,9 z" style="stroke-width:0;fill:#aaaaaa" />
 </svg>
diff --git a/data/styles/symbols/parking.svg b/data/styles/symbols/parking.svg
index 3c70cd463b..cfced222c1 100644
--- a/data/styles/symbols/parking.svg
+++ b/data/styles/symbols/parking.svg
@@ -1,8 +1,89 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <title>
-        Parking Map Icon
-    </title>
-    <rect ry="4.4" rx="4.4" y="1" x="1" height="22" width="22" fill="#f2f2f2"/>
-    <rect width="20" height="20" x="2" y="2" rx="4" ry="4" fill="#0044d8"/>
-    <path d="m 7,5 0,10 c 0,0 0,4 0,5 l 3,0 0,-5 3,0 c 2.761424,0 5,-2.238576 5,-5 0,-2.7614237 -2.238576,-5 -5,-5 l -3,0 z m 3,2.53125 3,0 c 1.10457,0 2,1.1126809 2,2.46875 0,1.356069 -0.89543,2.46875 -2,2.46875 l -3,0 L 10,10 z" fill="#fff"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   id="symbol-parking"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="parking.svg">
+  <title
+     id="title2985">Parking Map Icon</title>
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Parking Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="894"
+     inkscape:window-height="612"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="16.026026"
+     inkscape:cx="15.149227"
+     inkscape:cy="12.641088"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-parking">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <rect
+     ry="4.3999996"
+     rx="4.3999996"
+     y="1"
+     x="1"
+     height="22"
+     width="22"
+     id="rect2987"
+     style="fill:#f2f2f2;fill-opacity:1;stroke:none" />
+  <rect
+     style="fill:#0044d8;fill-opacity:1;stroke:none"
+     id="rect2985"
+     width="20"
+     height="20"
+     x="2"
+     y="2"
+     rx="4"
+     ry="4" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 7,5 0,10 c 0,0 0,4 0,5 l 3,0 0,-5 3,0 c 2.761424,0 5,-2.238576 5,-5 0,-2.7614237 -2.238576,-5 -5,-5 l -3,0 z m 3,2.53125 3,0 c 1.10457,0 2,1.1126809 2,2.46875 0,1.356069 -0.89543,2.46875 -2,2.46875 l -3,0 L 10,10 z"
+     id="rect3766"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccssscccsssccc" />
 </svg>
diff --git a/data/styles/symbols/parking_fee-permissive.svg b/data/styles/symbols/parking_fee-permissive.svg
index b408c8a866..5baa4c67dc 100644
--- a/data/styles/symbols/parking_fee-permissive.svg
+++ b/data/styles/symbols/parking_fee-permissive.svg
@@ -1,25 +1,83 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="36" height="18">
-    <g transform="matrix(.5 0 0 .5 0 -20)">
-        <g transform="translate(0 40)">
-            <rect width="72" height="36" rx="2" ry="2" fill="#aaa"/>
-            <path d="M 15.7,21.4 L 15.76,30.7 L 7.8,30.7 L 7.8,5.1 L 18.7,5.1 C 21.4,5.1 23.5,5.4 24.9,6 C 26.4,6.7 27.5,7.6 28.3,8.9 C 29.1,10.2 29.4,11.7 29.6,13.3 C 29.6,15.7 28.7,17.7 27,19.2 C 25.3,20.6 23,21.4 20.2,21.4 L 15.8,21.4 L 15.7,21.4 z M 15.6,15.9 L 18.3,15.9 C 20.6,15.9 21.7,15 21.7,13.1 C 21.7,11.8 20.7,11 18.5,11 L 15.64,11 L 15.6,15.9 z" fill="#fff"/>
-            <path d="M 38.5,33.76 L 69.5,33.76 C 69.776142,33.76 70,33.536142 70,33.26 L 70,2.26 C 70,1.9838576 69.776142,1.76 69.5,1.76 L 38.5,1.76 C 38.223858,1.76 38,1.9838576 38,2.26 L 38,33.26 C 38,33.536142 38.223858,33.76 38.5,33.76 z" fill="#fff"/>
-            <path d="M 40,31.76 L 40,3.76 L 68,3.76 L 68,31.76 L 40,31.76 z" fill="#aaa"/>
-        </g>
-        <g transform="matrix(.923 0 0 .923 4.17 4.468)" stroke="#fff">
-            <rect width="23.349" height="11.674" x="46.746" y="44.002" transform="rotate(5.829)" fill="#aaa" stroke-width="1.075"/>
-            <path d="M 411.42859 375.87302 A 46.984127 46.984127 0 1 1 317.46033,375.87302 A 46.984127 46.984127 0 1 1 411.42859 375.87302 z" transform="matrix(.127 0 0 .127 14.569 12.069)" fill="#aaa" stroke-width="7.6"/>
-            <text x="58.128" y="63.269" style="text-align:start;line-height:125%" font-size="9.665" font-weight="bold" fill="#fff" stroke-width=".141" font-family="Myriad Pro">
-                <tspan x="58.128" y="63.269" fill="#fff">
-                    2
-                </tspan>
-            </text>
-            <path d="M 411.42859 375.87302 A 46.984127 46.984127 0 1 1 317.46033,375.87302 A 46.984127 46.984127 0 1 1 411.42859 375.87302 z" transform="matrix(.099 0 0 .099 18.414 25.219)" fill="#aaa" stroke-width="7.6"/>
-            <text x="52.545" y="64.743" style="text-align:start;line-height:125%" font-size="7.117" font-weight="bold" fill="#fff" stroke-width=".141" font-family="Myriad Pro">
-                <tspan x="52.545" y="64.743" fill="#fff">
-                    1
-                </tspan>
-            </text>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="36"
+   height="18"
+   id="parking_fee-permissive">
+  <defs
+     id="defs2856" />
+  <g
+     transform="matrix(0.5,0,0,0.5,0,-20)"
+     id="parking_fee">
+    <g
+       transform="translate(0,40)"
+       id="g2900">
+      <rect
+         width="72"
+         height="36"
+         rx="2"
+         ry="2"
+         x="0"
+         y="0"
+         style="fill:#aaaaaa"
+         id="rect2902" />
+      <path
+         d="M 15.7,21.4 L 15.76,30.7 L 7.8,30.7 L 7.8,5.1 L 18.7,5.1 C 21.4,5.1 23.5,5.4 24.9,6 C 26.4,6.7 27.5,7.6 28.3,8.9 C 29.1,10.2 29.4,11.7 29.6,13.3 C 29.6,15.7 28.7,17.7 27,19.2 C 25.3,20.6 23,21.4 20.2,21.4 L 15.8,21.4 L 15.7,21.4 z M 15.6,15.9 L 18.3,15.9 C 20.6,15.9 21.7,15 21.7,13.1 C 21.7,11.8 20.7,11 18.5,11 L 15.64,11 L 15.6,15.9 z "
+         style="fill:#ffffff"
+         id="path2904" />
+      <path
+         d="M 38.5,33.76 L 69.5,33.76 C 69.776142,33.76 70,33.536142 70,33.26 L 70,2.26 C 70,1.9838576 69.776142,1.76 69.5,1.76 L 38.5,1.76 C 38.223858,1.76 38,1.9838576 38,2.26 L 38,33.26 C 38,33.536142 38.223858,33.76 38.5,33.76 z "
+         style="fill:#ffffff"
+         id="path2906" />
+      <path
+         d="M 40,31.76 L 40,3.76 L 68,3.76 L 68,31.76 L 40,31.76 z "
+         style="fill:#aaaaaa"
+         id="path2908" />
     </g>
+    <g
+       transform="matrix(0.922587,0,0,0.922587,4.1701143,4.4683601)"
+       id="g3894">
+      <rect
+         width="23.348639"
+         height="11.674319"
+         x="46.746216"
+         y="44.002426"
+         transform="matrix(0.9948298,0.1015563,-0.1015563,0.9948298,0,0)"
+         style="fill:#aaaaaa;fill-opacity:1;stroke:#ffffff;stroke-width:1.07493544;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4197" />
+      <path
+         d="M 411.42859 375.87302 A 46.984127 46.984127 0 1 1  317.46033,375.87302 A 46.984127 46.984127 0 1 1  411.42859 375.87302 z"
+         transform="matrix(0.1272924,0,0,0.1272924,14.568602,12.069448)"
+         style="fill:#aaaaaa;fill-opacity:1;stroke:#ffffff;stroke-width:7.5999999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path3224" />
+      <text
+         x="58.128101"
+         y="63.268608"
+         style="font-size:9.66500282px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.1414389px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Myriad Pro"
+         id="text4205"
+         xml:space="preserve"><tspan
+           x="58.128101"
+           y="63.268608"
+           style="fill:#ffffff;fill-opacity:1;stroke-width:0.1414389"
+           id="tspan4207">2</tspan></text>
+      <path
+         d="M 411.42859 375.87302 A 46.984127 46.984127 0 1 1  317.46033,375.87302 A 46.984127 46.984127 0 1 1  411.42859 375.87302 z"
+         transform="matrix(9.8999267e-2,0,0,9.8999267e-2,18.414082,25.218524)"
+         style="fill:#aaaaaa;fill-opacity:1;stroke:#ffffff;stroke-width:7.5999999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path4199" />
+      <text
+         x="52.545464"
+         y="64.742836"
+         style="font-size:7.11741495px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.1414389px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Myriad Pro"
+         id="text4201"
+         xml:space="preserve"><tspan
+           x="52.545464"
+           y="64.742836"
+           style="fill:#ffffff;fill-opacity:1;stroke-width:0.1414389"
+           id="tspan4203">1</tspan></text>
+    </g>
+  </g>
 </svg>
diff --git a/data/styles/symbols/parking_fee.svg b/data/styles/symbols/parking_fee.svg
index 8c27a5b4c1..83c349d92d 100644
--- a/data/styles/symbols/parking_fee.svg
+++ b/data/styles/symbols/parking_fee.svg
@@ -1,25 +1,83 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="36" height="18">
-    <g transform="matrix(.5 0 0 .5 0 -20)">
-        <g transform="translate(0 40)">
-            <rect width="72" height="36" rx="2" ry="2" fill="#00f"/>
-            <path d="M 15.7,21.4 L 15.76,30.7 L 7.8,30.7 L 7.8,5.1 L 18.7,5.1 C 21.4,5.1 23.5,5.4 24.9,6 C 26.4,6.7 27.5,7.6 28.3,8.9 C 29.1,10.2 29.4,11.7 29.6,13.3 C 29.6,15.7 28.7,17.7 27,19.2 C 25.3,20.6 23,21.4 20.2,21.4 L 15.8,21.4 L 15.7,21.4 z M 15.6,15.9 L 18.3,15.9 C 20.6,15.9 21.7,15 21.7,13.1 C 21.7,11.8 20.7,11 18.5,11 L 15.64,11 L 15.6,15.9 z" fill="#fff"/>
-            <path d="M 38.5,33.76 L 69.5,33.76 C 69.776142,33.76 70,33.536142 70,33.26 L 70,2.26 C 70,1.9838576 69.776142,1.76 69.5,1.76 L 38.5,1.76 C 38.223858,1.76 38,1.9838576 38,2.26 L 38,33.26 C 38,33.536142 38.223858,33.76 38.5,33.76 z" fill="#fff"/>
-            <path d="M 40,31.76 L 40,3.76 L 68,3.76 L 68,31.76 L 40,31.76 z" fill="#00f"/>
-        </g>
-        <g transform="matrix(.923 0 0 .923 4.17 4.468)" stroke="#fff">
-            <rect width="23.349" height="11.674" x="46.746" y="44.002" transform="rotate(5.829)" fill="#00f" stroke-width="1.075"/>
-            <path d="M 411.42859 375.87302 A 46.984127 46.984127 0 1 1 317.46033,375.87302 A 46.984127 46.984127 0 1 1 411.42859 375.87302 z" transform="matrix(.127 0 0 .127 14.569 12.069)" fill="#00f" stroke-width="7.6"/>
-            <text x="58.128" y="63.269" style="text-align:start;line-height:125%" font-size="9.665" font-weight="bold" fill="#fff" stroke-width=".141" font-family="Myriad Pro">
-                <tspan x="58.128" y="63.269" fill="#fff">
-                    2
-                </tspan>
-            </text>
-            <path d="M 411.42859 375.87302 A 46.984127 46.984127 0 1 1 317.46033,375.87302 A 46.984127 46.984127 0 1 1 411.42859 375.87302 z" transform="matrix(.099 0 0 .099 18.414 25.219)" fill="#00f" stroke-width="7.6"/>
-            <text x="52.545" y="64.743" style="text-align:start;line-height:125%" font-size="7.117" font-weight="bold" fill="#fff" stroke-width=".141" font-family="Myriad Pro">
-                <tspan x="52.545" y="64.743" fill="#fff">
-                    1
-                </tspan>
-            </text>
-        </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="36"
+   height="18"
+   id="parking_fee">
+  <defs
+     id="defs2856" />
+  <g
+     transform="matrix(0.5,0,0,0.5,0,-20)"
+     id="parking_fee">
+    <g
+       transform="translate(0,40)"
+       id="g2900">
+      <rect
+         width="72"
+         height="36"
+         rx="2"
+         ry="2"
+         x="0"
+         y="0"
+         style="fill:#0000ff"
+         id="rect2902" />
+      <path
+         d="M 15.7,21.4 L 15.76,30.7 L 7.8,30.7 L 7.8,5.1 L 18.7,5.1 C 21.4,5.1 23.5,5.4 24.9,6 C 26.4,6.7 27.5,7.6 28.3,8.9 C 29.1,10.2 29.4,11.7 29.6,13.3 C 29.6,15.7 28.7,17.7 27,19.2 C 25.3,20.6 23,21.4 20.2,21.4 L 15.8,21.4 L 15.7,21.4 z M 15.6,15.9 L 18.3,15.9 C 20.6,15.9 21.7,15 21.7,13.1 C 21.7,11.8 20.7,11 18.5,11 L 15.64,11 L 15.6,15.9 z "
+         style="fill:#ffffff"
+         id="path2904" />
+      <path
+         d="M 38.5,33.76 L 69.5,33.76 C 69.776142,33.76 70,33.536142 70,33.26 L 70,2.26 C 70,1.9838576 69.776142,1.76 69.5,1.76 L 38.5,1.76 C 38.223858,1.76 38,1.9838576 38,2.26 L 38,33.26 C 38,33.536142 38.223858,33.76 38.5,33.76 z "
+         style="fill:#ffffff"
+         id="path2906" />
+      <path
+         d="M 40,31.76 L 40,3.76 L 68,3.76 L 68,31.76 L 40,31.76 z "
+         style="fill:#0000ff"
+         id="path2908" />
     </g>
+    <g
+       transform="matrix(0.922587,0,0,0.922587,4.1701143,4.4683601)"
+       id="g3894">
+      <rect
+         width="23.348639"
+         height="11.674319"
+         x="46.746216"
+         y="44.002426"
+         transform="matrix(0.9948298,0.1015563,-0.1015563,0.9948298,0,0)"
+         style="fill:#0000ff;fill-opacity:1;stroke:#ffffff;stroke-width:1.07493544;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4197" />
+      <path
+         d="M 411.42859 375.87302 A 46.984127 46.984127 0 1 1  317.46033,375.87302 A 46.984127 46.984127 0 1 1  411.42859 375.87302 z"
+         transform="matrix(0.1272924,0,0,0.1272924,14.568602,12.069448)"
+         style="fill:#0000ff;fill-opacity:1;stroke:#ffffff;stroke-width:7.5999999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path3224" />
+      <text
+         x="58.128101"
+         y="63.268608"
+         style="font-size:9.66500282px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.1414389px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Myriad Pro"
+         id="text4205"
+         xml:space="preserve"><tspan
+           x="58.128101"
+           y="63.268608"
+           style="fill:#ffffff;fill-opacity:1;stroke-width:0.1414389"
+           id="tspan4207">2</tspan></text>
+      <path
+         d="M 411.42859 375.87302 A 46.984127 46.984127 0 1 1  317.46033,375.87302 A 46.984127 46.984127 0 1 1  411.42859 375.87302 z"
+         transform="matrix(9.8999267e-2,0,0,9.8999267e-2,18.414082,25.218524)"
+         style="fill:#0000ff;fill-opacity:1;stroke:#ffffff;stroke-width:7.5999999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path4199" />
+      <text
+         x="52.545464"
+         y="64.742836"
+         style="font-size:7.11741495px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.1414389px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Myriad Pro"
+         id="text4201"
+         xml:space="preserve"><tspan
+           x="52.545464"
+           y="64.742836"
+           style="fill:#ffffff;fill-opacity:1;stroke-width:0.1414389"
+           id="tspan4203">1</tspan></text>
+    </g>
+  </g>
 </svg>
diff --git a/data/styles/symbols/parking_roof-permissive.svg b/data/styles/symbols/parking_roof-permissive.svg
index 8c822e43ec..486dede727 100644
--- a/data/styles/symbols/parking_roof-permissive.svg
+++ b/data/styles/symbols/parking_roof-permissive.svg
@@ -1,7 +1,28 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="18" height="18">
-    <g>
-        <path d="M 82,0 L 114,0 C 115.108,0 116,0.892 116,2 L 116,34 C 116,35.108 115.108,36 114,36 L 82,36 C 80.892,36 80,35.108 80,34 L 80,2 C 80,0.892 80.892,0 82,0 z" fill="#aaa" transform="matrix(.5 0 0 .5 -40 0)"/>
-        <path d="M 96.181368,24.062684 L 96.231738,31.870441 L 89.548973,31.870441 L 89.548973,10.378121 L 98.699998,10.378121 C 100.96677,10.378121 102.72981,10.629985 103.90517,11.133711 C 105.16449,11.721391 106.08798,12.476981 106.75962,13.568388 C 107.43125,14.659794 107.68312,15.91911 107.85103,17.26238 C 107.85103,19.277285 107.09544,20.956372 105.66821,22.215688 C 104.24099,23.391049 102.31004,24.062684 99.959318,24.062684 L 96.265328,24.062684 L 96.181368,24.062684 z M 96.097418,19.445194 L 98.364178,19.445194 C 100.29513,19.445194 101.21863,18.689604 101.21863,17.094471 C 101.21863,16.003064 100.37909,15.331429 98.532088,15.331429 L 96.130998,15.331429 L 96.097418,19.445194 z" fill="#fff" transform="matrix(.5 0 0 .5 -40 0)"/>
-        <path d="M 98.276478,2.598089 L 86.167828,5.255891 L 86.167828,8.932056 L 98.276478,6.276769 L 110.38181,8.932056 L 110.38181,5.255891 L 98.276478,2.598089 z" fill="#fff" fill-rule="evenodd" transform="matrix(.5 0 0 .5 -40 0)"/>
-    </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="18"
+   height="18"
+   id="symbol-parking_roof-permissive">
+  <defs
+     id="defs9" />
+  <g
+     transform="matrix(0.5,0,0,0.5,-40,0)"
+     id="g3">
+    <path
+       d="M 82,0 L 114,0 C 115.108,0 116,0.892 116,2 L 116,34 C 116,35.108 115.108,36 114,36 L 82,36 C 80.892,36 80,35.108 80,34 L 80,2 C 80,0.892 80.892,0 82,0 z "
+       style="fill:#aaaaaa"
+       id="path4291" />
+    <path
+       d="M 96.181368,24.062684 L 96.231738,31.870441 L 89.548973,31.870441 L 89.548973,10.378121 L 98.699998,10.378121 C 100.96677,10.378121 102.72981,10.629985 103.90517,11.133711 C 105.16449,11.721391 106.08798,12.476981 106.75962,13.568388 C 107.43125,14.659794 107.68312,15.91911 107.85103,17.26238 C 107.85103,19.277285 107.09544,20.956372 105.66821,22.215688 C 104.24099,23.391049 102.31004,24.062684 99.959318,24.062684 L 96.265328,24.062684 L 96.181368,24.062684 z M 96.097418,19.445194 L 98.364178,19.445194 C 100.29513,19.445194 101.21863,18.689604 101.21863,17.094471 C 101.21863,16.003064 100.37909,15.331429 98.532088,15.331429 L 96.130998,15.331429 L 96.097418,19.445194 z "
+       style="fill:#ffffff"
+       id="path4293" />
+    <path
+       d="M 98.276478,2.598089 L 86.167828,5.255891 L 86.167828,8.932056 L 98.276478,6.276769 L 110.38181,8.932056 L 110.38181,5.255891 L 98.276478,2.598089 z "
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect2229" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/parking_roof.svg b/data/styles/symbols/parking_roof.svg
index 084390f597..64890ea396 100644
--- a/data/styles/symbols/parking_roof.svg
+++ b/data/styles/symbols/parking_roof.svg
@@ -1,10 +1,109 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-    <title>
-        Parking Map Icon
-    </title>
-    <rect ry="4.4" rx="4.4" y="1" x="1" height="22" width="22" fill="#f2f2f2"/>
-    <rect width="20" height="20" x="2" y="2" rx="4" ry="4" fill="#0044d8"/>
-    <path d="m 7,5.53125 0,10 c 0,0 0,4 0,5 l 3,0 0,-5 3,0 c 2.761424,0 5,-2.238576 5,-5 0,-2.7614237 -2.238576,-5 -5,-5 l -3,0 z m 3,2.53125 3,0 c 1.10457,0 2,1.1126809 2,2.46875 C 15,11.887319 14.10457,13 13,13 l -3,0 0,-2.46875 z" fill="#fff"/>
-    <rect width="9" height="2" x="2.073" y="5.038" transform="rotate(-15)" fill="#fff"/>
-    <rect transform="matrix(-.966 -.259 -.259 .966 0 0)" y="-1.174" x="-21.109" height="2" width="9" fill="#fff"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   id="symbol-parking"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="parking_roof.svg">
+  <title
+     id="title3061">Parking Map Icon</title>
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Parking Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="894"
+     inkscape:window-height="612"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="16.026026"
+     inkscape:cx="4.2918878"
+     inkscape:cy="12.641088"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-parking">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <rect
+     ry="4.3999996"
+     rx="4.3999996"
+     y="1"
+     x="1"
+     height="22"
+     width="22"
+     id="rect2987"
+     style="fill:#f2f2f2;fill-opacity:1;stroke:none" />
+  <rect
+     style="fill:#0044d8;fill-opacity:1;stroke:none"
+     id="rect2985"
+     width="20"
+     height="20"
+     x="2"
+     y="2"
+     rx="4"
+     ry="4" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 7,5.53125 0,10 c 0,0 0,4 0,5 l 3,0 0,-5 3,0 c 2.761424,0 5,-2.238576 5,-5 0,-2.7614237 -2.238576,-5 -5,-5 l -3,0 z m 3,2.53125 3,0 c 1.10457,0 2,1.1126809 2,2.46875 C 15,11.887319 14.10457,13 13,13 l -3,0 0,-2.46875 z"
+     id="rect3766"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccssscccsssccc" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     id="rect2988"
+     width="9"
+     height="2"
+     x="2.0734718"
+     y="5.0376801"
+     inkscape:transform-center-x="4.0878472"
+     inkscape:transform-center-y="2.1306115"
+     transform="matrix(0.96592583,-0.25881905,0.25881905,0.96592583,0,0)" />
+  <rect
+     transform="matrix(-0.96592583,-0.25881905,-0.25881905,0.96592583,0,0)"
+     inkscape:transform-center-y="2.1306115"
+     inkscape:transform-center-x="-4.0878472"
+     y="-1.173977"
+     x="-21.108747"
+     height="2"
+     width="9"
+     id="rect2990"
+     style="fill:#ffffff;fill-opacity:1;stroke:none" />
 </svg>
diff --git a/data/styles/symbols/parking_roof_fee-permissive.svg b/data/styles/symbols/parking_roof_fee-permissive.svg
index 8a769ff39a..2bb04b4425 100644
--- a/data/styles/symbols/parking_roof_fee-permissive.svg
+++ b/data/styles/symbols/parking_roof_fee-permissive.svg
@@ -1,24 +1,83 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="36" height="18">
-    <g transform="matrix(.5 0 0 .5 -40 -20)">
-        <rect width="72" height="36" rx="2" ry="2" x="80" y="40" fill="#aaa"/>
-        <path d="M 118.5,73.76 L 149.5,73.76 C 149.77614,73.76 150,73.536142 150,73.26 L 150,42.26 C 150,41.983858 149.77614,41.76 149.5,41.76 L 118.5,41.76 C 118.22386,41.76 118,41.983858 118,42.26 L 118,73.26 C 118,73.536142 118.22386,73.76 118.5,73.76 z" fill="#fff"/>
-        <path d="M 120,71.76 L 120,43.76 L 148,43.76 L 148,71.76 L 120,71.76 z" fill="#aaa"/>
-        <g transform="matrix(.923 0 0 .923 84.17 4.468)" stroke="#fff">
-            <rect width="23.349" height="11.674" x="46.746" y="44.002" transform="rotate(5.829)" fill="#aaa" stroke-width="1.075"/>
-            <path d="M 411.42859 375.87302 A 46.984127 46.984127 0 1 1 317.46033,375.87302 A 46.984127 46.984127 0 1 1 411.42859 375.87302 z" transform="matrix(.127 0 0 .127 14.569 12.069)" fill="#aaa" stroke-width="7.6"/>
-            <text x="58.128" y="63.269" style="text-align:start;line-height:125%" font-size="9.665" font-weight="bold" fill="#fff" stroke-width=".141" font-family="Myriad Pro">
-                <tspan x="58.128" y="63.269" fill="#fff">
-                    2
-                </tspan>
-            </text>
-            <path d="M 411.42859 375.87302 A 46.984127 46.984127 0 1 1 317.46033,375.87302 A 46.984127 46.984127 0 1 1 411.42859 375.87302 z" transform="matrix(.099 0 0 .099 18.414 25.219)" fill="#aaa" stroke-width="7.6"/>
-            <text x="52.545" y="64.743" style="text-align:start;line-height:125%" font-size="7.117" font-weight="bold" fill="#fff" stroke-width=".141" font-family="Myriad Pro">
-                <tspan x="52.545" y="64.743" fill="#fff">
-                    1
-                </tspan>
-            </text>
-        </g>
-        <path d="M 96.181368,64.062684 L 96.231738,71.870441 L 89.548973,71.870441 L 89.548973,50.378121 L 98.699998,50.378121 C 100.96677,50.378121 102.72981,50.629985 103.90517,51.133711 C 105.16449,51.721391 106.08798,52.476981 106.75962,53.568388 C 107.43125,54.659794 107.68312,55.91911 107.85103,57.26238 C 107.85103,59.277285 107.09544,60.956372 105.66821,62.215688 C 104.24099,63.391049 102.31004,64.062684 99.959318,64.062684 L 96.265328,64.062684 L 96.181368,64.062684 z M 96.097418,59.445194 L 98.364178,59.445194 C 100.29513,59.445194 101.21863,58.689604 101.21863,57.094471 C 101.21863,56.003064 100.37909,55.331429 98.532088,55.331429 L 96.130998,55.331429 L 96.097418,59.445194 z" fill="#fff"/>
-        <path d="M 98.276478,42.598089 L 86.167828,45.255891 L 86.167828,48.932056 L 98.276478,46.276769 L 110.38181,48.932056 L 110.38181,45.255891 L 98.276478,42.598089 z" fill="#fff" fill-rule="evenodd"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="36"
+   height="18"
+   id="symbol-parking_roof_fee-permissive">
+  <defs
+     id="defs2856" />
+  <g
+     transform="matrix(0.5,0,0,0.5,-40,-20)"
+     id="parking_roof_fee">
+    <rect
+       width="72"
+       height="36"
+       rx="2"
+       ry="2"
+       x="80"
+       y="40"
+       style="fill:#aaaaaa"
+       id="rect4443" />
+    <path
+       d="M 118.5,73.76 L 149.5,73.76 C 149.77614,73.76 150,73.536142 150,73.26 L 150,42.26 C 150,41.983858 149.77614,41.76 149.5,41.76 L 118.5,41.76 C 118.22386,41.76 118,41.983858 118,42.26 L 118,73.26 C 118,73.536142 118.22386,73.76 118.5,73.76 z "
+       style="fill:#ffffff"
+       id="path4447" />
+    <path
+       d="M 120,71.76 L 120,43.76 L 148,43.76 L 148,71.76 L 120,71.76 z "
+       style="fill:#aaaaaa"
+       id="path4449" />
+    <g
+       transform="matrix(0.922587,0,0,0.922587,84.170114,4.4683601)"
+       id="g4451">
+      <rect
+         width="23.348639"
+         height="11.674319"
+         x="46.746216"
+         y="44.002426"
+         transform="matrix(0.9948298,0.1015563,-0.1015563,0.9948298,0,0)"
+         style="fill:#aaaaaa;fill-opacity:1;stroke:#ffffff;stroke-width:1.07493544;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4453" />
+      <path
+         d="M 411.42859 375.87302 A 46.984127 46.984127 0 1 1  317.46033,375.87302 A 46.984127 46.984127 0 1 1  411.42859 375.87302 z"
+         transform="matrix(0.1272924,0,0,0.1272924,14.568602,12.069448)"
+         style="fill:#aaaaaa;fill-opacity:1;stroke:#ffffff;stroke-width:7.5999999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path4455" />
+      <text
+         x="58.128101"
+         y="63.268608"
+         style="font-size:9.66500282px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.1414389px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Myriad Pro"
+         id="text4457"
+         xml:space="preserve"><tspan
+           x="58.128101"
+           y="63.268608"
+           style="fill:#ffffff;fill-opacity:1;stroke-width:0.1414389"
+           id="tspan4459">2</tspan></text>
+      <path
+         d="M 411.42859 375.87302 A 46.984127 46.984127 0 1 1  317.46033,375.87302 A 46.984127 46.984127 0 1 1  411.42859 375.87302 z"
+         transform="matrix(9.8999267e-2,0,0,9.8999267e-2,18.414082,25.218524)"
+         style="fill:#aaaaaa;fill-opacity:1;stroke:#ffffff;stroke-width:7.5999999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path4461" />
+      <text
+         x="52.545464"
+         y="64.742836"
+         style="font-size:7.11741495px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.1414389px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Myriad Pro"
+         id="text4463"
+         xml:space="preserve"><tspan
+           x="52.545464"
+           y="64.742836"
+           style="fill:#ffffff;fill-opacity:1;stroke-width:0.1414389"
+           id="tspan4465">1</tspan></text>
     </g>
+    <path
+       d="M 96.181368,64.062684 L 96.231738,71.870441 L 89.548973,71.870441 L 89.548973,50.378121 L 98.699998,50.378121 C 100.96677,50.378121 102.72981,50.629985 103.90517,51.133711 C 105.16449,51.721391 106.08798,52.476981 106.75962,53.568388 C 107.43125,54.659794 107.68312,55.91911 107.85103,57.26238 C 107.85103,59.277285 107.09544,60.956372 105.66821,62.215688 C 104.24099,63.391049 102.31004,64.062684 99.959318,64.062684 L 96.265328,64.062684 L 96.181368,64.062684 z M 96.097418,59.445194 L 98.364178,59.445194 C 100.29513,59.445194 101.21863,58.689604 101.21863,57.094471 C 101.21863,56.003064 100.37909,55.331429 98.532088,55.331429 L 96.130998,55.331429 L 96.097418,59.445194 z "
+       style="fill:#ffffff"
+       id="path4560" />
+    <path
+       d="M 98.276478,42.598089 L 86.167828,45.255891 L 86.167828,48.932056 L 98.276478,46.276769 L 110.38181,48.932056 L 110.38181,45.255891 L 98.276478,42.598089 z "
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path4562" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/parking_roof_fee.svg b/data/styles/symbols/parking_roof_fee.svg
index 933e91f6d3..d569ca4212 100644
--- a/data/styles/symbols/parking_roof_fee.svg
+++ b/data/styles/symbols/parking_roof_fee.svg
@@ -1,24 +1,83 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="36" height="18">
-    <g transform="matrix(.5 0 0 .5 -40 -20)">
-        <rect width="72" height="36" rx="2" ry="2" x="80" y="40" fill="#00f"/>
-        <path d="M 118.5,73.76 L 149.5,73.76 C 149.77614,73.76 150,73.536142 150,73.26 L 150,42.26 C 150,41.983858 149.77614,41.76 149.5,41.76 L 118.5,41.76 C 118.22386,41.76 118,41.983858 118,42.26 L 118,73.26 C 118,73.536142 118.22386,73.76 118.5,73.76 z" fill="#fff"/>
-        <path d="M 120,71.76 L 120,43.76 L 148,43.76 L 148,71.76 L 120,71.76 z" fill="#00f"/>
-        <g transform="matrix(.923 0 0 .923 84.17 4.468)" stroke="#fff">
-            <rect width="23.349" height="11.674" x="46.746" y="44.002" transform="rotate(5.829)" fill="#00f" stroke-width="1.075"/>
-            <path d="M 411.42859 375.87302 A 46.984127 46.984127 0 1 1 317.46033,375.87302 A 46.984127 46.984127 0 1 1 411.42859 375.87302 z" transform="matrix(.127 0 0 .127 14.569 12.069)" fill="#00f" stroke-width="7.6"/>
-            <text x="58.128" y="63.269" style="text-align:start;line-height:125%" font-size="9.665" font-weight="bold" fill="#fff" stroke-width=".141" font-family="Myriad Pro">
-                <tspan x="58.128" y="63.269" fill="#fff">
-                    2
-                </tspan>
-            </text>
-            <path d="M 411.42859 375.87302 A 46.984127 46.984127 0 1 1 317.46033,375.87302 A 46.984127 46.984127 0 1 1 411.42859 375.87302 z" transform="matrix(.099 0 0 .099 18.414 25.219)" fill="#00f" stroke-width="7.6"/>
-            <text x="52.545" y="64.743" style="text-align:start;line-height:125%" font-size="7.117" font-weight="bold" fill="#fff" stroke-width=".141" font-family="Myriad Pro">
-                <tspan x="52.545" y="64.743" fill="#fff">
-                    1
-                </tspan>
-            </text>
-        </g>
-        <path d="M 96.181368,64.062684 L 96.231738,71.870441 L 89.548973,71.870441 L 89.548973,50.378121 L 98.699998,50.378121 C 100.96677,50.378121 102.72981,50.629985 103.90517,51.133711 C 105.16449,51.721391 106.08798,52.476981 106.75962,53.568388 C 107.43125,54.659794 107.68312,55.91911 107.85103,57.26238 C 107.85103,59.277285 107.09544,60.956372 105.66821,62.215688 C 104.24099,63.391049 102.31004,64.062684 99.959318,64.062684 L 96.265328,64.062684 L 96.181368,64.062684 z M 96.097418,59.445194 L 98.364178,59.445194 C 100.29513,59.445194 101.21863,58.689604 101.21863,57.094471 C 101.21863,56.003064 100.37909,55.331429 98.532088,55.331429 L 96.130998,55.331429 L 96.097418,59.445194 z" fill="#fff"/>
-        <path d="M 98.276478,42.598089 L 86.167828,45.255891 L 86.167828,48.932056 L 98.276478,46.276769 L 110.38181,48.932056 L 110.38181,45.255891 L 98.276478,42.598089 z" fill="#fff" fill-rule="evenodd"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="36"
+   height="18"
+   id="symbol-parking_roof_fee">
+  <defs
+     id="defs2856" />
+  <g
+     transform="matrix(0.5,0,0,0.5,-40,-20)"
+     id="parking_roof_fee">
+    <rect
+       width="72"
+       height="36"
+       rx="2"
+       ry="2"
+       x="80"
+       y="40"
+       style="fill:#0000ff"
+       id="rect4443" />
+    <path
+       d="M 118.5,73.76 L 149.5,73.76 C 149.77614,73.76 150,73.536142 150,73.26 L 150,42.26 C 150,41.983858 149.77614,41.76 149.5,41.76 L 118.5,41.76 C 118.22386,41.76 118,41.983858 118,42.26 L 118,73.26 C 118,73.536142 118.22386,73.76 118.5,73.76 z "
+       style="fill:#ffffff"
+       id="path4447" />
+    <path
+       d="M 120,71.76 L 120,43.76 L 148,43.76 L 148,71.76 L 120,71.76 z "
+       style="fill:#0000ff"
+       id="path4449" />
+    <g
+       transform="matrix(0.922587,0,0,0.922587,84.170114,4.4683601)"
+       id="g4451">
+      <rect
+         width="23.348639"
+         height="11.674319"
+         x="46.746216"
+         y="44.002426"
+         transform="matrix(0.9948298,0.1015563,-0.1015563,0.9948298,0,0)"
+         style="fill:#0000ff;fill-opacity:1;stroke:#ffffff;stroke-width:1.07493544;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4453" />
+      <path
+         d="M 411.42859 375.87302 A 46.984127 46.984127 0 1 1  317.46033,375.87302 A 46.984127 46.984127 0 1 1  411.42859 375.87302 z"
+         transform="matrix(0.1272924,0,0,0.1272924,14.568602,12.069448)"
+         style="fill:#0000ff;fill-opacity:1;stroke:#ffffff;stroke-width:7.5999999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path4455" />
+      <text
+         x="58.128101"
+         y="63.268608"
+         style="font-size:9.66500282px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.1414389px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Myriad Pro"
+         id="text4457"
+         xml:space="preserve"><tspan
+           x="58.128101"
+           y="63.268608"
+           style="fill:#ffffff;fill-opacity:1;stroke-width:0.1414389"
+           id="tspan4459">2</tspan></text>
+      <path
+         d="M 411.42859 375.87302 A 46.984127 46.984127 0 1 1  317.46033,375.87302 A 46.984127 46.984127 0 1 1  411.42859 375.87302 z"
+         transform="matrix(9.8999267e-2,0,0,9.8999267e-2,18.414082,25.218524)"
+         style="fill:#0000ff;fill-opacity:1;stroke:#ffffff;stroke-width:7.5999999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path4461" />
+      <text
+         x="52.545464"
+         y="64.742836"
+         style="font-size:7.11741495px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.1414389px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Myriad Pro"
+         id="text4463"
+         xml:space="preserve"><tspan
+           x="52.545464"
+           y="64.742836"
+           style="fill:#ffffff;fill-opacity:1;stroke-width:0.1414389"
+           id="tspan4465">1</tspan></text>
     </g>
+    <path
+       d="M 96.181368,64.062684 L 96.231738,71.870441 L 89.548973,71.870441 L 89.548973,50.378121 L 98.699998,50.378121 C 100.96677,50.378121 102.72981,50.629985 103.90517,51.133711 C 105.16449,51.721391 106.08798,52.476981 106.75962,53.568388 C 107.43125,54.659794 107.68312,55.91911 107.85103,57.26238 C 107.85103,59.277285 107.09544,60.956372 105.66821,62.215688 C 104.24099,63.391049 102.31004,64.062684 99.959318,64.062684 L 96.265328,64.062684 L 96.181368,64.062684 z M 96.097418,59.445194 L 98.364178,59.445194 C 100.29513,59.445194 101.21863,58.689604 101.21863,57.094471 C 101.21863,56.003064 100.37909,55.331429 98.532088,55.331429 L 96.130998,55.331429 L 96.097418,59.445194 z "
+       style="fill:#ffffff"
+       id="path4560" />
+    <path
+       d="M 98.276478,42.598089 L 86.167828,45.255891 L 86.167828,48.932056 L 98.276478,46.276769 L 110.38181,48.932056 L 110.38181,45.255891 L 98.276478,42.598089 z "
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path4562" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/peak-mini.svg b/data/styles/symbols/peak-mini.svg
index 1751c46c43..f64081d5c1 100644
--- a/data/styles/symbols/peak-mini.svg
+++ b/data/styles/symbols/peak-mini.svg
@@ -1,6 +1,90 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="0 0 266.66667 266.66667" height="24">
-    <title>
-        Paeak Map Icon
-    </title>
-    <path d="m 88.888891,200 c 39.040169,0 49.622969,0 88.888879,0 l -44.44444,-88.88888 z" fill="#4d4d4d"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="symbol-peak"
+   viewBox="0 0 266.66667 266.66667"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="peak.svg">
+  <title
+     id="title2986">Paeak Map Icon</title>
+  <metadata
+     id="metadata9">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Paeak Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1069"
+     inkscape:window-height="768"
+     id="namedview5"
+     showgrid="true"
+     inkscape:zoom="22.244238"
+     inkscape:cx="13.766949"
+     inkscape:cy="11.783898"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-peak">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#4d4d4d;stroke:none"
+     d="m 88.888891,200 c 39.040169,0 49.622969,0 88.888879,0 l -44.44444,-88.88888 z"
+     id="path2990"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
 </svg>
diff --git a/data/styles/symbols/peak.svg b/data/styles/symbols/peak.svg
index 20ff53baf4..ace28dc96c 100644
--- a/data/styles/symbols/peak.svg
+++ b/data/styles/symbols/peak.svg
@@ -1,6 +1,90 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="0 0 266.66667 266.66667" height="24">
-    <title>
-        Paeak Map Icon
-    </title>
-    <path d="m 44.444445,244.44445 c 78.080345,0 99.245945,0 177.777775,0 L 133.33333,66.666668 z" fill="#4d4d4d"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="symbol-peak"
+   viewBox="0 0 266.66667 266.66667"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="peak.svg">
+  <title
+     id="title2986">Paeak Map Icon</title>
+  <metadata
+     id="metadata9">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Paeak Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1069"
+     inkscape:window-height="768"
+     id="namedview5"
+     showgrid="true"
+     inkscape:zoom="22.244238"
+     inkscape:cx="13.766949"
+     inkscape:cy="11.783898"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-peak">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#4d4d4d;stroke:none"
+     d="m 44.444445,244.44445 c 78.080345,0 99.245945,0 177.777775,0 L 133.33333,66.666668 z"
+     id="path2990"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
 </svg>
diff --git a/data/styles/symbols/petrolStation.svg b/data/styles/symbols/petrolStation.svg
index edb00dbc01..177d5926ef 100644
--- a/data/styles/symbols/petrolStation.svg
+++ b/data/styles/symbols/petrolStation.svg
@@ -1,3 +1,66 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="0 0 148.06867 148.06867" height="24" fill-rule="evenodd">
-    <path d="M 8,2 C 6.892,2 6,2.892 6,4 l 0,16 -2,0 0,2 4,0 6,0 4,0 0,-2 -2,0 0,-8.3125 0.90625,0 0,3.3125 c 0,1.34138 0.07746,2.435661 0.53125,3.3125 0.453788,0.876839 1.400607,1.375 2.5625,1.375 1.145833,0 2.044441,-0.400462 2.5625,-1.09375 0.518059,-0.693288 0.651489,-1.527561 0.59375,-2.375 C 23.04548,14.592976 22.312386,12.90606 21.6875,11.8125 21.522922,10.478631 21.597868,9.0328279 21.625,7.78125 21.638939,7.1382039 21.649387,6.5536634 21.5625,6 21.475612,5.4463366 21.419011,4.9263158 21,4.517915 20.779494,4.3704534 20.708528,4.3959549 20.625,4.34375 L 17.46875,3.40625 16.625,3.21875 16.625,4 18.59375,4.9375 C 18.530571,5.1099864 18.4848,5.3354003 18.5,5.65625 18.512448,6.2337778 18.517865,6.7133596 19.1875,7 l 1.03125,0.3125 c 0.0097,0.1479256 0.03471,0.2780241 0.03125,0.4375 -0.02668,1.2304822 -0.147519,2.785591 0.0625,4.34375 l 0,0.125 0.09375,0.125 c 0.541113,0.915284 1.254827,2.66363 1.34375,3.96875 0.04446,0.65256 -0.08331,1.162039 -0.3125,1.46875 -0.229189,0.306711 -0.583334,0.53125 -1.4375,0.53125 -0.838108,0 -1.069224,-0.186177 -1.3125,-0.65625 C 18.444224,17.186177 18.3125,16.270974 18.3125,15 l 0,-4 0,-0.6875 -0.71875,0 L 16,10.3125 16,4 C 16,2.892 15.108,2 14,2 z m 1.0625,1.4375 3.9375,0 c 1.59375,0 1.59375,0 1.59375,2 l 0,2 c 0,2 0,2 -1.59375,2 l -3.9375,0 c -1.59375,0 -1.59375,0 -1.59375,-2 l 0,-2 c 0,-2 0,-2 1.59375,-2 z m 10.46875,1.9375 0.4375,0.21875 c 0.08298,0.1178774 0.275427,0.2295513 0.21875,0.625 -0.0065,0.045158 0.0022,0.1075691 0,0.15625 C 19.873321,6.3342149 19.610294,6.2535262 19.53125,6 z" transform="scale(6.17)" fill="#505050"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="petrolStation"
+   viewBox="0 0 148.06867 148.06867"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="petrolStation.svg"
+   style="fill:#000000;fill-rule:evenodd;stroke-width:3px">
+  <metadata
+     id="metadata9">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1007"
+     inkscape:window-height="805"
+     id="namedview5"
+     showgrid="true"
+     inkscape:zoom="55.819055"
+     inkscape:cx="19.310836"
+     inkscape:cy="16.308998"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="petrolStation">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="M 8,2 C 6.892,2 6,2.892 6,4 l 0,16 -2,0 0,2 4,0 6,0 4,0 0,-2 -2,0 0,-8.3125 0.90625,0 0,3.3125 c 0,1.34138 0.07746,2.435661 0.53125,3.3125 0.453788,0.876839 1.400607,1.375 2.5625,1.375 1.145833,0 2.044441,-0.400462 2.5625,-1.09375 0.518059,-0.693288 0.651489,-1.527561 0.59375,-2.375 C 23.04548,14.592976 22.312386,12.90606 21.6875,11.8125 21.522922,10.478631 21.597868,9.0328279 21.625,7.78125 21.638939,7.1382039 21.649387,6.5536634 21.5625,6 21.475612,5.4463366 21.419011,4.9263158 21,4.517915 20.779494,4.3704534 20.708528,4.3959549 20.625,4.34375 L 17.46875,3.40625 16.625,3.21875 16.625,4 18.59375,4.9375 C 18.530571,5.1099864 18.4848,5.3354003 18.5,5.65625 18.512448,6.2337778 18.517865,6.7133596 19.1875,7 l 1.03125,0.3125 c 0.0097,0.1479256 0.03471,0.2780241 0.03125,0.4375 -0.02668,1.2304822 -0.147519,2.785591 0.0625,4.34375 l 0,0.125 0.09375,0.125 c 0.541113,0.915284 1.254827,2.66363 1.34375,3.96875 0.04446,0.65256 -0.08331,1.162039 -0.3125,1.46875 -0.229189,0.306711 -0.583334,0.53125 -1.4375,0.53125 -0.838108,0 -1.069224,-0.186177 -1.3125,-0.65625 C 18.444224,17.186177 18.3125,16.270974 18.3125,15 l 0,-4 0,-0.6875 -0.71875,0 L 16,10.3125 16,4 C 16,2.892 15.108,2 14,2 z m 1.0625,1.4375 3.9375,0 c 1.59375,0 1.59375,0 1.59375,2 l 0,2 c 0,2 0,2 -1.59375,2 l -3.9375,0 c -1.59375,0 -1.59375,0 -1.59375,-2 l 0,-2 c 0,-2 0,-2 1.59375,-2 z m 10.46875,1.9375 0.4375,0.21875 c 0.08298,0.1178774 0.275427,0.2295513 0.21875,0.625 -0.0065,0.045158 0.0022,0.1075691 0,0.15625 C 19.873321,6.3342149 19.610294,6.2535262 19.53125,6 z"
+     transform="scale(6.1695279,6.1695279)"
+     id="rect2988"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ssccccccccccssssscsscccccccccscccsssssccccssssssssssssccsccc" />
 </svg>
diff --git a/data/styles/symbols/pharmacy.svg b/data/styles/symbols/pharmacy.svg
index af1acc6afd..4b8ac0e6d5 100644
--- a/data/styles/symbols/pharmacy.svg
+++ b/data/styles/symbols/pharmacy.svg
@@ -1,6 +1,73 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="0 0 22.4 22.4" height="24" stroke="#e60202" stroke-width="3" fill="none">
-    <title>
-        Pharmacy Map Icon
-    </title>
-    <path d="M 12 2 C 6.4771525 2 2 6.4771525 2 12 C 2 17.522847 6.4771525 22 12 22 C 17.522847 22 22 17.522847 22 12 C 22 6.4771525 17.522847 2 12 2 z M 12 4 C 16.418278 4 20 7.581722 20 12 C 20 16.418278 16.418278 20 12 20 C 7.581722 20 4 16.418278 4 12 C 4 7.581722 7.581722 4 12 4 z M 10 6 L 10 10 L 6 10 L 6 14 L 10 14 L 10 18 L 14 18 L 14 14 L 18 14 L 18 10 L 14 10 L 14 6 L 10 6 z" transform="scale(.933)" fill="#43b413"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="hospital"
+   viewBox="0 0 22.4 22.4"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="pharmacy.svg"
+   style="fill:none;stroke:#e60202;stroke-width:3px">
+  <title
+     id="title2987">Pharmacy Map Icon</title>
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Pharmacy Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="859"
+     inkscape:window-height="654"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="15.733333"
+     inkscape:cx="7.5"
+     inkscape:cy="11.25"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="hospital">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#43b413;fill-opacity:1;stroke:none"
+     d="M 12 2 C 6.4771525 2 2 6.4771525 2 12 C 2 17.522847 6.4771525 22 12 22 C 17.522847 22 22 17.522847 22 12 C 22 6.4771525 17.522847 2 12 2 z M 12 4 C 16.418278 4 20 7.581722 20 12 C 20 16.418278 16.418278 20 12 20 C 7.581722 20 4 16.418278 4 12 C 4 7.581722 7.581722 4 12 4 z M 10 6 L 10 10 L 6 10 L 6 14 L 10 14 L 10 18 L 14 18 L 14 14 L 18 14 L 18 10 L 14 10 L 14 6 L 10 6 z "
+     transform="scale(0.93333333,0.93333333)"
+     id="path2990" />
 </svg>
diff --git a/data/styles/symbols/picnic.svg b/data/styles/symbols/picnic.svg
index 3971be3eb7..cf58c0144c 100644
--- a/data/styles/symbols/picnic.svg
+++ b/data/styles/symbols/picnic.svg
@@ -1,6 +1,29 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="12" height="12" viewBox="0 0 580 580">
-    <path d="M 48.333333,338.33333 L 531.66667,338.33333" stroke="#000" stroke-width="24.167" stroke-linecap="square" fill="none"/>
-    <path d="M 229.58333,217.5 L 96.666667,483.33333" stroke="#000" stroke-width="24.167" fill="none"/>
-    <path d="M 350.41667,217.5 L 483.33333,483.33333" stroke="#000" stroke-width="24.167" fill="none"/>
-    <path d="M 193.33333,217.5 L 386.66667,217.5" stroke="#000" stroke-width="24.167" stroke-linecap="square" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="12"
+   height="12"
+   viewBox="0 0 580 580"
+   id="symbol-picnic">
+  <defs
+     id="defs14" />
+  <path
+     d="M 48.333333,338.33333 L 531.66667,338.33333"
+     id="path2391"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:24.16666603;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 229.58333,217.5 L 96.666667,483.33333"
+     id="path3163"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:24.16666603;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 350.41667,217.5 L 483.33333,483.33333"
+     id="path3165"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:24.16666603;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 193.33333,217.5 L 386.66667,217.5"
+     id="path2384"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:24.16666603;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/placemark-blue.svg b/data/styles/symbols/placemark-blue.svg
new file mode 100644
index 0000000000..d4483f1fea
--- /dev/null
+++ b/data/styles/symbols/placemark-blue.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="48px" height="64px" viewBox="0 0 48 64" enable-background="new 0 0 48 64" xml:space="preserve">
+<ellipse transform="matrix(-0.9858 0.1681 -0.1681 -0.9858 66.7396 112.8113)" opacity="0.5" fill="#808285" cx="28.595" cy="59.23" rx="7.5" ry="2.5"/>
+<polygon opacity="0.6" fill="#6D6E71" points="32,60 23,61 19,32 31,31 "/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="21.1318" y1="46.5293" x2="29.4692" y2="45.7785">
+	<stop  offset="0" style="stop-color:#E6E6E6"/>
+	<stop  offset="1" style="stop-color:#C4C4C4"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1_)" points="30,59 25,60 21,33 29,32 "/>
+<circle opacity="0.8" fill="#263C91" cx="24" cy="21.917" r="20"/>
+<radialGradient id="SVGID_2_" cx="23.522" cy="20.8936" r="18.0147" fx="14.8544" fy="14.3447" gradientUnits="userSpaceOnUse">
+	<stop  offset="0.248" style="stop-color:#D7E4F0"/>
+	<stop  offset="0.299" style="stop-color:#C1D2E8"/>
+	<stop  offset="0.4179" style="stop-color:#96AFD8"/>
+	<stop  offset="0.5375" style="stop-color:#7696CC"/>
+	<stop  offset="0.6561" style="stop-color:#5D85C3"/>
+	<stop  offset="0.7734" style="stop-color:#497ABD"/>
+	<stop  offset="0.8887" style="stop-color:#3C74BA"/>
+	<stop  offset="1" style="stop-color:#3772B9"/>
+</radialGradient>
+<circle fill="url(#SVGID_2_)" cx="24" cy="21.917" r="18.015"/>
+</svg>
diff --git a/data/styles/symbols/placemark-brown.svg b/data/styles/symbols/placemark-brown.svg
new file mode 100644
index 0000000000..fcb406172d
--- /dev/null
+++ b/data/styles/symbols/placemark-brown.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="48px" height="64px" viewBox="0 0 48 64" enable-background="new 0 0 48 64" xml:space="preserve">
+<ellipse transform="matrix(-0.9858 0.1681 -0.1681 -0.9858 66.7396 112.8113)" opacity="0.5" fill="#808285" cx="28.595" cy="59.23" rx="7.5" ry="2.5"/>
+<polygon opacity="0.6" fill="#6D6E71" points="32,60 23,61 19,32 31,31 "/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="21.1318" y1="46.5293" x2="29.4692" y2="45.7785">
+	<stop  offset="0" style="stop-color:#E6E6E6"/>
+	<stop  offset="1" style="stop-color:#C4C4C4"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1_)" points="30,59 25,60 21,33 29,32 "/>
+<circle opacity="0.8" fill="#895121" cx="24" cy="21.917" r="20"/>
+<radialGradient id="SVGID_2_" cx="23.522" cy="20.8936" r="18.0147" fx="14.8544" fy="14.3447" gradientUnits="userSpaceOnUse">
+	<stop  offset="0.1805" style="stop-color:#DBC5A4"/>
+	<stop  offset="0.198" style="stop-color:#D9C19E"/>
+	<stop  offset="0.334" style="stop-color:#CDA577"/>
+	<stop  offset="0.4708" style="stop-color:#C5915A"/>
+	<stop  offset="0.6065" style="stop-color:#BF8344"/>
+	<stop  offset="0.7406" style="stop-color:#BB7A36"/>
+	<stop  offset="0.8726" style="stop-color:#B9742E"/>
+	<stop  offset="1" style="stop-color:#B8722C"/>
+</radialGradient>
+<circle fill="url(#SVGID_2_)" cx="24" cy="21.917" r="18.015"/>
+</svg>
diff --git a/data/styles/symbols/placemark-green.svg b/data/styles/symbols/placemark-green.svg
new file mode 100644
index 0000000000..a951290c8a
--- /dev/null
+++ b/data/styles/symbols/placemark-green.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="48px" height="64px" viewBox="0 0 48 64" enable-background="new 0 0 48 64" xml:space="preserve">
+<ellipse transform="matrix(0.9858 -0.168 0.168 0.9858 -9.5425 5.6443)" opacity="0.5" fill="#808285" enable-background="new    " cx="28.594" cy="59.23" rx="7.5" ry="2.5"/>
+<polygon opacity="0.6" fill="#6D6E71" enable-background="new    " points="32,60 23,61 19,32 31,31 "/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="568.1318" y1="823.5293" x2="576.4692" y2="822.7785" gradientTransform="matrix(1 0 0 1 -547 -777)">
+	<stop  offset="0" style="stop-color:#E6E6E6"/>
+	<stop  offset="1" style="stop-color:#C4C4C4"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1_)" points="30,59 25,60 21,33 29,32 "/>
+<circle opacity="0.8" fill="#00751E" enable-background="new    " cx="24" cy="21.917" r="20"/>
+<radialGradient id="SVGID_2_" cx="570.5215" cy="797.8936" r="18.0152" fx="561.4042" fy="792.0648" gradientTransform="matrix(1 0 0 1 -547 -777)" gradientUnits="userSpaceOnUse">
+	<stop  offset="0.248" style="stop-color:#E5F1DA"/>
+	<stop  offset="0.2638" style="stop-color:#DFEED4"/>
+	<stop  offset="0.3705" style="stop-color:#B6DCAB"/>
+	<stop  offset="0.4785" style="stop-color:#93CD8C"/>
+	<stop  offset="0.5857" style="stop-color:#75C273"/>
+	<stop  offset="0.6919" style="stop-color:#5ABB5E"/>
+	<stop  offset="0.797" style="stop-color:#41B652"/>
+	<stop  offset="0.9003" style="stop-color:#2BB34C"/>
+	<stop  offset="1" style="stop-color:#21B24B"/>
+</radialGradient>
+<circle fill="url(#SVGID_2_)" cx="24" cy="21.917" r="18.015"/>
+</svg>
diff --git a/data/styles/symbols/placemark-orange.svg b/data/styles/symbols/placemark-orange.svg
new file mode 100644
index 0000000000..443c56664a
--- /dev/null
+++ b/data/styles/symbols/placemark-orange.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="48px" height="64px" viewBox="0 0 48 64" enable-background="new 0 0 48 64" xml:space="preserve">
+<ellipse transform="matrix(-0.9858 0.1681 -0.1681 -0.9858 66.7396 112.8113)" opacity="0.5" fill="#808285" cx="28.595" cy="59.23" rx="7.5" ry="2.5"/>
+<polygon opacity="0.6" fill="#6D6E71" points="32,60 23,61 19,32 31,31 "/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="21.1318" y1="46.5293" x2="29.4692" y2="45.7785">
+	<stop  offset="0" style="stop-color:#E6E6E6"/>
+	<stop  offset="1" style="stop-color:#C4C4C4"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1_)" points="30,59 25,60 21,33 29,32 "/>
+<circle opacity="0.8" fill="#C86F29" cx="24" cy="21.917" r="20"/>
+<radialGradient id="SVGID_2_" cx="23.522" cy="20.8936" r="18.0147" fx="14.8544" fy="14.3447" gradientUnits="userSpaceOnUse">
+	<stop  offset="0.248" style="stop-color:#FFF3E8"/>
+	<stop  offset="0.2977" style="stop-color:#FFE7CD"/>
+	<stop  offset="0.3995" style="stop-color:#FED19F"/>
+	<stop  offset="0.5025" style="stop-color:#FCBE7A"/>
+	<stop  offset="0.6047" style="stop-color:#FBAF5C"/>
+	<stop  offset="0.7061" style="stop-color:#FAA342"/>
+	<stop  offset="0.8063" style="stop-color:#F99C2F"/>
+	<stop  offset="0.9049" style="stop-color:#F89724"/>
+	<stop  offset="1" style="stop-color:#F89520"/>
+</radialGradient>
+<circle fill="url(#SVGID_2_)" cx="24" cy="21.917" r="18.015"/>
+</svg>
diff --git a/data/styles/symbols/placemark-pink.svg b/data/styles/symbols/placemark-pink.svg
new file mode 100644
index 0000000000..70d81b5996
--- /dev/null
+++ b/data/styles/symbols/placemark-pink.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="48px" height="64px" viewBox="0 0 48 64" enable-background="new 0 0 48 64" xml:space="preserve">
+<ellipse transform="matrix(-0.9858 0.1681 -0.1681 -0.9858 66.7396 112.8113)" opacity="0.5" fill="#808285" cx="28.595" cy="59.23" rx="7.5" ry="2.5"/>
+<polygon opacity="0.6" fill="#6D6E71" points="32,60 23,61 19,32 31,31 "/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="21.1318" y1="46.5293" x2="29.4692" y2="45.7785">
+	<stop  offset="0" style="stop-color:#E6E6E6"/>
+	<stop  offset="1" style="stop-color:#C4C4C4"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1_)" points="30,59 25,60 21,33 29,32 "/>
+<circle opacity="0.8" fill="#BA2B91" cx="24" cy="21.917" r="20"/>
+<radialGradient id="SVGID_2_" cx="23.522" cy="20.8936" r="18.0147" fx="14.8544" fy="14.3447" gradientUnits="userSpaceOnUse">
+	<stop  offset="0.248" style="stop-color:#F1D0E4"/>
+	<stop  offset="0.2606" style="stop-color:#F0CDE2"/>
+	<stop  offset="0.386" style="stop-color:#EAA9CC"/>
+	<stop  offset="0.5122" style="stop-color:#E68DBB"/>
+	<stop  offset="0.6372" style="stop-color:#E377AF"/>
+	<stop  offset="0.7609" style="stop-color:#E166A6"/>
+	<stop  offset="0.8826" style="stop-color:#E05AA1"/>
+	<stop  offset="1" style="stop-color:#E0569F"/>
+</radialGradient>
+<circle fill="url(#SVGID_2_)" cx="24" cy="21.917" r="18.015"/>
+</svg>
diff --git a/data/styles/symbols/placemark-purple.svg b/data/styles/symbols/placemark-purple.svg
new file mode 100644
index 0000000000..3c2624fcfb
--- /dev/null
+++ b/data/styles/symbols/placemark-purple.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="48px" height="64px" viewBox="0 0 48 64" enable-background="new 0 0 48 64" xml:space="preserve">
+<ellipse transform="matrix(-0.9858 0.1681 -0.1681 -0.9858 66.7396 112.8113)" opacity="0.5" fill="#808285" cx="28.595" cy="59.23" rx="7.5" ry="2.5"/>
+<polygon opacity="0.6" fill="#6D6E71" points="32,60 23,61 19,32 31,31 "/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="21.1318" y1="46.5293" x2="29.4692" y2="45.7785">
+	<stop  offset="0" style="stop-color:#E6E6E6"/>
+	<stop  offset="1" style="stop-color:#C4C4C4"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1_)" points="30,59 25,60 21,33 29,32 "/>
+<circle opacity="0.8" fill="#702774" cx="24" cy="21.917" r="20"/>
+<radialGradient id="SVGID_2_" cx="23.522" cy="20.8936" r="18.0147" fx="14.8544" fy="14.3447" gradientUnits="userSpaceOnUse">
+	<stop  offset="0.248" style="stop-color:#E8CCE2"/>
+	<stop  offset="0.3676" style="stop-color:#CBA5CD"/>
+	<stop  offset="0.4964" style="stop-color:#B486BC"/>
+	<stop  offset="0.6255" style="stop-color:#A371B0"/>
+	<stop  offset="0.7532" style="stop-color:#9962A9"/>
+	<stop  offset="0.8788" style="stop-color:#9359A4"/>
+	<stop  offset="1" style="stop-color:#9156A2"/>
+</radialGradient>
+<circle fill="url(#SVGID_2_)" cx="24" cy="21.917" r="18.015"/>
+</svg>
diff --git a/data/styles/symbols/placemark-red.svg b/data/styles/symbols/placemark-red.svg
new file mode 100644
index 0000000000..65fc93a68b
--- /dev/null
+++ b/data/styles/symbols/placemark-red.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="48px" height="64px" viewBox="0 0 48 64" enable-background="new 0 0 48 64" xml:space="preserve">
+<ellipse transform="matrix(0.168 0.9858 -0.9858 0.168 82.1781 21.0924)" opacity="0.5" fill="#808285" enable-background="new    " cx="28.594" cy="59.229" rx="2.5" ry="7.5"/>
+<polygon opacity="0.6" fill="#6D6E71" enable-background="new    " points="32,60 23,61 19,32 31,31 "/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="294.6318" y1="-370.5283" x2="302.9692" y2="-369.7775" gradientTransform="matrix(1 0 0 -1 -273.5 -324)">
+	<stop  offset="0" style="stop-color:#E6E6E6"/>
+	<stop  offset="1" style="stop-color:#C4C4C4"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1_)" points="30,59 25,60 21,33 29,32 "/>
+<circle opacity="0.8" fill="#A00215" cx="24" cy="21.917" r="20"/>
+<radialGradient id="SVGID_2_" cx="297.0215" cy="-344.8936" r="18.0152" fx="288.0799" fy="-338.1579" gradientTransform="matrix(1 0 0 -1 -273.5 -324)" gradientUnits="userSpaceOnUse">
+	<stop  offset="0.248" style="stop-color:#EEDBDC"/>
+	<stop  offset="0.2785" style="stop-color:#EECECA"/>
+	<stop  offset="0.3831" style="stop-color:#EDA598"/>
+	<stop  offset="0.4889" style="stop-color:#EB8473"/>
+	<stop  offset="0.5939" style="stop-color:#E96759"/>
+	<stop  offset="0.6981" style="stop-color:#E84D45"/>
+	<stop  offset="0.801" style="stop-color:#E73739"/>
+	<stop  offset="0.9023" style="stop-color:#E72432"/>
+	<stop  offset="1" style="stop-color:#E71D30"/>
+</radialGradient>
+<circle fill="url(#SVGID_2_)" cx="24" cy="21.917" r="18.015"/>
+</svg>
diff --git a/data/styles/symbols/placemark-yellow.svg b/data/styles/symbols/placemark-yellow.svg
new file mode 100644
index 0000000000..60c81f322c
--- /dev/null
+++ b/data/styles/symbols/placemark-yellow.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="48px" height="64px" viewBox="0 0 48 64" enable-background="new 0 0 48 64" xml:space="preserve">
+<ellipse transform="matrix(0.168 0.9858 -0.9858 0.168 82.1781 21.0924)" opacity="0.5" fill="#808285" enable-background="new    " cx="28.594" cy="59.229" rx="2.5" ry="7.5"/>
+<polygon opacity="0.6" fill="#6D6E71" enable-background="new    " points="32,60 23,61 19,32 31,31 "/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-877.5933" y1="2455.8281" x2="-869.2554" y2="2456.5789" gradientTransform="matrix(1 0 0 -1 898.7251 2502.3555)">
+	<stop  offset="0" style="stop-color:#E6E6E6"/>
+	<stop  offset="1" style="stop-color:#C4C4C4"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1_)" points="30,59 25,60 21,33 29,32 "/>
+<circle opacity="0.8" fill="#F4E206" enable-background="new    " cx="24" cy="21.917" r="20"/>
+<radialGradient id="SVGID_2_" cx="-875.2017" cy="2481.46" r="18.0152" fx="-883.8695" fy="2474.9109" gradientTransform="matrix(0.4111 0.9116 0.9116 -0.4111 -1877.5171 1839.0408)" gradientUnits="userSpaceOnUse">
+	<stop  offset="0" style="stop-color:#FFFFE8"/>
+	<stop  offset="0.248" style="stop-color:#FFFFFF"/>
+	<stop  offset="0.3718" style="stop-color:#FFFFBE"/>
+	<stop  offset="1" style="stop-color:#FFFF00"/>
+</radialGradient>
+<circle fill="url(#SVGID_2_)" cx="24" cy="21.916" r="18.015"/>
+</svg>
diff --git a/data/styles/symbols/playground.svg b/data/styles/symbols/playground.svg
index 4df0fca251..447e8c728d 100644
--- a/data/styles/symbols/playground.svg
+++ b/data/styles/symbols/playground.svg
@@ -1,9 +1,97 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24">
-    <title>
-        Playground Map Icon
-    </title>
-    <path d="m 20.184986,7.9991413 c -0.8002,-0.2144127 -1.622705,0.2604607 -1.837118,1.0606597 -0.214412,0.800199 0.260461,1.622705 1.06066,1.837118 0.800199,0.214412 1.622705,-0.260461 1.837118,-1.06066 0.214412,-0.8002 -0.260461,-1.622705 -1.06066,-1.8371177 z m -0.776458,2.8977777 -0.482963,-0.12941 c -0.535122,-0.143386 -1.081359,0.171984 -1.224744,0.707107 l -0.517638,1.931852 -0.965926,-0.258819 c -0.533467,-0.142942 -1.081803,0.17364 -1.224745,0.707106 l -0.776457,2.897778 c -0.142942,0.533466 0.17364,1.081803 0.707106,1.224745 0.533467,0.142942 1.081803,-0.173641 1.224745,-0.707107 l 0.517638,-1.931852 c -0.143385,0.535123 0.171984,1.081359 0.707107,1.224745 l 0.965926,0.258819 c 0.535123,0.143386 1.081359,-0.171984 1.224745,-0.707107 l 1.035276,-3.863703 c 0.143386,-0.535123 -0.171984,-1.081359 -0.707107,-1.224745 l -0.482963,-0.129409 z" fill="#505050"/>
-    <rect width="20" height="2" x="4.568" y="9.502" rx="1" ry="1" transform="rotate(15)" fill="#505050"/>
-    <path d="M 7.1449869,4.5050842 C 7.9451859,4.7194968 8.4200598,5.5420023 8.205647,6.3422015 7.9912344,7.1424005 7.1687288,7.6172743 6.3685297,7.4028616 5.5683307,7.188449 5.0934569,6.3659434 5.3078696,5.5657443 5.5222823,4.7655452 6.3447878,4.2906715 7.1449869,4.5050842 z M 6.3685297,7.4028616 6.8514927,7.5322712 C 7.3866156,7.6756569 7.7019852,8.221893 7.5585994,8.757016 l -0.5176381,1.931852 0.9659259,0.258819 c 0.5334663,0.142942 0.8500486,0.691278 0.7071068,1.224745 L 7.9375368,15.070209 C 7.7945949,15.603675 7.2462583,15.920258 6.7127919,15.777316 6.1793256,15.634374 5.8627433,15.086037 6.0056852,14.552571 l 0.5176381,-1.931852 c -0.1433858,0.535123 -0.689622,0.850493 -1.2247449,0.707107 L 4.3326526,13.069007 C 3.7975297,12.925621 3.48216,12.379385 3.6255458,11.844262 L 4.660822,7.9805589 C 4.8042077,7.445436 5.3504439,7.1300664 5.8855668,7.2734521 l 0.4829629,0.1294095 z" fill="#505050"/>
-    <path d="m 12,16 2,4 -4,0 z" fill="#505050"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="24"
+   height="24"
+   id="symbol-playground"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="playground.svg">
+  <title
+     id="title3792">Playground Map Icon</title>
+  <metadata
+     id="metadata17">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Playground Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="924"
+     inkscape:window-height="651"
+     id="namedview15"
+     showgrid="true"
+     inkscape:zoom="17.02075"
+     inkscape:cx="18.645217"
+     inkscape:cy="13.242113"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-playground">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2994"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4" />
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="m 20.184986,7.9991413 c -0.8002,-0.2144127 -1.622705,0.2604607 -1.837118,1.0606597 -0.214412,0.800199 0.260461,1.622705 1.06066,1.837118 0.800199,0.214412 1.622705,-0.260461 1.837118,-1.06066 0.214412,-0.8002 -0.260461,-1.622705 -1.06066,-1.8371177 z m -0.776458,2.8977777 -0.482963,-0.12941 c -0.535122,-0.143386 -1.081359,0.171984 -1.224744,0.707107 l -0.517638,1.931852 -0.965926,-0.258819 c -0.533467,-0.142942 -1.081803,0.17364 -1.224745,0.707106 l -0.776457,2.897778 c -0.142942,0.533466 0.17364,1.081803 0.707106,1.224745 0.533467,0.142942 1.081803,-0.173641 1.224745,-0.707107 l 0.517638,-1.931852 c -0.143385,0.535123 0.171984,1.081359 0.707107,1.224745 l 0.965926,0.258819 c 0.535123,0.143386 1.081359,-0.171984 1.224745,-0.707107 l 1.035276,-3.863703 c 0.143386,-0.535123 -0.171984,-1.081359 -0.707107,-1.224745 l -0.482963,-0.129409 z"
+     id="path2996"
+     inkscape:connector-curvature="0"
+     inkscape:transform-center-x="-6.3864785"
+     inkscape:transform-center-y="-0.9351855" />
+  <rect
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="rect3014"
+     width="20"
+     height="2"
+     x="4.5675287"
+     y="9.5023184"
+     rx="1"
+     ry="1"
+     transform="matrix(0.96592583,0.25881905,-0.25881905,0.96592583,0,0)" />
+  <path
+     id="path3017"
+     d="M 7.1449869,4.5050842 C 7.9451859,4.7194968 8.4200598,5.5420023 8.205647,6.3422015 7.9912344,7.1424005 7.1687288,7.6172743 6.3685297,7.4028616 5.5683307,7.188449 5.0934569,6.3659434 5.3078696,5.5657443 5.5222823,4.7655452 6.3447878,4.2906715 7.1449869,4.5050842 z M 6.3685297,7.4028616 6.8514927,7.5322712 C 7.3866156,7.6756569 7.7019852,8.221893 7.5585994,8.757016 l -0.5176381,1.931852 0.9659259,0.258819 c 0.5334663,0.142942 0.8500486,0.691278 0.7071068,1.224745 L 7.9375368,15.070209 C 7.7945949,15.603675 7.2462583,15.920258 6.7127919,15.777316 6.1793256,15.634374 5.8627433,15.086037 6.0056852,14.552571 l 0.5176381,-1.931852 c -0.1433858,0.535123 -0.689622,0.850493 -1.2247449,0.707107 L 4.3326526,13.069007 C 3.7975297,12.925621 3.48216,12.379385 3.6255458,11.844262 L 4.660822,7.9805589 C 4.8042077,7.445436 5.3504439,7.1300664 5.8855668,7.2734521 l 0.4829629,0.1294095 z"
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     inkscape:connector-curvature="0"
+     inkscape:transform-center-x="5.1833137"
+     inkscape:transform-center-y="-3.782195" />
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="m 12,16 2,4 -4,0 z"
+     id="rect3021"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
 </svg>
diff --git a/data/styles/symbols/police.svg b/data/styles/symbols/police.svg
index 6f8309f4be..5438143da8 100755
--- a/data/styles/symbols/police.svg
+++ b/data/styles/symbols/police.svg
@@ -1,8 +1,66 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" enable-background="new 0 0 510.24 283.46">
-    <g>
-        <path d="M 125.42455,28.358 H 57.499548 V 16.324 c 0,-3.493 2.831,-6.324 6.324,-6.324 h 55.277002 c 3.493,0 6.324,2.831 6.324,6.324 v 12.034 z"/>
-        <path d="m 125.42455,36.956 c 0,18.757 -15.206,39.962 -33.962002,39.962 -18.756,0 -33.962,-21.206 -33.962,-39.962 23.651,0 45.029002,0 67.924002,0 z"/>
-        <path d="m 144.13455,159.982 c 0,6.881 -5.076,12.458 -11.338,12.458 H 50.723548 c -6.262,0 -11.337999,-5.577 -11.337999,-12.458 V 96.398 c 0,-6.88 5.076999,-12.458 11.337999,-12.458 h 82.073002 c 6.262,0 11.338,5.578 11.338,12.458 v 63.584 z"/>
-        <polygon transform="translate(-119.615 -21.81)" points="199,194.25 180.25,194.25 237.039,105.75 253.5,105.75" fill="#fff"/>
-    </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="182.44"
+   height="182.43999"
+   viewBox="0 0 182.44 182.44"
+   enable-background="new 0 0 510.24 283.46"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="police.svg"><metadata
+   id="metadata16"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs14" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="640"
+   inkscape:window-height="484"
+   id="namedview12"
+   showgrid="false"
+   fit-margin-left="10"
+   fit-margin-top="10"
+   fit-margin-right="10"
+   fit-margin-bottom="10"
+   inkscape:zoom="0.74866731"
+   inkscape:cx="106.119"
+   inkscape:cy="62.519989"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="svg2" />
+	
+	
+	
+	<g
+   id="g2993"><path
+     inkscape:connector-curvature="0"
+     id="path4"
+     d="M 125.42455,28.358 H 57.499548 V 16.324 c 0,-3.493 2.831,-6.324 6.324,-6.324 h 55.277002 c 3.493,0 6.324,2.831 6.324,6.324 v 12.034 z" /><path
+     inkscape:connector-curvature="0"
+     id="path6"
+     d="m 125.42455,36.956 c 0,18.757 -15.206,39.962 -33.962002,39.962 -18.756,0 -33.962,-21.206 -33.962,-39.962 23.651,0 45.029002,0 67.924002,0 z" /><path
+     inkscape:connector-curvature="0"
+     id="path8"
+     d="m 144.13455,159.982 c 0,6.881 -5.076,12.458 -11.338,12.458 H 50.723548 c -6.262,0 -11.337999,-5.577 -11.337999,-12.458 V 96.398 c 0,-6.88 5.076999,-12.458 11.337999,-12.458 h 82.073002 c 6.262,0 11.338,5.578 11.338,12.458 v 63.584 z" /><polygon
+     transform="translate(-119.61545,-21.81)"
+     style="fill:#ffffff"
+     id="polygon10"
+     points="199,194.25 180.25,194.25 237.039,105.75 253.5,105.75 " /></g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/postbox.svg b/data/styles/symbols/postbox.svg
index a42499d430..1e6490de83 100644
--- a/data/styles/symbols/postbox.svg
+++ b/data/styles/symbols/postbox.svg
@@ -1,3 +1,64 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="0 0 46.351933 46.351933" height="24">
-    <path d="M 3.5625 7 L 11 14 L 13 14 L 20.4375 7 L 3.5625 7 z M 2 8.4375 L 2 18 L 8.03125 13.375 L 2 8.4375 z M 22 8.46875 L 16.03125 13.34375 L 22 18 L 22 8.46875 z M 15.25 14 L 14 15 L 10 15 L 8.90625 14.09375 L 3 19 L 21 19 L 15.25 14 z" transform="scale(1.931)" fill="#505050"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="postoffice"
+   viewBox="0 0 46.351933 46.351933"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="postoffice.svg">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1125"
+     inkscape:window-height="669"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="7.2917032"
+     inkscape:cx="8.9629805"
+     inkscape:cy="8.9363231"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="postoffice">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="M 3.5625 7 L 11 14 L 13 14 L 20.4375 7 L 3.5625 7 z M 2 8.4375 L 2 18 L 8.03125 13.375 L 2 8.4375 z M 22 8.46875 L 16.03125 13.34375 L 22 18 L 22 8.46875 z M 15.25 14 L 14 15 L 10 15 L 8.90625 14.09375 L 3 19 L 21 19 L 15.25 14 z "
+     id="rect2990"
+     transform="scale(1.9313305,1.9313305)" />
 </svg>
diff --git a/data/styles/symbols/postoffice.svg b/data/styles/symbols/postoffice.svg
index a42499d430..d1989792ca 100644
--- a/data/styles/symbols/postoffice.svg
+++ b/data/styles/symbols/postoffice.svg
@@ -1,3 +1,63 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="0 0 46.351933 46.351933" height="24">
-    <path d="M 3.5625 7 L 11 14 L 13 14 L 20.4375 7 L 3.5625 7 z M 2 8.4375 L 2 18 L 8.03125 13.375 L 2 8.4375 z M 22 8.46875 L 16.03125 13.34375 L 22 18 L 22 8.46875 z M 15.25 14 L 14 15 L 10 15 L 8.90625 14.09375 L 3 19 L 21 19 L 15.25 14 z" transform="scale(1.931)" fill="#505050"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="postoffice"
+   viewBox="0 0 46.351933 46.351933"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="postoffice.svg">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1125"
+     inkscape:window-height="669"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="7.2917032"
+     inkscape:cx="8.9629805"
+     inkscape:cy="8.9363231"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="postoffice">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="M 3.5625 7 L 11 14 L 13 14 L 20.4375 7 L 3.5625 7 z M 2 8.4375 L 2 18 L 8.03125 13.375 L 2 8.4375 z M 22 8.46875 L 16.03125 13.34375 L 22 18 L 22 8.46875 z M 15.25 14 L 14 15 L 10 15 L 8.90625 14.09375 L 3 19 L 21 19 L 15.25 14 z "
+     id="rect2990"
+     transform="scale(1.9313305,1.9313305)" />
 </svg>
diff --git a/data/styles/symbols/power-pole.svg b/data/styles/symbols/power-pole.svg
index cc7821870f..0e3d90dafd 100644
--- a/data/styles/symbols/power-pole.svg
+++ b/data/styles/symbols/power-pole.svg
@@ -1,3 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="5" viewBox="0 0 10 10" stroke="#808080" height="5">
-    <svg:path d="M 0 0 L 10 10 M 0 10 L 10 0"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="5" id="power-pole" viewBox="0 0 10 10" stroke-width="1px" stroke="#808080" height="5">
+   <svg:path d="M 0 0 L 10 10 M 0 10 L 10 0"/>
 </svg>
diff --git a/data/styles/symbols/power-tower.svg b/data/styles/symbols/power-tower.svg
index 71912f8ae4..7fbd624f32 100644
--- a/data/styles/symbols/power-tower.svg
+++ b/data/styles/symbols/power-tower.svg
@@ -1,3 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="9.32" viewBox="0 0 10 10" stroke="#808080" height="9.32">
-    <svg:path d="M 0 0 L 10 10 M 0 10 L 10 0"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="9.32" id="power-tower" viewBox="0 0 10 10" stroke-width="1px" stroke="#808080" height="9.32">
+   <svg:path d="M 0 0 L 10 10 M 0 10 L 10 0"/>
 </svg>
diff --git a/data/styles/symbols/power_generic.svg b/data/styles/symbols/power_generic.svg
index 6c7a869b69..04d499e793 100644
--- a/data/styles/symbols/power_generic.svg
+++ b/data/styles/symbols/power_generic.svg
@@ -1,3 +1,15 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="16" height="16">
-    <path d="M 8.5,12.8 L 11.9,6.5 L 7.1,7.6 L 10.8,1.5 L 8.2,0.17 L 4.1,10.1 L 9,8.6 L 7.4,12.3 L 7.1,11.6 L 6.65,15.7 L 9.3,12.5 L 8.5,12.8 z" fill="#ff0" fill-rule="evenodd" stroke="#000" stroke-width=".2"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="16"
+   height="16"
+   id="symbol-power-generic">
+    <path
+       d="M 8.5,12.8 L 11.9,6.5 L 7.1,7.6 L 10.8,1.5 L 8.2,0.17 L 4.1,10.1 L 9,8.6 L 7.4,12.3 L 7.1,11.6 L 6.65,15.7 L 9.3,12.5 L 8.5,12.8 z"
+       id="path4518"
+       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/power_hydro.svg b/data/styles/symbols/power_hydro.svg
index bb994539f5..719b51b3a0 100644
--- a/data/styles/symbols/power_hydro.svg
+++ b/data/styles/symbols/power_hydro.svg
@@ -1,3 +1,15 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="16" height="16">
-    <path d="M 8.5,12.8 L 11.9,6.5 L 7.1,7.6 L 10.8,1.5 L 8.2,0.17 L 4.1,10.1 L 9,8.6 L 7.4,12.3 L 7.1,11.6 L 6.65,15.7 L 9.3,12.5 L 8.5,12.8 z" fill="#0cf" fill-rule="evenodd" stroke="#000" stroke-width=".2"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="16"
+   height="16"
+   id="symbol-power-hydro">
+    <path
+       d="M 8.5,12.8 L 11.9,6.5 L 7.1,7.6 L 10.8,1.5 L 8.2,0.17 L 4.1,10.1 L 9,8.6 L 7.4,12.3 L 7.1,11.6 L 6.65,15.7 L 9.3,12.5 L 8.5,12.8 z"
+       id="path4518"
+       style="fill:#00ccff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/power_photovoltaic.svg b/data/styles/symbols/power_photovoltaic.svg
index 7d93c09529..f7e0bcdb8f 100644
--- a/data/styles/symbols/power_photovoltaic.svg
+++ b/data/styles/symbols/power_photovoltaic.svg
@@ -1,14 +1,16 @@
-<svg xmlns="http://www.w3.org/2000/svg" baseProfile="full" width="18" height="18" viewBox="0 0 16 16">
-    <g transform="matrix(1 0 -.26 1 .15 0)">
-        <rect x="3.4" y="3.4" width="13" height="8.9" fill="#fff" stroke="#000" stroke-width=".4"/>
-        <g fill="#000084">
-            <rect x="3.9" y="8" width="3.8" height="3.8"/>
-            <rect x="8" y="8" width="3.8" height="3.8"/>
-            <rect x="12.1" y="8" width="3.8" height="3.8"/>
-            <rect x="3.9" y="3.9" width="3.8" height="3.8"/>
-            <rect x="8" y="3.9" width="3.8" height="3.8"/>
-            <rect x="12.1" y="3.9" width="3.8" height="3.8"/>
-        </g>
-    </g>
-    <path d="M 2.72 0.34 L 2.97 2.59 L 1.38 2.13 L 2.44 3.25 L 0.38 3.98 L 2.59 4.38 L 1.59 5.72 L 3.13 5.03 L 3.16 7.22 L 4.25 5.34 L 5.22 6.63 L 5.03 5 L 7.22 5.66 L 5.72 4.06 L 7.25 3.59 L 5.59 3.28 L 6.97 1.41 L 4.88 2.34 L 4.88 0.78 L 4.09 2.13 L 2.72 0.34 z" fill="#ff0" stroke="#000" stroke-width=".1"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" version="1.1" baseProfile="full"
+   width="16" height="16" id="symbol-power-photovoltaic">
+ <g transform="matrix(1,0,-0.26,1,0.15,0)">
+  <rect x="3.4" y="3.4" width="13" height="8.9" style="fill:#ffffff;stroke:#000000;stroke-width:0.4"/>
+  <g style="stroke-width:0;fill:#000084" >
+   <rect x="3.9" y="8" width="3.8" height="3.8" />
+   <rect x="8" y="8" width="3.8" height="3.8" />
+   <rect x="12.1" y="8" width="3.8" height="3.8" />
+   <rect x="3.9" y="3.9" width="3.8" height="3.8" />
+   <rect x="8" y="3.9" width="3.8" height="3.8" />
+   <rect x="12.1" y="3.9" width="3.8" height="3.8" />
+  </g>
+ </g>
+ <path d="M 2.72 0.34 L 2.97 2.59 L 1.38 2.13 L 2.44 3.25 L 0.38 3.98 L 2.59 4.38 L 1.59 5.72 L 3.13 5.03 L 3.16 7.22 L 4.25 5.34 L 5.22 6.63 L 5.03 5 L 7.22 5.66 L 5.72 4.06 L 7.25 3.59 L 5.59 3.28 L 6.97 1.41 L 4.88 2.34 L 4.88 0.78 L 4.09 2.13 L 2.72 0.34 z" style="fill:#ffff00;stroke:#000000;stroke-width:0.1" />
 </svg>
diff --git a/data/styles/symbols/power_wind.svg b/data/styles/symbols/power_wind.svg
index 8639d395bb..88484b85df 100644
--- a/data/styles/symbols/power_wind.svg
+++ b/data/styles/symbols/power_wind.svg
@@ -1,7 +1,33 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="16" height="16">
-    <rect width=".775" height="8.139" x="8.345" y="7.861"/>
-    <path d="M 9.4685289,7.5398227 C 9.5951548,7.3769778 10.64679,8.1902804 11.817421,9.3563852 C 12.988052,10.52249 13.834385,11.599816 13.707759,11.762661 C 13.581133,11.925506 12.529499,11.112204 11.358868,9.9460989 C 10.188236,8.7799942 9.341903,7.7026676 9.4685289,7.5398227 z"/>
-    <path d="M 9.0179241,5.7934416 C 8.8242005,5.7429518 9.0001786,4.4242539 9.4109824,2.8480475 C 9.8217862,1.2718412 10.311853,0.03500359 10.505576,0.085493431 C 10.6993,0.13598327 10.523322,1.4546811 10.112518,3.0308874 C 9.7017142,4.6070939 9.2116477,5.8439315 9.0179241,5.7934416 z"/>
-    <path d="M 7.7057548,7.0801563 C 7.7567258,7.273754 6.5211097,7.7668916 4.9459289,8.1816099 C 3.3707482,8.5963282 2.0524917,8.7755817 2.0015207,8.5819841 C 1.9505497,8.3883865 3.1861658,7.8952488 4.7613465,7.4805306 C 6.3365273,7.0658123 7.6547838,6.8865587 7.7057548,7.0801563 z"/>
-    <path d="M 9.7448924,6.787931 C 9.7450023,7.3521951 9.2876067,7.8096797 8.7233428,7.8096797 C 8.1590787,7.8096797 7.7016831,7.3521951 7.701793,6.787931 C 7.7016831,6.2236669 8.1590787,5.7661823 8.7233428,5.7661823 C 9.2876067,5.7661823 9.7450023,6.2236669 9.7448924,6.787931 L 9.7448924,6.787931 z"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="16"
+   height="16"
+   id="symbol-power-wind">
+  <rect
+     width="0.77532399"
+     height="8.1394444"
+     x="8.3448029"
+     y="7.860559"
+     id="rect2385"
+     style="fill:#000000" />
+  <path
+     d="M 9.4685289,7.5398227 C 9.5951548,7.3769778 10.64679,8.1902804 11.817421,9.3563852 C 12.988052,10.52249 13.834385,11.599816 13.707759,11.762661 C 13.581133,11.925506 12.529499,11.112204 11.358868,9.9460989 C 10.188236,8.7799942 9.341903,7.7026676 9.4685289,7.5398227 z"
+     id="path2387"
+     style="fill:#000000" />
+  <path
+     d="M 9.0179241,5.7934416 C 8.8242005,5.7429518 9.0001786,4.4242539 9.4109824,2.8480475 C 9.8217862,1.2718412 10.311853,0.03500359 10.505576,0.085493431 C 10.6993,0.13598327 10.523322,1.4546811 10.112518,3.0308874 C 9.7017142,4.6070939 9.2116477,5.8439315 9.0179241,5.7934416 z"
+     id="path2393"
+     style="fill:#000000" />
+  <path
+     d="M 7.7057548,7.0801563 C 7.7567258,7.273754 6.5211097,7.7668916 4.9459289,8.1816099 C 3.3707482,8.5963282 2.0524917,8.7755817 2.0015207,8.5819841 C 1.9505497,8.3883865 3.1861658,7.8952488 4.7613465,7.4805306 C 6.3365273,7.0658123 7.6547838,6.8865587 7.7057548,7.0801563 z"
+     id="path2395"
+     style="fill:#000000" />
+  <path
+     d="M 9.7448924,6.787931 C 9.7450023,7.3521951 9.2876067,7.8096797 8.7233428,7.8096797 C 8.1590787,7.8096797 7.7016831,7.3521951 7.701793,6.787931 C 7.7016831,6.2236669 8.1590787,5.7661823 8.7233428,5.7661823 C 9.2876067,5.7661823 9.7450023,6.2236669 9.7448924,6.787931 L 9.7448924,6.787931 z"
+     id="path2397"
+     style="fill:#000000" />
 </svg>
diff --git a/data/styles/symbols/pub.svg b/data/styles/symbols/pub.svg
index 4231142813..7bffd548f2 100644
--- a/data/styles/symbols/pub.svg
+++ b/data/styles/symbols/pub.svg
@@ -1,17 +1,188 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" viewBox="0 0 995.70819 995.70819" height="24">
-    <title>
-        Pub Map Icon
-    </title>
-    <path d="m 207.43921,-207.43921 c 0,45.8262 -37.14948,82.97568 -82.97569,82.97568 -45.826199,0 -82.975679,-37.14948 -82.975679,-82.97568 0,-45.8262 37.14948,-82.97568 82.975679,-82.97568 45.82621,0 82.97569,37.14948 82.97569,82.97568 z" id="a" fill="#000094"/>
-    <use xlink:href="#a" transform="translate(82.976 -82.976)" width="995.708" height="995.708" fill="#000094"/>
-    <use height="995.708" width="995.708" transform="translate(248.927 -82.976)" xlink:href="#a" fill="#000094"/>
-    <use xlink:href="#a" transform="translate(414.878 -82.976)" width="995.708" height="995.708" fill="#000094"/>
-    <use height="995.708" width="995.708" transform="translate(497.854)" xlink:href="#a" fill="#000094"/>
-    <rect width="2" height="1" x="4" y="-7" transform="scale(41.488)" fill="#000094"/>
-    <path d="M 12 7 L 10.3125 8 L 8.15625 8 C 6.9559165 8 6 6.9901462 6 8.15625 L 6 9.125 C 5.3123393 9.1444418 4.6271197 9.1867936 3.96875 9.40625 C 3.479908 9.5691975 2.9797615 9.8251279 2.625 10.28125 C 2.2702386 10.737372 2.09375 11.35 2.09375 12 L 2.09375 16 C 2.09375 16.575 2.170219 17.090439 2.40625 17.5625 C 2.6422807 18.034561 3.065071 18.407278 3.53125 18.59375 C 4.2229406 18.870426 5.0469768 18.873739 6 18.875 L 6 20.90625 C 6 22.072354 6.9559165 23 8.15625 23 L 16.84375 23 C 18.044083 23 19 22.072354 19 20.90625 L 19 8.15625 C 19 6.9901462 18.044083 8 16.84375 8 L 13 7 L 12 7 z M 8 9 L 9 9 L 9 21 L 8 21 L 8 9 z M 10 9 L 11 9 L 11 21 L 10 21 L 10 9 z M 12 9 L 13 9 L 13 21 L 12 21 L 12 9 z M 14 9 L 15 9 L 15 21 L 14 21 L 14 9 z M 16 9 L 17 9 L 17 21 L 16 21 L 16 9 z M 5.59375 10.9375 C 5.7170152 10.9302 5.8678932 10.9416 6 10.9375 L 6 17.0625 C 5.1248155 17.038273 4.4502311 16.998843 4.21875 16.90625 C 4.0599288 16.842722 4.0452195 16.840439 4 16.75 C 3.9547807 16.659561 3.90625 16.425 3.90625 16 L 3.90625 12 C 3.90625 11.65 3.979761 11.512628 4.0625 11.40625 C 4.145239 11.299872 4.270092 11.180803 4.53125 11.09375 C 4.792408 11.0067 5.166852 10.962612 5.59375 10.9375 z" transform="scale(41.488)" fill="#505050"/>
-    <path d="m 19,5 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z" transform="scale(41.488)" fill="#fff" stroke="#505050" stroke-width="1.3"/>
-    <path d="m 19,5 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z" transform="matrix(41.488 0 0 41.488 -290.415 0)" fill="#fff" stroke="#505050" stroke-width="1.3"/>
-    <path transform="matrix(27.659 0 0 27.659 76.061 69.146)" d="m 19,5 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z" fill="#fff" stroke="#505050" stroke-width="1.95"/>
-    <path d="m 19,5 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z" transform="matrix(27.659 0 0 27.659 -193.61 110.634)" fill="#fff" stroke="#505050" stroke-width="1.95"/>
-    <path transform="matrix(27.659 0 0 27.659 345.732 110.634)" d="m 19,5 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z" fill="#fff" stroke="#505050" stroke-width="1.8"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="pub"
+   viewBox="0 0 995.70819 995.70819"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="pub.svg">
+  <title
+     id="title2989">Pub Map Icon</title>
+  <metadata
+     id="metadata17">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Pub Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs15" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1060"
+     inkscape:window-height="751"
+     id="namedview13"
+     showgrid="true"
+     inkscape:zoom="18.302216"
+     inkscape:cx="12.670859"
+     inkscape:cy="11.153348"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="pub">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2994"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#000094;fill-opacity:1;stroke:none"
+     d="m 207.43921,-207.43921 c 0,45.8262 -37.14948,82.97568 -82.97569,82.97568 -45.826199,0 -82.975679,-37.14948 -82.975679,-82.97568 0,-45.8262 37.14948,-82.97568 82.975679,-82.97568 45.82621,0 82.97569,37.14948 82.97569,82.97568 z"
+     id="path3038"
+     inkscape:connector-curvature="0" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#path3038"
+     id="use3042"
+     transform="translate(82.975677,-82.975678)"
+     width="995.70819"
+     height="995.70819"
+     style="fill:#000094" />
+  <use
+     height="995.70819"
+     width="995.70819"
+     transform="translate(248.92704,-82.975678)"
+     id="use3046"
+     xlink:href="#path3038"
+     y="0"
+     x="0"
+     style="fill:#000094" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#path3038"
+     id="use3050"
+     transform="translate(414.8784,-82.975678)"
+     width="995.70819"
+     height="995.70819"
+     style="fill:#000094" />
+  <use
+     height="995.70819"
+     width="995.70819"
+     transform="translate(497.85408,4.9999996e-7)"
+     id="use3054"
+     xlink:href="#path3038"
+     y="0"
+     x="0"
+     style="fill:#000094" />
+  <rect
+     style="fill:#000094;fill-opacity:1;stroke:none"
+     id="rect3079"
+     width="2"
+     height="1"
+     x="4"
+     y="-7"
+     transform="scale(41.487841,41.487841)" />
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="M 12 7 L 10.3125 8 L 8.15625 8 C 6.9559165 8 6 6.9901462 6 8.15625 L 6 9.125 C 5.3123393 9.1444418 4.6271197 9.1867936 3.96875 9.40625 C 3.479908 9.5691975 2.9797615 9.8251279 2.625 10.28125 C 2.2702386 10.737372 2.09375 11.35 2.09375 12 L 2.09375 16 C 2.09375 16.575 2.170219 17.090439 2.40625 17.5625 C 2.6422807 18.034561 3.065071 18.407278 3.53125 18.59375 C 4.2229406 18.870426 5.0469768 18.873739 6 18.875 L 6 20.90625 C 6 22.072354 6.9559165 23 8.15625 23 L 16.84375 23 C 18.044083 23 19 22.072354 19 20.90625 L 19 8.15625 C 19 6.9901462 18.044083 8 16.84375 8 L 13 7 L 12 7 z M 8 9 L 9 9 L 9 21 L 8 21 L 8 9 z M 10 9 L 11 9 L 11 21 L 10 21 L 10 9 z M 12 9 L 13 9 L 13 21 L 12 21 L 12 9 z M 14 9 L 15 9 L 15 21 L 14 21 L 14 9 z M 16 9 L 17 9 L 17 21 L 16 21 L 16 9 z M 5.59375 10.9375 C 5.7170152 10.9302 5.8678932 10.9416 6 10.9375 L 6 17.0625 C 5.1248155 17.038273 4.4502311 16.998843 4.21875 16.90625 C 4.0599288 16.842722 4.0452195 16.840439 4 16.75 C 3.9547807 16.659561 3.90625 16.425 3.90625 16 L 3.90625 12 C 3.90625 11.65 3.979761 11.512628 4.0625 11.40625 C 4.145239 11.299872 4.270092 11.180803 4.53125 11.09375 C 4.792408 11.0067 5.166852 10.962612 5.59375 10.9375 z "
+     transform="scale(41.487841,41.487841)"
+     id="rect2990" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#ffffff;fill-opacity:1;stroke:#505050;stroke-opacity:1;stroke-width:1.30000000999999998;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path3784"
+     sodipodi:cx="16"
+     sodipodi:cy="5"
+     sodipodi:rx="3"
+     sodipodi:ry="3"
+     d="m 19,5 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+     transform="scale(41.487841,41.487841)" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#ffffff;fill-opacity:1;stroke:#505050;stroke-width:1.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="path3788"
+     sodipodi:cx="16"
+     sodipodi:cy="5"
+     sodipodi:rx="3"
+     sodipodi:ry="3"
+     d="m 19,5 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+     transform="matrix(41.487841,0,0,41.487841,-290.41488,4.9999994e-7)" />
+  <path
+     transform="matrix(27.658561,0,0,27.658561,76.061048,69.146397)"
+     d="m 19,5 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+     sodipodi:ry="3"
+     sodipodi:rx="3"
+     sodipodi:cy="5"
+     sodipodi:cx="16"
+     id="path3790"
+     style="fill:#ffffff;fill-opacity:1;stroke:#505050;stroke-width:1.95000005;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:type="arc" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#ffffff;fill-opacity:1;stroke:#505050;stroke-width:1.94999999000000002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="path3792"
+     sodipodi:cx="16"
+     sodipodi:cy="5"
+     sodipodi:rx="3"
+     sodipodi:ry="3"
+     d="m 19,5 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+     transform="matrix(27.658561,0,0,27.658561,-193.60993,110.63424)" />
+  <path
+     transform="matrix(27.658561,0,0,27.658561,345.73201,110.63424)"
+     d="m 19,5 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+     sodipodi:ry="3"
+     sodipodi:rx="3"
+     sodipodi:cy="5"
+     sodipodi:cx="16"
+     id="path3794"
+     style="fill:#ffffff;fill-opacity:1;stroke:#505050;stroke-width:1.79999999000000011;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:type="arc" />
 </svg>
diff --git a/data/styles/symbols/pubx.svg b/data/styles/symbols/pubx.svg
index 20a059777f..b314e5b55d 100644
--- a/data/styles/symbols/pubx.svg
+++ b/data/styles/symbols/pubx.svg
@@ -1,11 +1,12 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="24" viewBox="0 0 600 600" height="24">
-    <svg:g fill-rule="nonzero">
-        <svg:path d="M 598.46 512.06 C 598.46 557.96 561.20 595.40 515.30 595.40 L 88.70 595.40 C 42.62 595.40 5.36 557.96 5.36 512.06 L 5.36 85.46 C 5.36 39.38 42.62 2.12 88.70 2.12 L 515.30 2.12 C 561.20 2.12 598.46 39.38 598.46 85.46 L 598.46 512.06" fill="#fff" stroke="#000" stroke-width="50" stroke-linecap="butt" stroke-linejoin="miter"/>
-        <svg:path d="M 311.00 565.88 C 344.84 567.68 384.26 575.96 413.60 589.28 L 190.40 589.46 C 221.00 574.88 256.28 567.68 291.92 566.06 L 291.92 377.24 C 224.60 371.48 169.70 318.38 170.24 245.48 C 170.60 191.66 198.86 133.88 198.86 133.88 L 407.30 133.88 C 407.30 133.88 433.76 181.22 433.76 245.48 C 433.76 309.74 379.94 372.74 311.00 376.88 L 311.00 565.88 Z" fill="#fff" stroke="none"/>
-        <svg:path d="M 311.00 565.88 C 344.84 567.68 384.26 575.96 413.60 589.28 L 190.40 589.46 C 221.00 574.88 256.28 567.68 291.92 566.06 L 291.92 377.24 C 224.60 371.48 169.70 318.38 170.24 245.48 C 170.60 191.66 198.86 133.88 198.86 133.88 L 407.30 133.88 C 407.30 133.88 433.76 181.22 433.76 245.48 C 433.76 309.74 379.94 372.74 311.00 376.88 L 311.00 565.88" stroke="#000" stroke-width="14.94" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-        <svg:path d="M 431.60 210.74 C 432.86 220.64 433.76 234.32 433.76 245.48 C 433.76 309.74 379.94 372.74 311.00 376.88 L 311.00 565.88 C 344.84 567.68 384.26 575.96 413.60 589.28 L 190.40 589.46 C 221.00 574.88 256.28 567.68 291.92 566.06 L 291.92 377.24 C 224.60 371.48 169.70 318.38 170.24 245.48 C 170.24 234.14 171.50 222.62 173.48 211.64 L 431.60 210.74 Z" fill="#000" stroke="none" stroke-width="14.94" stroke-linecap="round" stroke-linejoin="bevel"/>
-        <svg:path d="M 431.60 210.74 C 432.86 220.64 433.76 234.32 433.76 245.48 C 433.76 309.74 379.94 372.74 311.00 376.88 L 311.00 565.88 C 344.84 567.68 384.26 575.96 413.60 589.28 L 190.40 589.46 C 221.00 574.88 256.28 567.68 291.92 566.06 L 291.92 377.24 C 224.60 371.48 169.70 318.38 170.24 245.48 C 170.24 234.14 171.50 222.62 173.48 211.64 L 431.60 210.74" stroke="#000" stroke-width=".54" stroke-linecap="butt" stroke-linejoin="miter" fill="none"/>
-        <svg:path d="M 365.90 333.68 C 365.90 347.00 355.28 357.62 341.96 357.62 C 328.64 357.62 318.02 347.00 318.02 333.68 C 318.02 320.36 328.64 309.74 341.96 309.74 C 355.28 309.74 365.90 320.36 365.90 333.68 Z" fill="#fff" stroke="none" stroke-width=".54" stroke-linecap="butt" stroke-linejoin="bevel"/>
-        <svg:path d="M 365.90 333.68 C 365.90 347.00 355.28 357.62 341.96 357.62 C 328.64 357.62 318.02 347.00 318.02 333.68 C 318.02 320.36 328.64 309.74 341.96 309.74 C 355.28 309.74 365.90 320.36 365.90 333.68" stroke="#000" stroke-width="1.08" stroke-linecap="butt" stroke-linejoin="miter" fill="none"/>
-    </svg:g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="24" id="pubx" viewBox="0 0 600 600" height="24">
+   <svg:g style="fill-rule: nonzero;">
+                <svg:path style="fill:#ffffff; stroke:#000000; stroke-width:50; stroke-linecap:butt; stroke-linejoin:miter" d="M 598.46 512.06 C 598.46 557.96 561.20 595.40 515.30 595.40 L 88.70 595.40       C 42.62 595.40 5.36 557.96 5.36 512.06 L 5.36 85.46 C 5.36 39.38 42.62 2.12 88.70 2.12       L 515.30 2.12 C 561.20 2.12 598.46 39.38 598.46 85.46 L 598.46 512.06"/>
+                <svg:path style="fill:#FFFFFF; stroke:none;" d="M 311.00 565.88 C 344.84 567.68 384.26 575.96 413.60 589.28 L 190.40 589.46       C 221.00 574.88 256.28 567.68 291.92 566.06 L 291.92 377.24 C 224.60 371.48 169.70 318.38 170.24 245.48       C 170.60 191.66 198.86 133.88 198.86 133.88 L 407.30 133.88 C 407.30 133.88 433.76 181.22 433.76 245.48       C 433.76 309.74 379.94 372.74 311.00 376.88 L 311.00 565.88 Z"/>
+                <svg:path style="fill:none; stroke:#000000; stroke-width:14.94; stroke-linecap:round; stroke-linejoin:round" d="M 311.00 565.88 C 344.84 567.68 384.26 575.96 413.60 589.28 L 190.40 589.46       C 221.00 574.88 256.28 567.68 291.92 566.06 L 291.92 377.24 C 224.60 371.48 169.70 318.38 170.24 245.48       C 170.60 191.66 198.86 133.88 198.86 133.88 L 407.30 133.88 C 407.30 133.88 433.76 181.22 433.76 245.48       C 433.76 309.74 379.94 372.74 311.00 376.88 L 311.00 565.88"/>
+                <svg:path style="fill:#000000; stroke:none; stroke-width:14.94; stroke-linecap:round; stroke-linejoin:bevel" d="M 431.60 210.74 C 432.86 220.64 433.76 234.32 433.76 245.48 C 433.76 309.74 379.94 372.74 311.00 376.88       L 311.00 565.88 C 344.84 567.68 384.26 575.96 413.60 589.28 L 190.40 589.46       C 221.00 574.88 256.28 567.68 291.92 566.06 L 291.92 377.24 C 224.60 371.48 169.70 318.38 170.24 245.48       C 170.24 234.14 171.50 222.62 173.48 211.64 L 431.60 210.74 Z"/>
+                <svg:path style="fill:none; stroke:#000000; stroke-width:0.54; stroke-linecap:butt; stroke-linejoin:miter" d="M 431.60 210.74 C 432.86 220.64 433.76 234.32 433.76 245.48 C 433.76 309.74 379.94 372.74 311.00 376.88       L 311.00 565.88 C 344.84 567.68 384.26 575.96 413.60 589.28 L 190.40 589.46       C 221.00 574.88 256.28 567.68 291.92 566.06 L 291.92 377.24 C 224.60 371.48 169.70 318.38 170.24 245.48       C 170.24 234.14 171.50 222.62 173.48 211.64 L 431.60 210.74"/>
+                <svg:path style="fill:#FFFFFF; stroke:none; stroke-width:0.54; stroke-linecap:butt; stroke-linejoin:bevel" d="M 365.90 333.68 C 365.90 347.00 355.28 357.62 341.96 357.62 C 328.64 357.62 318.02 347.00 318.02 333.68       C 318.02 320.36 328.64 309.74 341.96 309.74 C 355.28 309.74 365.90 320.36 365.90 333.68 Z"/>
+                <svg:path style="fill:none; stroke:#000000; stroke-width:1.08; stroke-linecap:butt; stroke-linejoin:miter" d="M 365.90 333.68 C 365.90 347.00 355.28 357.62 341.96 357.62 C 328.64 357.62 318.02 347.00 318.02 333.68       C 318.02 320.36 328.64 309.74 341.96 309.74 C 355.28 309.74 365.90 320.36 365.90 333.68"/>
+            </svg:g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/railway-crossing-small.svg b/data/styles/symbols/railway-crossing-small.svg
index bb93cc174c..d09862ab70 100644
--- a/data/styles/symbols/railway-crossing-small.svg
+++ b/data/styles/symbols/railway-crossing-small.svg
@@ -1,6 +1,25 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="32.62" height="32.62" viewBox="0 0 600 600">
-    <g>
-        <path d="M 1.5,4.5 L 67.5,6 L 257.5,97.4 L 456,0 L 519,4.5 L 504,52.5 L 319.5,139.5 L 495,220.5 L 510,271.5 L 451.5,277.5 L 258,178.5 C 258,178.5 69,274.5 64.5,277.5 C 60,280.5 0,279 0,279 L 6,228 L 178.5,142.5 L 12,63 L 1.5,4.5 z" fill="#f00" transform="matrix(.5 0 0 .5 179.75 219.844)"/>
-        <path d="M 49.5,21 L 33,49.5 L 219,141 L 36,237 L 52.5,262.5 L 258,156 L 454.5,261 L 475.5,228 L 286.5,136.5 L 475.5,49.5 L 454.5,19.5 L 257.8,116.2 L 49.5,21 z" fill="#fff" transform="matrix(.5 0 0 .5 179.75 219.844)"/>
-    </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="32.619999"
+   height="32.619999"
+   viewBox="0 0 600 600"
+   id="symbol-railway-crossing-small">
+  <defs
+     id="defs10" />
+  <g
+     transform="matrix(0.5,0,0,0.5,179.75,219.84375)"
+     id="g3">
+    <path
+       d="M 1.5,4.5 L 67.5,6 L 257.5,97.4 L 456,0 L 519,4.5 L 504,52.5 L 319.5,139.5 L 495,220.5 L 510,271.5 L 451.5,277.5 L 258,178.5 C 258,178.5 69,274.5 64.5,277.5 C 60,280.5 0,279 0,279 L 6,228 L 178.5,142.5 L 12,63 L 1.5,4.5 z"
+       id="path5"
+       style="fill:#ff0000" />
+    <path
+       d="M 49.5,21 L 33,49.5 L 219,141 L 36,237 L 52.5,262.5 L 258,156 L 454.5,261 L 475.5,228 L 286.5,136.5 L 475.5,49.5 L 454.5,19.5 L 257.8,116.2 L 49.5,21 z"
+       id="path7"
+       style="fill:#ffffff" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/railway-crossing.svg b/data/styles/symbols/railway-crossing.svg
index 1a8d41ec1c..0dd1f022a2 100644
--- a/data/styles/symbols/railway-crossing.svg
+++ b/data/styles/symbols/railway-crossing.svg
@@ -1,6 +1,7 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="32.62" viewBox="0 0 600 600" height="32.62">
-    <svg:g transform="translate(50 150)">
-        <svg:path fill="#f00" d="M1.5,4.5l66,1.5l190,91.4L456,0l63,4.5l-15,48 l-184.5,87l175.5,81l15,51l-58.5,6l-193.5-99c0,0-189,96-193.5,99S0,279,0,279l6-51l172.5-85.5L12,63L1.5,4.5z"/>
-        <svg:path fill="#fff" d="M49.5,21L33,49.5L219,141L36,237l16.5,25.5 L258,156l196.5,105l21-33l-189-91.5l189-87l-21-30l-196.7,96.7L49.5,21z"/>
-    </svg:g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="32.620000000000005" id="symbol-railway-crossing" viewBox="0 0 600 600" height="32.620000000000005">
+   <svg:g transform="translate(50,150)">
+            <svg:path fill="red" d="M1.5,4.5l66,1.5l190,91.4L456,0l63,4.5l-15,48    l-184.5,87l175.5,81l15,51l-58.5,6l-193.5-99c0,0-189,96-193.5,99S0,279,0,279l6-51l172.5-85.5L12,63L1.5,4.5z"/>
+            <svg:path fill="#FFFFFF" d="M49.5,21L33,49.5L219,141L36,237l16.5,25.5    L258,156l196.5,105l21-33l-189-91.5l189-87l-21-30l-196.7,96.7L49.5,21z"/>
+          </svg:g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/railway-station-mini.svg b/data/styles/symbols/railway-station-mini.svg
index 1bfaf784f2..5946d96bb9 100644
--- a/data/styles/symbols/railway-station-mini.svg
+++ b/data/styles/symbols/railway-station-mini.svg
@@ -1,8 +1,76 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24" enable-background="new 0 0 66.461 100">
-    <title>
-        Train Map Icon
-    </title>
-    <rect ry="3.4" rx="3.2" y="3" x="4" height="17" width="16" fill="#f2f2f2"/>
-    <rect width="14" height="15" x="5" y="4" rx="2.8" ry="3" fill="#0044d8"/>
-    <path d="m 11.984445,5.3245238 c -0.368153,0 -0.683293,0.2052752 -0.855543,0.5092356 l -1.3377565,0 C 8.756891,5.8329038 8.0012976,6.5481919 8.002284,7.329639 l 0,5.537937 c -9.874e-4,0.7592 0.6831692,1.397115 1.3688682,1.495881 l -2.0533018,2.673486 1.1822039,0 7.4665507,0 0.715545,0 -2.068857,-2.673486 c 0.686404,-0.09888 1.370417,-0.736681 1.368867,-1.495881 l 0,-5.537937 C 15.98396,6.5481919 15.23691,5.8329038 14.208855,5.8337594 l -0.7311,0 -0.637767,0 C 12.667738,5.529799 12.352598,5.3245238 11.984445,5.3245238 z m 0,0.5092356 c 0.27491,0 0.49777,0.2279925 0.49777,0.5092357 0,0.281243 -0.22286,0.5092356 -0.49777,0.5092356 -0.274911,0 -0.49777,-0.2279926 -0.49777,-0.5092356 0,-0.2812432 0.222859,-0.5092357 0.49777,-0.5092357 z M 9.4644834,7.3932936 c 0.1113913,-0.00391 0.2429587,2.139e-4 0.3888828,0 l 2.1466338,0 2.146633,0 c 0.584402,8.4e-4 0.881658,0.043642 0.886653,0.7797668 l 0,1.0025578 c 0.0015,0.4818481 0.235367,0.7638538 -0.886653,0.7638538 l -2.146633,0 -2.1466338,0 c -0.8940971,0 -0.9031936,-0.2820057 -0.9022083,-0.7638538 l 0,-1.0025578 c 0,-0.6628219 0.1791524,-0.7680279 0.5133255,-0.7797668 z m 0.2799965,4.7899974 c 0.4353411,-0.0021 0.7913481,0.308902 0.7933211,0.684285 -0.0019,0.376727 -0.35798,0.681475 -0.7933211,0.684285 -0.430975,-0.0028 -0.7787521,-0.307678 -0.7777658,-0.684285 -9.884e-4,-0.375383 0.3467908,-0.686119 0.7777658,-0.684285 z m 4.4799301,0 c 0.435343,-0.0021 0.775512,0.308902 0.777766,0.684285 -0.0024,0.376605 -0.342423,0.681353 -0.777766,0.684285 -0.431538,-0.0031 -0.794589,-0.30768 -0.793321,-0.684285 -0.0013,-0.375383 0.361783,-0.686119 0.793321,-0.684285 z M 9.993364,15 l 1.991081,0 1.99108,0 0.388883,0.509237 -4.7443707,0 L 9.993364,15 z m -0.7466544,1.018472 5.4910264,0 0.388882,0.509236 -6.2532361,0 0.3733277,-0.509236 z" fill="#fff"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   enable-background="new 0 0 66.461 100"
+   xml:space="preserve"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="railway-station.svg"><title
+   id="title3765">Train Map Icon</title><metadata
+   id="metadata13"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Train Map Icon</dc:title><dc:creator><cc:Agent><dc:title>Yury Melnichek</dc:title></cc:Agent></dc:creator><dc:source>mapsforhumans.com</dc:source></cc:Work></rdf:RDF></metadata><defs
+   id="defs11" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="909"
+   inkscape:window-height="754"
+   id="namedview9"
+   showgrid="true"
+   inkscape:zoom="19.154332"
+   inkscape:cx="16.487407"
+   inkscape:cy="13.293445"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"><inkscape:grid
+     type="xygrid"
+     id="grid2982"
+     empspacing="2"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
+
+
+<rect
+   ry="3.4000001"
+   rx="3.2"
+   y="3"
+   x="4"
+   height="17"
+   width="16"
+   id="rect3759"
+   style="fill:#f2f2f2;fill-opacity:1;stroke:none" /><rect
+   style="fill:#0044d8;fill-opacity:1;stroke:none"
+   id="rect2989"
+   width="14"
+   height="15"
+   x="5"
+   y="4"
+   rx="2.8000002"
+   ry="3" />
+<path
+   style="fill:#ffffff;fill-opacity:1"
+   d="m 11.984445,5.3245238 c -0.368153,0 -0.683293,0.2052752 -0.855543,0.5092356 l -1.3377565,0 C 8.756891,5.8329038 8.0012976,6.5481919 8.002284,7.329639 l 0,5.537937 c -9.874e-4,0.7592 0.6831692,1.397115 1.3688682,1.495881 l -2.0533018,2.673486 1.1822039,0 7.4665507,0 0.715545,0 -2.068857,-2.673486 c 0.686404,-0.09888 1.370417,-0.736681 1.368867,-1.495881 l 0,-5.537937 C 15.98396,6.5481919 15.23691,5.8329038 14.208855,5.8337594 l -0.7311,0 -0.637767,0 C 12.667738,5.529799 12.352598,5.3245238 11.984445,5.3245238 z m 0,0.5092356 c 0.27491,0 0.49777,0.2279925 0.49777,0.5092357 0,0.281243 -0.22286,0.5092356 -0.49777,0.5092356 -0.274911,0 -0.49777,-0.2279926 -0.49777,-0.5092356 0,-0.2812432 0.222859,-0.5092357 0.49777,-0.5092357 z M 9.4644834,7.3932936 c 0.1113913,-0.00391 0.2429587,2.139e-4 0.3888828,0 l 2.1466338,0 2.146633,0 c 0.584402,8.4e-4 0.881658,0.043642 0.886653,0.7797668 l 0,1.0025578 c 0.0015,0.4818481 0.235367,0.7638538 -0.886653,0.7638538 l -2.146633,0 -2.1466338,0 c -0.8940971,0 -0.9031936,-0.2820057 -0.9022083,-0.7638538 l 0,-1.0025578 c 0,-0.6628219 0.1791524,-0.7680279 0.5133255,-0.7797668 z m 0.2799965,4.7899974 c 0.4353411,-0.0021 0.7913481,0.308902 0.7933211,0.684285 -0.0019,0.376727 -0.35798,0.681475 -0.7933211,0.684285 -0.430975,-0.0028 -0.7787521,-0.307678 -0.7777658,-0.684285 -9.884e-4,-0.375383 0.3467908,-0.686119 0.7777658,-0.684285 z m 4.4799301,0 c 0.435343,-0.0021 0.775512,0.308902 0.777766,0.684285 -0.0024,0.376605 -0.342423,0.681353 -0.777766,0.684285 -0.431538,-0.0031 -0.794589,-0.30768 -0.793321,-0.684285 -0.0013,-0.375383 0.361783,-0.686119 0.793321,-0.684285 z M 9.993364,15 l 1.991081,0 1.99108,0 0.388883,0.509237 -4.7443707,0 L 9.993364,15 z m -0.7466544,1.018472 5.4910264,0 0.388882,0.509236 -6.2532361,0 0.3733277,-0.509236 z"
+   id="path7"
+   inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/data/styles/symbols/railway-station.svg b/data/styles/symbols/railway-station.svg
index 2267949d9a..cc6d3b8968 100644
--- a/data/styles/symbols/railway-station.svg
+++ b/data/styles/symbols/railway-station.svg
@@ -1,8 +1,76 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24" enable-background="new 0 0 66.461 100">
-    <title>
-        Train Map Icon
-    </title>
-    <rect ry="4.4" rx="4.4" y="1" x="1" height="22" width="22" fill="#f2f2f2"/>
-    <rect width="20" height="20" x="2" y="2" rx="4" ry="4" fill="#0044d8"/>
-    <path d="M 12.007782,4.266537 C 11.45236,4.266537 10.976917,4.5621993 10.717048,5 L 8.6988084,5 C 7.1384552,4.9987676 5.9985122,6.0290127 6,7.1545477 l 0,7.9764103 c -0.00149,1.093491 1.0306787,2.012294 2.0651751,2.154548 l -3.0977626,3.850681 1.7835603,0 11.2645912,0 1.079524,0 -3.121231,-3.850681 c 1.035561,-0.142432 2.067513,-1.061057 2.065175,-2.154548 l 0,-7.9764103 C 18.041632,6.0290127 16.914693,4.9987676 15.363692,5 L 14.2607,5 13.298517,5 C 13.038648,4.5621993 12.563205,4.266537 12.007782,4.266537 z m 0,0.733463 c 0.414751,0 0.750973,0.3283826 0.750973,0.7334631 0,0.4050804 -0.336222,0.733463 -0.750973,0.733463 -0.414751,0 -0.750973,-0.3283826 -0.750973,-0.733463 C 11.256809,5.3283826 11.593031,5 12.007782,5 z M 8.2059825,7.2462306 c 0.1680532,-0.00563 0.3665454,3.082e-4 0.5866975,0 l 3.23857,0 3.23857,0 c 0.881671,0.00121 1.330133,0.062858 1.33767,1.1231152 l 0,1.4440054 c 0.0023,0.6940168 0.355092,1.1001948 -1.33767,1.1001948 l -3.23857,0 -3.23857,0 c -1.3489021,0 -1.362626,-0.406178 -1.3611382,-1.1001948 l 0,-1.4440054 c 0,-0.9546769 0.2702811,-1.1062073 0.7744407,-1.1231152 z m 0.4224222,6.8991364 c 0.6567894,-0.0029 1.193887,0.444919 1.1968628,0.985591 -0.00276,0.542608 -0.5400734,0.981543 -1.1968628,0.985591 -0.6502004,-0.004 -1.174883,-0.443158 -1.173395,-0.985591 -0.00149,-0.540672 0.5231946,-0.988232 1.173395,-0.985591 z m 6.7587553,0 c 0.656789,-0.0029 1.169995,0.444919 1.173394,0.985591 -0.0035,0.542432 -0.516605,0.981366 -1.173394,0.985591 -0.65105,-0.0043 -1.198777,-0.443159 -1.196863,-0.985591 -0.002,-0.540672 0.545813,-0.988232 1.196863,-0.985591 z m -6.3832689,4.056968 3.0038909,0 3.003891,0 0.586698,0.733463 -7.1577095,0 0.5632296,-0.733463 z m -1.1264592,1.466925 8.2841681,0 0.586698,0.733464 -9.4340957,0 0.5632296,-0.733464 z" fill="#fff"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   enable-background="new 0 0 66.461 100"
+   xml:space="preserve"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="railway-station.svg"><title
+   id="title3765">Train Map Icon</title><metadata
+   id="metadata13"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Train Map Icon</dc:title><dc:creator><cc:Agent><dc:title>Yury Melnichek</dc:title></cc:Agent></dc:creator><dc:source>mapsforhumans.com</dc:source></cc:Work></rdf:RDF></metadata><defs
+   id="defs11" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="909"
+   inkscape:window-height="754"
+   id="namedview9"
+   showgrid="true"
+   inkscape:zoom="19.154332"
+   inkscape:cx="16.487407"
+   inkscape:cy="13.293445"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"><inkscape:grid
+     type="xygrid"
+     id="grid2982"
+     empspacing="2"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
+
+
+<rect
+   ry="4.4000001"
+   rx="4.4000001"
+   y="1"
+   x="1"
+   height="22"
+   width="22"
+   id="rect3759"
+   style="fill:#f2f2f2;fill-opacity:1;stroke:none" /><rect
+   style="fill:#0044d8;fill-opacity:1;stroke:none"
+   id="rect2989"
+   width="20"
+   height="20"
+   x="2"
+   y="2"
+   rx="4"
+   ry="4" />
+<path
+   style="fill:#ffffff;fill-opacity:1"
+   d="M 12.007782,4.266537 C 11.45236,4.266537 10.976917,4.5621993 10.717048,5 L 8.6988084,5 C 7.1384552,4.9987676 5.9985122,6.0290127 6,7.1545477 l 0,7.9764103 c -0.00149,1.093491 1.0306787,2.012294 2.0651751,2.154548 l -3.0977626,3.850681 1.7835603,0 11.2645912,0 1.079524,0 -3.121231,-3.850681 c 1.035561,-0.142432 2.067513,-1.061057 2.065175,-2.154548 l 0,-7.9764103 C 18.041632,6.0290127 16.914693,4.9987676 15.363692,5 L 14.2607,5 13.298517,5 C 13.038648,4.5621993 12.563205,4.266537 12.007782,4.266537 z m 0,0.733463 c 0.414751,0 0.750973,0.3283826 0.750973,0.7334631 0,0.4050804 -0.336222,0.733463 -0.750973,0.733463 -0.414751,0 -0.750973,-0.3283826 -0.750973,-0.733463 C 11.256809,5.3283826 11.593031,5 12.007782,5 z M 8.2059825,7.2462306 c 0.1680532,-0.00563 0.3665454,3.082e-4 0.5866975,0 l 3.23857,0 3.23857,0 c 0.881671,0.00121 1.330133,0.062858 1.33767,1.1231152 l 0,1.4440054 c 0.0023,0.6940168 0.355092,1.1001948 -1.33767,1.1001948 l -3.23857,0 -3.23857,0 c -1.3489021,0 -1.362626,-0.406178 -1.3611382,-1.1001948 l 0,-1.4440054 c 0,-0.9546769 0.2702811,-1.1062073 0.7744407,-1.1231152 z m 0.4224222,6.8991364 c 0.6567894,-0.0029 1.193887,0.444919 1.1968628,0.985591 -0.00276,0.542608 -0.5400734,0.981543 -1.1968628,0.985591 -0.6502004,-0.004 -1.174883,-0.443158 -1.173395,-0.985591 -0.00149,-0.540672 0.5231946,-0.988232 1.173395,-0.985591 z m 6.7587553,0 c 0.656789,-0.0029 1.169995,0.444919 1.173394,0.985591 -0.0035,0.542432 -0.516605,0.981366 -1.173394,0.985591 -0.65105,-0.0043 -1.198777,-0.443159 -1.196863,-0.985591 -0.002,-0.540672 0.545813,-0.988232 1.196863,-0.985591 z m -6.3832689,4.056968 3.0038909,0 3.003891,0 0.586698,0.733463 -7.1577095,0 0.5632296,-0.733463 z m -1.1264592,1.466925 8.2841681,0 0.586698,0.733464 -9.4340957,0 0.5632296,-0.733464 z"
+   id="path7"
+   inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/data/styles/symbols/recycling.svg b/data/styles/symbols/recycling.svg
index 5408c3cf46..10666e0a5e 100644
--- a/data/styles/symbols/recycling.svg
+++ b/data/styles/symbols/recycling.svg
@@ -1,8 +1,89 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="0 0 103.0043 103.0043" height="24" fill="#32cd32">
-    <path d="M 68.061158,52.349648 86.91611,40.992571 95.406351,57.42174 c 1.984732,8.931293 -9.151819,12.128917 -18.193375,11.577602 L 68.061158,52.349648 z" fill="#505050"/>
-    <path d="m 63.760905,64.037512 -9.923658,17.531798 9.923658,17.86259 0.220526,-7.167091 9.041556,0 c 3.307886,0.330788 7.608139,-1.874469 9.262082,-4.96183 l 11.577602,-21.50126 c -3.748938,3.859201 -8.710767,4.851567 -14.444437,4.851567 l -15.32654,0 -0.330789,-6.615773 z" fill="#505050"/>
-    <path d="M 41.598067,42.315726 22.52259,31.289438 32.666774,15.852636 C 39.39281,9.7881775 47.772788,17.94763 51.631989,26.107083 L 41.487804,42.315726 z" fill="#505050"/>
-    <path d="m 53.837247,40.441257 20.178106,0.110262 10.695499,-17.311271 -6.395247,3.197623 -4.410515,-7.938927 c -1.323154,-2.977097 -5.292618,-5.733668 -8.82103,-5.623406 l -24.368096,0.220526 c 5.182355,1.54368 8.490242,5.40288 11.246814,10.36471 l 7.497875,13.452072 -5.623406,3.528412 z" fill="#505050"/>
-    <path d="M 7.8576275,41.433622 13.811823,45.9544 8.298679,55.878059 c -2.8668348,5.292618 1.984732,10.033922 4.961829,11.577603 2.977098,1.653943 7.608138,1.874469 12.018654,1.874469 L 33.107826,56.760162 38.951758,59.847523 28.697311,41.213097 7.8576275,41.433622 z" fill="#505050"/>
-    <path d="m 8.7397305,65.581192 12.6802305,22.93468 c 2.536046,3.197623 7.387613,3.969463 12.349442,3.8592 l 13.341808,0 0,-21.721787 -25.360462,-0.220526 c -3.8592,0.220526 -9.041555,-0.551314 -13.0110185,-4.851567 z" fill="#505050"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="recycling"
+   viewBox="0 0 103.0043 103.0043"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="recycling.svg"
+   style="fill:#32cd32;stroke:none">
+  <metadata
+     id="metadata19">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs17" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="995"
+     inkscape:window-height="758"
+     id="namedview15"
+     showgrid="true"
+     inkscape:zoom="12.660945"
+     inkscape:cx="9.3199997"
+     inkscape:cy="9.3199997"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="recycling">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2996"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     d="M 68.061158,52.349648 86.91611,40.992571 95.406351,57.42174 c 1.984732,8.931293 -9.151819,12.128917 -18.193375,11.577602 L 68.061158,52.349648 z"
+     id="path3"
+     inkscape:connector-curvature="0"
+     style="fill:#505050;fill-opacity:1" />
+  <path
+     d="m 63.760905,64.037512 -9.923658,17.531798 9.923658,17.86259 0.220526,-7.167091 9.041556,0 c 3.307886,0.330788 7.608139,-1.874469 9.262082,-4.96183 l 11.577602,-21.50126 c -3.748938,3.859201 -8.710767,4.851567 -14.444437,4.851567 l -15.32654,0 -0.330789,-6.615773 z"
+     id="path5"
+     inkscape:connector-curvature="0"
+     style="fill:#505050;fill-opacity:1" />
+  <path
+     d="M 41.598067,42.315726 22.52259,31.289438 32.666774,15.852636 C 39.39281,9.7881775 47.772788,17.94763 51.631989,26.107083 L 41.487804,42.315726 z"
+     id="path7"
+     inkscape:connector-curvature="0"
+     style="fill:#505050;fill-opacity:1" />
+  <path
+     d="m 53.837247,40.441257 20.178106,0.110262 10.695499,-17.311271 -6.395247,3.197623 -4.410515,-7.938927 c -1.323154,-2.977097 -5.292618,-5.733668 -8.82103,-5.623406 l -24.368096,0.220526 c 5.182355,1.54368 8.490242,5.40288 11.246814,10.36471 l 7.497875,13.452072 -5.623406,3.528412 z"
+     id="path9"
+     inkscape:connector-curvature="0"
+     style="fill:#505050;fill-opacity:1" />
+  <path
+     d="M 7.8576275,41.433622 13.811823,45.9544 8.298679,55.878059 c -2.8668348,5.292618 1.984732,10.033922 4.961829,11.577603 2.977098,1.653943 7.608138,1.874469 12.018654,1.874469 L 33.107826,56.760162 38.951758,59.847523 28.697311,41.213097 7.8576275,41.433622 z"
+     id="path11"
+     inkscape:connector-curvature="0"
+     style="fill:#505050;fill-opacity:1" />
+  <path
+     d="m 8.7397305,65.581192 12.6802305,22.93468 c 2.536046,3.197623 7.387613,3.969463 12.349442,3.8592 l 13.341808,0 0,-21.721787 -25.360462,-0.220526 c -3.8592,0.220526 -9.041555,-0.551314 -13.0110185,-4.851567 z"
+     id="path13"
+     inkscape:connector-curvature="0"
+     style="fill:#505050;fill-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/religion.svg b/data/styles/symbols/religion.svg
index 0a4ec0cb0d..16073dae06 100644
--- a/data/styles/symbols/religion.svg
+++ b/data/styles/symbols/religion.svg
@@ -1,3 +1,71 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-513.937 -261.9685 24 24">
-    <path d="m -503.937,1310.2362 0,-1241.844529 201.5748,-331.158451 212.373143,331.158451 0,687.513819 C -56.393257,655.1181 -16.7979,571.1286 50.3937,503.937 151.1811,403.1496 264.92082,352.7559 365.70822,352.7559 c 100.7874,0 188.62248,50.3937 289.40988,151.1811 67.19159,67.1916 131.98357,151.1811 165.57937,251.96849 l 0,554.33071 z" fill="#505050" stroke="#000" transform="matrix(.012 0 0 .012 -503.85 -255.795)"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100%"
+   height="100%"
+   version="1.1"
+   viewBox="-513.937 -261.9685 24 24"
+   xlink:xlink=""
+   id="svg2"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="religion.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1109"
+     inkscape:window-height="765"
+     id="namedview10"
+     showgrid="true"
+     inkscape:zoom="38.351275"
+     inkscape:cx="9.0782648"
+     inkscape:cy="14.715805"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2989"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4" />
+  <g
+     id="g6"
+     transform="matrix(0.0120788,0,0,0.01207881,-503.85004,-255.79459)"
+     style="fill:#505050;fill-opacity:1">
+    <path
+       d="m -503.937,1310.2362 0,-1241.844529 201.5748,-331.158451 212.373143,331.158451 0,687.513819 C -56.393257,655.1181 -16.7979,571.1286 50.3937,503.937 151.1811,403.1496 264.92082,352.7559 365.70822,352.7559 c 100.7874,0 188.62248,50.3937 289.40988,151.1811 67.19159,67.1916 131.98357,151.1811 165.57937,251.96849 l 0,554.33071 z"
+       id="path8"
+       inkscape:connector-curvature="0"
+       style="fill:#505050;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:nodetypes="cccccsssccc" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/restaurant.svg b/data/styles/symbols/restaurant.svg
index 9c00a59b8a..4cfd72de98 100644
--- a/data/styles/symbols/restaurant.svg
+++ b/data/styles/symbols/restaurant.svg
@@ -1,8 +1,103 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="10 0 108 138" height="24">
-    <title>
-        Restaraunt Map Icon
-    </title>
-    <path d="m 38.125,11.5 c -1.58782,0 -2.875,1.287181 -2.875,2.875 l 0,34.5 c 0,1.587819 1.28718,2.875 2.875,2.875 l 11.5,0 11.5,0 C 62.71282,51.75 64,50.462819 64,48.875 l 0,-34.5 C 64,12.787181 62.71282,11.5 61.125,11.5 c -1.58782,0 -2.875,1.287181 -2.875,2.875 l 0,31.625 -5.75,0 0,-31.625 c 0,-1.587819 -1.28718,-2.875 -2.875,-2.875 -1.58782,0 -2.875,1.287181 -2.875,2.875 L 46.75,46 41,46 41,14.375 C 41,12.787181 39.71282,11.5 38.125,11.5 z" fill="#4d4d4d"/>
-    <path d="m 87,11.5 c -6.35127,0 -11.5,10.898725 -11.5,17.25 l 0,28.75 c 0,6.351272 8.221604,23 11.5,23 l 0,40.25 c 0,3.17564 2.57436,5.75 5.75,5.75 3.17564,0 5.75,-2.57436 5.75,-5.75 l 0,-57.5 0,-40.25 C 98.5,16.648725 93.35127,11.5 87,11.5 z" fill="#4d4d4d"/>
-    <path d="m 43.875,51.75 0,69 c 0,3.17564 2.57436,5.75 5.75,5.75 3.17564,0 5.75,-2.57436 5.75,-5.75 l 0,-69 z" fill="#4d4d4d"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="symbol-restaurant"
+   viewBox="10 0 108 138"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="restaurant.svg"
+   style="fill:#000000;stroke:none">
+  <title
+     id="title2986">Restaraunt Map Icon</title>
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Restaraunt Map Icon</dc:title>
+        <dc:identifier></dc:identifier>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1160"
+     inkscape:window-height="714"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="20.583333"
+     inkscape:cx="3.5951416"
+     inkscape:cy="12"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-restaurant">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     d="m 38.125,11.5 c -1.58782,0 -2.875,1.287181 -2.875,2.875 l 0,34.5 c 0,1.587819 1.28718,2.875 2.875,2.875 l 11.5,0 11.5,0 C 62.71282,51.75 64,50.462819 64,48.875 l 0,-34.5 C 64,12.787181 62.71282,11.5 61.125,11.5 c -1.58782,0 -2.875,1.287181 -2.875,2.875 l 0,31.625 -5.75,0 0,-31.625 c 0,-1.587819 -1.28718,-2.875 -2.875,-2.875 -1.58782,0 -2.875,1.287181 -2.875,2.875 L 46.75,46 41,46 41,14.375 C 41,12.787181 39.71282,11.5 38.125,11.5 z"
+     id="use3040"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     d="m 87,11.5 c -6.35127,0 -11.5,10.898725 -11.5,17.25 l 0,28.75 c 0,6.351272 8.221604,23 11.5,23 l 0,40.25 c 0,3.17564 2.57436,5.75 5.75,5.75 3.17564,0 5.75,-2.57436 5.75,-5.75 l 0,-57.5 0,-40.25 C 98.5,16.648725 93.35127,11.5 87,11.5 z"
+     id="path3083"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ssscssscss" />
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     d="m 43.875,51.75 0,69 c 0,3.17564 2.57436,5.75 5.75,5.75 3.17564,0 5.75,-2.57436 5.75,-5.75 l 0,-69 z"
+     id="path3094"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cssscc" />
 </svg>
diff --git a/data/styles/symbols/roundabout_left.svg b/data/styles/symbols/roundabout_left.svg
index 5abc35bffe..134c16b872 100644
--- a/data/styles/symbols/roundabout_left.svg
+++ b/data/styles/symbols/roundabout_left.svg
@@ -1,6 +1,7 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="18.64" viewBox="0 0 507 507" height="18.64">
-    <svg:path fill="#00f" d="M507,253.5c0,140-113.5,253.5-253.5,253.5 S0,393.5,0,253.5S113.5,0,253.5,0S507,113.5,507,253.5z"/>
-    <svg:path fill="#fff" d="M97.6,113.6l40.8-47.7c0,0,91.7,3.1,90.6,2.1 c-1.1-1,2.3,89.2,2.3,89.2l-49.8,33.2l-1.1-48.8c0,0-27.2,27-30.6,27c-3.4,0-27.2,61.2-27.2,61.2l-3.4,79.9L67,312.8v-73.6 l10.6-50.5l18.8-34.5l38.5-40.5"/>
-    <svg:path fill="#fff" d="M459.6,190.5l19.7,59.6 c0,0-50.2,76.9-48.7,76.4c1.5-0.4-77.5-44.3-77.5-44.3l-2.6-59.8l42.3,24.3c0,0-9-37.2-7.2-40.1c1.8-2.9-38.3-54.9-38.3-54.9 l-66.6-44.3l24.3-46.2l63,38.1l37.7,35.3l19.8,34l14.7,53.9"/>
-    <svg:path fill="#fff" d="M209.2,466.6l-60.7-16.1 c0,0-36.9-84-37.4-82.6c-0.4,1.5,79.4-40.7,79.4-40.7l51.5,30.6l-43.5,22.1c0,0,36.1,12.8,37.6,15.9c1.5,3.1,66.9-2,66.9-2 l73.5-31.5l25.4,45.6l-66.4,31.9l-50.2,12.3l-39.3-2L193,432.9"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="symbol-roundabout_left" viewBox="0 0 507 507" height="18.64">
+   <svg:path fill="blue" d="M507,253.5c0,140-113.5,253.5-253.5,253.5 S0,393.5,0,253.5S113.5,0,253.5,0S507,113.5,507,253.5z"/>
+   <svg:path fill="white" d="M97.6,113.6l40.8-47.7c0,0,91.7,3.1,90.6,2.1 c-1.1-1,2.3,89.2,2.3,89.2l-49.8,33.2l-1.1-48.8c0,0-27.2,27-30.6,27c-3.4,0-27.2,61.2-27.2,61.2l-3.4,79.9L67,312.8v-73.6 l10.6-50.5l18.8-34.5l38.5-40.5"/>
+   <svg:path fill="white" d="M459.6,190.5l19.7,59.6 c0,0-50.2,76.9-48.7,76.4c1.5-0.4-77.5-44.3-77.5-44.3l-2.6-59.8l42.3,24.3c0,0-9-37.2-7.2-40.1c1.8-2.9-38.3-54.9-38.3-54.9 l-66.6-44.3l24.3-46.2l63,38.1l37.7,35.3l19.8,34l14.7,53.9"/>
+   <svg:path fill="white" d="M209.2,466.6l-60.7-16.1 c0,0-36.9-84-37.4-82.6c-0.4,1.5,79.4-40.7,79.4-40.7l51.5,30.6l-43.5,22.1c0,0,36.1,12.8,37.6,15.9c1.5,3.1,66.9-2,66.9-2 l73.5-31.5l25.4,45.6l-66.4,31.9l-50.2,12.3l-39.3-2L193,432.9"/>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/roundabout_right.svg b/data/styles/symbols/roundabout_right.svg
index ab1ea69754..1f51026f49 100644
--- a/data/styles/symbols/roundabout_right.svg
+++ b/data/styles/symbols/roundabout_right.svg
@@ -1,8 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="18.64" viewBox="0 0 507 507" height="18.64">
-    <svg:g transform="translate(507) scale(-1 1)">
-        <svg:path fill="#00f" d="M507,253.5c0,140-113.5,253.5-253.5,253.5 S0,393.5,0,253.5S113.5,0,253.5,0S507,113.5,507,253.5z"/>
-        <svg:path fill="#fff" d="M97.6,113.6l40.8-47.7c0,0,91.7,3.1,90.6,2.1 c-1.1-1,2.3,89.2,2.3,89.2l-49.8,33.2l-1.1-48.8c0,0-27.2,27-30.6,27c-3.4,0-27.2,61.2-27.2,61.2l-3.4,79.9L67,312.8v-73.6 l10.6-50.5l18.8-34.5l38.5-40.5"/>
-        <svg:path fill="#fff" d="M459.6,190.5l19.7,59.6 c0,0-50.2,76.9-48.7,76.4c1.5-0.4-77.5-44.3-77.5-44.3l-2.6-59.8l42.3,24.3c0,0-9-37.2-7.2-40.1c1.8-2.9-38.3-54.9-38.3-54.9 l-66.6-44.3l24.3-46.2l63,38.1l37.7,35.3l19.8,34l14.7,53.9"/>
-        <svg:path fill="#fff" d="M209.2,466.6l-60.7-16.1 c0,0-36.9-84-37.4-82.6c-0.4,1.5,79.4-40.7,79.4-40.7l51.5,30.6l-43.5,22.1c0,0,36.1,12.8,37.6,15.9c1.5,3.1,66.9-2,66.9-2 l73.5-31.5l25.4,45.6l-66.4,31.9l-50.2,12.3l-39.3-2L193,432.9"/>
-    </svg:g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="symbol-roundabout_right" viewBox="0 0 507 507" height="18.64">
+   <svg:g transform="translate(507,0) scale(-1,1)">
+                <svg:path fill="blue" d="M507,253.5c0,140-113.5,253.5-253.5,253.5 S0,393.5,0,253.5S113.5,0,253.5,0S507,113.5,507,253.5z"/>
+                <svg:path fill="#FFFFFF" d="M97.6,113.6l40.8-47.7c0,0,91.7,3.1,90.6,2.1 c-1.1-1,2.3,89.2,2.3,89.2l-49.8,33.2l-1.1-48.8c0,0-27.2,27-30.6,27c-3.4,0-27.2,61.2-27.2,61.2l-3.4,79.9L67,312.8v-73.6 l10.6-50.5l18.8-34.5l38.5-40.5"/>
+                <svg:path fill="#FFFFFF" d="M459.6,190.5l19.7,59.6 c0,0-50.2,76.9-48.7,76.4c1.5-0.4-77.5-44.3-77.5-44.3l-2.6-59.8l42.3,24.3c0,0-9-37.2-7.2-40.1c1.8-2.9-38.3-54.9-38.3-54.9 l-66.6-44.3l24.3-46.2l63,38.1l37.7,35.3l19.8,34l14.7,53.9"/>
+                <svg:path fill="#FFFFFF" d="M209.2,466.6l-60.7-16.1 c0,0-36.9-84-37.4-82.6c-0.4,1.5,79.4-40.7,79.4-40.7l51.5,30.6l-43.5,22.1c0,0,36.1,12.8,37.6,15.9c1.5,3.1,66.9-2,66.9-2 l73.5-31.5l25.4,45.6l-66.4,31.9l-50.2,12.3l-39.3-2L193,432.9"/>
+            </svg:g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/ruins.svg b/data/styles/symbols/ruins.svg
index e91f26ad4c..7c793a1141 100755
--- a/data/styles/symbols/ruins.svg
+++ b/data/styles/symbols/ruins.svg
@@ -1,13 +1,116 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 141.14998 141.15" enable-background="new 0 0 510.24 283.46">
-    <g transform="translate(19.596 7.996)">
-        <rect height="22.756" width="14.227" fill="#3c2415"/>
-        <rect height="24.641" width="14.25" x="29.908" fill="#3c2415"/>
-        <rect height="17.308" width="14.249" y="9.256" x="59.547" fill="#3c2415"/>
-        <path d="m 80.615003,51.564 c 4.41,0 5.446,0.09 5.446,0.09 V 105.09 H 7.1130027 V 33.154 c 0,0 -0.503,-3.078 -2.498,-6.042 -1.995,-2.964 -4.50200001,-4.356 -4.50200001,-4.356 H 80.061003 c 0,0 0.554,24.731 0.554,28.808 z" fill="#3c2415"/>
-        <path d="m 97.211003,110.693 c 0.914,2.187 2.321,4.128 2.321,4.128 H 3.8650027 c 0,0 1.581,-1.187 2.625,-4.959 1.044,-3.772 0.623,-4.772 0.623,-4.772 H 96.061003 c 0,0 0.142,3.194 1.15,5.603 z" fill="#3c2415"/>
-        <rect height="10.333" width="95.667" y="114.821" x="3.865" fill="#3c2415"/>
-        <rect height="40.886" width="25.279" y="64.204" x="39.213" fill="#fff"/>
-        <circle transform="translate(-135.135 -88.513)" r="12.639" cy="152.717" cx="186.987" fill="#fff"/>
-        <rect height="10.603" width="12.446" y="94.487" x="83.615" fill="#3c2415"/>
-    </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="141.14999"
+   height="141.14999"
+   viewBox="0 0 141.14998 141.15"
+   enable-background="new 0 0 510.24 283.46"
+   xml:space="preserve"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="ruins.svg"><metadata
+   id="metadata25"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs23" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="640"
+   inkscape:window-height="484"
+   id="namedview21"
+   showgrid="false"
+   fit-margin-top="8"
+   fit-margin-left="8"
+   fit-margin-right="8"
+   fit-margin-bottom="8"
+   inkscape:zoom="0.68987145"
+   inkscape:cx="127.985"
+   inkscape:cy="79.937005"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1" />
+
+
+
+
+
+
+
+
+<g
+   id="g2990"
+   transform="translate(19.596366,7.995999)"><rect
+     style="fill:#3c2415"
+     id="rect3"
+     height="22.756001"
+     width="14.227"
+     y="2.8421709e-14"
+     x="-2.8077982e-06" /><rect
+     style="fill:#3c2415"
+     id="rect5"
+     height="24.641001"
+     width="14.25"
+     y="2.8421709e-14"
+     x="29.908003" /><rect
+     style="fill:#3c2415"
+     id="rect7"
+     height="17.308001"
+     width="14.249"
+     y="9.2559967"
+     x="59.547009" /><path
+     style="fill:#3c2415"
+     inkscape:connector-curvature="0"
+     id="path9"
+     d="m 80.615003,51.564 c 4.41,0 5.446,0.09 5.446,0.09 V 105.09 H 7.1130027 V 33.154 c 0,0 -0.503,-3.078 -2.498,-6.042 -1.995,-2.964 -4.50200001,-4.356 -4.50200001,-4.356 H 80.061003 c 0,0 0.554,24.731 0.554,28.808 z" /><path
+     style="fill:#3c2415"
+     inkscape:connector-curvature="0"
+     id="path11"
+     d="m 97.211003,110.693 c 0.914,2.187 2.321,4.128 2.321,4.128 H 3.8650027 c 0,0 1.581,-1.187 2.625,-4.959 1.044,-3.772 0.623,-4.772 0.623,-4.772 H 96.061003 c 0,0 0.142,3.194 1.15,5.603 z" /><rect
+     style="fill:#3c2415"
+     id="rect13"
+     height="10.333"
+     width="95.667"
+     y="114.821"
+     x="3.8650026" /><rect
+     style="fill:#ffffff"
+     id="rect15"
+     height="40.886002"
+     width="25.278999"
+     y="64.203995"
+     x="39.213009" /><circle
+     transform="translate(-135.135,-88.513)"
+     style="fill:#ffffff"
+     sodipodi:ry="12.639"
+     sodipodi:rx="12.639"
+     sodipodi:cy="152.717"
+     sodipodi:cx="186.987"
+     id="circle17"
+     r="12.639"
+     cy="152.717"
+     cx="186.987"
+     d="m 199.626,152.717 c 0,6.98032 -5.65867,12.639 -12.639,12.639 -6.98033,0 -12.639,-5.65868 -12.639,-12.639 0,-6.98033 5.65867,-12.639 12.639,-12.639 6.98033,0 12.639,5.65867 12.639,12.639 z" /><rect
+     style="fill:#3c2415"
+     id="rect19"
+     height="10.603"
+     width="12.446"
+     y="94.487"
+     x="83.615005" /></g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/school.svg b/data/styles/symbols/school.svg
index 1ae12ae06a..09cb5a6450 100644
--- a/data/styles/symbols/school.svg
+++ b/data/styles/symbols/school.svg
@@ -1,10 +1,114 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="0 0 566.52362 566.52362" height="24">
-    <path d="m 94.420608,283.26181 70.815442,-94.4206 94.42061,23.60515 23.60515,47.2103" stroke="#505050" stroke-width="37.768" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="m 188.84121,472.10302 -23.60516,-94.4206 47.21031,-94.42061 47.2103,118.02576 70.81545,-23.60516" stroke="#505050" stroke-width="37.768" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="m 330.47211,236.05151 23.60515,47.2103 70.81546,-47.2103 70.81545,23.60515 23.60515,70.81545" stroke="#505050" stroke-width="35.408" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="m 401.28756,472.10302 -23.60515,-70.81545 70.81546,-70.81546 23.60515,94.42061 47.2103,0" stroke="#505050" stroke-width="37.768" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 8,4 A 2,2 0 1 1 4,4 2,2 0 1 1 8,4 z" transform="matrix(23.605 0 0 23.605 0 23.605)" fill="#505050"/>
-    <path d="m 20,8 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" transform="matrix(23.605 0 0 23.605 0 -23.605)" fill="#505050"/>
-    <path d="m 377.68241,354.07727 118.02576,23.60515 -70.81545,-141.63091 0,0 z" fill="#505050" stroke="#505050" stroke-width="23.605" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="m 188.84121,330.47212 47.2103,0 -23.60515,-118.02576 -47.2103,-23.60515 -23.60515,47.2103 z" fill="#505050" stroke="#505050" stroke-width="23.605"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="symbol-school"
+   viewBox="0 0 566.52362 566.52362"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="school.svg">
+  <metadata
+     id="metadata27">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs25" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="960"
+     inkscape:window-height="705"
+     id="namedview23"
+     showgrid="true"
+     inkscape:zoom="14.105278"
+     inkscape:cx="14.618427"
+     inkscape:cy="10.269576"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-school">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3004"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:none;stroke:#505050;stroke-width:37.76824188;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 94.420608,283.26181 70.815442,-94.4206 94.42061,23.60515 23.60515,47.2103"
+     id="path3039"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="fill:none;stroke:#505050;stroke-width:37.76824188;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 188.84121,472.10302 -23.60516,-94.4206 47.21031,-94.42061 47.2103,118.02576 70.81545,-23.60516"
+     id="path3809"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+  <path
+     sodipodi:nodetypes="ccccc"
+     inkscape:connector-curvature="0"
+     id="path3811"
+     d="m 330.47211,236.05151 23.60515,47.2103 70.81546,-47.2103 70.81545,23.60515 23.60515,70.81545"
+     style="fill:none;stroke:#505050;stroke-width:35.40772629;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     sodipodi:nodetypes="ccccc"
+     inkscape:connector-curvature="0"
+     id="path3813"
+     d="m 401.28756,472.10302 -23.60515,-70.81545 70.81546,-70.81546 23.60515,94.42061 47.2103,0"
+     style="fill:none;stroke:#505050;stroke-width:37.76824188;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="path3815"
+     sodipodi:cx="6"
+     sodipodi:cy="4"
+     sodipodi:rx="2"
+     sodipodi:ry="2"
+     d="M 8,4 A 2,2 0 1 1 4,4 2,2 0 1 1 8,4 z"
+     transform="matrix(23.605151,0,0,23.605151,-1.3333333e-6,23.605149)" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="path3817"
+     sodipodi:cx="18"
+     sodipodi:cy="8"
+     sodipodi:rx="2"
+     sodipodi:ry="2"
+     d="m 20,8 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
+     transform="matrix(23.605151,0,0,23.605151,-3.3333333e-6,-23.605153)" />
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:#505050;stroke-width:23.60515022px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="m 377.68241,354.07727 118.02576,23.60515 -70.81545,-141.63091 0,0 z"
+     id="path3819"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:#505050;stroke-width:23.60515022px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 188.84121,330.47212 47.2103,0 -23.60515,-118.02576 -47.2103,-23.60515 -23.60515,47.2103 z"
+     id="path3821"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccc" />
 </svg>
diff --git a/data/styles/symbols/shelter-fireplace.svg b/data/styles/symbols/shelter-fireplace.svg
index 7d4b8381d3..2329b8fd79 100644
--- a/data/styles/symbols/shelter-fireplace.svg
+++ b/data/styles/symbols/shelter-fireplace.svg
@@ -1,21 +1,22 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="37.28" viewBox="0 0 12 12" height="37.28">
-    <svg:path d="M 3.25,2.25 L 2.25,3.25" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" fill="none"/>
-    <svg:path d="M 3.6,3.4 L 2.3679807,4.6320194" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 5.1320193,3.1179806 L 3.9,4.35" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 3.1,4.9 L 2.1331457,5.8668544" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 6.3820193,2.8679806 L 5.15,4.1" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 8.1320193,2.1179806 L 6.9,3.35" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 8.6320193,3.6179806 L 7.4,4.85" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 10.029592,3.5035534 L 9.1179807,4.3820194" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 10.029592,2.0035534 L 9.1179802,2.8820194" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 10.062738,4.7093592 L 9.1179803,5.6320194" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 8.5434563,4.9896893 L 8.1179807,5.3820194" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 7.2633009,4.0087961 L 6.65,4.6" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 4.841767,2.1361359 L 4.1179807,2.8820194" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 2.25,6.5 L 6,4.5 L 9.75,6.5 L 9.4989134,6.7556834 L 8.2452133,6.25 L 5.9986595,5.9796244 L 3.7469743,6.2460938 L 2.4998353,6.7500598 L 2.25,6.5 z" fill="#000" fill-opacity="1" fill-rule="evenodd" stroke="#000" stroke-width=".4" stroke-linecap="butt" stroke-linejoin="miter" marker-mid="none" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline"/>
-    <svg:rect width=".5" height="3.5" x="3.75" y="6" fill="#000" fill-opacity="1" stroke="#000" stroke-width=".4" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline"/>
-    <svg:rect width=".5" height="3.5" x="7.75" y="6" fill="#000" fill-opacity="1" stroke="#000" stroke-width=".4" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline"/>
-    <svg:path d="M 6.0132105,9.4927507 C 8.5559855,9.4927507 6.0132105,6.7566673 6.0132105,6.7566673 C 6.0132105,6.7566673 3.4109882,9.5713193 6.0132105,9.4927507 z" fill="#fff" fill-opacity="1" fill-rule="evenodd" stroke="#000" stroke-width=".213" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1"/>
-    <svg:path d="M 6.0086658,9.2482305 C 7.6766678,9.2482305 6.0086658,8 6.0086658,8 C 6.0086658,8 4.3016678,9.2840744 6.0086658,9.2482305 z" fill="#000" fill-opacity="1" fill-rule="evenodd" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-opacity="1"/>
-    <svg:path d="M 7.015165,9.7610485 C 6.7416602,8.8729417 5.2679806,8.8743495 4.9958835,9.7610485 C 4.9958835,9.7610485 7.015165,9.7610485 7.015165,9.7610485 z" fill="#000" fill-opacity="1" fill-rule="evenodd" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-opacity="1"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="37.28" id="symbol-shelter-fireplace" viewBox="0 0 12 12" height="37.28">
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 3.25,2.25 L 2.25,3.25"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 3.6,3.4 L 2.3679807,4.6320194"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 5.1320193,3.1179806 L 3.9,4.35"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 3.1,4.9 L 2.1331457,5.8668544"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 6.3820193,2.8679806 L 5.15,4.1"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 8.1320193,2.1179806 L 6.9,3.35"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 8.6320193,3.6179806 L 7.4,4.85"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 10.029592,3.5035534 L 9.1179807,4.3820194"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 10.029592,2.0035534 L 9.1179802,2.8820194"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 10.062738,4.7093592 L 9.1179803,5.6320194"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 8.5434563,4.9896893 L 8.1179807,5.3820194"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 7.2633009,4.0087961 L 6.65,4.6"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 4.841767,2.1361359 L 4.1179807,2.8820194"/>
+   <svg:path style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;marker-mid:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 2.25,6.5 L 6,4.5 L 9.75,6.5 L 9.4989134,6.7556834 L 8.2452133,6.25 L 5.9986595,5.9796244 L 3.7469743,6.2460938 L 2.4998353,6.7500598 L 2.25,6.5 z "/>
+   <svg:rect style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" width="0.5" height="3.5" x="3.75" y="6"/>
+   <svg:rect style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.40000001;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" width="0.5" height="3.5" x="7.75" y="6"/>
+   <svg:path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.21333456;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 6.0132105,9.4927507 C 8.5559855,9.4927507 6.0132105,6.7566673 6.0132105,6.7566673 C 6.0132105,6.7566673 3.4109882,9.5713193 6.0132105,9.4927507 z "/>
+   <svg:path style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 6.0086658,9.2482305 C 7.6766678,9.2482305 6.0086658,8 6.0086658,8 C 6.0086658,8 4.3016678,9.2840744 6.0086658,9.2482305 z "/>
+   <svg:path style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 7.015165,9.7610485 C 6.7416602,8.8729417 5.2679806,8.8743495 4.9958835,9.7610485 C 4.9958835,9.7610485 7.015165,9.7610485 7.015165,9.7610485 z "/>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/shelter.svg b/data/styles/symbols/shelter.svg
index 7625d039e5..0d020d544e 100644
--- a/data/styles/symbols/shelter.svg
+++ b/data/styles/symbols/shelter.svg
@@ -1,18 +1,19 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="37.28" viewBox="0 0 12 12" height="37.28">
-    <svg:path d="M 3.25,2.25 L 2.25,3.25" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" fill="none"/>
-    <svg:path d="M 3.6,3.4 L 2.3679807,4.6320194" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 5.1320193,3.1179806 L 3.9,4.35" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 3.1,4.9 L 2.1331457,5.8668544" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 6.3820193,2.8679806 L 5.15,4.1" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 8.1320193,2.1179806 L 6.9,3.35" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 8.6320193,3.6179806 L 7.4,4.85" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 10.029592,3.5035534 L 9.1179807,4.3820194" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 10.029592,2.0035534 L 9.1179802,2.8820194" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 10.062738,4.7093592 L 9.1179803,5.6320194" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 8.5434563,4.9896893 L 8.1179807,5.3820194" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 7.2633009,4.0087961 L 6.65,4.6" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 4.841767,2.1361359 L 4.1179807,2.8820194" stroke="#000" stroke-width=".3" stroke-linecap="round" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline" fill="none"/>
-    <svg:path d="M 2.25,6.5 L 6,4.5 L 9.75,6.5 L 9.4989134,6.7556834 L 8.2452133,6.25 L 5.9986595,5.9796244 L 3.7469743,6.2460938 L 2.4998353,6.7500598 L 2.25,6.5 z" fill="#000" fill-opacity="1" fill-rule="evenodd" stroke="#000" stroke-width=".4" stroke-linecap="butt" stroke-linejoin="miter" marker-mid="none" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline"/>
-    <svg:rect width=".5" height="3.5" x="3.75" y="6" fill="#000" fill-opacity="1" stroke="#000" stroke-width=".4" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline"/>
-    <svg:rect width=".5" height="3.5" x="7.75" y="6" fill="#000" fill-opacity="1" stroke="#000" stroke-width=".4" stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1" display="inline"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="37.28" id="symbol-shelter" viewBox="0 0 12 12" height="37.28">
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 3.25,2.25 L 2.25,3.25"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 3.6,3.4 L 2.3679807,4.6320194"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 5.1320193,3.1179806 L 3.9,4.35"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 3.1,4.9 L 2.1331457,5.8668544"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 6.3820193,2.8679806 L 5.15,4.1"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 8.1320193,2.1179806 L 6.9,3.35"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 8.6320193,3.6179806 L 7.4,4.85"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 10.029592,3.5035534 L 9.1179807,4.3820194"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 10.029592,2.0035534 L 9.1179802,2.8820194"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 10.062738,4.7093592 L 9.1179803,5.6320194"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 8.5434563,4.9896893 L 8.1179807,5.3820194"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 7.2633009,4.0087961 L 6.65,4.6"/>
+   <svg:path style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 4.841767,2.1361359 L 4.1179807,2.8820194"/>
+   <svg:path style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;marker-mid:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" d="M 2.25,6.5 L 6,4.5 L 9.75,6.5 L 9.4989134,6.7556834 L 8.2452133,6.25 L 5.9986595,5.9796244 L 3.7469743,6.2460938 L 2.4998353,6.7500598 L 2.25,6.5 z "/>
+   <svg:rect style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" width="0.5" height="3.5" x="3.75" y="6"/>
+   <svg:rect style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.40000001;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" width="0.5" height="3.5" x="7.75" y="6"/>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/shooting-borderless.svg b/data/styles/symbols/shooting-borderless.svg
index addb6f6c4e..12d9375ef0 100644
--- a/data/styles/symbols/shooting-borderless.svg
+++ b/data/styles/symbols/shooting-borderless.svg
@@ -1,12 +1,49 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="38" height="38" viewBox="0 0 300 300">
-    <path d="M 58.261298,71.858418 C 58.258258,80.787624 65.495987,88.027798 74.425237,88.027798 C 83.354477,88.027798 90.592208,80.787624 90.589168,71.858418 C 90.592208,62.929168 83.354477,55.688978 74.425237,55.688978 C 65.495987,55.688978 58.258258,62.929168 58.261298,71.858418 L 58.261298,71.858418 z" fill-rule="evenodd" stroke="#000"/>
-    <path d="M 69.959369,96.772801 C 71.98539,96.431432 74.06469,96.893278 75.755693,98.060241 L 100.59767,114.66154 L 132.88253,108.80052 C 137.17888,108.02087 141.29377,110.87171 142.07343,115.16807 C 142.85307,119.46441 140.00222,123.5793 135.70588,124.35895 L 100.24949,130.77021 C 98.240939,131.13384 96.169626,130.70547 94.470076,129.57498 L 66.978213,111.17239 C 64.254731,109.39894 62.896171,106.13781 63.555056,102.9553 C 64.213929,99.772781 66.755621,97.319131 69.959369,96.772801 z" fill-rule="evenodd" stroke="#fff" stroke-width=".789" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M 68.942546,109.29519 C 68.942546,109.29519 68.587219,166.30833 68.587219,166.30833" stroke="#000" stroke-width="34.34" stroke-linecap="round" fill="none"/>
-    <path d="M 77.80665,173.55893 L 88.87122,200.50364 L 89.26628,236.07501" stroke="#000" stroke-width="19.737" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 61.212962,171.91509 L 60.672082,201.03809 L 46.913852,233.84343" stroke="#000" stroke-width="19.737" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 164.14708,102.85322 L 139.24142,102.85323 L 133.58104,115.87209" stroke="#000" stroke-width="5.921" fill="none"/>
-    <g stroke="#000" fill="none">
-        <path d="M 406.57915,94.737891 C 406.57915,118.7182 387.13879,138.15809 363.1579,138.15809 C 339.177,138.15809 319.73665,118.7182 319.73665,94.737891 C 319.73665,70.757583 339.177,51.317695 363.1579,51.317695 C 387.13879,51.317695 406.57915,70.757583 406.57915,94.737891 L 406.57915,94.737891 z" stroke-width="7.894" transform="matrix(.667 0 0 1 -11.162 6.583)"/>
-        <path d="M 382.89618,94.736115 C 382.89618,105.63685 374.05936,114.47368 363.15862,114.47368 C 352.25788,114.47368 343.42105,105.63685 343.42105,94.736115 C 343.42105,83.835363 352.25788,74.998553 363.15862,74.998553 C 374.05936,74.998553 382.89618,83.835363 382.89618,94.736115 L 382.89618,94.736115 z" stroke-width="7.895" transform="matrix(.667 0 0 1 -11.162 6.583)"/>
-    </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="38"
+   height="38"
+   viewBox="0 0 300 300"
+   id="symbol-shooting-borderless">
+  <defs
+     id="defs2474" />
+  <path
+     d="M 58.261298,71.858418 C 58.258258,80.787624 65.495987,88.027798 74.425237,88.027798 C 83.354477,88.027798 90.592208,80.787624 90.589168,71.858418 C 90.592208,62.929168 83.354477,55.688978 74.425237,55.688978 C 65.495987,55.688978 58.258258,62.929168 58.261298,71.858418 L 58.261298,71.858418 z"
+     id="path2387"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 69.959369,96.772801 C 71.98539,96.431432 74.06469,96.893278 75.755693,98.060241 L 100.59767,114.66154 L 132.88253,108.80052 C 137.17888,108.02087 141.29377,110.87171 142.07343,115.16807 C 142.85307,119.46441 140.00222,123.5793 135.70588,124.35895 L 100.24949,130.77021 C 98.240939,131.13384 96.169626,130.70547 94.470076,129.57498 L 66.978213,111.17239 C 64.254731,109.39894 62.896171,106.13781 63.555056,102.9553 C 64.213929,99.772781 66.755621,97.319131 69.959369,96.772801 z"
+     id="path3168"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.78947365;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 68.942546,109.29519 C 68.942546,109.29519 68.587219,166.30833 68.587219,166.30833"
+     id="path2383"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:34.3404007;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 77.80665,173.55893 L 88.87122,200.50364 L 89.26628,236.07501"
+     id="path3157"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:19.7368412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 61.212962,171.91509 L 60.672082,201.03809 L 46.913852,233.84343"
+     id="path2388"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:19.7368412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 164.14708,102.85322 L 139.24142,102.85323 L 133.58104,115.87209"
+     id="path3191"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5.92105246;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     transform="matrix(0.6666666,0,0,1.0000003,-11.161847,6.5828335)"
+     id="g3233">
+    <path
+       d="M 406.57915,94.737891 C 406.57915,118.7182 387.13879,138.15809 363.1579,138.15809 C 339.177,138.15809 319.73665,118.7182 319.73665,94.737891 C 319.73665,70.757583 339.177,51.317695 363.1579,51.317695 C 387.13879,51.317695 406.57915,70.757583 406.57915,94.737891 L 406.57915,94.737891 z"
+       id="path3238"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:7.89434481;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 382.89618,94.736115 C 382.89618,105.63685 374.05936,114.47368 363.15862,114.47368 C 352.25788,114.47368 343.42105,105.63685 343.42105,94.736115 C 343.42105,83.835363 352.25788,74.998553 363.15862,74.998553 C 374.05936,74.998553 382.89618,83.835363 382.89618,94.736115 L 382.89618,94.736115 z"
+       id="path3175"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:7.89473677;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/shooting.svg b/data/styles/symbols/shooting.svg
index b66ea61d4d..f0f604a84d 100644
--- a/data/styles/symbols/shooting.svg
+++ b/data/styles/symbols/shooting.svg
@@ -1,13 +1,57 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="38" height="38" viewBox="0 0 300 300">
-    <rect width="269.521" height="258.248" ry="20.87" x="15.29" y="20.639" stroke="#000" stroke-width="14.69" stroke-linejoin="round" fill="none"/>
-    <path d="M 58.261298,71.858418 C 58.258258,80.787624 65.495987,88.027798 74.425237,88.027798 C 83.354477,88.027798 90.592208,80.787624 90.589168,71.858418 C 90.592208,62.929168 83.354477,55.688978 74.425237,55.688978 C 65.495987,55.688978 58.258258,62.929168 58.261298,71.858418 L 58.261298,71.858418 z" fill-rule="evenodd" stroke="#000"/>
-    <path d="M 69.959369,96.772801 C 71.98539,96.431432 74.06469,96.893278 75.755693,98.060241 L 100.59767,114.66154 L 132.88253,108.80052 C 137.17888,108.02087 141.29377,110.87171 142.07343,115.16807 C 142.85307,119.46441 140.00222,123.5793 135.70588,124.35895 L 100.24949,130.77021 C 98.240939,131.13384 96.169626,130.70547 94.470076,129.57498 L 66.978213,111.17239 C 64.254731,109.39894 62.896171,106.13781 63.555056,102.9553 C 64.213929,99.772781 66.755621,97.319131 69.959369,96.772801 z" fill-rule="evenodd" stroke="#fff" stroke-width=".789" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M 68.942546,109.29519 C 68.942546,109.29519 68.587219,166.30833 68.587219,166.30833" stroke="#000" stroke-width="34.34" stroke-linecap="round" fill="none"/>
-    <path d="M 77.80665,173.55893 L 88.87122,200.50364 L 89.26628,236.07501" stroke="#000" stroke-width="19.737" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 61.212962,171.91509 L 60.672082,201.03809 L 46.913852,233.84343" stroke="#000" stroke-width="19.737" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-    <path d="M 164.14708,102.85322 L 139.24142,102.85323 L 133.58104,115.87209" stroke="#000" stroke-width="5.921" fill="none"/>
-    <g stroke="#000" fill="none">
-        <path d="M 406.57915,94.737891 C 406.57915,118.7182 387.13879,138.15809 363.1579,138.15809 C 339.177,138.15809 319.73665,118.7182 319.73665,94.737891 C 319.73665,70.757583 339.177,51.317695 363.1579,51.317695 C 387.13879,51.317695 406.57915,70.757583 406.57915,94.737891 L 406.57915,94.737891 z" stroke-width="7.894" transform="matrix(.667 0 0 1 -15.303 9.057)"/>
-        <path d="M 382.89618,94.736115 C 382.89618,105.63685 374.05936,114.47368 363.15862,114.47368 C 352.25788,114.47368 343.42105,105.63685 343.42105,94.736115 C 343.42105,83.835363 352.25788,74.998553 363.15862,74.998553 C 374.05936,74.998553 382.89618,83.835363 382.89618,94.736115 L 382.89618,94.736115 z" stroke-width="7.895" transform="matrix(.667 0 0 1 -15.303 9.057)"/>
-    </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="38"
+   height="38"
+   viewBox="0 0 300 300"
+   id="symbol-shooting">
+  <defs
+     id="defs2474" />
+  <rect
+     width="269.52087"
+     height="258.24777"
+     ry="20.869576"
+     x="15.289689"
+     y="20.638819"
+     id="rect2471"
+     style="fill:none;stroke:#000000;stroke-width:14.68965149;stroke-linejoin:round;stroke-miterlimit:4" />
+  <path
+     d="M 58.261298,71.858418 C 58.258258,80.787624 65.495987,88.027798 74.425237,88.027798 C 83.354477,88.027798 90.592208,80.787624 90.589168,71.858418 C 90.592208,62.929168 83.354477,55.688978 74.425237,55.688978 C 65.495987,55.688978 58.258258,62.929168 58.261298,71.858418 L 58.261298,71.858418 z"
+     id="path2387"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 69.959369,96.772801 C 71.98539,96.431432 74.06469,96.893278 75.755693,98.060241 L 100.59767,114.66154 L 132.88253,108.80052 C 137.17888,108.02087 141.29377,110.87171 142.07343,115.16807 C 142.85307,119.46441 140.00222,123.5793 135.70588,124.35895 L 100.24949,130.77021 C 98.240939,131.13384 96.169626,130.70547 94.470076,129.57498 L 66.978213,111.17239 C 64.254731,109.39894 62.896171,106.13781 63.555056,102.9553 C 64.213929,99.772781 66.755621,97.319131 69.959369,96.772801 z"
+     id="path3168"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.78947365;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 68.942546,109.29519 C 68.942546,109.29519 68.587219,166.30833 68.587219,166.30833"
+     id="path2383"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:34.3404007;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 77.80665,173.55893 L 88.87122,200.50364 L 89.26628,236.07501"
+     id="path3157"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:19.7368412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 61.212962,171.91509 L 60.672082,201.03809 L 46.913852,233.84343"
+     id="path2388"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:19.7368412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 164.14708,102.85322 L 139.24142,102.85323 L 133.58104,115.87209"
+     id="path3191"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5.92105246;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     transform="matrix(0.6666666,0,0,1,-15.302868,9.0566038)"
+     id="g3233">
+    <path
+       d="M 406.57915,94.737891 C 406.57915,118.7182 387.13879,138.15809 363.1579,138.15809 C 339.177,138.15809 319.73665,118.7182 319.73665,94.737891 C 319.73665,70.757583 339.177,51.317695 363.1579,51.317695 C 387.13879,51.317695 406.57915,70.757583 406.57915,94.737891 L 406.57915,94.737891 z"
+       id="path3171"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:7.89434481;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 382.89618,94.736115 C 382.89618,105.63685 374.05936,114.47368 363.15862,114.47368 C 352.25788,114.47368 343.42105,105.63685 343.42105,94.736115 C 343.42105,83.835363 352.25788,74.998553 363.15862,74.998553 C 374.05936,74.998553 382.89618,83.835363 382.89618,94.736115 L 382.89618,94.736115 z"
+       id="path3175"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:7.89473677;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/slipway.svg b/data/styles/symbols/slipway.svg
index 2b33681e42..137efaa2e0 100644
--- a/data/styles/symbols/slipway.svg
+++ b/data/styles/symbols/slipway.svg
@@ -1,5 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="37.28" viewBox="0 0 50 50" fill="#00f" height="37.28">
-    <svg:g transform="translate(0 2.5)">
-        <svg:path d="M 45,33 L 45,45 L 2,45 C 2,45 45,33 45,33 z M 0,35 L 43,22 L 43,26 C 43,26 37,32 26,36 C 15,40 0,35 0,35 z M 3,32 C 3,32 13,0 13,0 L 22,26 L 3,32 z M 16,0 L 42,20 L 25,25 L 16,0 z"/>
-    </svg:g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="37.28" id="slipway" viewBox="0 0 50 50" fill="blue" stroke="none" height="37.28">
+   <svg:g transform="translate(0,2.5)">
+            <svg:path d="M 45,33 L 45,45 L 2,45 C 2,45 45,33 45,33 z M 0,35 L 43,22 L 43,26 C 43,26 37,32 26,36 C 15,40 0,35 0,35 z M 3,32 C 3,32 13,0 13,0 L 22,26 L 3,32 z M 16,0 L 42,20 L 25,25 L 16,0 z "/>
+          </svg:g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/soccer-borderless.svg b/data/styles/symbols/soccer-borderless.svg
index b16f4d65a8..340ffde6a9 100644
--- a/data/styles/symbols/soccer-borderless.svg
+++ b/data/styles/symbols/soccer-borderless.svg
@@ -1,7 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="46.6" viewBox="0 0 300 300" height="46.6">
-    <svg:path d="M 138.74616,143.61379 C 138.74616,143.61379 109.59709,168.6577 103.30914,173.40498 C 96.920194,178.22857 93.459587,180.19396 88.308187,174.28928 C 83.233587,168.47274 87.546897,165.90133 92.356387,160.5422 C 97.062964,155.29765 126.64868,128.8279 126.64868,128.8279 L 138.74616,143.61379 z"/>
-    <svg:path d="M 145.803,151.21693 C 145.803,151.21693 64.746317,251.03849 59.902387,257.44445 C 54.992242,263.93797 56.955466,267.71456 60.932697,270.81067 C 64.818957,273.83606 70.258397,273.0927 74.393827,267.92604 C 78.458207,262.84803 158.70289,162.55321 158.70289,162.55321 L 145.803,151.21693 z"/>
-    <svg:path d="M 176.96875 238.12976 A 0.61328125 0.78710938 0 1 1 175.74219,238.12976 A 0.61328125 0.78710938 0 1 1 176.96875 238.12976 z" transform="matrix(26.974 0 0 21.225 -4619.75 -4799.171)" fill="#000"/>
-    <svg:path d="M 162.86792,73.810661 C 182.71632,70.206361 198.86902,68.638661 217.39881,82.508331 L 248.37776,110.06685 C 257.17341,120.77778 257.34762,132.42219 244.07772,139.38463 C 231.42942,146.02091 214.53612,152.724 206.12774,155.37896 C 197.79751,158.00932 193.98122,157.90533 192.86968,152.41453 C 191.76298,146.94765 197.65499,143.56834 203.09835,141.17606 C 208.75019,138.6923 214.2445,137.26621 225.77066,129.97037 C 237.41308,122.6009 233.81653,120.39175 225.24946,113.12886 C 216.61776,105.81117 206.01633,103.64514 199.61271,112.6079 C 190.62693,124.62333 177.01478,146.15042 174.20421,149.64565 C 171.43883,153.08459 168.57247,155.66717 164.30853,153.59661 C 160.0802,151.54333 138.13481,133.95528 135.0829,129.17072 C 132.16792,124.60099 131.91007,123.44358 135.63621,118.30903 C 139.3184,113.23493 147.23184,103.71485 147.23184,103.71485 C 156.94231,91.555571 161.23218,90.026241 143.97429,95.733951 C 126.83389,101.40288 95.624614,111.92225 71.429977,120.33004 C 63.786057,122.48298 60.352877,124.17668 58.269727,117.8216 C 56.135218,111.30982 58.274147,110.46013 65.371177,107.46276 C 72.468207,104.46538 154.37407,75.266611 162.86792,73.810661 z" fill="#000" fill-opacity="1"/>
-    <svg:path d="M 179.09375 229.38562 A 0.703125 0.6484375 0 1 1 177.6875,229.38562 A 0.703125 0.6484375 0 1 1 179.09375 229.38562 z" transform="matrix(25.018 0 0 27.128 -4257.797 -6173.312)"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="46.6" id="symbol-soccer-borderless" viewBox="0 0 300 300" height="46.6">
+   <svg:path d="M 138.74616,143.61379 C 138.74616,143.61379 109.59709,168.6577 103.30914,173.40498 C 96.920194,178.22857 93.459587,180.19396 88.308187,174.28928 C 83.233587,168.47274 87.546897,165.90133 92.356387,160.5422 C 97.062964,155.29765 126.64868,128.8279 126.64868,128.8279 L 138.74616,143.61379 z "/>
+   <svg:path d="M 145.803,151.21693 C 145.803,151.21693 64.746317,251.03849 59.902387,257.44445 C 54.992242,263.93797 56.955466,267.71456 60.932697,270.81067 C 64.818957,273.83606 70.258397,273.0927 74.393827,267.92604 C 78.458207,262.84803 158.70289,162.55321 158.70289,162.55321 L 145.803,151.21693 z "/>
+   <svg:path style="fill:#000000;" d="M 176.96875 238.12976 A 0.61328125 0.78710938 0 1 1  175.74219,238.12976 A 0.61328125 0.78710938 0 1 1  176.96875 238.12976 z" transform="matrix(26.974199,0,0,21.22496,-4619.7504,-4799.1711)"/>
+   <svg:path style="fill:#000000;fill-opacity:1;" d="M 162.86792,73.810661 C 182.71632,70.206361 198.86902,68.638661 217.39881,82.508331 L 248.37776,110.06685 C 257.17341,120.77778 257.34762,132.42219 244.07772,139.38463 C 231.42942,146.02091 214.53612,152.724 206.12774,155.37896 C 197.79751,158.00932 193.98122,157.90533 192.86968,152.41453 C 191.76298,146.94765 197.65499,143.56834 203.09835,141.17606 C 208.75019,138.6923 214.2445,137.26621 225.77066,129.97037 C 237.41308,122.6009 233.81653,120.39175 225.24946,113.12886 C 216.61776,105.81117 206.01633,103.64514 199.61271,112.6079 C 190.62693,124.62333 177.01478,146.15042 174.20421,149.64565 C 171.43883,153.08459 168.57247,155.66717 164.30853,153.59661 C 160.0802,151.54333 138.13481,133.95528 135.0829,129.17072 C 132.16792,124.60099 131.91007,123.44358 135.63621,118.30903 C 139.3184,113.23493 147.23184,103.71485 147.23184,103.71485 C 156.94231,91.555571 161.23218,90.026241 143.97429,95.733951 C 126.83389,101.40288 95.624614,111.92225 71.429977,120.33004 C 63.786057,122.48298 60.352877,124.17668 58.269727,117.8216 C 56.135218,111.30982 58.274147,110.46013 65.371177,107.46276 C 72.468207,104.46538 154.37407,75.266611 162.86792,73.810661 z "/>
+   <svg:path d="M 179.09375 229.38562 A 0.703125 0.6484375 0 1 1  177.6875,229.38562 A 0.703125 0.6484375 0 1 1  179.09375 229.38562 z" transform="matrix(25.017727,0,0,27.127655,-4257.7972,-6173.3124)"/>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/soccer.svg b/data/styles/symbols/soccer.svg
index b75693798f..e859126a4a 100644
--- a/data/styles/symbols/soccer.svg
+++ b/data/styles/symbols/soccer.svg
@@ -1,8 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="37.28" viewBox="0 0 300 300" height="37.28">
-    <svg:path d="M 138.74616,143.61379 C 138.74616,143.61379 109.59709,168.6577 103.30914,173.40498 C 96.920194,178.22857 93.459587,180.19396 88.308187,174.28928 C 83.233587,168.47274 87.546897,165.90133 92.356387,160.5422 C 97.062964,155.29765 126.64868,128.8279 126.64868,128.8279 L 138.74616,143.61379 z"/>
-    <svg:path d="M 145.803,151.21693 C 145.803,151.21693 64.746317,251.03849 59.902387,257.44445 C 54.992242,263.93797 56.955466,267.71456 60.932697,270.81067 C 64.818957,273.83606 70.258397,273.0927 74.393827,267.92604 C 78.458207,262.84803 158.70289,162.55321 158.70289,162.55321 L 145.803,151.21693 z"/>
-    <svg:path d="M 176.96875 238.12976 A 0.61328125 0.78710938 0 1 1 175.74219,238.12976 A 0.61328125 0.78710938 0 1 1 176.96875 238.12976 z" transform="matrix(26.974 0 0 21.225 -4619.75 -4799.171)" fill="#000"/>
-    <svg:path d="M 162.86792,73.810661 C 182.71632,70.206361 198.86902,68.638661 217.39881,82.508331 L 248.37776,110.06685 C 257.17341,120.77778 257.34762,132.42219 244.07772,139.38463 C 231.42942,146.02091 214.53612,152.724 206.12774,155.37896 C 197.79751,158.00932 193.98122,157.90533 192.86968,152.41453 C 191.76298,146.94765 197.65499,143.56834 203.09835,141.17606 C 208.75019,138.6923 214.2445,137.26621 225.77066,129.97037 C 237.41308,122.6009 233.81653,120.39175 225.24946,113.12886 C 216.61776,105.81117 206.01633,103.64514 199.61271,112.6079 C 190.62693,124.62333 177.01478,146.15042 174.20421,149.64565 C 171.43883,153.08459 168.57247,155.66717 164.30853,153.59661 C 160.0802,151.54333 138.13481,133.95528 135.0829,129.17072 C 132.16792,124.60099 131.91007,123.44358 135.63621,118.30903 C 139.3184,113.23493 147.23184,103.71485 147.23184,103.71485 C 156.94231,91.555571 161.23218,90.026241 143.97429,95.733951 C 126.83389,101.40288 95.624614,111.92225 71.429977,120.33004 C 63.786057,122.48298 60.352877,124.17668 58.269727,117.8216 C 56.135218,111.30982 58.274147,110.46013 65.371177,107.46276 C 72.468207,104.46538 154.37407,75.266611 162.86792,73.810661 z" fill="#000" fill-opacity="1"/>
-    <svg:path d="M 179.09375 229.38562 A 0.703125 0.6484375 0 1 1 177.6875,229.38562 A 0.703125 0.6484375 0 1 1 179.09375 229.38562 z" transform="matrix(25.018 0 0 27.128 -4257.797 -6173.312)"/>
-    <svg:rect width="269.398" height="269.398" x="15.301" y="17.663" ry="21.771" stroke="#000" stroke-width="15" stroke-linejoin="round" fill="none"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="37.28" id="symbol-soccer" viewBox="0 0 300 300" height="37.28">
+   <svg:path d="M 138.74616,143.61379 C 138.74616,143.61379 109.59709,168.6577 103.30914,173.40498 C 96.920194,178.22857 93.459587,180.19396 88.308187,174.28928 C 83.233587,168.47274 87.546897,165.90133 92.356387,160.5422 C 97.062964,155.29765 126.64868,128.8279 126.64868,128.8279 L 138.74616,143.61379 z "/>
+   <svg:path d="M 145.803,151.21693 C 145.803,151.21693 64.746317,251.03849 59.902387,257.44445 C 54.992242,263.93797 56.955466,267.71456 60.932697,270.81067 C 64.818957,273.83606 70.258397,273.0927 74.393827,267.92604 C 78.458207,262.84803 158.70289,162.55321 158.70289,162.55321 L 145.803,151.21693 z "/>
+   <svg:path style="fill:#000000;" d="M 176.96875 238.12976 A 0.61328125 0.78710938 0 1 1  175.74219,238.12976 A 0.61328125 0.78710938 0 1 1  176.96875 238.12976 z" transform="matrix(26.974199,0,0,21.22496,-4619.7504,-4799.1711)"/>
+   <svg:path style="fill:#000000;fill-opacity:1;" d="M 162.86792,73.810661 C 182.71632,70.206361 198.86902,68.638661 217.39881,82.508331 L 248.37776,110.06685 C 257.17341,120.77778 257.34762,132.42219 244.07772,139.38463 C 231.42942,146.02091 214.53612,152.724 206.12774,155.37896 C 197.79751,158.00932 193.98122,157.90533 192.86968,152.41453 C 191.76298,146.94765 197.65499,143.56834 203.09835,141.17606 C 208.75019,138.6923 214.2445,137.26621 225.77066,129.97037 C 237.41308,122.6009 233.81653,120.39175 225.24946,113.12886 C 216.61776,105.81117 206.01633,103.64514 199.61271,112.6079 C 190.62693,124.62333 177.01478,146.15042 174.20421,149.64565 C 171.43883,153.08459 168.57247,155.66717 164.30853,153.59661 C 160.0802,151.54333 138.13481,133.95528 135.0829,129.17072 C 132.16792,124.60099 131.91007,123.44358 135.63621,118.30903 C 139.3184,113.23493 147.23184,103.71485 147.23184,103.71485 C 156.94231,91.555571 161.23218,90.026241 143.97429,95.733951 C 126.83389,101.40288 95.624614,111.92225 71.429977,120.33004 C 63.786057,122.48298 60.352877,124.17668 58.269727,117.8216 C 56.135218,111.30982 58.274147,110.46013 65.371177,107.46276 C 72.468207,104.46538 154.37407,75.266611 162.86792,73.810661 z "/>
+   <svg:path d="M 179.09375 229.38562 A 0.703125 0.6484375 0 1 1  177.6875,229.38562 A 0.703125 0.6484375 0 1 1  179.09375 229.38562 z" transform="matrix(25.017727,0,0,27.127655,-4257.7972,-6173.3124)"/>
+   <svg:rect style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:15;stroke-linejoin:round;" width="269.39795" height="269.39795" x="15.301026" y="17.663221" ry="21.770645"/>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/speed_trap.svg b/data/styles/symbols/speed_trap.svg
index cc5a3b52b2..fd31db4181 100644
--- a/data/styles/symbols/speed_trap.svg
+++ b/data/styles/symbols/speed_trap.svg
@@ -1,4 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="18.64" viewBox="0 0 36 36" height="18.64">
-    <svg:rect x="0" y="0" width="36" height="36" rx="2" ry="2" fill="#ff00"/>
-    <svg:path d="M0.5 37.44 L31.5 37.44 a0.5 0.5 -180 0 0 0.5 -0.5 L32 5.94 a0.5 0.5 -180 0 0 -0.5 -0.5 L0.5 5.44 a0.5 0.5 -180 0 0 -0.5 0.5 L0 36.94 a0.5 0.5 -180 0 0 0.5 0.5 Z M2 35.44 L2 7.44 L30 7.44 L30 35.44 L2 35.44 Z M8 30.44 L16 30.44 A3 3 -180 0 0 19 27.44 L19 15.44 A3 3 -180 0 0 16 12.44 L8 12.44 A3 3 -180 0 0 5 15.44 L5 27.44 A3 3 -180 0 0 8 30.44 Z M14 24.94 A3.5 3.5 0 1 1 7 24.94 A3.5 3.5 0 1 1 14 24.94 Z M13 24.94 A2.5 2.5 -180 1 0 8 24.94 A2.5 2.5 -180 1 0 13 24.94 Z M17 15.44 A2 2 0 1 1 13 15.44 A2 2 0 1 1 17 15.44 Z M16 15.44 a1 1 -180 1 0 -2 7.10543E-015 a1 1 -180 1 0 2 -7.10543E-015 Z M20 25.94 L21 25.94 L21 15.44 L20 15.44 L20 25.94 Z M22 25.94 L23 25.94 L23 16.44 L22 16.44 L22 25.94 Z M20 26.94 L20 27.94 L25 27.94 L25 24.94 L27 24.94 L27 19.44 L25 19.44 L25 17.44 L24 17.44 L24 26.94 L20 26.94 Z" transform="translate(2 -3.44)" fill="#000"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="speed_trap" viewBox="0 0 36 36" height="18.64">
+   <svg:rect style="fill:yellow" x="0" y="0" width="36" height="36" rx="2" ry="2"/>
+   <svg:path style="fill:#000000" d="M0.5 37.44 L31.5 37.44 a0.5 0.5 -180 0 0 0.5 -0.5 L32 5.94 a0.5 0.5 -180 0 0 -0.5 -0.5 L0.5 5.44 a0.5 0.5 -180    0 0 -0.5 0.5 L0 36.94 a0.5 0.5 -180 0 0 0.5 0.5 Z M2 35.44 L2 7.44 L30 7.44 L30 35.44 L2 35.44 Z M8 30.44    L16 30.44 A3 3 -180 0 0 19 27.44 L19 15.44 A3 3 -180 0 0 16 12.44 L8 12.44 A3 3 -180 0 0 5 15.44 L5 27.44    A3 3 -180 0 0 8 30.44 Z M14 24.94 A3.5 3.5 0 1 1 7 24.94 A3.5 3.5 0 1 1 14 24.94 Z M13 24.94 A2.5 2.5 -180    1 0 8 24.94 A2.5 2.5 -180 1 0 13 24.94 Z M17 15.44 A2 2 0 1 1 13 15.44 A2 2 0 1 1 17 15.44 Z M16 15.44 a1    1 -180 1 0 -2 7.10543E-015 a1 1 -180 1 0 2 -7.10543E-015 Z M20 25.94 L21 25.94 L21 15.44 L20 15.44 L20 25.94    Z M22 25.94 L23 25.94 L23 16.44 L22 16.44 L22 25.94 Z M20 26.94 L20 27.94 L25 27.94 L25 24.94 L27 24.94    L27 19.44 L25 19.44 L25 17.44 L24 17.44 L24 26.94 L20 26.94 Z" transform="translate(2,-3.44)"/>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/subway-station-l.svg b/data/styles/symbols/subway-station-l.svg
index 7e1cbf32d8..ddb80b7392 100644
--- a/data/styles/symbols/subway-station-l.svg
+++ b/data/styles/symbols/subway-station-l.svg
@@ -1,8 +1,77 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24" enable-background="new 0 0 66.461 100">
-    <title>
-        Train Map Icon
-    </title>
-    <rect ry="4.4" rx="4.4" y="1" x="1" height="22" width="22" fill="#f2f2f2"/>
-    <rect width="20" height="20" x="2" y="2" rx="4" ry="4" fill="#0044d8"/>
-    <path d="M 19,6 15,6 12,11.142857 9,6 5,6 5,18 9,18 9,11 12,16.285714 15,11 l 0,7 4,0 z" fill="#fff"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   enable-background="new 0 0 66.461 100"
+   xml:space="preserve"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="subway-station-7.svg"><title
+   id="title3765">Train Map Icon</title><metadata
+   id="metadata13"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Train Map Icon</dc:title><dc:creator><cc:Agent><dc:title>Yury Melnichek</dc:title></cc:Agent></dc:creator><dc:source>mapsforhumans.com</dc:source></cc:Work></rdf:RDF></metadata><defs
+   id="defs11" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="909"
+   inkscape:window-height="754"
+   id="namedview9"
+   showgrid="true"
+   inkscape:zoom="19.154332"
+   inkscape:cx="14.352161"
+   inkscape:cy="11.886819"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"><inkscape:grid
+     type="xygrid"
+     id="grid2982"
+     empspacing="2"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
+
+
+<rect
+   ry="4.4000001"
+   rx="4.4000001"
+   y="1"
+   x="1"
+   height="22"
+   width="22"
+   id="rect3759"
+   style="fill:#f2f2f2;fill-opacity:1;stroke:none" /><rect
+   style="fill:#0044d8;fill-opacity:1;stroke:none"
+   id="rect2989"
+   width="20"
+   height="20"
+   x="2"
+   y="2"
+   rx="4"
+   ry="4" />
+<path
+   id="path3821"
+   style="fill:#ffffff;fill-opacity:1;stroke:none"
+   d="M 19,6 15,6 12,11.142857 9,6 5,6 5,18 9,18 9,11 12,16.285714 15,11 l 0,7 4,0 z"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="ccccccccccccc" /></svg>
\ No newline at end of file
diff --git a/data/styles/symbols/subway-station-m.svg b/data/styles/symbols/subway-station-m.svg
index fec124d4b9..5728fb767b 100644
--- a/data/styles/symbols/subway-station-m.svg
+++ b/data/styles/symbols/subway-station-m.svg
@@ -1,8 +1,77 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24" enable-background="new 0 0 66.461 100">
-    <title>
-        Train Map Icon
-    </title>
-    <rect ry="3.8" rx="3.6" y="3" x="3" height="19" width="18" fill="#f2f2f2"/>
-    <rect width="16" height="17" x="4" y="4" rx="3.2" ry="3.4" fill="#0044d8"/>
-    <path d="M 17,9 13.96,9 12,13 10,9 7,9 l 0,8 3,0 0,-4 2,3 1.96,-3 0.04,4 3,0 z" fill="#fff"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   enable-background="new 0 0 66.461 100"
+   xml:space="preserve"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="subway-station-77.svg"><title
+   id="title3765">Train Map Icon</title><metadata
+   id="metadata13"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Train Map Icon</dc:title><dc:creator><cc:Agent><dc:title>Yury Melnichek</dc:title></cc:Agent></dc:creator><dc:source>mapsforhumans.com</dc:source></cc:Work></rdf:RDF></metadata><defs
+   id="defs11" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="909"
+   inkscape:window-height="754"
+   id="namedview9"
+   showgrid="true"
+   inkscape:zoom="19.154332"
+   inkscape:cx="14.352161"
+   inkscape:cy="11.886819"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"><inkscape:grid
+     type="xygrid"
+     id="grid2982"
+     empspacing="2"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
+
+
+<rect
+   ry="3.8"
+   rx="3.6000001"
+   y="3"
+   x="3"
+   height="19"
+   width="18"
+   id="rect3759"
+   style="fill:#f2f2f2;fill-opacity:1;stroke:none" /><rect
+   style="fill:#0044d8;fill-opacity:1;stroke:none"
+   id="rect2989"
+   width="16"
+   height="17"
+   x="4"
+   y="4"
+   rx="3.2"
+   ry="3.3999999" />
+<path
+   id="path3821"
+   style="fill:#ffffff;fill-opacity:1;stroke:none"
+   d="M 17,9 13.96,9 12,13 10,9 7,9 l 0,8 3,0 0,-4 2,3 1.96,-3 0.04,4 3,0 z"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="ccccccccccccc" /></svg>
\ No newline at end of file
diff --git a/data/styles/symbols/subway-station-s.svg b/data/styles/symbols/subway-station-s.svg
index 17616131b1..53faabd3cb 100644
--- a/data/styles/symbols/subway-station-s.svg
+++ b/data/styles/symbols/subway-station-s.svg
@@ -1,8 +1,77 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24" enable-background="new 0 0 66.461 100">
-    <title>
-        Train Map Icon
-    </title>
-    <rect ry="2.6" rx="2.4" y="6" x="6" height="13" width="12" fill="#f2f2f2"/>
-    <rect width="10" height="11" x="7" y="7" rx="2" ry="2.2" fill="#0044d8"/>
-    <path d="m 16,9.942857 -2.432,0 -1.568,2.928571 -1.6,-2.928571 -2.4,0 0,5.857143 2.4,0 0,-2.928572 1.6,2.196429 1.568,-2.196429 0.03198,2.928572 2.399999,0 z" fill="#fff"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   enable-background="new 0 0 66.461 100"
+   xml:space="preserve"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="subway-station-77.svg"><title
+   id="title3765">Train Map Icon</title><metadata
+   id="metadata13"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Train Map Icon</dc:title><dc:creator><cc:Agent><dc:title>Yury Melnichek</dc:title></cc:Agent></dc:creator><dc:source>mapsforhumans.com</dc:source></cc:Work></rdf:RDF></metadata><defs
+   id="defs11" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="909"
+   inkscape:window-height="754"
+   id="namedview9"
+   showgrid="true"
+   inkscape:zoom="19.154332"
+   inkscape:cx="14.352161"
+   inkscape:cy="11.886819"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"><inkscape:grid
+     type="xygrid"
+     id="grid2982"
+     empspacing="2"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
+
+
+<rect
+   ry="2.5999997"
+   rx="2.3999999"
+   y="6"
+   x="6"
+   height="13"
+   width="12"
+   id="rect3759"
+   style="fill:#f2f2f2;fill-opacity:1;stroke:none" /><rect
+   style="fill:#0044d8;fill-opacity:1;stroke:none"
+   id="rect2989"
+   width="10"
+   height="11"
+   x="7"
+   y="7"
+   rx="1.9999999"
+   ry="2.1999998" />
+<path
+   id="path3821"
+   style="fill:#ffffff;fill-opacity:1;stroke:none"
+   d="m 16,9.942857 -2.432,0 -1.568,2.928571 -1.6,-2.928571 -2.4,0 0,5.857143 2.4,0 0,-2.928572 1.6,2.196429 1.568,-2.196429 0.03198,2.928572 2.399999,0 z"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="ccccccccccccc" /></svg>
\ No newline at end of file
diff --git a/data/styles/symbols/subway.svg b/data/styles/symbols/subway.svg
index df9dd1b0ee..1c46805f1a 100644
--- a/data/styles/symbols/subway.svg
+++ b/data/styles/symbols/subway.svg
@@ -1,4 +1,78 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 90 90" width="24" height="24">
-    <path d="M 20,10 A 8,8 0 1 1 4,10 8,8 0 1 1 20,10 z" transform="matrix(2.344 0 0 2.344 16.875 21.563)" fill="#fff"/>
-    <path transform="matrix(1.915 0 0 1.875 22.023 26.25)" d="M 20,10 A 8,8 0 1 1 4,10 8,8 0 1 1 20,10 z" fill="#44d"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="subway"
+   viewBox="0 0 90 90"
+   width="24"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="subway.svg">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1007"
+     inkscape:window-height="688"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="subway">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     sodipodi:type="arc"
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     id="path2990"
+     sodipodi:cx="12"
+     sodipodi:cy="10"
+     sodipodi:rx="8"
+     sodipodi:ry="8"
+     d="M 20,10 A 8,8 0 1 1 4,10 8,8 0 1 1 20,10 z"
+     transform="matrix(2.34375,0,0,2.34375,16.875,21.5625)" />
+  <path
+     transform="matrix(1.9147246,0,0,1.875,22.023305,26.25)"
+     d="M 20,10 A 8,8 0 1 1 4,10 8,8 0 1 1 20,10 z"
+     sodipodi:ry="8"
+     sodipodi:rx="8"
+     sodipodi:cy="10"
+     sodipodi:cx="12"
+     id="path2992"
+     style="fill:#4444dd;fill-opacity:1;stroke:none"
+     sodipodi:type="arc" />
 </svg>
diff --git a/data/styles/symbols/supermarket.svg b/data/styles/symbols/supermarket.svg
index e369b3fbcf..17932e2c39 100644
--- a/data/styles/symbols/supermarket.svg
+++ b/data/styles/symbols/supermarket.svg
@@ -1,5 +1,84 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="0 0 38.626611 38.626611" height="24">
-    <path d="m 7.4436697,1.6094425 -4.2247855,0 c -1.1618445,0.082504 -1.6094421,0.540388 -1.6094421,1.7157589 0,1.0073373 0.5141533,1.4862134 1.6094421,1.5031254 l 1.7168339,-1e-7 c 0.534088,1e-7 0.8018467,0.2634093 0.8714825,0.7933188 L 9.4538062,28.978387 C 9.6669683,29.773918 10.080335,30.5794 11.188865,30.5794 l 19.390535,0 c 1.034227,0 1.609442,-0.556661 1.609442,-1.609442 0,-0.920663 -0.514494,-1.609442 -1.415076,-1.609442 l -18.30059,0 -0.50295,-3.218884 17.278115,0 c 1.411146,0.208141 1.445555,-0.348826 1.800506,-1.42463 1.373998,-4.14029 2.838517,-8.313734 4.056809,-11.867386 0.02055,-2.2220062 -0.173155,-2.1629918 -1.307372,-2.802405 l -1.156786,-1e-7 -23.1860257,0 L 8.5158889,2.7241044 C 8.3348035,2.0482847 8.0471154,1.6094425 7.4436697,1.6094425 z m 2.5147533,9.6566525 4.526556,0 0,3.218884 -4.023605,0 z m 7.74544,0 4.828326,0 0,3.218884 -4.828326,0 z m 8.047211,0 5.783932,0 -1.106491,3.218884 -4.677441,0 z m -14.78675,6.437768 3.520655,0 0,3.218885 -3.017704,0 z m 6.739539,0 4.828326,0 0,3.218885 -4.828326,0 z m 8.047211,0 3.570949,0 -1.106491,3.218885 -2.464458,0 z" fill="#505050"/>
-    <path d="m 9,21.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" transform="scale(1.609)" fill="#505050"/>
-    <path d="m 20,21.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" transform="scale(1.609)" fill="#505050"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="symbol-supermarket"
+   viewBox="0 0 38.626611 38.626611"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="supermarket.svg">
+  <metadata
+     id="metadata35">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs33" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1025"
+     inkscape:window-height="749"
+     id="namedview31"
+     showgrid="true"
+     inkscape:zoom="15.33316"
+     inkscape:cx="1.4984643"
+     inkscape:cy="11.843158"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-supermarket">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3012"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="m 7.4436697,1.6094425 -4.2247855,0 c -1.1618445,0.082504 -1.6094421,0.540388 -1.6094421,1.7157589 0,1.0073373 0.5141533,1.4862134 1.6094421,1.5031254 l 1.7168339,-1e-7 c 0.534088,1e-7 0.8018467,0.2634093 0.8714825,0.7933188 L 9.4538062,28.978387 C 9.6669683,29.773918 10.080335,30.5794 11.188865,30.5794 l 19.390535,0 c 1.034227,0 1.609442,-0.556661 1.609442,-1.609442 0,-0.920663 -0.514494,-1.609442 -1.415076,-1.609442 l -18.30059,0 -0.50295,-3.218884 17.278115,0 c 1.411146,0.208141 1.445555,-0.348826 1.800506,-1.42463 1.373998,-4.14029 2.838517,-8.313734 4.056809,-11.867386 0.02055,-2.2220062 -0.173155,-2.1629918 -1.307372,-2.802405 l -1.156786,-1e-7 -23.1860257,0 L 8.5158889,2.7241044 C 8.3348035,2.0482847 8.0471154,1.6094425 7.4436697,1.6094425 z m 2.5147533,9.6566525 4.526556,0 0,3.218884 -4.023605,0 z m 7.74544,0 4.828326,0 0,3.218884 -4.828326,0 z m 8.047211,0 5.783932,0 -1.106491,3.218884 -4.677441,0 z m -14.78675,6.437768 3.520655,0 0,3.218885 -3.017704,0 z m 6.739539,0 4.828326,0 0,3.218885 -4.828326,0 z m 8.047211,0 3.570949,0 -1.106491,3.218885 -2.464458,0 z"
+     id="rect3022"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="path3034"
+     sodipodi:cx="7.5"
+     sodipodi:cy="21.5"
+     sodipodi:rx="1.5"
+     sodipodi:ry="1.5"
+     d="m 9,21.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
+     transform="scale(1.6094421,1.6094421)" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="path3036"
+     sodipodi:cx="18.5"
+     sodipodi:cy="21.5"
+     sodipodi:rx="1.5"
+     sodipodi:ry="1.5"
+     d="m 20,21.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
+     transform="scale(1.6094421,1.6094421)" />
 </svg>
diff --git a/data/styles/symbols/survey_point.svg b/data/styles/symbols/survey_point.svg
index 5c13a90bfc..f1970f3d9b 100644
--- a/data/styles/symbols/survey_point.svg
+++ b/data/styles/symbols/survey_point.svg
@@ -1,5 +1,24 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="8" height="8">
-    <path d="M 7.5,4 C 7.5,6 6,7.5 4,7.5 C 2,7.5 0.5,6 0.5,4 C 0.5,2 2,0.5 4,0.5 C 6,0.5 7.5,2 7.5,4 z" stroke="#000" fill="none"/>
-    <path d="M 4,0.5 L 4,4 L 7.5,4 C 7.5,2.2 5.8,0.5 4,0.5 z" fill-rule="evenodd"/>
-    <path d="M 4,7.5 L 4,4 L 0.5,4 C 0.5,5.8 2.2,7.5 4,7.5 z" fill-rule="evenodd"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="8"
+   height="8"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <path
+     d="M 7.5,4 C 7.5,6 6,7.5 4,7.5 C 2,7.5 0.5,6 0.5,4 C 0.5,2 2,0.5 4,0.5 C 6,0.5 7.5,2 7.5,4 z"
+     id="path2403"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 4,0.5 L 4,4 L 7.5,4 C 7.5,2.2 5.8,0.5 4,0.5 z"
+     id="path3176"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 4,7.5 L 4,4 L 0.5,4 C 0.5,5.8 2.2,7.5 4,7.5 z"
+     id="path3178"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/swimming-borderless.svg b/data/styles/symbols/swimming-borderless.svg
index 43d24326a8..177b6f9143 100644
--- a/data/styles/symbols/swimming-borderless.svg
+++ b/data/styles/symbols/swimming-borderless.svg
@@ -1,4 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="46.6" viewBox="0 0 300 300" height="46.6">
-    <svg:path d="M 210.53915,180.45818 C 221.18483,180.42063 228.59512,160.17099 250.83602,160.44974 C 273.582,160.72849 276.4272,177.41436 290.76227,177.7222 C 290.68595,187.3812 290.75823,185.21412 290.83303,193.87816 C 270.18685,193.40007 268.0079,172.81556 251.07545,173.33716 C 234.32157,173.85876 230.97744,194.56702 211.28145,194.18182 C 191.40689,193.79662 189.17993,173.19882 168.67447,173.10386 C 147.99044,173.00889 142.97677,193.08728 125.06307,193.36288 C 120.39415,193.24116 116.11472,191.54501 112.08545,189.20714 C 102.30978,183.53507 94.006659,174.08564 85.186335,174.17905 C 72.729891,174.31098 61.09516,190.45637 45.663964,190.6261 C 30.613903,190.79068 24.262669,177.90922 16.243098,177.92116 C 16.330948,168.99273 16.146328,170.51037 16.0949,162.12021 C 30.018485,162.41604 36.756221,175.52218 44.709562,175.70947 C 52.752189,175.89677 71.586801,159.33619 81.451947,159.44526 C 91.315702,159.55432 96.825144,160.05397 105.80266,166.84009 C 122.39809,159.11328 155.04728,141.99864 155.67088,140.85475 C 160.58076,131.84835 156.09627,109.8996 140.93062,105.9839 C 125.93231,102.11141 98.315313,111.19762 78.932923,114.42935 C 59.626217,117.64846 56.387347,102.77595 73.838857,95.61157 C 91.538773,88.3452 117.48654,82.076364 137.70712,78.24353 C 157.8058,74.433803 160.83707,80.588591 163.77824,86.63543 C 166.76917,92.784581 203.28035,176.19322 203.28035,176.19322 C 206.63143,179.44496 207.56153,180.46846 210.53915,180.45818 z"/>
-    <svg:path d="M 371.07143 260.39789 A 18.571428 22.678572 0 1 1 333.92857,260.39789 A 18.571428 22.678572 0 1 1 371.07143 260.39789 z" transform="matrix(1.041 0 0 .829 -145.293 -80.924)" stroke="#000" stroke-width="21" stroke-linejoin="miter" stroke-miterlimit="4"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="46.6" id="symbol-swimming-borderless" viewBox="0 0 300 300" height="46.6">
+   <svg:path d="M 210.53915,180.45818 C 221.18483,180.42063 228.59512,160.17099 250.83602,160.44974 C 273.582,160.72849 276.4272,177.41436 290.76227,177.7222 C 290.68595,187.3812 290.75823,185.21412 290.83303,193.87816 C 270.18685,193.40007 268.0079,172.81556 251.07545,173.33716 C 234.32157,173.85876 230.97744,194.56702 211.28145,194.18182 C 191.40689,193.79662 189.17993,173.19882 168.67447,173.10386 C 147.99044,173.00889 142.97677,193.08728 125.06307,193.36288 C 120.39415,193.24116 116.11472,191.54501 112.08545,189.20714 C 102.30978,183.53507 94.006659,174.08564 85.186335,174.17905 C 72.729891,174.31098 61.09516,190.45637 45.663964,190.6261 C 30.613903,190.79068 24.262669,177.90922 16.243098,177.92116 C 16.330948,168.99273 16.146328,170.51037 16.0949,162.12021 C 30.018485,162.41604 36.756221,175.52218 44.709562,175.70947 C 52.752189,175.89677 71.586801,159.33619 81.451947,159.44526 C 91.315702,159.55432 96.825144,160.05397 105.80266,166.84009 C 122.39809,159.11328 155.04728,141.99864 155.67088,140.85475 C 160.58076,131.84835 156.09627,109.8996 140.93062,105.9839 C 125.93231,102.11141 98.315313,111.19762 78.932923,114.42935 C 59.626217,117.64846 56.387347,102.77595 73.838857,95.61157 C 91.538773,88.3452 117.48654,82.076364 137.70712,78.24353 C 157.8058,74.433803 160.83707,80.588591 163.77824,86.63543 C 166.76917,92.784581 203.28035,176.19322 203.28035,176.19322 C 206.63143,179.44496 207.56153,180.46846 210.53915,180.45818 z "/>
+   <svg:path style="stroke:#000000;stroke-width:21;stroke-linejoin:miter;stroke-miterlimit:4" d="M 371.07143 260.39789 A 18.571428 22.678572 0 1 1  333.92857,260.39789 A 18.571428 22.678572 0 1 1  371.07143 260.39789 z" transform="matrix(1.040898,0,0,0.8287669,-145.29268,-80.9236)"/>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/swimming.svg b/data/styles/symbols/swimming.svg
index f468b508fb..93ea4adc5d 100644
--- a/data/styles/symbols/swimming.svg
+++ b/data/styles/symbols/swimming.svg
@@ -1,5 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="37.28" viewBox="0 0 300 300" height="37.28">
-    <svg:path d="M 210.53915,180.45818 C 221.18483,180.42063 228.59512,160.17099 250.83602,160.44974 C 273.582,160.72849 276.4272,177.41436 290.76227,177.7222 C 290.68595,187.3812 290.75823,185.21412 290.83303,193.87816 C 270.18685,193.40007 268.0079,172.81556 251.07545,173.33716 C 234.32157,173.85876 230.97744,194.56702 211.28145,194.18182 C 191.40689,193.79662 189.17993,173.19882 168.67447,173.10386 C 147.99044,173.00889 142.97677,193.08728 125.06307,193.36288 C 120.39415,193.24116 116.11472,191.54501 112.08545,189.20714 C 102.30978,183.53507 94.006659,174.08564 85.186335,174.17905 C 72.729891,174.31098 61.09516,190.45637 45.663964,190.6261 C 30.613903,190.79068 24.262669,177.90922 16.243098,177.92116 C 16.330948,168.99273 16.146328,170.51037 16.0949,162.12021 C 30.018485,162.41604 36.756221,175.52218 44.709562,175.70947 C 52.752189,175.89677 71.586801,159.33619 81.451947,159.44526 C 91.315702,159.55432 96.825144,160.05397 105.80266,166.84009 C 122.39809,159.11328 155.04728,141.99864 155.67088,140.85475 C 160.58076,131.84835 156.09627,109.8996 140.93062,105.9839 C 125.93231,102.11141 98.315313,111.19762 78.932923,114.42935 C 59.626217,117.64846 56.387347,102.77595 73.838857,95.61157 C 91.538773,88.3452 117.48654,82.076364 137.70712,78.24353 C 157.8058,74.433803 160.83707,80.588591 163.77824,86.63543 C 166.76917,92.784581 203.28035,176.19322 203.28035,176.19322 C 206.63143,179.44496 207.56153,180.46846 210.53915,180.45818 z"/>
-    <svg:path d="M 371.07143 260.39789 A 18.571428 22.678572 0 1 1 333.92857,260.39789 A 18.571428 22.678572 0 1 1 371.07143 260.39789 z" transform="matrix(1.041 0 0 .829 -145.293 -80.924)" stroke="#000" stroke-width="21" stroke-linejoin="miter" stroke-miterlimit="4"/>
-    <svg:rect width="269.398" height="269.398" x="16.816" y="17.105" ry="21.771" stroke="#000" stroke-width="15" stroke-linejoin="round" stroke-miterlimit="4" fill="none"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="37.28" id="symbol-swimming" viewBox="0 0 300 300" height="37.28">
+   <svg:path d="M 210.53915,180.45818 C 221.18483,180.42063 228.59512,160.17099 250.83602,160.44974 C 273.582,160.72849 276.4272,177.41436 290.76227,177.7222 C 290.68595,187.3812 290.75823,185.21412 290.83303,193.87816 C 270.18685,193.40007 268.0079,172.81556 251.07545,173.33716 C 234.32157,173.85876 230.97744,194.56702 211.28145,194.18182 C 191.40689,193.79662 189.17993,173.19882 168.67447,173.10386 C 147.99044,173.00889 142.97677,193.08728 125.06307,193.36288 C 120.39415,193.24116 116.11472,191.54501 112.08545,189.20714 C 102.30978,183.53507 94.006659,174.08564 85.186335,174.17905 C 72.729891,174.31098 61.09516,190.45637 45.663964,190.6261 C 30.613903,190.79068 24.262669,177.90922 16.243098,177.92116 C 16.330948,168.99273 16.146328,170.51037 16.0949,162.12021 C 30.018485,162.41604 36.756221,175.52218 44.709562,175.70947 C 52.752189,175.89677 71.586801,159.33619 81.451947,159.44526 C 91.315702,159.55432 96.825144,160.05397 105.80266,166.84009 C 122.39809,159.11328 155.04728,141.99864 155.67088,140.85475 C 160.58076,131.84835 156.09627,109.8996 140.93062,105.9839 C 125.93231,102.11141 98.315313,111.19762 78.932923,114.42935 C 59.626217,117.64846 56.387347,102.77595 73.838857,95.61157 C 91.538773,88.3452 117.48654,82.076364 137.70712,78.24353 C 157.8058,74.433803 160.83707,80.588591 163.77824,86.63543 C 166.76917,92.784581 203.28035,176.19322 203.28035,176.19322 C 206.63143,179.44496 207.56153,180.46846 210.53915,180.45818 z "/>
+   <svg:path style="stroke:#000000;stroke-width:21;stroke-linejoin:miter;stroke-miterlimit:4" d="M 371.07143 260.39789 A 18.571428 22.678572 0 1 1  333.92857,260.39789 A 18.571428 22.678572 0 1 1  371.07143 260.39789 z" transform="matrix(1.040898,0,0,0.8287669,-145.29268,-80.9236)"/>
+   <svg:rect style="fill:none;stroke:#000000;stroke-width:15;stroke-linejoin:round;stroke-miterlimit:4" width="269.39795" height="269.39795" x="16.816265" y="17.104565" ry="21.770645"/>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/synagogue.svg b/data/styles/symbols/synagogue.svg
index 9e9d17aa0c..7ae1216767 100644
--- a/data/styles/symbols/synagogue.svg
+++ b/data/styles/symbols/synagogue.svg
@@ -1,4 +1,75 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="0 0 28.326181 28.326181" height="24" stroke="#00f" stroke-width="1.5" fill="none">
-    <path d="M 24.785408,19.979639 3.5641532,19.97964 14.38291,2.3605151 z" stroke="#505050" stroke-width="1.543" fill="none"/>
-    <path d="M 24.785408,8.3465427 3.5641532,8.346541 14.38291,25.965666 z" stroke="#505050" stroke-width="1.543" fill="none"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="synagogue"
+   viewBox="0 0 28.326181 28.326181"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="synagogue.svg"
+   style="fill:none;stroke:#0000ff;stroke-width:1.5px;stroke-linecap:butt;stroke-linejoin:miter">
+  <metadata
+     id="metadata9">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1026"
+     inkscape:window-height="663"
+     id="namedview5"
+     showgrid="true"
+     inkscape:zoom="12.660945"
+     inkscape:cx="9.3199997"
+     inkscape:cy="9.3199997"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="synagogue">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:none;stroke:#505050;stroke-width:1.54331827;stroke-linejoin:miter;stroke-opacity:1"
+     inkscape:transform-center-x="0.088171942"
+     inkscape:transform-center-y="-2.3923052"
+     d="M 24.785408,19.979639 3.5641532,19.97964 14.38291,2.3605151 z"
+     id="path2994"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path3773"
+     d="M 24.785408,8.3465427 3.5641532,8.346541 14.38291,25.965666 z"
+     inkscape:transform-center-y="2.3923048"
+     inkscape:transform-center-x="0.088171942"
+     style="fill:none;stroke:#505050;stroke-width:1.54331827;stroke-linejoin:miter;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/taxi.svg b/data/styles/symbols/taxi.svg
index 47cf0204ad..8785bb72f2 100644
--- a/data/styles/symbols/taxi.svg
+++ b/data/styles/symbols/taxi.svg
@@ -1,11 +1,126 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24">
-    <title>
-        Cafe Map Icon
-    </title>
-    <path d="M 5 8 L 3 15 L 3 20 L 4 20 L 4 23 L 7 23 L 7 20 L 17 20 L 17 23 L 20 23 L 20 20 L 21 20 L 21 15 L 19 8 L 5 8 z M 6 9 L 18 9 L 19.46875 14 L 4.53125 14 L 6 9 z M 5.5 16 C 6.3284271 16 7 16.671573 7 17.5 C 7 18.328427 6.3284271 19 5.5 19 C 4.6715729 19 4 18.328427 4 17.5 C 4 16.671573 4.6715729 16 5.5 16 z M 18.46875 16 C 19.297177 16 19.96875 16.671573 19.96875 17.5 C 19.96875 18.328427 19.297177 19 18.46875 19 C 17.640323 19 16.96875 18.328427 16.96875 17.5 C 16.96875 16.671573 17.640323 16 18.46875 16 z" fill="#4d4d4d" fill-rule="evenodd"/>
-    <rect width="3" height="3" x="4" y="1" fill="#4d4d4d" fill-rule="evenodd"/>
-    <rect width="3" height="3" x="7" y="4" fill="#4d4d4d" fill-rule="evenodd"/>
-    <rect width="3" height="3" x="10" y="1" fill="#4d4d4d" fill-rule="evenodd"/>
-    <rect width="3" height="3" x="13" y="4" fill="#4d4d4d" fill-rule="evenodd"/>
-    <rect width="3" height="3" x="16" y="1" fill="#4d4d4d" fill-rule="evenodd"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="24"
+   height="24"
+   id="symbol-cafe"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="car_rental.svg">
+  <title
+     id="title2988">Cafe Map Icon</title>
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Cafe Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1298"
+     inkscape:window-height="819"
+     id="namedview9"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="30.085005"
+     inkscape:cx="8.4373846"
+     inkscape:cy="13.633601"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-cafe">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs2230" />
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     d="M 5 8 L 3 15 L 3 20 L 4 20 L 4 23 L 7 23 L 7 20 L 17 20 L 17 23 L 20 23 L 20 20 L 21 20 L 21 15 L 19 8 L 5 8 z M 6 9 L 18 9 L 19.46875 14 L 4.53125 14 L 6 9 z M 5.5 16 C 6.3284271 16 7 16.671573 7 17.5 C 7 18.328427 6.3284271 19 5.5 19 C 4.6715729 19 4 18.328427 4 17.5 C 4 16.671573 4.6715729 16 5.5 16 z M 18.46875 16 C 19.297177 16 19.96875 16.671573 19.96875 17.5 C 19.96875 18.328427 19.297177 19 18.46875 19 C 17.640323 19 16.96875 18.328427 16.96875 17.5 C 16.96875 16.671573 17.640323 16 18.46875 16 z "
+     id="rect3008" />
+  <rect
+     style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     id="rect3810"
+     width="3"
+     height="3"
+     x="4"
+     y="1" />
+  <rect
+     style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     id="rect3812"
+     width="3"
+     height="3"
+     x="7"
+     y="4" />
+  <rect
+     style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     id="rect3814"
+     width="3"
+     height="3"
+     x="10"
+     y="1" />
+  <rect
+     style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     id="rect3816"
+     width="3"
+     height="3"
+     x="13"
+     y="4" />
+  <rect
+     style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     id="rect3818"
+     width="3"
+     height="3"
+     x="16"
+     y="1" />
 </svg>
diff --git a/data/styles/symbols/telephone.svg b/data/styles/symbols/telephone.svg
index a9b07468ed..0a99b2c5f3 100644
--- a/data/styles/symbols/telephone.svg
+++ b/data/styles/symbols/telephone.svg
@@ -1,6 +1,90 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="24" height="24" viewBox="0 0 29.999928 30.000014">
-    <title>
-        Phone Map Icon
-    </title>
-    <path d="M 24.35657,5.0367984 C 22.588802,3.26903 16.401615,2.3851462 9.3305439,9.4562181 2.2594726,16.527289 3.1433558,22.714476 4.9111242,24.482244 l 6.1871878,-6.187188 c -0.883884,-0.883884 -0.883885,-2.651651 1.767767,-5.303303 2.651652,-2.651652 4.41942,-2.651651 5.303304,-1.767767 L 24.35657,5.0367984 z m 0.883884,0.8838835 -6.187188,6.1871871 0.883884,0.883884 0.883884,0.883884 c 0.489673,0.489673 1.278096,0.489672 1.767768,0 l 4.41942,-4.4194189 c 0.489671,-0.489672 0.489672,-1.2780957 -1e-6,-1.7677687 L 26.124338,6.8045661 25.240454,5.9206819 z M 11.982196,19.17894 l -6.1871883,6.187188 0.8838842,0.883884 0.8838834,0.883883 c 0.4896729,0.489673 1.2780956,0.489673 1.7677684,0 l 4.4194193,-4.419419 c 0.489672,-0.489671 0.489673,-1.278096 0,-1.767768 L 12.86608,20.062824 11.982196,19.17894 z" fill="#505050"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="24"
+   height="24"
+   viewBox="0 0 29.999928 30.000014"
+   id="symbol-telephone"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="telephone.svg">
+  <title
+     id="title3019">Phone Map Icon</title>
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Phone Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1028"
+     inkscape:window-height="685"
+     id="namedview8"
+     showgrid="true"
+     inkscape:zoom="18.511647"
+     inkscape:cx="12.010175"
+     inkscape:cy="12.44076"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-telephone">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2987"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs2403" />
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="M 24.35657,5.0367984 C 22.588802,3.26903 16.401615,2.3851462 9.3305439,9.4562181 2.2594726,16.527289 3.1433558,22.714476 4.9111242,24.482244 l 6.1871878,-6.187188 c -0.883884,-0.883884 -0.883885,-2.651651 1.767767,-5.303303 2.651652,-2.651652 4.41942,-2.651651 5.303304,-1.767767 L 24.35657,5.0367984 z m 0.883884,0.8838835 -6.187188,6.1871871 0.883884,0.883884 0.883884,0.883884 c 0.489673,0.489673 1.278096,0.489672 1.767768,0 l 4.41942,-4.4194189 c 0.489671,-0.489672 0.489672,-1.2780957 -1e-6,-1.7677687 L 26.124338,6.8045661 25.240454,5.9206819 z M 11.982196,19.17894 l -6.1871883,6.187188 0.8838842,0.883884 0.8838834,0.883883 c 0.4896729,0.489673 1.2780956,0.489673 1.7677684,0 l 4.4194193,-4.419419 c 0.489672,-0.489671 0.489673,-1.278096 0,-1.767768 L 12.86608,20.062824 11.982196,19.17894 z"
+     id="rect2991"
+     inkscape:connector-curvature="0" />
 </svg>
diff --git a/data/styles/symbols/tennis-borderless.svg b/data/styles/symbols/tennis-borderless.svg
index fabfab4803..f36ede87a3 100644
--- a/data/styles/symbols/tennis-borderless.svg
+++ b/data/styles/symbols/tennis-borderless.svg
@@ -1,8 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="46.6" viewBox="0 0 300 300" height="46.6">
-    <svg:path d="M 133.48356,82.980553 C 138.35306,72.173033 171.2655,58.800363 192.51384,60.653723 C 213.73985,62.505073 237.71405,63.665993 258.04302,67.164113 C 278.41938,70.670383 273.81866,89.251073 253.94604,86.309203 C 234.07342,83.367333 223.5886,81.516293 212.70243,81.368303 C 201.25474,81.212673 176.06421,83.336283 176.06421,83.336283 C 176.06421,83.336283 209.33859,133.59333 206.51429,141.4943 C 203.49726,149.93472 167.79803,153.18438 164.35398,151.01567 C 159.7332,148.10599 145.81537,122.15035 145.81537,122.15035 C 145.81537,122.15035 145.48073,139.84659 138.26094,148.15246 C 131.2924,156.16936 113.30665,166.08736 93.570228,177.10527 C 74.172798,187.93395 68.917428,170.73223 86.575458,160.96204 C 104.57891,151.00072 110.2885,150.74159 119.77793,136.51374 C 128.44132,123.52437 128.20621,94.692963 133.48356,82.980553 z"/>
-    <svg:path transform="matrix(9.104 1.388 -1.388 9.104 -4261.612 -3496.328)" d="M 533.25 308.01843 A 1.96875 2.03125 0 1 1 529.3125,308.01843 A 1.96875 2.03125 0 1 1 533.25 308.01843 z"/>
-    <svg:path d="M 523.25 317.36218 A 2.21875 3.4375 0 1 1 518.8125,317.36218 A 2.21875 3.4375 0 1 1 523.25 317.36218 z" transform="matrix(8.574 -3.362 3.362 8.574 -5484.028 -867.365)" stroke="#000" stroke-width="1" stroke-linejoin="miter" stroke-miterlimit="4" fill="none"/>
-    <svg:path d="M 62.035328,130.7928 L 83.309188,176.55851 L 83.309188,176.55851" stroke="#000" stroke-width="11" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="4" fill="none"/>
-    <svg:path d="M 167.88902,179.26882 C 174.63629,196.08176 185.51796,222.30373 191.27971,235.00091 C 197.81276,249.42148 216.58336,244.48335 209.90891,229.13702 C 203.29399,213.92749 192.40258,190.93014 185.66274,173.99209 C 179.80977,159.28237 161.65625,163.73783 167.88902,179.26882 z"/>
-    <svg:path d="M 193.27277,162.52913 C 189.19197,155.01532 206.63644,152.75805 209.97627,158.98654 C 213.27965,165.14706 256.36141,243.72038 263.82444,258.19246 C 271.28994,272.66912 252.41266,278.68635 246.02367,265.48633 C 239.98905,253.01845 197.45908,170.23721 193.27277,162.52913 z"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="46.6" id="symbol-tennis-borderless" viewBox="0 0 300 300" height="46.6">
+   <svg:path d="M 133.48356,82.980553 C 138.35306,72.173033 171.2655,58.800363 192.51384,60.653723 C 213.73985,62.505073 237.71405,63.665993 258.04302,67.164113 C 278.41938,70.670383 273.81866,89.251073 253.94604,86.309203 C 234.07342,83.367333 223.5886,81.516293 212.70243,81.368303 C 201.25474,81.212673 176.06421,83.336283 176.06421,83.336283 C 176.06421,83.336283 209.33859,133.59333 206.51429,141.4943 C 203.49726,149.93472 167.79803,153.18438 164.35398,151.01567 C 159.7332,148.10599 145.81537,122.15035 145.81537,122.15035 C 145.81537,122.15035 145.48073,139.84659 138.26094,148.15246 C 131.2924,156.16936 113.30665,166.08736 93.570228,177.10527 C 74.172798,187.93395 68.917428,170.73223 86.575458,160.96204 C 104.57891,151.00072 110.2885,150.74159 119.77793,136.51374 C 128.44132,123.52437 128.20621,94.692963 133.48356,82.980553 z "/>
+   <svg:path transform="matrix(9.1042659,1.3880946,-1.3880946,9.1042659,-4261.6122,-3496.328)" d="M 533.25 308.01843 A 1.96875 2.03125 0 1 1  529.3125,308.01843 A 1.96875 2.03125 0 1 1  533.25 308.01843 z"/>
+   <svg:path style="fill:none;stroke:#000000;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4" d="M 523.25 317.36218 A 2.21875 3.4375 0 1 1  518.8125,317.36218 A 2.21875 3.4375 0 1 1  523.25 317.36218 z" transform="matrix(8.5738824,-3.3619914,3.3619914,8.5738824,-5484.0276,-867.36526)"/>
+   <svg:path style="fill:none;stroke:#000000;stroke-width:11;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4" d="M 62.035328,130.7928 L 83.309188,176.55851 L 83.309188,176.55851"/>
+   <svg:path d="M 167.88902,179.26882 C 174.63629,196.08176 185.51796,222.30373 191.27971,235.00091 C 197.81276,249.42148 216.58336,244.48335 209.90891,229.13702 C 203.29399,213.92749 192.40258,190.93014 185.66274,173.99209 C 179.80977,159.28237 161.65625,163.73783 167.88902,179.26882 z "/>
+   <svg:path d="M 193.27277,162.52913 C 189.19197,155.01532 206.63644,152.75805 209.97627,158.98654 C 213.27965,165.14706 256.36141,243.72038 263.82444,258.19246 C 271.28994,272.66912 252.41266,278.68635 246.02367,265.48633 C 239.98905,253.01845 197.45908,170.23721 193.27277,162.52913 z "/>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/tennis.svg b/data/styles/symbols/tennis.svg
index 17172e4652..ea49b2eaf7 100644
--- a/data/styles/symbols/tennis.svg
+++ b/data/styles/symbols/tennis.svg
@@ -1,9 +1,10 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="37.28" viewBox="0 0 300 300" height="37.28">
-    <svg:path d="M 133.48356,82.980553 C 138.35306,72.173033 171.2655,58.800363 192.51384,60.653723 C 213.73985,62.505073 237.71405,63.665993 258.04302,67.164113 C 278.41938,70.670383 273.81866,89.251073 253.94604,86.309203 C 234.07342,83.367333 223.5886,81.516293 212.70243,81.368303 C 201.25474,81.212673 176.06421,83.336283 176.06421,83.336283 C 176.06421,83.336283 209.33859,133.59333 206.51429,141.4943 C 203.49726,149.93472 167.79803,153.18438 164.35398,151.01567 C 159.7332,148.10599 145.81537,122.15035 145.81537,122.15035 C 145.81537,122.15035 145.48073,139.84659 138.26094,148.15246 C 131.2924,156.16936 113.30665,166.08736 93.570228,177.10527 C 74.172798,187.93395 68.917428,170.73223 86.575458,160.96204 C 104.57891,151.00072 110.2885,150.74159 119.77793,136.51374 C 128.44132,123.52437 128.20621,94.692963 133.48356,82.980553 z"/>
-    <svg:path transform="matrix(9.104 1.388 -1.388 9.104 -4261.612 -3496.328)" d="M 533.25 308.01843 A 1.96875 2.03125 0 1 1 529.3125,308.01843 A 1.96875 2.03125 0 1 1 533.25 308.01843 z"/>
-    <svg:path d="M 523.25 317.36218 A 2.21875 3.4375 0 1 1 518.8125,317.36218 A 2.21875 3.4375 0 1 1 523.25 317.36218 z" transform="matrix(8.574 -3.362 3.362 8.574 -5484.028 -867.365)" stroke="#000" stroke-width="1" stroke-linejoin="miter" stroke-miterlimit="4" fill="none"/>
-    <svg:path d="M 62.035328,130.7928 L 83.309188,176.55851 L 83.309188,176.55851" stroke="#000" stroke-width="11" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="4" fill="none"/>
-    <svg:path d="M 167.88902,179.26882 C 174.63629,196.08176 185.51796,222.30373 191.27971,235.00091 C 197.81276,249.42148 216.58336,244.48335 209.90891,229.13702 C 203.29399,213.92749 192.40258,190.93014 185.66274,173.99209 C 179.80977,159.28237 161.65625,163.73783 167.88902,179.26882 z"/>
-    <svg:path d="M 193.27277,162.52913 C 189.19197,155.01532 206.63644,152.75805 209.97627,158.98654 C 213.27965,165.14706 256.36141,243.72038 263.82444,258.19246 C 271.28994,272.66912 252.41266,278.68635 246.02367,265.48633 C 239.98905,253.01845 197.45908,170.23721 193.27277,162.52913 z"/>
-    <svg:rect width="269.398" height="269.398" x="14.299" y="16.102" ry="21.771" stroke="#000" stroke-width="15" stroke-linejoin="round" fill="none"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="37.28" id="symbol-tennis" viewBox="0 0 300 300" height="37.28">
+   <svg:path d="M 133.48356,82.980553 C 138.35306,72.173033 171.2655,58.800363 192.51384,60.653723 C 213.73985,62.505073 237.71405,63.665993 258.04302,67.164113 C 278.41938,70.670383 273.81866,89.251073 253.94604,86.309203 C 234.07342,83.367333 223.5886,81.516293 212.70243,81.368303 C 201.25474,81.212673 176.06421,83.336283 176.06421,83.336283 C 176.06421,83.336283 209.33859,133.59333 206.51429,141.4943 C 203.49726,149.93472 167.79803,153.18438 164.35398,151.01567 C 159.7332,148.10599 145.81537,122.15035 145.81537,122.15035 C 145.81537,122.15035 145.48073,139.84659 138.26094,148.15246 C 131.2924,156.16936 113.30665,166.08736 93.570228,177.10527 C 74.172798,187.93395 68.917428,170.73223 86.575458,160.96204 C 104.57891,151.00072 110.2885,150.74159 119.77793,136.51374 C 128.44132,123.52437 128.20621,94.692963 133.48356,82.980553 z "/>
+   <svg:path transform="matrix(9.1042659,1.3880946,-1.3880946,9.1042659,-4261.6122,-3496.328)" d="M 533.25 308.01843 A 1.96875 2.03125 0 1 1  529.3125,308.01843 A 1.96875 2.03125 0 1 1  533.25 308.01843 z"/>
+   <svg:path style="fill:none;stroke:#000000;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4" d="M 523.25 317.36218 A 2.21875 3.4375 0 1 1  518.8125,317.36218 A 2.21875 3.4375 0 1 1  523.25 317.36218 z" transform="matrix(8.5738824,-3.3619914,3.3619914,8.5738824,-5484.0276,-867.36526)"/>
+   <svg:path style="fill:none;stroke:#000000;stroke-width:11;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4" d="M 62.035328,130.7928 L 83.309188,176.55851 L 83.309188,176.55851"/>
+   <svg:path d="M 167.88902,179.26882 C 174.63629,196.08176 185.51796,222.30373 191.27971,235.00091 C 197.81276,249.42148 216.58336,244.48335 209.90891,229.13702 C 203.29399,213.92749 192.40258,190.93014 185.66274,173.99209 C 179.80977,159.28237 161.65625,163.73783 167.88902,179.26882 z "/>
+   <svg:path d="M 193.27277,162.52913 C 189.19197,155.01532 206.63644,152.75805 209.97627,158.98654 C 213.27965,165.14706 256.36141,243.72038 263.82444,258.19246 C 271.28994,272.66912 252.41266,278.68635 246.02367,265.48633 C 239.98905,253.01845 197.45908,170.23721 193.27277,162.52913 z "/>
+   <svg:rect style="fill:none;stroke:#000000;stroke-width:15;stroke-linejoin:round;" width="269.39795" height="269.39795" x="14.29852" y="16.102072" ry="21.770645"/>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/theatre.svg b/data/styles/symbols/theatre.svg
index c80f2384e0..9d847670c8 100644
--- a/data/styles/symbols/theatre.svg
+++ b/data/styles/symbols/theatre.svg
@@ -1,15 +1,122 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="0 0 566.52362 566.52362" height="24">
-    <g>
-        <path d="M -3.6666666e-6,23.605152 C 132.18885,89.699577 198.28327,89.699577 330.47213,23.605152 l 0,99.141638 c 0,132.18885 -33.04721,330.47212 -165.23607,330.47212 C 33.047209,453.21891 -3.6666666e-6,254.93564 -3.6666666e-6,122.74679 z" fill="#505050" transform="matrix(.842 -.226 .226 .842 5.856 169.628)"/>
-        <path d="m 99.14164,171.19876 c 42.57148,13.39036 33.23879,17.62116 33.04721,50.68966 -61.944948,-13.64168 -62.935868,-14.77107 -99.141643,0 0,-15.73317 32.925183,-50.68966 66.094433,-50.68966 z" fill="#fff" transform="matrix(.842 -.226 .226 .842 5.856 169.628)"/>
-        <path d="m 231.33048,171.19876 c -33.04721,17.64245 -33.04721,17.64245 -33.04721,50.68966 50.48458,-18.28979 63.53582,-14.62664 99.14165,0 0,-15.73317 -32.92519,-50.68966 -66.09444,-50.68966 z" fill="#fff" transform="matrix(.842 -.226 .226 .842 5.856 169.628)"/>
-        <path d="m 231.33048,354.07726 c -29.3753,-33.45907 -102.81355,-37.44952 -132.18884,0 0,-66.09442 132.18884,-66.09442 132.18884,0 z" fill="#fff" transform="matrix(.842 -.226 .226 .842 5.856 169.628)"/>
-    </g>
-    <g>
-        <path d="m 377.68241,23.605152 c 132.18886,66.094425 198.28328,66.094425 330.47214,0 l 0,99.141638 c 0,132.18885 -33.04721,330.47212 -165.23607,330.47212 -132.18885,0 -165.23607,-198.28327 -165.23607,-330.47212 z" fill="#505050" transform="matrix(.842 .226 -.226 .842 -24.212 -67.594)"/>
-        <path d="m 401.28756,70.815452 c 113.30474,51.568178 169.9571,51.568178 283.26184,0 l 0,77.352268 c 0,103.13635 -28.32619,276.72499 -141.63093,276.72499 -113.30473,0 -141.63091,-173.58864 -141.63091,-276.72499 z" fill="#fff" transform="matrix(.842 .226 -.226 .842 -24.212 -67.594)"/>
-        <path d="m 472.10302,221.88842 c 42.57148,-13.39036 33.23879,-17.62116 33.04721,-50.68966 -61.94495,13.64168 -62.93587,14.77107 -99.14165,0 0,15.73317 32.92519,50.68966 66.09444,50.68966 z" fill="#505050" transform="matrix(.842 .226 -.226 .842 -24.212 -67.594)"/>
-        <path d="m 609.0129,304.50645 c -29.3753,33.45907 -102.81355,37.44952 -132.18884,0 0,66.09442 132.18884,66.09442 132.18884,0 z" fill="#505050" transform="matrix(.842 .226 -.226 .842 -24.212 -67.594)"/>
-        <path d="m 590.12877,221.88842 c -42.57148,-13.39036 -33.23879,-17.62116 -33.04721,-50.68966 61.94495,13.64168 62.93587,14.77107 99.14165,0 0,15.73317 -32.92519,50.68966 -66.09444,50.68966 z" fill="#505050" transform="matrix(.842 .226 -.226 .842 -24.212 -67.594)"/>
-    </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="theatre"
+   viewBox="0 0 566.52362 566.52362"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="theatre.svg">
+  <metadata
+     id="metadata37">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs35" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="977"
+     inkscape:window-height="658"
+     id="namedview33"
+     showgrid="true"
+     inkscape:zoom="13.240134"
+     inkscape:cx="12.362941"
+     inkscape:cy="14.034139"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="theatre">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3014"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <g
+     id="g3816"
+     transform="matrix(0.84170782,-0.22553493,0.22553493,0.84170782,5.8561786,169.6283)">
+    <path
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0"
+       id="rect3016"
+       d="M -3.6666666e-6,23.605152 C 132.18885,89.699577 198.28327,89.699577 330.47213,23.605152 l 0,99.141638 c 0,132.18885 -33.04721,330.47212 -165.23607,330.47212 C 33.047209,453.21891 -3.6666666e-6,254.93564 -3.6666666e-6,122.74679 z"
+       style="fill:#505050;fill-opacity:1;stroke:none" />
+    <path
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       id="rect3019"
+       d="m 99.14164,171.19876 c 42.57148,13.39036 33.23879,17.62116 33.04721,50.68966 -61.944948,-13.64168 -62.935868,-14.77107 -99.141643,0 0,-15.73317 32.925183,-50.68966 66.094433,-50.68966 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 231.33048,171.19876 c -33.04721,17.64245 -33.04721,17.64245 -33.04721,50.68966 50.48458,-18.28979 63.53582,-14.62664 99.14165,0 0,-15.73317 -32.92519,-50.68966 -66.09444,-50.68966 z"
+       id="path3024"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="rect3026"
+       d="m 231.33048,354.07726 c -29.3753,-33.45907 -102.81355,-37.44952 -132.18884,0 0,-66.09442 132.18884,-66.09442 132.18884,0 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+  </g>
+  <g
+     id="g3809"
+     transform="matrix(0.84170782,0.22553493,-0.22553493,0.84170782,-24.211815,-67.593688)"
+     inkscape:transform-center-x="1.9163805"
+     inkscape:transform-center-y="3.1686007">
+    <path
+       style="fill:#505050;fill-opacity:1;stroke:none"
+       d="m 377.68241,23.605152 c 132.18886,66.094425 198.28328,66.094425 330.47214,0 l 0,99.141638 c 0,132.18885 -33.04721,330.47212 -165.23607,330.47212 -132.18885,0 -165.23607,-198.28327 -165.23607,-330.47212 z"
+       id="path3029"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0"
+       id="path3037"
+       d="m 401.28756,70.815452 c 113.30474,51.568178 169.9571,51.568178 283.26184,0 l 0,77.352268 c 0,103.13635 -28.32619,276.72499 -141.63093,276.72499 -113.30473,0 -141.63091,-173.58864 -141.63091,-276.72499 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    <path
+       style="fill:#505050;fill-opacity:1;stroke:none"
+       d="m 472.10302,221.88842 c 42.57148,-13.39036 33.23879,-17.62116 33.04721,-50.68966 -61.94495,13.64168 -62.93587,14.77107 -99.14165,0 0,15.73317 32.92519,50.68966 66.09444,50.68966 z"
+       id="path3031"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#505050;fill-opacity:1;stroke:none"
+       d="m 609.0129,304.50645 c -29.3753,33.45907 -102.81355,37.44952 -132.18884,0 0,66.09442 132.18884,66.09442 132.18884,0 z"
+       id="path3035"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       id="path3807"
+       d="m 590.12877,221.88842 c -42.57148,-13.39036 -33.23879,-17.62116 -33.04721,-50.68966 61.94495,13.64168 62.93587,14.77107 99.14165,0 0,15.73317 -32.92519,50.68966 -66.09444,50.68966 z"
+       style="fill:#505050;fill-opacity:1;stroke:none" />
+  </g>
 </svg>
diff --git a/data/styles/symbols/toilets.svg b/data/styles/symbols/toilets.svg
index 760c5927fa..59972928fd 100644
--- a/data/styles/symbols/toilets.svg
+++ b/data/styles/symbols/toilets.svg
@@ -1,7 +1,96 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="0 0 257.51074 257.51074" height="24">
-    <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="m 29.108405,75.107298 c -6.198355,10e-7 -10.742861,4.097492 -13.706217,8.717811 -2.963356,4.62032 -4.672574,10.38228 -4.672574,16.765021 l 0,58.67758 c 0.511608,4.36116 4.326807,7.98184 8.410633,7.98184 4.083827,0 7.899026,-3.62068 8.410633,-7.98184 l 0,-58.67758 c 0,-2.849692 0.782822,-5.162827 1.557525,-6.370707 0.340944,-0.531583 0.55023,-0.941724 0.62301,-1.005901 l 4.361069,0 c -0.250261,48.650038 -0.62301,92.668558 -0.62301,142.837988 0.328596,5.73507 5.252975,10.71879 10.591168,10.71879 5.338192,0 10.262571,-4.98372 10.591167,-10.71879 l 0,-64.37769 8.722138,0 0,64.37769 c 0.328596,5.73507 5.252974,10.71879 10.591167,10.71879 5.338193,0 10.262572,-4.98372 10.591168,-10.71879 C 84.935971,188.9957 83.8758,136.67802 83.933272,93.213522 l 4.361069,0 c 0.062,0.05075 0.327205,0.241995 0.62301,0.6706 0.655536,0.949829 1.557525,2.954509 1.557525,5.700108 l 0,59.68348 c 0.511605,4.36116 4.326806,7.98184 8.410632,7.98184 4.083832,0 7.899032,-3.62068 8.410632,-7.98184 l 0,-59.68348 c 0,-6.336955 -1.59004,-11.96332 -4.67257,-16.429722 -3.082531,-4.466401 -7.902173,-8.047209 -13.706219,-8.04721 z" color="#000" fill="#505050" overflow="visible" enable-background="accumulate" font-family="Sans"/>
-    <path d="M 6,5 A 2,2 0 1 1 2,5 2,2 0 1 1 6,5 z" transform="matrix(10.73 0 0 10.73 16.094 -10.73)" fill="#505050"/>
-    <rect width="23.503" height="225.322" x="117.004" y="21.459" fill="#505050"/>
-    <path style="text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;-inkscape-font-specification:Sans" d="M 16.40625 7.25 C 15.622227 7.25 15.006682 7.810696 14.8125 8.5625 L 13.28125 14.8125 A 0.75007499 0.75007499 0 1 0 14.71875 15.1875 L 16.28125 8.90625 C 16.335122 8.8275442 16.45542 8.75 16.40625 8.75 L 16.78125 8.75 L 16.84375 8.75 L 15 18 L 16.15625 18 C 16.146991 19.309483 16.125 20.595045 16.125 22 C 16.155626 22.534509 16.59623 23 17.09375 23 C 17.591267 23 18.063124 22.534509 18.09375 22 L 18.09375 18 L 18.90625 18 L 18.90625 22 C 18.936876 22.534509 19.408731 23 19.90625 23 C 20.403769 23 20.844374 22.534509 20.875 22 C 20.885437 20.706551 20.878479 19.346628 20.875 18 L 22 18 L 20.15625 8.75 L 20.6875 8.75 C 20.79513 8.75 20.817416 8.7479622 20.84375 8.75 C 20.844706 8.7618178 20.887225 8.821202 20.90625 8.875 C 20.92383 8.9247105 20.879068 8.8703251 20.9375 9 L 22.28125 15.15625 A 0.75007499 0.75007499 0 1 0 23.71875 14.84375 L 22.34375 8.53125 L 22.34375 8.46875 L 22.3125 8.40625 C 22.322668 8.4288155 22.302578 8.1250965 22.03125 7.78125 C 21.759922 7.4374035 21.239787 7.25 20.6875 7.25 L 20.0625 7.25 L 16.78125 7.25 L 16.40625 7.25 z" transform="scale(10.73)" color="#000" fill="#505050" overflow="visible" enable-background="accumulate" font-family="Sans"/>
-    <path transform="matrix(10.73 0 0 10.73 156.25 -10.73)" d="M 6,5 A 2,2 0 1 1 2,5 2,2 0 1 1 6,5 z" fill="#505050"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="toilets"
+   viewBox="0 0 257.51074 257.51074"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="toilets.svg">
+  <metadata
+     id="metadata19">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs17" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="935"
+     inkscape:window-height="697"
+     id="namedview15"
+     showgrid="true"
+     inkscape:zoom="8.4875217"
+     inkscape:cx="23.553524"
+     inkscape:cy="13.222152"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="toilets">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2996"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#505050;fill-opacity:1;stroke:none;stroke-width:22.83884811000000070;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     d="m 29.108405,75.107298 c -6.198355,10e-7 -10.742861,4.097492 -13.706217,8.717811 -2.963356,4.62032 -4.672574,10.38228 -4.672574,16.765021 l 0,58.67758 c 0.511608,4.36116 4.326807,7.98184 8.410633,7.98184 4.083827,0 7.899026,-3.62068 8.410633,-7.98184 l 0,-58.67758 c 0,-2.849692 0.782822,-5.162827 1.557525,-6.370707 0.340944,-0.531583 0.55023,-0.941724 0.62301,-1.005901 l 4.361069,0 c -0.250261,48.650038 -0.62301,92.668558 -0.62301,142.837988 0.328596,5.73507 5.252975,10.71879 10.591168,10.71879 5.338192,0 10.262571,-4.98372 10.591167,-10.71879 l 0,-64.37769 8.722138,0 0,64.37769 c 0.328596,5.73507 5.252974,10.71879 10.591167,10.71879 5.338193,0 10.262572,-4.98372 10.591168,-10.71879 C 84.935971,188.9957 83.8758,136.67802 83.933272,93.213522 l 4.361069,0 c 0.062,0.05075 0.327205,0.241995 0.62301,0.6706 0.655536,0.949829 1.557525,2.954509 1.557525,5.700108 l 0,59.68348 c 0.511605,4.36116 4.326806,7.98184 8.410632,7.98184 4.083832,0 7.899032,-3.62068 8.410632,-7.98184 l 0,-59.68348 c 0,-6.336955 -1.59004,-11.96332 -4.67257,-16.429722 -3.082531,-4.466401 -7.902173,-8.047209 -13.706219,-8.04721 z"
+     id="path2998"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ssscscsscccsccccscccsscscssss" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="path3776"
+     sodipodi:cx="4"
+     sodipodi:cy="5"
+     sodipodi:rx="2"
+     sodipodi:ry="2"
+     d="M 6,5 A 2,2 0 1 1 2,5 2,2 0 1 1 6,5 z"
+     transform="matrix(10.729614,0,0,10.729614,16.094421,-10.729613)" />
+  <rect
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="rect3787"
+     width="23.502964"
+     height="225.3219"
+     x="117.00388"
+     y="21.459229" />
+  <path
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#505050;fill-opacity:1;stroke:none;stroke-width:22.83884811000000070;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     d="M 16.40625 7.25 C 15.622227 7.25 15.006682 7.810696 14.8125 8.5625 L 13.28125 14.8125 A 0.75007499 0.75007499 0 1 0 14.71875 15.1875 L 16.28125 8.90625 C 16.335122 8.8275442 16.45542 8.75 16.40625 8.75 L 16.78125 8.75 L 16.84375 8.75 L 15 18 L 16.15625 18 C 16.146991 19.309483 16.125 20.595045 16.125 22 C 16.155626 22.534509 16.59623 23 17.09375 23 C 17.591267 23 18.063124 22.534509 18.09375 22 L 18.09375 18 L 18.90625 18 L 18.90625 22 C 18.936876 22.534509 19.408731 23 19.90625 23 C 20.403769 23 20.844374 22.534509 20.875 22 C 20.885437 20.706551 20.878479 19.346628 20.875 18 L 22 18 L 20.15625 8.75 L 20.6875 8.75 C 20.79513 8.75 20.817416 8.7479622 20.84375 8.75 C 20.844706 8.7618178 20.887225 8.821202 20.90625 8.875 C 20.92383 8.9247105 20.879068 8.8703251 20.9375 9 L 22.28125 15.15625 A 0.75007499 0.75007499 0 1 0 23.71875 14.84375 L 22.34375 8.53125 L 22.34375 8.46875 L 22.3125 8.40625 C 22.322668 8.4288155 22.302578 8.1250965 22.03125 7.78125 C 21.759922 7.4374035 21.239787 7.25 20.6875 7.25 L 20.0625 7.25 L 16.78125 7.25 L 16.40625 7.25 z "
+     transform="scale(10.729614,10.729614)"
+     id="path3804" />
+  <path
+     transform="matrix(10.729614,0,0,10.729614,156.25,-10.729613)"
+     d="M 6,5 A 2,2 0 1 1 2,5 2,2 0 1 1 6,5 z"
+     sodipodi:ry="2"
+     sodipodi:rx="2"
+     sodipodi:cy="5"
+     sodipodi:cx="4"
+     id="path3791"
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     sodipodi:type="arc" />
 </svg>
diff --git a/data/styles/symbols/traffic_signal.svg b/data/styles/symbols/traffic_signal.svg
index fa56f6a28d..c231e08175 100644
--- a/data/styles/symbols/traffic_signal.svg
+++ b/data/styles/symbols/traffic_signal.svg
@@ -1,10 +1,11 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="18.64" viewBox="0 0 550 550" height="18.64">
-    <svg:g transform="translate(167)">
-        <svg:path d="M212.1,105c0,58-47.5,105-106,105c-58.6,0-106-47-106-105 C0,47,47.5,0,106,0C164.6,0,212.1,47,212.1,105z"/>
-        <svg:path d="M212.1,452.3c0,58-47.5,105-106,105c-58.6,0-106-47-106-105 c0-58,47.5-105,106-105C164.6,347.3,212.1,394.3,212.1,452.3z"/>
-        <svg:path d="M211.3,458.9H0V106.7h211.3V458.9z"/>
-        <svg:path fill="#f00" d="M190,103c0,46.4-37.6,84-84,84 c-46.4,0-84-37.6-84-84s37.6-84,84-84C152.4,19,190,56.6,190,103z"/>
-        <svg:path fill="#32cd32" d="M190,455c0,46.4-37.6,84-84,84 c-46.4,0-84-37.6-84-84c0-46.4,37.6-84,84-84C152.4,371.1,190,408.7,190,455z"/>
-        <svg:path fill="#ff00" d="M190,279c0,46.4-37.6,84-84,84 c-46.4,0-84-37.6-84-84c0-46.4,37.6-84,84-84C152.4,195,190,232.6,190,279z"/>
-    </svg:g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="symbol-traffic_signal" viewBox="0 0 550 550" height="18.64">
+   <svg:g transform="translate(167,0)">
+                <svg:path d="M212.1,105c0,58-47.5,105-106,105c-58.6,0-106-47-106-105 C0,47,47.5,0,106,0C164.6,0,212.1,47,212.1,105z"/>
+                <svg:path d="M212.1,452.3c0,58-47.5,105-106,105c-58.6,0-106-47-106-105 c0-58,47.5-105,106-105C164.6,347.3,212.1,394.3,212.1,452.3z"/>
+                <svg:path d="M211.3,458.9H0V106.7h211.3V458.9z"/>
+                <svg:path fill="red" d="M190,103c0,46.4-37.6,84-84,84 c-46.4,0-84-37.6-84-84s37.6-84,84-84C152.4,19,190,56.6,190,103z"/>
+                <svg:path fill="limegreen" d="M190,455c0,46.4-37.6,84-84,84 c-46.4,0-84-37.6-84-84c0-46.4,37.6-84,84-84C152.4,371.1,190,408.7,190,455z"/>
+                <svg:path fill="yellow" d="M190,279c0,46.4-37.6,84-84,84 c-46.4,0-84-37.6-84-84c0-46.4,37.6-84,84-84C152.4,195,190,232.6,190,279z"/>
+            </svg:g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/symbols/tramway-mini.svg b/data/styles/symbols/tramway-mini.svg
index b86e3b1c56..c0481e2110 100644
--- a/data/styles/symbols/tramway-mini.svg
+++ b/data/styles/symbols/tramway-mini.svg
@@ -1,13 +1,132 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 51.502147 51.502147">
-    <title>
-        Tramway Stop Map Icon
-    </title>
-    <rect ry="7.725" rx="6.867" y="4.292" x="8.584" height="38.627" width="34.335" fill="#f2f2f2"/>
-    <rect width="30.043" height="34.335" x="10.73" y="6.438" rx="6.009" ry="6.867" fill="#003cd8"/>
-    <path d="m 19.619869,17.167383 18.546905,0 0,17.167382 -3.372165,0 -1.686081,-3.121342 -13.488659,0 -1.686082,3.121342 -3.372164,0 c -1.150275,0 -1.686082,-0.439642 -1.686082,-1.560672 l 0,-4.682013 c 0,-0.72602 0.538403,-2.36761 0.929259,-2.99424 l 4.128987,-6.369786 c 0.355801,-0.456595 0.917828,-1.560672 1.686082,-1.560671 z" fill="#fff"/>
-    <path d="m 12,18 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" transform="matrix(1.686 0 0 1.561 6.131 6.243)" fill="#fff"/>
-    <path transform="matrix(1.686 0 0 1.561 12.876 6.243)" d="m 12,18 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" fill="#fff"/>
-    <path d="m 19.047788,19.610604 -3.463393,5.342975 c -0.512897,0.964891 -0.107885,1.57783 1.440553,1.57783 l 7.653168,0 0,-7.803355 -3.906719,0 c -1.151528,0 -1.031312,0.138181 -1.723609,0.88255 z" fill="#0044d8"/>
-    <rect width="10.116" height="7.803" x="26.364" y="18.728" fill="#0044d8"/>
-    <path d="m 26.605857,8.5836914 -4.342725,3.4334766 -0.0016,0.858369 0.0016,0.858369 4.342725,3.433476 0.03912,0 0.634015,-1.502145 -3.568289,-2.7897 3.584008,-2.7897 -0.01293,-1.5021458 z m 1.291081,0 -0.622761,-2e-7 0.0047,1.4913678 3.51327,2.800478 -3.52113,2.7897 -0.626003,1.502145 1.251982,0 4.342726,-3.433476 0.0094,-0.858369 -0.0094,-0.858369 z" fill="#fff"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   id="symbol-bus"
+   viewBox="0 0 51.502147 51.502147"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="tramway-mini.svg">
+  <title
+     id="title2983">Tramway Stop Map Icon</title>
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Tramway Stop Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs21" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="876"
+     inkscape:window-height="731"
+     id="namedview19"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="21.911915"
+     inkscape:cx="11.36558"
+     inkscape:cy="11.369316"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-bus">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <rect
+     ry="7.7253222"
+     rx="6.8669529"
+     y="4.2918458"
+     x="8.5836916"
+     height="38.62661"
+     width="34.334766"
+     id="rect2995"
+     style="fill:#f2f2f2;fill-opacity:1;stroke:none" />
+  <rect
+     style="fill:#003cd8;fill-opacity:1;stroke:none"
+     id="rect2993"
+     width="30.042919"
+     height="34.334766"
+     x="10.729614"
+     y="6.4377685"
+     rx="6.0085835"
+     ry="6.8669538" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 19.619869,17.167383 18.546905,0 0,17.167382 -3.372165,0 -1.686081,-3.121342 -13.488659,0 -1.686082,3.121342 -3.372164,0 c -1.150275,0 -1.686082,-0.439642 -1.686082,-1.560672 l 0,-4.682013 c 0,-0.72602 0.538403,-2.36761 0.929259,-2.99424 l 4.128987,-6.369786 c 0.355801,-0.456595 0.917828,-1.560672 1.686082,-1.560671 z"
+     id="rect3005"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccccccccc" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     id="path3008"
+     sodipodi:cx="10"
+     sodipodi:cy="18"
+     sodipodi:rx="2"
+     sodipodi:ry="2"
+     d="m 12,18 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
+     transform="matrix(1.6860822,0,0,1.5606711,6.1312114,6.2426844)" />
+  <path
+     transform="matrix(1.6860822,0,0,1.5606711,12.875541,6.2426844)"
+     d="m 12,18 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
+     sodipodi:ry="2"
+     sodipodi:rx="2"
+     sodipodi:cy="18"
+     sodipodi:cx="10"
+     id="path3010"
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     sodipodi:type="arc" />
+  <path
+     style="fill:#0044d8;fill-opacity:1;stroke:none"
+     d="m 19.047788,19.610604 -3.463393,5.342975 c -0.512897,0.964891 -0.107885,1.57783 1.440553,1.57783 l 7.653168,0 0,-7.803355 -3.906719,0 c -1.151528,0 -1.031312,0.138181 -1.723609,0.88255 z"
+     id="path3012"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
+  <rect
+     style="fill:#0044d8;fill-opacity:1;stroke:none"
+     id="rect3782"
+     width="10.116493"
+     height="7.8033557"
+     x="26.364197"
+     y="18.728054" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 26.605857,8.5836914 -4.342725,3.4334766 -0.0016,0.858369 0.0016,0.858369 4.342725,3.433476 0.03912,0 0.634015,-1.502145 -3.568289,-2.7897 3.584008,-2.7897 -0.01293,-1.5021458 z m 1.291081,0 -0.622761,-2e-7 0.0047,1.4913678 3.51327,2.800478 -3.52113,2.7897 -0.626003,1.502145 1.251982,0 4.342726,-3.433476 0.0094,-0.858369 -0.0094,-0.858369 z"
+     id="rect3795"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccccccccccccccccc" />
 </svg>
diff --git a/data/styles/symbols/tramway.svg b/data/styles/symbols/tramway.svg
index 689c246cbb..8225bbe397 100644
--- a/data/styles/symbols/tramway.svg
+++ b/data/styles/symbols/tramway.svg
@@ -1,13 +1,133 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 51.502147 51.502147">
-    <title>
-        Tramway Stop Map Icon
-    </title>
-    <rect ry="9.442" rx="9.442" y="2.146" x="2.146" height="47.21" width="47.21" fill="#f2f2f2"/>
-    <rect width="20" height="20" x="2" y="2" transform="scale(2.146)" rx="4" ry="4" fill="#003cd8"/>
-    <path d="m 19.313305,17.167383 23.605151,0 0,23.60515 -4.291846,0 -2.145922,-4.291845 -17.167383,0 -2.145923,4.291845 -4.291845,0 c -1.463986,0 -2.145923,-0.604507 -2.145923,-2.145923 l 0,-6.437768 c 0,-0.998278 0.68524,-3.255464 1.182694,-4.11708 l 5.255074,-8.758457 c 0.452838,-0.627817 1.168145,-2.145923 2.145923,-2.145922 z" fill="#fff"/>
-    <path d="m 12,18 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" transform="matrix(2.146 0 0 2.146 2.146 2.146)" fill="#fff"/>
-    <path transform="matrix(2.146 0 0 2.146 10.73 2.146)" d="m 12,18 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" fill="#fff"/>
-    <path d="m 18.585201,20.526812 -4.407954,7.346591 c -0.652778,1.326725 -0.137308,2.169516 1.833431,2.169516 l 9.740395,0 0,-10.729614 -4.972188,0 c -1.46558,0 -1.312578,0.189999 -2.193684,1.213507 z" fill="#0044d8"/>
-    <rect width="12.876" height="10.73" x="27.897" y="19.313" fill="#0044d8"/>
-    <path d="m 27.829936,6.4377688 -7.443669,4.2918452 -0.0027,1.072961 0.0027,1.072962 7.443669,4.291845 0.06706,0 1.086736,-1.877682 -6.116242,-3.487125 6.143186,-3.4871238 -0.02217,-1.8776827 z m 2.212983,0 -1.067447,-3e-7 0.008,1.8642104 6.021936,3.5005961 L 28.97,15.2897 l -1.073004,1.877682 2.145965,0 7.44367,-4.291845 0.01618,-1.072962 -0.01618,-1.072961 z" fill="#fff"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   id="symbol-bus"
+   viewBox="0 0 51.502147 51.502147"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="tramway.svg">
+  <title
+     id="title2983">Tramway Stop Map Icon</title>
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Tramway Stop Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs21" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="876"
+     inkscape:window-height="731"
+     id="namedview19"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="21.911915"
+     inkscape:cx="0.67185307"
+     inkscape:cy="11.369316"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-bus">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <rect
+     ry="9.4420605"
+     rx="9.4420605"
+     y="2.1459229"
+     x="2.1459229"
+     height="47.2103"
+     width="47.2103"
+     id="rect2995"
+     style="fill:#f2f2f2;fill-opacity:1;stroke:none" />
+  <rect
+     style="fill:#003cd8;fill-opacity:1;stroke:none"
+     id="rect2993"
+     width="20"
+     height="20"
+     x="2"
+     y="2"
+     transform="scale(2.1459228,2.1459228)"
+     rx="4"
+     ry="4" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 19.313305,17.167383 23.605151,0 0,23.60515 -4.291846,0 -2.145922,-4.291845 -17.167383,0 -2.145923,4.291845 -4.291845,0 c -1.463986,0 -2.145923,-0.604507 -2.145923,-2.145923 l 0,-6.437768 c 0,-0.998278 0.68524,-3.255464 1.182694,-4.11708 l 5.255074,-8.758457 c 0.452838,-0.627817 1.168145,-2.145923 2.145923,-2.145922 z"
+     id="rect3005"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccccccccc" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     id="path3008"
+     sodipodi:cx="10"
+     sodipodi:cy="18"
+     sodipodi:rx="2"
+     sodipodi:ry="2"
+     d="m 12,18 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
+     transform="matrix(2.1459228,0,0,2.1459228,2.1459227,2.1459226)" />
+  <path
+     transform="matrix(2.1459228,0,0,2.1459228,10.729614,2.1459226)"
+     d="m 12,18 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
+     sodipodi:ry="2"
+     sodipodi:rx="2"
+     sodipodi:cy="18"
+     sodipodi:cx="10"
+     id="path3010"
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     sodipodi:type="arc" />
+  <path
+     style="fill:#0044d8;fill-opacity:1;stroke:none"
+     d="m 18.585201,20.526812 -4.407954,7.346591 c -0.652778,1.326725 -0.137308,2.169516 1.833431,2.169516 l 9.740395,0 0,-10.729614 -4.972188,0 c -1.46558,0 -1.312578,0.189999 -2.193684,1.213507 z"
+     id="path3012"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
+  <rect
+     style="fill:#0044d8;fill-opacity:1;stroke:none"
+     id="rect3782"
+     width="12.875537"
+     height="10.729614"
+     x="27.896996"
+     y="19.313305" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 27.829936,6.4377688 -7.443669,4.2918452 -0.0027,1.072961 0.0027,1.072962 7.443669,4.291845 0.06706,0 1.086736,-1.877682 -6.116242,-3.487125 6.143186,-3.4871238 -0.02217,-1.8776827 z m 2.212983,0 -1.067447,-3e-7 0.008,1.8642104 6.021936,3.5005961 L 28.97,15.2897 l -1.073004,1.877682 2.145965,0 7.44367,-4.291845 0.01618,-1.072962 -0.01618,-1.072961 z"
+     id="rect3795"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccccccccccccccccc" />
 </svg>
diff --git a/data/styles/symbols/tree.svg b/data/styles/symbols/tree.svg
index 643047493b..03a42fbf83 100644
--- a/data/styles/symbols/tree.svg
+++ b/data/styles/symbols/tree.svg
@@ -1,3 +1,14 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="4" height="4">
-    <path d="M 0,0 L 4,0 L 4,4 L 0,4 L 0,0 z" fill="#6fc18e"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="4"
+   height="4"
+   id="svg2">
+   <path
+       d="M 0,0 L 4,0 L 4,4 L 0,4 L 0,0 z"
+       id="rect2403"
+       style="fill:#6fc18e;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/university.svg b/data/styles/symbols/university.svg
index 2f256822c6..ff79248e6e 100644
--- a/data/styles/symbols/university.svg
+++ b/data/styles/symbols/university.svg
@@ -1,8 +1,85 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" viewBox="0 0 164.80687 164.80687" height="24">
-    <title>
-        University Map Icon
-    </title>
-    <path d="M 2,6 12,2 22,6 12,10 z" transform="scale(6.867)" fill="#505050"/>
-    <path d="m 34.334765,54.935623 48.06867,20.600859 48.068675,-20.600859 0,34.334765 C 109.87125,82.403435 99.945963,78.594813 82.403435,96.137341 65.063177,78.797083 54.935623,82.403435 34.334765,89.270388 z" fill="#505050"/>
-    <path transform="scale(6.867)" d="M 2,6 12,2 22,6 12,10 4,7 3,9 4,13 4.7172361,13.769694 5.5100188,15.510019 4.3740138,16 4,15 3,16 2,16 3,14 2,9 3,6.3738919 z" fill="#505050"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="symbol-university"
+   viewBox="0 0 164.80687 164.80687"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="university.svg">
+  <title
+     id="title2985">University Map Icon</title>
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>University Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1041"
+     inkscape:window-height="705"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="29.410679"
+     inkscape:cx="17.910704"
+     inkscape:cy="14.970319"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-university">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#505050;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+     d="M 2,6 12,2 22,6 12,10 z"
+     id="path2990"
+     inkscape:connector-curvature="0"
+     transform="scale(6.8669529,6.8669529)" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path3760"
+     d="m 34.334765,54.935623 48.06867,20.600859 48.068675,-20.600859 0,34.334765 C 109.87125,82.403435 99.945963,78.594813 82.403435,96.137341 65.063177,78.797083 54.935623,82.403435 34.334765,89.270388 z"
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     sodipodi:nodetypes="ccccccc" />
+  <path
+     transform="scale(6.8669529,6.8669529)"
+     inkscape:connector-curvature="0"
+     id="path3762"
+     d="M 2,6 12,2 22,6 12,10 4,7 3,9 4,13 4.7172361,13.769694 5.5100188,15.510019 4.3740138,16 4,15 3,16 2,16 3,14 2,9 3,6.3738919 z"
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     sodipodi:nodetypes="ccccccccccccccccc" />
 </svg>
diff --git a/data/styles/symbols/viewpoint.svg b/data/styles/symbols/viewpoint.svg
index 221bd74d89..d8ce2043df 100644
--- a/data/styles/symbols/viewpoint.svg
+++ b/data/styles/symbols/viewpoint.svg
@@ -1,13 +1,57 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="16" height="16">
-    <g stroke="#000" transform="matrix(.182 0 0 .182 -.716 -.754)">
-        <path d="M 9.6000004,7.9698114 A 1.5849056,1.6 0 1 1 6.4301891,7.9698114 A 1.5849056,1.6 0 1 1 9.6000004,7.9698114 z" transform="matrix(5.48 0 0 5.502 3.937 4.176)" fill="#0101ff" stroke-width=".05"/>
-        <path d="M 8.6867391,52.624353 C 6.816871,52.169299 5.0737341,50.833315 4.3997553,49.338698 C 4.0106344,48.47578 3.9820521,48.157277 4.2219002,47.356736 C 4.6013085,46.090398 5.8552159,44.841148 7.512558,44.078313 C 8.7083867,43.527899 9.0683066,43.476543 10.642634,43.631675 C 12.711707,43.835556 15.892175,44.430036 20.682301,45.50825 C 26.45013,46.806533 27.518576,47.246271 27.162141,48.175121 C 26.77599,49.181407 22.256558,50.607424 15.252731,51.932893 C 11.197845,52.700279 9.6629304,52.861918 8.6867391,52.624353 z" fill="#00f" stroke-width=".275" transform="matrix(.996 0 0 1 .016 .025)"/>
-        <path d="M 46.323106,91.254109 C 45.429343,90.664965 44.841518,89.955361 44.126115,88.601956 C 43.657516,87.715454 43.612849,87.319767 43.74128,85.192691 C 44.065059,79.83036 46.533819,69.619869 47.677483,68.913045 C 48.812842,68.211358 49.984033,71.41417 51.642463,79.755871 C 52.794126,85.548606 52.767965,87.454362 51.510401,89.375316 C 51.054522,90.071678 50.317045,90.891179 49.87156,91.196429 C 48.851387,91.895463 47.333521,91.920138 46.323111,91.254109 L 46.323106,91.254109 z" fill="#00f" stroke-width=".275" transform="matrix(.996 0 0 1 .016 .025)"/>
-        <path d="M 17.044681,79.335663 C 16.041725,78.47295 15.909337,76.932904 16.633253,74.549568 C 17.121851,72.94095 17.380844,72.530139 18.719337,71.240598 C 20.695789,69.33643 26.831885,65.257083 30.506991,63.404027 C 33.573019,61.858077 34.31936,61.66391 34.31936,62.412203 C 34.31936,63.968442 28.485956,73.397145 25.537553,76.606503 C 23.522698,78.799686 21.892223,79.67643 19.548743,79.826827 C 17.92388,79.9311 17.681706,79.8836 17.044688,79.33566 L 17.044681,79.335663 z" fill="#00f" stroke-width=".275" transform="matrix(.996 0 0 1 .016 .025)"/>
-        <path d="M 73.519587,79.210442 C 70.756653,77.848597 62.658467,66.329855 61.940638,62.74071 C 61.795752,62.016292 61.837428,61.951932 62.451341,61.951932 C 63.800912,61.951932 66.839118,63.612598 72.452619,67.418577 C 78.501561,71.519787 80.084314,73.581687 79.696577,76.855506 C 79.516421,78.376596 79.111112,79.04287 78.16538,79.372553 C 77.040979,79.764518 74.46107,79.674496 73.51959,79.210442 L 73.519587,79.210442 z" fill="#00f" stroke-width=".275" transform="matrix(.996 0 0 1 .016 .025)"/>
-        <path d="M 79.165163,51.596088 C 72.594333,50.241188 70.095854,49.457565 69.067279,48.42899 C 68.520471,47.882182 68.559332,47.637841 69.266845,47.174262 C 70.721869,46.22089 82.660857,43.690306 85.83714,43.66203 C 87.894346,43.643713 88.04272,43.681286 89.400976,44.564515 C 91.282486,45.787997 92.113604,47.357195 91.667947,48.844665 C 91.321604,50.000666 90.027955,51.382141 88.618413,52.101235 C 87.106573,52.872515 84.742854,52.746205 79.165163,51.596088 z" fill="#00f" stroke-width=".275" transform="matrix(.996 0 0 1 .016 .025)"/>
-        <path d="M 31.793979,34.013792 C 29.637523,32.817297 23.932345,29.006704 21.015724,26.814799 C 18.572261,24.978491 17.384173,23.690935 16.764379,22.207561 C 16.017401,20.419796 16.444898,17.558738 17.569053,16.822163 C 18.491863,16.217513 21.265186,16.234024 22.52538,16.851669 C 23.984757,17.566938 26.009196,19.798837 28.615723,23.566136 C 32.799805,29.61352 34.807872,33.658635 34.068241,34.549835 C 33.650071,35.053699 33.681598,35.061129 31.793979,34.013795 L 31.793979,34.013792 z" fill="#00f" stroke-width=".275" transform="matrix(.996 0 0 1 .016 .025)"/>
-        <path d="M 62.014382,34.509457 C 61.604709,34.099789 61.948141,33.092665 63.379858,30.505123 C 65.636044,26.427506 70.06706,19.873614 71.678867,18.230086 C 72.902467,16.982406 73.272186,16.759054 74.541117,16.500977 C 76.60474,16.081274 78.604869,16.532183 79.248069,17.562107 C 79.436013,17.863059 79.646529,18.816093 79.715871,19.67995 C 79.818113,20.953598 79.737538,21.466281 79.289801,22.391182 C 78.417431,24.193266 75.680576,26.529527 70.1387,30.202848 C 63.810256,34.397534 62.563397,35.058474 62.014376,34.509454 L 62.014382,34.509457 z" fill="#00f" stroke-width=".275" transform="matrix(.996 0 0 1 .016 .025)"/>
-        <path d="M 47.496659,27.029997 C 46.694512,26.063475 45.391612,21.317753 44.292374,15.358646 C 43.393033,10.483236 43.400066,8.8399172 44.32754,7.1340423 C 46.432498,3.2624584 49.990945,3.494503 52.119437,7.6421389 C 52.485049,8.3545692 52.541797,8.9256791 52.43315,10.798866 C 52.219894,14.475672 49.949809,24.841443 49.001319,26.469498 C 48.503096,27.324691 47.92114,27.54147 47.496653,27.029997 L 47.496659,27.029997 z" fill="#00f" stroke-width=".275" transform="matrix(.996 0 0 1 .016 .025)"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="16"
+   height="16"
+   id="symbol-viewpoint">
+  <defs
+     id="defs2381" />
+  <g
+     transform="matrix(0.1817625,0,0,0.1817625,-0.715681,-0.754427)"
+     id="g3334">
+    <g
+       transform="matrix(0.9957238,0,0,0.9997285,1.5927618e-2,2.4998745e-2)"
+       id="g3191">
+      <path
+         d="M 9.6000004,7.9698114 A 1.5849056,1.6 0 1 1 6.4301891,7.9698114 A 1.5849056,1.6 0 1 1 9.6000004,7.9698114 z"
+         transform="matrix(5.5016849,0,0,5.5016849,3.9374513,4.1506196)"
+         id="path2419"
+         style="fill:#0101ff;fill-opacity:1;stroke:#000000;stroke-width:0.05;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         d="M 8.6867391,52.624353 C 6.816871,52.169299 5.0737341,50.833315 4.3997553,49.338698 C 4.0106344,48.47578 3.9820521,48.157277 4.2219002,47.356736 C 4.6013085,46.090398 5.8552159,44.841148 7.512558,44.078313 C 8.7083867,43.527899 9.0683066,43.476543 10.642634,43.631675 C 12.711707,43.835556 15.892175,44.430036 20.682301,45.50825 C 26.45013,46.806533 27.518576,47.246271 27.162141,48.175121 C 26.77599,49.181407 22.256558,50.607424 15.252731,51.932893 C 11.197845,52.700279 9.6629304,52.861918 8.6867391,52.624353 z"
+         id="path3296"
+         style="fill:#0000ff;stroke:#000000;stroke-width:0.27508423;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         d="M 46.323106,91.254109 C 45.429343,90.664965 44.841518,89.955361 44.126115,88.601956 C 43.657516,87.715454 43.612849,87.319767 43.74128,85.192691 C 44.065059,79.83036 46.533819,69.619869 47.677483,68.913045 C 48.812842,68.211358 49.984033,71.41417 51.642463,79.755871 C 52.794126,85.548606 52.767965,87.454362 51.510401,89.375316 C 51.054522,90.071678 50.317045,90.891179 49.87156,91.196429 C 48.851387,91.895463 47.333521,91.920138 46.323111,91.254109 L 46.323106,91.254109 z"
+         id="path3310"
+         style="fill:#0000ff;stroke:#000000;stroke-width:0.27508423;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         d="M 17.044681,79.335663 C 16.041725,78.47295 15.909337,76.932904 16.633253,74.549568 C 17.121851,72.94095 17.380844,72.530139 18.719337,71.240598 C 20.695789,69.33643 26.831885,65.257083 30.506991,63.404027 C 33.573019,61.858077 34.31936,61.66391 34.31936,62.412203 C 34.31936,63.968442 28.485956,73.397145 25.537553,76.606503 C 23.522698,78.799686 21.892223,79.67643 19.548743,79.826827 C 17.92388,79.9311 17.681706,79.8836 17.044688,79.33566 L 17.044681,79.335663 z"
+         id="path3312"
+         style="fill:#0000ff;stroke:#000000;stroke-width:0.27508423;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         d="M 73.519587,79.210442 C 70.756653,77.848597 62.658467,66.329855 61.940638,62.74071 C 61.795752,62.016292 61.837428,61.951932 62.451341,61.951932 C 63.800912,61.951932 66.839118,63.612598 72.452619,67.418577 C 78.501561,71.519787 80.084314,73.581687 79.696577,76.855506 C 79.516421,78.376596 79.111112,79.04287 78.16538,79.372553 C 77.040979,79.764518 74.46107,79.674496 73.51959,79.210442 L 73.519587,79.210442 z"
+         id="path3308"
+         style="fill:#0000ff;stroke:#000000;stroke-width:0.27508423;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         d="M 79.165163,51.596088 C 72.594333,50.241188 70.095854,49.457565 69.067279,48.42899 C 68.520471,47.882182 68.559332,47.637841 69.266845,47.174262 C 70.721869,46.22089 82.660857,43.690306 85.83714,43.66203 C 87.894346,43.643713 88.04272,43.681286 89.400976,44.564515 C 91.282486,45.787997 92.113604,47.357195 91.667947,48.844665 C 91.321604,50.000666 90.027955,51.382141 88.618413,52.101235 C 87.106573,52.872515 84.742854,52.746205 79.165163,51.596088 z"
+         id="path3306"
+         style="fill:#0000ff;stroke:#000000;stroke-width:0.27508423;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         d="M 31.793979,34.013792 C 29.637523,32.817297 23.932345,29.006704 21.015724,26.814799 C 18.572261,24.978491 17.384173,23.690935 16.764379,22.207561 C 16.017401,20.419796 16.444898,17.558738 17.569053,16.822163 C 18.491863,16.217513 21.265186,16.234024 22.52538,16.851669 C 23.984757,17.566938 26.009196,19.798837 28.615723,23.566136 C 32.799805,29.61352 34.807872,33.658635 34.068241,34.549835 C 33.650071,35.053699 33.681598,35.061129 31.793979,34.013795 L 31.793979,34.013792 z"
+         id="path3300"
+         style="fill:#0000ff;stroke:#000000;stroke-width:0.27508423;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         d="M 62.014382,34.509457 C 61.604709,34.099789 61.948141,33.092665 63.379858,30.505123 C 65.636044,26.427506 70.06706,19.873614 71.678867,18.230086 C 72.902467,16.982406 73.272186,16.759054 74.541117,16.500977 C 76.60474,16.081274 78.604869,16.532183 79.248069,17.562107 C 79.436013,17.863059 79.646529,18.816093 79.715871,19.67995 C 79.818113,20.953598 79.737538,21.466281 79.289801,22.391182 C 78.417431,24.193266 75.680576,26.529527 70.1387,30.202848 C 63.810256,34.397534 62.563397,35.058474 62.014376,34.509454 L 62.014382,34.509457 z"
+         id="path3304"
+         style="fill:#0000ff;stroke:#000000;stroke-width:0.27508423;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         d="M 47.496659,27.029997 C 46.694512,26.063475 45.391612,21.317753 44.292374,15.358646 C 43.393033,10.483236 43.400066,8.8399172 44.32754,7.1340423 C 46.432498,3.2624584 49.990945,3.494503 52.119437,7.6421389 C 52.485049,8.3545692 52.541797,8.9256791 52.43315,10.798866 C 52.219894,14.475672 49.949809,24.841443 49.001319,26.469498 C 48.503096,27.324691 47.92114,27.54147 47.496653,27.029997 L 47.496659,27.029997 z"
+         id="path3302"
+         style="fill:#0000ff;stroke:#000000;stroke-width:0.27508423;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
+  </g>
 </svg>
diff --git a/data/styles/symbols/vulcan.svg b/data/styles/symbols/vulcan.svg
index 660d572efb..1bbe8cf958 100644
--- a/data/styles/symbols/vulcan.svg
+++ b/data/styles/symbols/vulcan.svg
@@ -1,3 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="9" viewBox="0 0 100 100" height="9">
-    <svg:path fill="#f00" stroke="#000" stroke-width="5" d="M 0,90 L 50,10 L 100,90 Z"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="9" id="symbol-vulcan" viewBox="0 0 100 100" height="9">
+	   <svg:path fill="#ff0000" stroke="black" stroke-width="5" d="M 0,90 L 50,10 L 100,90 Z"/>
 </svg>
diff --git a/data/styles/symbols/wastewater.svg b/data/styles/symbols/wastewater.svg
index 165ee86363..bc9988e096 100644
--- a/data/styles/symbols/wastewater.svg
+++ b/data/styles/symbols/wastewater.svg
@@ -1,6 +1,26 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1" width="16" height="16">
-    <g transform="translate(0 -1036.362)">
-        <path d="M 8.6704377,1052.3616 C 5.8778813,1052.3193 3.3066465,1050.1394 4.1696694,1047.0975 C 5.0326922,1044.0555 6.8683983,1040.2805 8.6211777,1036.9851 C 9.0313355,1036.1543 9.53177,1036.0713 9.318092,1037.4336 C 9.1044137,1038.7958 10.298606,1040.8968 11.256236,1042.3766 C 12.213866,1043.8565 13.80443,1045.7732 13.846869,1048.0104 C 13.889309,1050.2476 11.462995,1052.4039 8.6704377,1052.3616 z" transform="translate(-.615 .045)"/>
-        <path d="M 9.6438828,1050.3924 C 9.4359603,1050.0465 9.2141656,1049.7088 9.0135619,1049.3587 C 9.2136016,1049.0096 9.4375807,1048.6714 9.6512715,1048.3306 C 9.6308149,1048.5611 9.648804,1048.7751 9.936814,1048.6837 C 10.31748,1048.6722 10.699108,1048.6719 11.07896,1048.647 C 11.225994,1048.6439 11.525845,1048.3854 11.318921,1048.6512 C 11.078092,1049.0354 10.869818,1049.4412 10.606099,1049.8104 C 10.409069,1050.0158 10.099526,1049.9245 9.8473925,1049.9566 C 9.5277272,1049.8467 9.7163629,1050.3186 9.6438828,1050.3924 L 9.6438828,1050.3924 z M 7.5254031,1049.9577 C 7.1628333,1049.9198 6.8729582,1049.5419 6.9735956,1049.1825 C 7.0741064,1049.0003 7.1431242,1048.6595 7.4168193,1048.7244 C 7.8604287,1048.7226 8.3041836,1048.7086 8.747659,1048.713 C 8.7547033,1049.1269 8.7719401,1049.5481 8.7597116,1049.9576 C 8.3482939,1049.9542 7.936435,1049.9877 7.5254031,1049.9577 z M 6.9185133,1049.4368 C 6.6863522,1049.0139 6.4072876,1048.6183 6.1829117,1048.1912 C 6.0777707,1047.8876 6.3946782,1047.6552 6.4988228,1047.3947 C 6.5295422,1047.2536 6.1353125,1047.2081 6.1517738,1047.1206 C 6.5606882,1047.1175 6.971196,1047.1007 7.3792443,1047.1126 C 7.5915702,1047.4394 7.7775267,1047.7889 7.9814949,1048.1235 C 7.9672692,1048.1912 7.7504369,1047.9777 7.6430629,1047.9647 C 7.4099019,1048.3397 7.1835601,1048.7208 6.9690877,1049.1069 C 6.9209486,1049.2054 6.9202675,1049.3546 6.9185133,1049.4368 z M 10.630053,1048.6337 C 10.370581,1048.2352 10.128749,1047.8249 9.8757102,1047.4219 C 10.225018,1047.184 10.598349,1046.9816 10.963393,1046.7686 C 11.171569,1047.0896 11.387342,1047.4087 11.569405,1047.7451 C 11.736631,1048.1308 11.428955,1048.6048 11.013329,1048.6247 C 10.88606,1048.6333 10.757397,1048.6436 10.630053,1048.6337 z M 8.0725342,1047.1824 C 7.7143741,1046.9858 7.3550494,1046.7913 6.9981965,1046.5923 C 7.2239693,1046.2156 7.4404512,1045.8318 7.6874018,1045.4692 C 7.8850491,1045.2826 8.1839612,1045.3736 8.4293013,1045.3424 C 8.759802,1045.3338 9.0905317,1045.3305 9.4210768,1045.3292 C 9.0993871,1045.466 8.9577282,1045.7979 8.7836146,1046.0755 C 8.5568213,1046.447 8.3438692,1046.828 8.1128665,1047.1961 L 8.097372,1047.1955 L 8.0725342,1047.1824 L 8.0725342,1047.1824 z M 9.0161492,1046.8649 C 9.1493331,1046.7534 9.5217402,1046.695 9.2769701,1046.483 C 9.1623566,1046.286 9.0360785,1046.0957 8.9239647,1045.8972 C 9.0591669,1045.613 9.2992568,1045.3341 9.6380055,1045.3235 C 9.9002,1045.2962 10.176533,1045.4291 10.288577,1045.6739 C 10.392336,1045.8664 10.514889,1046.1097 10.728996,1045.8811 C 10.83994,1045.8097 11.026359,1045.6956 10.865811,1045.8954 C 10.673622,1046.209 10.488426,1046.5273 10.294621,1046.84 C 9.8685211,1046.8485 9.4421871,1046.8594 9.0161492,1046.8649 z" fill="#fff" transform="translate(-.615 .045)"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="16"
+   height="16"
+   id="symbol-wastewater">
+  <g
+     transform="translate(-1.1460296e-7,-1036.3622)"
+     id="layer1">
+    <g
+       transform="matrix(0.9999576,0,0,0.9999576,-0.615215,4.4596691e-2)"
+       id="g2760">
+      <path
+         d="M 8.6704377,1052.3616 C 5.8778813,1052.3193 3.3066465,1050.1394 4.1696694,1047.0975 C 5.0326922,1044.0555 6.8683983,1040.2805 8.6211777,1036.9851 C 9.0313355,1036.1543 9.53177,1036.0713 9.318092,1037.4336 C 9.1044137,1038.7958 10.298606,1040.8968 11.256236,1042.3766 C 12.213866,1043.8565 13.80443,1045.7732 13.846869,1048.0104 C 13.889309,1050.2476 11.462995,1052.4039 8.6704377,1052.3616 z"
+         id="path2603"
+         style="fill:#000000" />
+      <path
+         d="M 9.6438828,1050.3924 C 9.4359603,1050.0465 9.2141656,1049.7088 9.0135619,1049.3587 C 9.2136016,1049.0096 9.4375807,1048.6714 9.6512715,1048.3306 C 9.6308149,1048.5611 9.648804,1048.7751 9.936814,1048.6837 C 10.31748,1048.6722 10.699108,1048.6719 11.07896,1048.647 C 11.225994,1048.6439 11.525845,1048.3854 11.318921,1048.6512 C 11.078092,1049.0354 10.869818,1049.4412 10.606099,1049.8104 C 10.409069,1050.0158 10.099526,1049.9245 9.8473925,1049.9566 C 9.5277272,1049.8467 9.7163629,1050.3186 9.6438828,1050.3924 L 9.6438828,1050.3924 z M 7.5254031,1049.9577 C 7.1628333,1049.9198 6.8729582,1049.5419 6.9735956,1049.1825 C 7.0741064,1049.0003 7.1431242,1048.6595 7.4168193,1048.7244 C 7.8604287,1048.7226 8.3041836,1048.7086 8.747659,1048.713 C 8.7547033,1049.1269 8.7719401,1049.5481 8.7597116,1049.9576 C 8.3482939,1049.9542 7.936435,1049.9877 7.5254031,1049.9577 z M 6.9185133,1049.4368 C 6.6863522,1049.0139 6.4072876,1048.6183 6.1829117,1048.1912 C 6.0777707,1047.8876 6.3946782,1047.6552 6.4988228,1047.3947 C 6.5295422,1047.2536 6.1353125,1047.2081 6.1517738,1047.1206 C 6.5606882,1047.1175 6.971196,1047.1007 7.3792443,1047.1126 C 7.5915702,1047.4394 7.7775267,1047.7889 7.9814949,1048.1235 C 7.9672692,1048.1912 7.7504369,1047.9777 7.6430629,1047.9647 C 7.4099019,1048.3397 7.1835601,1048.7208 6.9690877,1049.1069 C 6.9209486,1049.2054 6.9202675,1049.3546 6.9185133,1049.4368 z M 10.630053,1048.6337 C 10.370581,1048.2352 10.128749,1047.8249 9.8757102,1047.4219 C 10.225018,1047.184 10.598349,1046.9816 10.963393,1046.7686 C 11.171569,1047.0896 11.387342,1047.4087 11.569405,1047.7451 C 11.736631,1048.1308 11.428955,1048.6048 11.013329,1048.6247 C 10.88606,1048.6333 10.757397,1048.6436 10.630053,1048.6337 z M 8.0725342,1047.1824 C 7.7143741,1046.9858 7.3550494,1046.7913 6.9981965,1046.5923 C 7.2239693,1046.2156 7.4404512,1045.8318 7.6874018,1045.4692 C 7.8850491,1045.2826 8.1839612,1045.3736 8.4293013,1045.3424 C 8.759802,1045.3338 9.0905317,1045.3305 9.4210768,1045.3292 C 9.0993871,1045.466 8.9577282,1045.7979 8.7836146,1046.0755 C 8.5568213,1046.447 8.3438692,1046.828 8.1128665,1047.1961 L 8.097372,1047.1955 L 8.0725342,1047.1824 L 8.0725342,1047.1824 z M 9.0161492,1046.8649 C 9.1493331,1046.7534 9.5217402,1046.695 9.2769701,1046.483 C 9.1623566,1046.286 9.0360785,1046.0957 8.9239647,1045.8972 C 9.0591669,1045.613 9.2992568,1045.3341 9.6380055,1045.3235 C 9.9002,1045.2962 10.176533,1045.4291 10.288577,1045.6739 C 10.392336,1045.8664 10.514889,1046.1097 10.728996,1045.8811 C 10.83994,1045.8097 11.026359,1045.6956 10.865811,1045.8954 C 10.673622,1046.209 10.488426,1046.5273 10.294621,1046.84 C 9.8685211,1046.8485 9.4421871,1046.8594 9.0161492,1046.8649 z"
+         id="path2530"
+         style="fill:#ffffff" />
     </g>
+  </g>
 </svg>
diff --git a/data/styles/symbols/windmill.svg b/data/styles/symbols/windmill.svg
index 2f56897a24..577ee9539a 100644
--- a/data/styles/symbols/windmill.svg
+++ b/data/styles/symbols/windmill.svg
@@ -1,7 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" baseProfile="full" width="18.64" viewBox="0 0 480 480" height="18.64">
-    <svg:g transform="translate(82)">
-        <svg:path fill="#000" d="M106.7,148.2l104-1l61,333l-231-1"/>
-        <svg:path stroke="#000" stroke-width="24" d="M6.7,201 l284-191" fill="none"/>
-        <svg:path stroke="#000" stroke-width="24" d="M19.7,17.5 l290,176" fill="none"/>
-    </svg:g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="symbol-windmill" viewBox="0 0 480 480" height="18.64">
+   <svg:g transform="translate(82,0)">
+            <svg:path fill="#000000" d="M106.7,148.2l104-1l61,333l-231-1"/>
+            <svg:path fill="none" stroke="#000000" stroke-width="24" d="M6.7,201 l284-191"/>
+            <svg:path fill="none" stroke="#000000" stroke-width="24" d="M19.7,17.5 l290,176"/>
+          </svg:g>
 </svg>
diff --git a/data/symbols/api_pin.svg b/data/symbols/api_pin.svg
deleted file mode 100644
index 18f9a72002..0000000000
--- a/data/symbols/api_pin.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="24" viewBox="0 0 48 64">
-    <ellipse transform="matrix(.05 -.999 .999 .05 -36.602 80.966)" opacity=".5" fill="#808285" enable-background="new" cx="24.244" cy="59.716" rx="1.387" ry="4.166"/>
-    <ellipse transform="matrix(.05 -.999 .999 .05 -36.553 80.791)" opacity=".5" enable-background="new" cx="24.184" cy="59.606" rx=".784" ry="2.353"/>
-    <path fill="#360" d="M42.125,20.689c0-10.246-8.087-18.551-18.062-18.551S6,10.443,6,20.689c0,4.472,1.745,8.42,4.107,11.776	c2.197,3.121,4.364,7.096,7.818,13.114c2.405,4.192,4.471,9.91,5.492,12.961c0.109,0.326,0.155,0.587,0.264,0.739	c0.365,0.517,0.475,0.47,0.475,0.47s0.109,0.062,0.43-0.519c0.087-0.156,0.139-0.392,0.241-0.686	c1.138-3.268,3.411-9.545,5.319-13.309c2.097-4.131,6.258-10.584,7.461-12.305C40.078,29.395,42.125,25.388,42.125,20.689z"/>
-    <path fill="#8AC33F" d="M41.167,20.829C41.167,10.879,33.581,3,24.25,3S7.219,10.925,7.219,20.875c0,4.342,1.79,8.131,3.999,11.39	c2.055,3.031,4.332,6.92,7.563,12.767c2.25,4.071,5.406,13.438,5.406,13.438s3.497-10.283,5.281-13.938	c1.962-4.011,6.22-10.173,7.345-11.845C39.123,29.251,41.167,25.391,41.167,20.829z"/>
-    <path fill="#fff" d="M23.342,10.624c0.483-0.979,1.274-0.979,1.758,0l1.735,3.511c0.483,0.978,1.763,1.907,2.843,2.064 l3.885,0.564c1.08,0.157,1.324,0.909,0.543,1.67l-2.81,2.735c-0.78,0.762-1.271,2.265-1.085,3.34l0.662,3.859 c0.184,1.076-0.455,1.541-1.422,1.033l-3.475-1.825c-0.965-0.508-2.546-0.507-3.513,0L18.991,29.4 c-0.966,0.507-1.605,0.043-1.421-1.033l0.663-3.859c0.185-1.076-0.304-2.579-1.086-3.34l-2.81-2.736 c-0.782-0.762-0.538-1.513,0.542-1.67l3.886-0.564c1.08-0.157,2.359-1.086,2.842-2.064L23.342,10.624z"/>
-</svg>
diff --git a/data/symbols/current-position.svg b/data/symbols/current-position.svg
deleted file mode 100644
index 9f427b93f2..0000000000
--- a/data/symbols/current-position.svg
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="72"
-   height="72"
-   viewBox="0 0 72 72"
-   version="1"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="current-position.svg">
-  <metadata
-     id="metadata47">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1852"
-     inkscape:window-height="1060"
-     id="namedview45"
-     showgrid="false"
-     inkscape:zoom="13.906433"
-     inkscape:cx="9.5483903"
-     inkscape:cy="-12.909491"
-     inkscape:window-x="64"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     fit-margin-left="0.1"
-     fit-margin-top="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <defs
-     id="defs4">
-    <linearGradient
-       id="c">
-      <stop
-         offset="0"
-         stop-color="#fff"
-         id="stop7" />
-      <stop
-         offset="1"
-         stop-color="#fff"
-         stop-opacity="0"
-         id="stop9" />
-    </linearGradient>
-    <linearGradient
-       id="d">
-      <stop
-         offset="0"
-         stop-color="#fff"
-         id="stop12" />
-      <stop
-         offset="1"
-         stop-color="#fff"
-         stop-opacity="0"
-         id="stop14" />
-    </linearGradient>
-    <linearGradient
-       id="b">
-      <stop
-         offset="0"
-         stop-color="#fff"
-         stop-opacity=".875"
-         id="stop17" />
-      <stop
-         offset="1"
-         stop-color="#fff"
-         stop-opacity="0"
-         id="stop19" />
-    </linearGradient>
-    <linearGradient
-       id="a">
-      <stop
-         offset="0"
-         stop-color="#1f2259"
-         id="stop22" />
-      <stop
-         offset="1"
-         stop-color="#2fb5ea"
-         id="stop24" />
-    </linearGradient>
-    <filter
-       id="i"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         stdDeviation="1.466"
-         id="feGaussianBlur27" />
-    </filter>
-    <filter
-       x="-0.101"
-       width="1.202"
-       y="-0.138"
-       height="1.276"
-       id="k"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         stdDeviation="3.411"
-         id="feGaussianBlur30" />
-    </filter>
-    <filter
-       id="f"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         stdDeviation=".842"
-         id="feGaussianBlur33" />
-    </filter>
-    <linearGradient
-       xlink:href="#a"
-       id="e"
-       gradientUnits="userSpaceOnUse"
-       x1="194.689"
-       y1="31.854"
-       x2="194.689"
-       y2="74.711998" />
-    <radialGradient
-       xlink:href="#b"
-       id="g"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.162,2.107,-1.691,0.263,228.263,-371.43)"
-       cx="180.72501"
-       cy="38.594002"
-       fx="180.72501"
-       fy="38.594002"
-       r="28.884001" />
-    <linearGradient
-       xlink:href="#c"
-       id="h"
-       gradientUnits="userSpaceOnUse"
-       x1="181.996"
-       y1="36.387001"
-       x2="183.27901"
-       y2="53.875" />
-    <radialGradient
-       xlink:href="#d"
-       id="j"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.018,0,0,-1.182,391.624,74.389)"
-       cx="194.07899"
-       cy="26.292999"
-       fx="194.07899"
-       fy="26.292999"
-       r="28.884001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#a"
-       id="linearGradient3889"
-       gradientUnits="userSpaceOnUse"
-       x1="194.689"
-       y1="31.854"
-       x2="194.689"
-       y2="74.711998" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#b"
-       id="radialGradient3891"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.162,2.107,-1.691,0.263,228.263,-371.43)"
-       cx="180.72501"
-       cy="38.594002"
-       fx="180.72501"
-       fy="38.594002"
-       r="28.884001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#c"
-       id="linearGradient3893"
-       gradientUnits="userSpaceOnUse"
-       x1="181.996"
-       y1="36.387001"
-       x2="183.27901"
-       y2="53.875" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#d"
-       id="radialGradient3895"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.018,0,0,-1.182,391.624,74.389)"
-       cx="194.07899"
-       cy="26.292999"
-       fx="194.07899"
-       fy="26.292999"
-       r="28.884001" />
-  </defs>
-  <g
-     id="g3884"
-     transform="translate(-13.843097,-13.230172)">
-    <path
-       id="path39"
-       d="m 72.427,48.012 c 0,12.363 -10.022,22.385 -22.385,22.385 -12.363,0 -22.385,-10.022 -22.385,-22.385 0,-12.363 10.022,-22.385 22.385,-22.385 12.363,0 22.385,10.022 22.385,22.385 z"
-       style="fill:url(#linearGradient3889);filter:url(#f)"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path41"
-       d="m 222.448,56.486 c 0,15.952 -12.932,28.884 -28.884,28.884 -15.952,0 -28.884,-12.932 -28.884,-28.884 0,-15.952 12.932,-28.884 28.884,-28.884 15.952,0 28.884,12.932 28.884,28.884 z"
-       transform="matrix(0.436,-0.078,0.055,0.307,-39.974,33.867)"
-       style="fill:url(#radialGradient3891);stroke:url(#linearGradient3893);stroke-width:0.815;filter:url(#i)"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path43"
-       d="M 38.99,63.519 C 36.278,57.345 40.921,49.34 49.36,45.64 c 8.439,-3.701 17.478,-1.697 20.19,4.477 2.712,6.174 -1.931,14.179 -10.37,17.879 -8.439,3.701 -17.478,1.697 -20.19,-4.477 z"
-       style="fill:url(#radialGradient3895);filter:url(#k)"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/data/symbols/placemark-blue.svg b/data/symbols/placemark-blue.svg
deleted file mode 100644
index 4df6b5501c..0000000000
--- a/data/symbols/placemark-blue.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="24" viewBox="0 0 48 64" enable-background="new 0 0 48 64">
-    <ellipse transform="matrix(-.986 .168 -.168 -.986 66.74 112.811)" opacity=".5" fill="#808285" cx="28.595" cy="59.23" rx="7.5" ry="2.5"/>
-    <polygon opacity=".6" fill="#6D6E71" points="32,60 23,61 19,32 31,31"/>
-    <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="21.132" y1="46.529" x2="29.469" y2="45.779">
-        <stop offset="0" stop-color="#E6E6E6"/>
-        <stop offset="1" stop-color="#C4C4C4"/>
-    </linearGradient>
-    <polygon fill="url(#a)" points="30,59 25,60 21,33 29,32"/>
-    <circle opacity=".8" fill="#263C91" cx="24" cy="21.917" r="20"/>
-    <radialGradient id="b" cx="23.522" cy="20.894" r="18.015" fx="14.854" fy="14.345" gradientUnits="userSpaceOnUse">
-        <stop offset=".248" stop-color="#D7E4F0"/>
-        <stop offset=".299" stop-color="#C1D2E8"/>
-        <stop offset=".418" stop-color="#96AFD8"/>
-        <stop offset=".537" stop-color="#7696CC"/>
-        <stop offset=".656" stop-color="#5D85C3"/>
-        <stop offset=".773" stop-color="#497ABD"/>
-        <stop offset=".889" stop-color="#3C74BA"/>
-        <stop offset="1" stop-color="#3772B9"/>
-    </radialGradient>
-    <circle fill="url(#b)" cx="24" cy="21.917" r="18.015"/>
-</svg>
diff --git a/data/symbols/placemark-brown.svg b/data/symbols/placemark-brown.svg
deleted file mode 100644
index a1b47fe582..0000000000
--- a/data/symbols/placemark-brown.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="24" viewBox="0 0 48 64" enable-background="new 0 0 48 64">
-    <ellipse transform="matrix(-.986 .168 -.168 -.986 66.74 112.811)" opacity=".5" fill="#808285" cx="28.595" cy="59.23" rx="7.5" ry="2.5"/>
-    <polygon opacity=".6" fill="#6D6E71" points="32,60 23,61 19,32 31,31"/>
-    <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="21.132" y1="46.529" x2="29.469" y2="45.779">
-        <stop offset="0" stop-color="#E6E6E6"/>
-        <stop offset="1" stop-color="#C4C4C4"/>
-    </linearGradient>
-    <polygon fill="url(#a)" points="30,59 25,60 21,33 29,32"/>
-    <circle opacity=".8" fill="#895121" cx="24" cy="21.917" r="20"/>
-    <radialGradient id="b" cx="23.522" cy="20.894" r="18.015" fx="14.854" fy="14.345" gradientUnits="userSpaceOnUse">
-        <stop offset=".18" stop-color="#DBC5A4"/>
-        <stop offset=".198" stop-color="#D9C19E"/>
-        <stop offset=".334" stop-color="#CDA577"/>
-        <stop offset=".471" stop-color="#C5915A"/>
-        <stop offset=".607" stop-color="#BF8344"/>
-        <stop offset=".741" stop-color="#BB7A36"/>
-        <stop offset=".873" stop-color="#B9742E"/>
-        <stop offset="1" stop-color="#B8722C"/>
-    </radialGradient>
-    <circle fill="url(#b)" cx="24" cy="21.917" r="18.015"/>
-</svg>
diff --git a/data/symbols/placemark-green.svg b/data/symbols/placemark-green.svg
deleted file mode 100644
index 02dde1bd13..0000000000
--- a/data/symbols/placemark-green.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="24" viewBox="0 0 48 64" enable-background="new 0 0 48 64">
-    <ellipse transform="matrix(.986 -.168 .168 .986 -9.543 5.644)" opacity=".5" fill="#808285" enable-background="new" cx="28.594" cy="59.23" rx="7.5" ry="2.5"/>
-    <polygon opacity=".6" fill="#6D6E71" enable-background="new" points="32,60 23,61 19,32 31,31"/>
-    <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="568.132" y1="823.529" x2="576.469" y2="822.779" gradientTransform="translate(-547 -777)">
-        <stop offset="0" stop-color="#E6E6E6"/>
-        <stop offset="1" stop-color="#C4C4C4"/>
-    </linearGradient>
-    <polygon fill="url(#a)" points="30,59 25,60 21,33 29,32"/>
-    <circle opacity=".8" fill="#00751E" enable-background="new" cx="24" cy="21.917" r="20"/>
-    <radialGradient id="b" cx="570.521" cy="797.894" r="18.015" fx="561.404" fy="792.065" gradientTransform="translate(-547 -777)" gradientUnits="userSpaceOnUse">
-        <stop offset=".248" stop-color="#E5F1DA"/>
-        <stop offset=".264" stop-color="#DFEED4"/>
-        <stop offset=".37" stop-color="#B6DCAB"/>
-        <stop offset=".478" stop-color="#93CD8C"/>
-        <stop offset=".586" stop-color="#75C273"/>
-        <stop offset=".692" stop-color="#5ABB5E"/>
-        <stop offset=".797" stop-color="#41B652"/>
-        <stop offset=".9" stop-color="#2BB34C"/>
-        <stop offset="1" stop-color="#21B24B"/>
-    </radialGradient>
-    <circle fill="url(#b)" cx="24" cy="21.917" r="18.015"/>
-</svg>
diff --git a/data/symbols/placemark-orange.svg b/data/symbols/placemark-orange.svg
deleted file mode 100644
index 51e21bbe66..0000000000
--- a/data/symbols/placemark-orange.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="24" viewBox="0 0 48 64" enable-background="new 0 0 48 64">
-    <ellipse transform="matrix(-.986 .168 -.168 -.986 66.74 112.811)" opacity=".5" fill="#808285" cx="28.595" cy="59.23" rx="7.5" ry="2.5"/>
-    <polygon opacity=".6" fill="#6D6E71" points="32,60 23,61 19,32 31,31"/>
-    <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="21.132" y1="46.529" x2="29.469" y2="45.779">
-        <stop offset="0" stop-color="#E6E6E6"/>
-        <stop offset="1" stop-color="#C4C4C4"/>
-    </linearGradient>
-    <polygon fill="url(#a)" points="30,59 25,60 21,33 29,32"/>
-    <circle opacity=".8" fill="#C86F29" cx="24" cy="21.917" r="20"/>
-    <radialGradient id="b" cx="23.522" cy="20.894" r="18.015" fx="14.854" fy="14.345" gradientUnits="userSpaceOnUse">
-        <stop offset=".248" stop-color="#FFF3E8"/>
-        <stop offset=".298" stop-color="#FFE7CD"/>
-        <stop offset=".4" stop-color="#FED19F"/>
-        <stop offset=".502" stop-color="#FCBE7A"/>
-        <stop offset=".605" stop-color="#FBAF5C"/>
-        <stop offset=".706" stop-color="#FAA342"/>
-        <stop offset=".806" stop-color="#F99C2F"/>
-        <stop offset=".905" stop-color="#F89724"/>
-        <stop offset="1" stop-color="#F89520"/>
-    </radialGradient>
-    <circle fill="url(#b)" cx="24" cy="21.917" r="18.015"/>
-</svg>
diff --git a/data/symbols/placemark-pink.svg b/data/symbols/placemark-pink.svg
deleted file mode 100644
index 130be51a36..0000000000
--- a/data/symbols/placemark-pink.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="24" viewBox="0 0 48 64" enable-background="new 0 0 48 64">
-    <ellipse transform="matrix(-.986 .168 -.168 -.986 66.74 112.811)" opacity=".5" fill="#808285" cx="28.595" cy="59.23" rx="7.5" ry="2.5"/>
-    <polygon opacity=".6" fill="#6D6E71" points="32,60 23,61 19,32 31,31"/>
-    <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="21.132" y1="46.529" x2="29.469" y2="45.779">
-        <stop offset="0" stop-color="#E6E6E6"/>
-        <stop offset="1" stop-color="#C4C4C4"/>
-    </linearGradient>
-    <polygon fill="url(#a)" points="30,59 25,60 21,33 29,32"/>
-    <circle opacity=".8" fill="#BA2B91" cx="24" cy="21.917" r="20"/>
-    <radialGradient id="b" cx="23.522" cy="20.894" r="18.015" fx="14.854" fy="14.345" gradientUnits="userSpaceOnUse">
-        <stop offset=".248" stop-color="#F1D0E4"/>
-        <stop offset=".261" stop-color="#F0CDE2"/>
-        <stop offset=".386" stop-color="#EAA9CC"/>
-        <stop offset=".512" stop-color="#E68DBB"/>
-        <stop offset=".637" stop-color="#E377AF"/>
-        <stop offset=".761" stop-color="#E166A6"/>
-        <stop offset=".883" stop-color="#E05AA1"/>
-        <stop offset="1" stop-color="#E0569F"/>
-    </radialGradient>
-    <circle fill="url(#b)" cx="24" cy="21.917" r="18.015"/>
-</svg>
diff --git a/data/symbols/placemark-purple.svg b/data/symbols/placemark-purple.svg
deleted file mode 100644
index 40417e60ba..0000000000
--- a/data/symbols/placemark-purple.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="24" viewBox="0 0 48 64" enable-background="new 0 0 48 64">
-    <ellipse transform="matrix(-.986 .168 -.168 -.986 66.74 112.811)" opacity=".5" fill="#808285" cx="28.595" cy="59.23" rx="7.5" ry="2.5"/>
-    <polygon opacity=".6" fill="#6D6E71" points="32,60 23,61 19,32 31,31"/>
-    <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="21.132" y1="46.529" x2="29.469" y2="45.779">
-        <stop offset="0" stop-color="#E6E6E6"/>
-        <stop offset="1" stop-color="#C4C4C4"/>
-    </linearGradient>
-    <polygon fill="url(#a)" points="30,59 25,60 21,33 29,32"/>
-    <circle opacity=".8" fill="#702774" cx="24" cy="21.917" r="20"/>
-    <radialGradient id="b" cx="23.522" cy="20.894" r="18.015" fx="14.854" fy="14.345" gradientUnits="userSpaceOnUse">
-        <stop offset=".248" stop-color="#E8CCE2"/>
-        <stop offset=".368" stop-color="#CBA5CD"/>
-        <stop offset=".496" stop-color="#B486BC"/>
-        <stop offset=".625" stop-color="#A371B0"/>
-        <stop offset=".753" stop-color="#9962A9"/>
-        <stop offset=".879" stop-color="#9359A4"/>
-        <stop offset="1" stop-color="#9156A2"/>
-    </radialGradient>
-    <circle fill="url(#b)" cx="24" cy="21.917" r="18.015"/>
-</svg>
diff --git a/data/symbols/placemark-red.svg b/data/symbols/placemark-red.svg
deleted file mode 100644
index 5741f95a2e..0000000000
--- a/data/symbols/placemark-red.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="24" viewBox="0 0 48 64" enable-background="new 0 0 48 64">
-    <ellipse transform="matrix(.168 .986 -.986 .168 82.178 21.092)" opacity=".5" fill="#808285" enable-background="new" cx="28.594" cy="59.229" rx="2.5" ry="7.5"/>
-    <polygon opacity=".6" fill="#6D6E71" enable-background="new" points="32,60 23,61 19,32 31,31"/>
-    <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="294.632" y1="-370.528" x2="302.969" y2="-369.777" gradientTransform="matrix(1 0 0 -1 -273.5 -324)">
-        <stop offset="0" stop-color="#E6E6E6"/>
-        <stop offset="1" stop-color="#C4C4C4"/>
-    </linearGradient>
-    <polygon fill="url(#a)" points="30,59 25,60 21,33 29,32"/>
-    <circle opacity=".8" fill="#A00215" cx="24" cy="21.917" r="20"/>
-    <radialGradient id="b" cx="297.022" cy="-344.894" r="18.015" fx="288.08" fy="-338.158" gradientTransform="matrix(1 0 0 -1 -273.5 -324)" gradientUnits="userSpaceOnUse">
-        <stop offset=".248" stop-color="#EEDBDC"/>
-        <stop offset=".279" stop-color="#EECECA"/>
-        <stop offset=".383" stop-color="#EDA598"/>
-        <stop offset=".489" stop-color="#EB8473"/>
-        <stop offset=".594" stop-color="#E96759"/>
-        <stop offset=".698" stop-color="#E84D45"/>
-        <stop offset=".801" stop-color="#E73739"/>
-        <stop offset=".902" stop-color="#E72432"/>
-        <stop offset="1" stop-color="#E71D30"/>
-    </radialGradient>
-    <circle fill="url(#b)" cx="24" cy="21.917" r="18.015"/>
-</svg>
diff --git a/data/symbols/placemark-yellow.svg b/data/symbols/placemark-yellow.svg
deleted file mode 100644
index 52e75b3520..0000000000
--- a/data/symbols/placemark-yellow.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<svg version="1" xmlns="http://www.w3.org/2000/svg" width="16" height="24" viewBox="0 0 48 64" enable-background="new 0 0 48 64">
-    <ellipse transform="matrix(.168 .986 -.986 .168 82.178 21.092)" opacity=".5" fill="#808285" enable-background="new" cx="28.594" cy="59.229" rx="2.5" ry="7.5"/>
-    <polygon opacity=".6" fill="#6D6E71" enable-background="new" points="32,60 23,61 19,32 31,31"/>
-    <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="-877.593" y1="2455.828" x2="-869.255" y2="2456.579" gradientTransform="matrix(1 0 0 -1 898.725 2502.356)">
-        <stop offset="0" stop-color="#E6E6E6"/>
-        <stop offset="1" stop-color="#C4C4C4"/>
-    </linearGradient>
-    <polygon fill="url(#a)" points="30,59 25,60 21,33 29,32"/>
-    <circle opacity=".8" fill="#F4E206" enable-background="new" cx="24" cy="21.917" r="20"/>
-    <radialGradient id="b" cx="-875.202" cy="2481.46" r="18.015" fx="-883.87" fy="2474.911" gradientTransform="matrix(.411 .912 .912 -.411 -1877.517 1839.041)" gradientUnits="userSpaceOnUse">
-        <stop offset="0" stop-color="#FFFFE8"/>
-        <stop offset=".248" stop-color="#fff"/>
-        <stop offset=".372" stop-color="#FFFFBE"/>
-        <stop offset="1" stop-color="#ff0"/>
-    </radialGradient>
-    <circle fill="url(#b)" cx="24" cy="21.916" r="18.015"/>
-</svg>
diff --git a/data/types.txt b/data/types.txt
index bf22d9f2ad..3c15b0065b 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -289,7 +289,7 @@ leisure|slipway
 tourism|caravan_site
 place|state
 highway|path|private
-railway|subway
+railway|subway|tunnel
 barrier|city_wall
 place|farm
 boundary|administrative|11
@@ -512,7 +512,7 @@ highway|tertiary_link
 highway|track
 sport|curling
 natural|water
-landuse|forest|coniferous
+landuse|forest
 mapswithme
 mapswithme
 leisure|playground|tennis
@@ -953,77 +953,3 @@ landuse|residential|urban
 amenity|ferry_terminal
 amenity
 shop|furniture
-tourism|gallery
-shop|car_parts
-amenity|bicycle_parking
-shop|general
-shop|copyshop
-amenity|emergency_phone
-emergency|phone
-harbour
-seamark:type|harbour
-shop|music
-shop|musical_instrument
-wood|deciduous
-wood|coniferous
-amenity|prison
-religion|christian
-religion|jewish
-religion|muslim
-amenity|brothel
-railway|subway_entrance|red
-railway|subway_entrance|blue
-railway|subway_entrance|orange
-railway|subway_entrance|green
-railway|subway_entrance|brown
-railway|subway_entrance|yellow
-railway|subway_entrance|purple
-railway|subway_entrance|grey
-railway|subway_entrance|violet
-railway|subway_entrance|lightgreen
-railway|subway_entrance|lightblue
-railway|subway_entrance|gray
-railway|subway_entrance|darkgreen
-amenity|money_transfer
-craft|carpenter
-shop|motorcycle
-craft
-shop|photo
-craft|shoemaker
-shop|photo_studio
-craft|tailor
-man_made|water_well
-leisure|beach_resort
-amenity|waste_basket
-man_made|watermill
-man_made|water_tower
-man_made|communication_tower
-man_made|mast
-amenity|fire_hydrant
-emergency|fire_hydrant
-highway|street_lamp
-man_made|water_well|drinking_water
-power|generator|solar
-power|generator|nuclear
-man_made|storage_tank
-man_made|water_well|manual
-man_made|water_well|powered
-barrier|border_control
-amenity|courthouse
-amenity|social_facility
-religion|hindu
-office|ngo
-amenity|community_centre
-healthcare
-healthcare|dentist
-healthcare|hospital
-amenity|dentist
-amenity|laundry
-shop|dry_cleaning
-shop|funeral_directors
-amenity|gambling
-amenity|casino
-amenity|shower
-shop|confectionery
-shop|outdoor
-railway|construction
diff --git a/graphics/image_renderer.cpp b/graphics/image_renderer.cpp
index 1fc66469ab..720f76663a 100644
--- a/graphics/image_renderer.cpp
+++ b/graphics/image_renderer.cpp
@@ -27,6 +27,7 @@ namespace graphics
     ASSERT(res->m_cat == Resource::EImage, ());
 
     m2::RectI texRect(res->m_texRect);
+    texRect.Inflate(-2, -2);
 
     m2::PointF pts[6] =
     {
diff --git a/graphics/symbol_element.cpp b/graphics/symbol_element.cpp
index e94191c3ed..2fefa5ca84 100644
--- a/graphics/symbol_element.cpp
+++ b/graphics/symbol_element.cpp
@@ -44,6 +44,7 @@ namespace graphics
   m2::AnyRectD const SymbolElement::boundRect() const
   {
     m2::RectI texRect(m_symbolRect);
+    texRect.Inflate(-1, -1);
 
     m2::PointD sz(texRect.SizeX(), texRect.SizeY());
 
@@ -75,6 +76,7 @@ namespace graphics
     }
 
     m2::RectI texRect(res->m_texRect);
+    texRect.Inflate(-1, -1);
 
     m2::PointD sz(texRect.SizeX(), texRect.SizeY());