From cc73dedaae9353e1612be042b44ba0fbc3d18426 Mon Sep 17 00:00:00 2001
From: Darafei Praliaskouski <komzpa@gmail.com>
Date: Fri, 18 Oct 2013 18:32:42 +0300
Subject: [style] added Nori icons

---
 data/drules_proto-bw.txt | 5080 ++++++++++++++++++++++++++++------------------
 1 file changed, 3132 insertions(+), 1948 deletions(-)

(limited to 'data/drules_proto-bw.txt')

diff --git a/data/drules_proto-bw.txt b/data/drules_proto-bw.txt
index 09aa4e1a8a..20826bca0c 100644
--- a/data/drules_proto-bw.txt
+++ b/data/drules_proto-bw.txt
@@ -214,46 +214,46 @@ cont {
   name: "aerialway-station"
   element {
     scale: 16
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
       }
-      priority: 16000
+      priority: 15000
     }
   }
   element {
     scale: 17
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
       }
-      priority: 16000
+      priority: 15000
     }
   }
   element {
     scale: 18
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
       }
-      priority: 16000
+      priority: 15000
     }
   }
   element {
     scale: 19
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
       }
-      priority: 16000
+      priority: 15000
     }
   }
 }
@@ -273,7 +273,7 @@ cont {
       priority: -16002
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#000000::16.0:16"
+      name: "symbols/maki/airfield-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -298,7 +298,7 @@ cont {
       priority: -16003
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#000000::16.0:16"
+      name: "symbols/maki/airfield-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -323,7 +323,7 @@ cont {
       priority: -16004
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#000000::16.0:16"
+      name: "symbols/maki/airfield-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -348,7 +348,7 @@ cont {
       priority: -16005
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#000000::16.0:16"
+      name: "symbols/maki/airfield-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -373,7 +373,7 @@ cont {
       priority: -16006
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#000000::16.0:16"
+      name: "symbols/maki/airfield-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -398,7 +398,7 @@ cont {
       priority: -16007
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#000000::16.0:16"
+      name: "symbols/maki/airfield-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -423,7 +423,7 @@ cont {
       priority: -16008
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#000000::16.0:16"
+      name: "symbols/maki/airfield-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -448,7 +448,7 @@ cont {
       priority: -16009
     }
     symbol {
-      name: "symbols/maki/airfield-18.svg:#000000::16.0:16"
+      name: "symbols/maki/airfield-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -472,7 +472,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/airport-18.svg:#000000::16.0:16"
+      name: "symbols/maki/airport-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -493,7 +493,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/airport-18.svg:#000000::16.0:16"
+      name: "symbols/maki/airport-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -514,7 +514,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/airport-18.svg:#000000::16.0:16"
+      name: "symbols/maki/airport-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -535,7 +535,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/airport-18.svg:#000000::16.0:16"
+      name: "symbols/maki/airport-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -556,7 +556,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/airport-18.svg:#000000::16.0:16"
+      name: "symbols/maki/airport-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -577,7 +577,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/airport-18.svg:#000000::16.0:16"
+      name: "symbols/maki/airport-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -598,7 +598,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/airport-18.svg:#000000::16.0:16"
+      name: "symbols/maki/airport-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -619,7 +619,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/airport-18.svg:#000000::16.0:16"
+      name: "symbols/maki/airport-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -708,35 +708,35 @@ cont {
   name: "aeroway-gate"
   element {
     scale: 17
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
       }
-      priority: 16000
+      priority: 15000
     }
   }
   element {
     scale: 18
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
       }
-      priority: 16000
+      priority: 15000
     }
   }
   element {
     scale: 19
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
       }
-      priority: 16000
+      priority: 15000
     }
   }
 }
@@ -745,7 +745,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/heliport-18.svg:#000000::16.0:16"
+      name: "symbols/maki/heliport-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -757,7 +757,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/heliport-18.svg:#000000::16.0:16"
+      name: "symbols/maki/heliport-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -769,7 +769,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/heliport-18.svg:#000000::16.0:16"
+      name: "symbols/maki/heliport-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -781,7 +781,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/heliport-18.svg:#000000::16.0:16"
+      name: "symbols/maki/heliport-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -793,7 +793,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/heliport-18.svg:#000000::16.0:16"
+      name: "symbols/maki/heliport-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -1184,14 +1184,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bank-18.svg:#000000::16.0:16"
+      name: "symbols/nori/atm-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bank-18.svg:#000000::16.0:16"
+      name: "symbols/nori/atm-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1212,7 +1212,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bank-18.svg:#000000::16.0:16"
+      name: "symbols/nori/atm-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1233,7 +1233,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bank-18.svg:#000000::16.0:16"
+      name: "symbols/nori/atm-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1257,7 +1257,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bank-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bank-18.svg:#000000:::"
       priority: 16017
     }
     circle {
@@ -1269,7 +1269,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bank-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bank-18.svg:#000000:::"
       priority: 16017
     }
     caption {
@@ -1290,7 +1290,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bank-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bank-18.svg:#000000:::"
       priority: 16017
     }
     caption {
@@ -1311,7 +1311,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bank-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bank-18.svg:#000000:::"
       priority: 16017
     }
     caption {
@@ -1335,7 +1335,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bar-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bar-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -1347,7 +1347,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bar-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bar-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1368,7 +1368,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bar-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bar-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1389,7 +1389,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bar-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bar-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1410,17 +1410,10 @@ cont {
 }
 cont {
   name: "amenity-bench"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/bench.svg:#000000::16.0:16"
-      priority: 16000
-    }
-  }
   element {
     scale: 17
     symbol {
-      name: "symbols/bench.svg:#000000::16.0:16"
+      name: "symbols/nori/bench-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1436,7 +1429,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/bench.svg:#000000::16.0:16"
+      name: "symbols/nori/bench-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1452,7 +1445,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/bench.svg:#000000::16.0:16"
+      name: "symbols/nori/bench-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1471,14 +1464,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bicycle-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bicycle-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1494,7 +1487,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bicycle-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1510,7 +1503,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bicycle-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1529,7 +1522,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bicycle-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -1541,7 +1534,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bicycle-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1562,7 +1555,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bicycle-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1583,7 +1576,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bicycle-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1646,7 +1639,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bank-18.svg:#000000::16.0:16"
+      name: "symbols/nori/bureau_de_change-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -1658,7 +1651,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bank-18.svg:#000000::16.0:16"
+      name: "symbols/nori/bureau_de_change-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1679,7 +1672,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bank-18.svg:#000000::16.0:16"
+      name: "symbols/nori/bureau_de_change-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1700,7 +1693,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bank-18.svg:#000000::16.0:16"
+      name: "symbols/nori/bureau_de_change-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1724,7 +1717,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bus-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bus-18.svg:#000000:::"
       priority: 16034
     }
     circle {
@@ -1736,7 +1729,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bus-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bus-18.svg:#000000:::"
       priority: 16034
     }
     caption {
@@ -1757,7 +1750,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bus-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bus-18.svg:#000000:::"
       priority: 16034
     }
     caption {
@@ -1778,7 +1771,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bus-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bus-18.svg:#000000:::"
       priority: 16034
     }
     caption {
@@ -1802,7 +1795,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/cafe-18.svg:#000000::16.0:16"
+      name: "symbols/maki/cafe-18.svg:#000000:::"
       priority: 16008
     }
     circle {
@@ -1814,7 +1807,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/cafe-18.svg:#000000::16.0:16"
+      name: "symbols/maki/cafe-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1835,7 +1828,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/cafe-18.svg:#000000::16.0:16"
+      name: "symbols/maki/cafe-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1856,7 +1849,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/cafe-18.svg:#000000::16.0:16"
+      name: "symbols/maki/cafe-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1880,7 +1873,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/car_rental.svg:#000000::16.0:16"
+      name: "symbols/nori/car_rental-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -1892,7 +1885,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/car_rental.svg:#000000::16.0:16"
+      name: "symbols/nori/car_rental-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1913,7 +1906,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/car_rental.svg:#000000::16.0:16"
+      name: "symbols/nori/car_rental-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1934,7 +1927,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/car_rental.svg:#000000::16.0:16"
+      name: "symbols/nori/car_rental-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -1956,23 +1949,31 @@ cont {
 cont {
   name: "amenity-car_sharing"
   element {
-    scale: 16
-    symbol {
-      name: "symbols/car_sharing.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
     }
   }
   element {
-    scale: 17
-    symbol {
-      name: "symbols/car_sharing.svg:#000000::16.0:16"
-      priority: 16008
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
     }
+  }
+  element {
+    scale: 19
     caption {
       primary {
         height: 11
@@ -1982,18 +1983,24 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
+  }
+}
+cont {
+  name: "amenity-casino"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
     }
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/car_sharing.svg:#000000::16.0:16"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -2003,18 +2010,9 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/car_sharing.svg:#000000::16.0:16"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -2024,11 +2022,6 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
 }
 cont {
@@ -2036,7 +2029,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/cinema-18.svg:#000000::16.0:16"
+      name: "symbols/maki/cinema-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -2048,7 +2041,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/cinema-18.svg:#000000::16.0:16"
+      name: "symbols/maki/cinema-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2069,7 +2062,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/cinema-18.svg:#000000::16.0:16"
+      name: "symbols/maki/cinema-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2090,7 +2083,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/cinema-18.svg:#000000::16.0:16"
+      name: "symbols/maki/cinema-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2125,7 +2118,7 @@ cont {
       priority: -16028
     }
     symbol {
-      name: "symbols/maki/college-18.svg:#000000::16.0:16"
+      name: "symbols/maki/college-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -2136,7 +2129,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/college-18.svg:#000000::16.0:16"
+      name: "symbols/maki/college-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2161,7 +2154,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/college-18.svg:#000000::16.0:16"
+      name: "symbols/maki/college-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2186,7 +2179,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/college-18.svg:#000000::16.0:16"
+      name: "symbols/maki/college-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2205,12 +2198,186 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-community_centre"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/community_centre-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/community_centre-18.svg:#000000:::"
+      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:::"
+      priority: 16008
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/nori/community_centre-18.svg:#000000:::"
+      priority: 16008
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
+    }
+  }
+}
+cont {
+  name: "amenity-courthouse"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/courthouse-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/courthouse-18.svg:#000000:::"
+      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:::"
+      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:::"
+      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:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/dentist-18.svg:#000000:::"
+      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:::"
+      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:::"
+      priority: 16008
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
+    }
+  }
+}
 cont {
   name: "amenity-doctors"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/hospital-18.svg:#000000::16.0:16"
+      name: "symbols/maki/hospital-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -2222,7 +2389,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/hospital-18.svg:#000000::16.0:16"
+      name: "symbols/maki/hospital-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2243,7 +2410,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/hospital-18.svg:#000000::16.0:16"
+      name: "symbols/maki/hospital-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2264,7 +2431,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/hospital-18.svg:#000000::16.0:16"
+      name: "symbols/maki/hospital-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2288,14 +2455,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/water-18.svg:#000000::16.0:16"
+      name: "symbols/nori/drinking_water-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/water-18.svg:#000000::16.0:16"
+      name: "symbols/nori/drinking_water-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2316,7 +2483,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/water-18.svg:#000000::16.0:16"
+      name: "symbols/nori/drinking_water-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2337,7 +2504,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/water-18.svg:#000000::16.0:16"
+      name: "symbols/nori/drinking_water-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2361,7 +2528,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/embassy-18.svg:#000000::16.0:16"
+      name: "symbols/maki/embassy-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -2373,7 +2540,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/embassy-18.svg:#000000::16.0:16"
+      name: "symbols/maki/embassy-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2394,7 +2561,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/embassy-18.svg:#000000::16.0:16"
+      name: "symbols/maki/embassy-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2415,7 +2582,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/embassy-18.svg:#000000::16.0:16"
+      name: "symbols/maki/embassy-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2439,14 +2606,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#000000::16.0:16"
+      name: "symbols/maki/emergency-telephone-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#000000::16.0:16"
+      name: "symbols/maki/emergency-telephone-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2462,7 +2629,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#000000::16.0:16"
+      name: "symbols/maki/emergency-telephone-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2478,7 +2645,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#000000::16.0:16"
+      name: "symbols/maki/emergency-telephone-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2497,7 +2664,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/fast-food-18.svg:#000000::16.0:16"
+      name: "symbols/maki/fast-food-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -2509,7 +2676,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/fast-food-18.svg:#000000::16.0:16"
+      name: "symbols/maki/fast-food-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2530,7 +2697,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/fast-food-18.svg:#000000::16.0:16"
+      name: "symbols/maki/fast-food-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2551,7 +2718,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/fast-food-18.svg:#000000::16.0:16"
+      name: "symbols/maki/fast-food-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2575,7 +2742,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/ferry-18.svg:#000000::16.0:16"
+      name: "symbols/maki/ferry-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -2587,7 +2754,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/ferry-18.svg:#000000::16.0:16"
+      name: "symbols/maki/ferry-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2608,7 +2775,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/ferry-18.svg:#000000::16.0:16"
+      name: "symbols/maki/ferry-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2629,7 +2796,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/ferry-18.svg:#000000::16.0:16"
+      name: "symbols/maki/ferry-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2648,12 +2815,70 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-fire_hydrant"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/fire_hydrant-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/fire_hydrant-18.svg:#000000:::"
+      priority: 16008
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/nori/fire_hydrant-18.svg:#000000:::"
+      priority: 16008
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/nori/fire_hydrant-18.svg:#000000:::"
+      priority: 16008
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
+    }
+  }
+}
 cont {
   name: "amenity-fire_station"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/fire-station-18.svg:#000000::16.0:16"
+      name: "symbols/maki/fire-station-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -2665,7 +2890,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/fire-station-18.svg:#000000::16.0:16"
+      name: "symbols/maki/fire-station-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2686,7 +2911,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/fire-station-18.svg:#000000::16.0:16"
+      name: "symbols/maki/fire-station-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2707,7 +2932,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/fire-station-18.svg:#000000::16.0:16"
+      name: "symbols/maki/fire-station-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2734,15 +2959,6 @@ cont {
       color: 0
       priority: 1105
     }
-    symbol {
-      name: "symbols/fountain.svg:#000000::16.0:16"
-      priority: 16104
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14104
-    }
   }
   element {
     scale: 17
@@ -2750,10 +2966,6 @@ cont {
       color: 0
       priority: 1009
     }
-    symbol {
-      name: "symbols/fountain.svg:#000000::16.0:16"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -2763,11 +2975,6 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 18
@@ -2775,10 +2982,6 @@ cont {
       color: 0
       priority: 1009
     }
-    symbol {
-      name: "symbols/fountain.svg:#000000::16.0:16"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -2788,11 +2991,6 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 19
@@ -2800,10 +2998,6 @@ cont {
       color: 0
       priority: 1009
     }
-    symbol {
-      name: "symbols/fountain.svg:#000000::16.0:16"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -2813,11 +3007,6 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
 }
 cont {
@@ -2825,7 +3014,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/fuel-18.svg:#000000::16.0:16"
+      name: "symbols/maki/fuel-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -2837,7 +3026,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/fuel-18.svg:#000000::16.0:16"
+      name: "symbols/maki/fuel-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -2849,7 +3038,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/fuel-18.svg:#000000::16.0:16"
+      name: "symbols/maki/fuel-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2870,7 +3059,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/fuel-18.svg:#000000::16.0:16"
+      name: "symbols/maki/fuel-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2891,7 +3080,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/fuel-18.svg:#000000::16.0:16"
+      name: "symbols/maki/fuel-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2911,47 +3100,18 @@ cont {
   }
 }
 cont {
-  name: "amenity-grave_yard"
-  element {
-    scale: 13
-    area {
-      color: 6710886
-      priority: 1001
-    }
-  }
-  element {
-    scale: 14
-    area {
-      color: 6710886
-      priority: 1001
-    }
-  }
-  element {
-    scale: 15
-    area {
-      color: 6710886
-      priority: 1001
-    }
-  }
+  name: "amenity-gambling"
   element {
     scale: 16
-    area {
-      color: 6710886
-      priority: 1001
-    }
     symbol {
-      name: "symbols/maki/cemetery-18.svg:#000000::16.0:16"
+      name: "symbols/nori/gambling-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
-    area {
-      color: 6710886
-      priority: 1009
-    }
     symbol {
-      name: "symbols/maki/cemetery-18.svg:#000000::16.0:16"
+      name: "symbols/nori/gambling-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2966,12 +3126,8 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 6710886
-      priority: 1009
-    }
     symbol {
-      name: "symbols/maki/cemetery-18.svg:#000000::16.0:16"
+      name: "symbols/nori/gambling-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -2986,12 +3142,8 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 6710886
-      priority: 1009
-    }
     symbol {
-      name: "symbols/maki/cemetery-18.svg:#000000::16.0:16"
+      name: "symbols/nori/gambling-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3006,7 +3158,7 @@ cont {
   }
 }
 cont {
-  name: "amenity-grave_yard-christian"
+  name: "amenity-grave_yard"
   element {
     scale: 13
     area {
@@ -3035,7 +3187,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/maki/religious-christian-18.svg:#000000::16.0:16"
+      name: "symbols/nori/grave_yard-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -3046,7 +3198,7 @@ cont {
       priority: 1009
     }
     symbol {
-      name: "symbols/maki/religious-christian-18.svg:#000000::16.0:16"
+      name: "symbols/nori/grave_yard-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3066,7 +3218,7 @@ cont {
       priority: 1009
     }
     symbol {
-      name: "symbols/maki/religious-christian-18.svg:#000000::16.0:16"
+      name: "symbols/nori/grave_yard-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3086,7 +3238,7 @@ cont {
       priority: 1009
     }
     symbol {
-      name: "symbols/maki/religious-christian-18.svg:#000000::16.0:16"
+      name: "symbols/nori/grave_yard-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3101,96 +3253,47 @@ cont {
   }
 }
 cont {
-  name: "amenity-hospital"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/hospital-18.svg:#000000::16.0:16"
-      priority: 16000
-    }
-  }
+  name: "amenity-grave_yard-christian"
   element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/hospital-18.svg:#000000::16.0:16"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
+    scale: 13
+    area {
+      color: 6710886
+      priority: 1001
     }
   }
   element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/hospital-18.svg:#000000::16.0:16"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
+    scale: 14
+    area {
+      color: 6710886
+      priority: 1001
     }
   }
   element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/hospital-18.svg:#000000::16.0:16"
-      priority: 16008
-    }
-    caption {
-      primary {
-        height: 11
-        color: 0
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15008
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
+    scale: 15
+    area {
+      color: 6710886
+      priority: 1001
     }
   }
-}
-cont {
-  name: "amenity-hunting_stand"
   element {
     scale: 16
+    area {
+      color: 6710886
+      priority: 1001
+    }
     symbol {
-      name: "symbols/hunting_closed_high.svg:#000000::16.0:16"
+      name: "symbols/nori/grave_yard-18.svg:#000000:::"
       priority: 16000
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
   }
   element {
     scale: 17
+    area {
+      color: 6710886
+      priority: 1009
+    }
     symbol {
-      name: "symbols/hunting_closed_high.svg:#000000::16.0:16"
+      name: "symbols/nori/grave_yard-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3202,16 +3305,15 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 18
+    area {
+      color: 6710886
+      priority: 1009
+    }
     symbol {
-      name: "symbols/hunting_closed_high.svg:#000000::16.0:16"
+      name: "symbols/nori/grave_yard-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3223,16 +3325,15 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 19
+    area {
+      color: 6710886
+      priority: 1009
+    }
     symbol {
-      name: "symbols/hunting_closed_high.svg:#000000::16.0:16"
+      name: "symbols/nori/grave_yard-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3244,41 +3345,21 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
 }
 cont {
-  name: "amenity-kindergarten"
-  element {
-    scale: 15
-    area {
-      color: 6710886
-      priority: -16029
-    }
-  }
+  name: "amenity-hospital"
   element {
     scale: 16
-    area {
-      color: 6710886
-      priority: -16030
-    }
     symbol {
-      name: "symbols/maki/school-18.svg:#000000::16.0:16"
+      name: "symbols/nori/hospital-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
-    area {
-      color: 6710886
-      priority: -15992
-    }
     symbol {
-      name: "symbols/maki/school-18.svg:#000000::16.0:16"
+      name: "symbols/nori/hospital-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3298,12 +3379,8 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 6710886
-      priority: -15992
-    }
     symbol {
-      name: "symbols/maki/school-18.svg:#000000::16.0:16"
+      name: "symbols/nori/hospital-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3323,12 +3400,8 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 6710886
-      priority: -15992
-    }
     symbol {
-      name: "symbols/maki/school-18.svg:#000000::16.0:16"
+      name: "symbols/nori/hospital-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3348,23 +3421,72 @@ cont {
   }
 }
 cont {
-  name: "amenity-library"
+  name: "amenity-hunting_stand"
+  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: "amenity-kindergarten"
+  element {
+    scale: 15
+    area {
+      color: 6710886
+      priority: -16029
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 6710886
+      priority: -16030
+    }
     symbol {
-      name: "symbols/maki/library-18.svg:#000000::16.0:16"
+      name: "symbols/nori/kindergarten-18.svg:#000000:::"
       priority: 16000
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
   }
   element {
     scale: 17
+    area {
+      color: 6710886
+      priority: -15992
+    }
     symbol {
-      name: "symbols/maki/library-18.svg:#000000::16.0:16"
+      name: "symbols/nori/kindergarten-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3384,8 +3506,12 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 6710886
+      priority: -15992
+    }
     symbol {
-      name: "symbols/maki/library-18.svg:#000000::16.0:16"
+      name: "symbols/nori/kindergarten-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3405,8 +3531,12 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 6710886
+      priority: -15992
+    }
     symbol {
-      name: "symbols/maki/library-18.svg:#000000::16.0:16"
+      name: "symbols/nori/kindergarten-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3426,11 +3556,69 @@ cont {
   }
 }
 cont {
-  name: "amenity-marketplace"
+  name: "amenity-landury"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/nori/dry_cleaning-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/dry_cleaning-18.svg:#000000:::"
+      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:::"
+      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:::"
+      priority: 16008
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
+    }
+  }
+}
+cont {
+  name: "amenity-library"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/maki/library-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -3442,7 +3630,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/library-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3463,7 +3651,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/library-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3484,7 +3672,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/library-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3504,11 +3692,11 @@ cont {
   }
 }
 cont {
-  name: "amenity-nightclub"
+  name: "amenity-marketplace"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bar-18.svg:#000000::16.0:16"
+      name: "symbols/maki/shop-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -3520,7 +3708,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bar-18.svg:#000000::16.0:16"
+      name: "symbols/maki/shop-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3541,7 +3729,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bar-18.svg:#000000::16.0:16"
+      name: "symbols/maki/shop-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3562,7 +3750,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bar-18.svg:#000000::16.0:16"
+      name: "symbols/maki/shop-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3582,18 +3770,18 @@ cont {
   }
 }
 cont {
-  name: "amenity-parking"
+  name: "amenity-money_transfer"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/nori/money_transfer-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/nori/money_transfer-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3609,7 +3797,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/nori/money_transfer-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3625,7 +3813,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/nori/money_transfer-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3640,18 +3828,23 @@ cont {
   }
 }
 cont {
-  name: "amenity-parking-fee"
+  name: "amenity-nightclub"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bar-18.svg:#000000:::"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bar-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3663,11 +3856,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bar-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3679,11 +3877,16 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bar-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3695,21 +3898,26 @@ cont {
       }
       priority: 15008
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14008
+    }
   }
 }
 cont {
-  name: "amenity-parking-multi-storey"
+  name: "amenity-parking"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3725,7 +3933,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3741,7 +3949,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3756,18 +3964,18 @@ cont {
   }
 }
 cont {
-  name: "amenity-parking-multi-storey-fee"
+  name: "amenity-parking-fee"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3783,7 +3991,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3799,7 +4007,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3814,9 +4022,20 @@ cont {
   }
 }
 cont {
-  name: "amenity-parking-no-access"
+  name: "amenity-parking-multi-storey"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/maki/parking-garage-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
   element {
     scale: 17
+    symbol {
+      name: "symbols/maki/parking-garage-18.svg:#000000:::"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -3829,6 +4048,10 @@ cont {
   }
   element {
     scale: 18
+    symbol {
+      name: "symbols/maki/parking-garage-18.svg:#000000:::"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -3841,6 +4064,10 @@ cont {
   }
   element {
     scale: 19
+    symbol {
+      name: "symbols/maki/parking-garage-18.svg:#000000:::"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -3853,18 +4080,18 @@ cont {
   }
 }
 cont {
-  name: "amenity-parking-park_and_ride"
+  name: "amenity-parking-multi-storey-fee"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-garage-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-garage-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3880,7 +4107,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-garage-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3896,7 +4123,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-garage-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3911,18 +4138,57 @@ cont {
   }
 }
 cont {
-  name: "amenity-parking-permissive"
+  name: "amenity-parking-no-access"
+  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: "amenity-parking-park_and_ride"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3938,7 +4204,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3954,7 +4220,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3969,18 +4235,18 @@ cont {
   }
 }
 cont {
-  name: "amenity-parking-permissive-fee"
+  name: "amenity-parking-permissive"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -3996,7 +4262,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4012,7 +4278,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4027,18 +4293,18 @@ cont {
   }
 }
 cont {
-  name: "amenity-parking-private"
+  name: "amenity-parking-permissive-fee"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4054,7 +4320,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4070,7 +4336,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/parking-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4085,18 +4351,18 @@ cont {
   }
 }
 cont {
-  name: "amenity-parking-underground"
+  name: "amenity-parking-private"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4112,7 +4378,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4128,7 +4394,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4143,18 +4409,18 @@ cont {
   }
 }
 cont {
-  name: "amenity-parking-underground-fee"
+  name: "amenity-parking-underground"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-garage-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-garage-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4170,7 +4436,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-garage-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4186,7 +4452,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/parking-garage-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-garage-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4201,23 +4467,18 @@ cont {
   }
 }
 cont {
-  name: "amenity-pharmacy"
+  name: "amenity-parking-underground-fee"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/pharmacy-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-garage-18.svg:#000000:::"
       priority: 16000
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/pharmacy-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-garage-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4229,16 +4490,11 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/pharmacy-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-garage-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4250,16 +4506,11 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/pharmacy-18.svg:#000000::16.0:16"
+      name: "symbols/maki/parking-garage-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4271,19 +4522,14 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
 }
 cont {
-  name: "amenity-place_of_worship"
+  name: "amenity-pharmacy"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/place-of-worship-18.svg:#000000::16.0:16"
+      name: "symbols/nori/pharmacy-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -4295,7 +4541,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/place-of-worship-18.svg:#000000::16.0:16"
+      name: "symbols/nori/pharmacy-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4316,7 +4562,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/place-of-worship-18.svg:#000000::16.0:16"
+      name: "symbols/nori/pharmacy-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4337,7 +4583,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/place-of-worship-18.svg:#000000::16.0:16"
+      name: "symbols/nori/pharmacy-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4357,18 +4603,23 @@ cont {
   }
 }
 cont {
-  name: "amenity-police"
+  name: "amenity-place_of_worship"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/police-18.svg:#000000::16.0:16"
+      name: "symbols/maki/place-of-worship-18.svg:#000000:::"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/police-18.svg:#000000::16.0:16"
+      name: "symbols/maki/place-of-worship-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4389,7 +4640,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/police-18.svg:#000000::16.0:16"
+      name: "symbols/maki/place-of-worship-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4410,7 +4661,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/police-18.svg:#000000::16.0:16"
+      name: "symbols/maki/place-of-worship-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4430,11 +4681,18 @@ cont {
   }
 }
 cont {
-  name: "amenity-post_box"
+  name: "amenity-police"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/maki/police-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
   element {
     scale: 17
     symbol {
-      name: "symbols/postbox.svg:#000000::16.0:16"
+      name: "symbols/maki/police-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4455,7 +4713,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/postbox.svg:#000000::16.0:16"
+      name: "symbols/maki/police-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4476,7 +4734,73 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/postbox.svg:#000000::16.0:16"
+      name: "symbols/maki/police-18.svg:#000000:::"
+      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-post_box"
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/postbox.svg:#000000:::"
+      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/postbox.svg:#000000:::"
+      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: 19
+    symbol {
+      name: "symbols/postbox.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4500,7 +4824,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/post-18.svg:#000000::16.0:16"
+      name: "symbols/maki/post-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -4512,7 +4836,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/post-18.svg:#000000::16.0:16"
+      name: "symbols/maki/post-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4533,7 +4857,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/post-18.svg:#000000::16.0:16"
+      name: "symbols/maki/post-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4554,7 +4878,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/post-18.svg:#000000::16.0:16"
+      name: "symbols/maki/post-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4578,14 +4902,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/prison-18.svg:#000000::16.0:16"
+      name: "symbols/maki/prison-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/prison-18.svg:#000000::16.0:16"
+      name: "symbols/maki/prison-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4601,7 +4925,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/prison-18.svg:#000000::16.0:16"
+      name: "symbols/maki/prison-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4617,7 +4941,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/prison-18.svg:#000000::16.0:16"
+      name: "symbols/maki/prison-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4636,7 +4960,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/beer-18.svg:#000000::16.0:16"
+      name: "symbols/nori/pub-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -4648,7 +4972,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/beer-18.svg:#000000::16.0:16"
+      name: "symbols/nori/pub-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4669,7 +4993,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/beer-18.svg:#000000::16.0:16"
+      name: "symbols/nori/pub-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4690,7 +5014,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/beer-18.svg:#000000::16.0:16"
+      name: "symbols/nori/pub-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4714,14 +5038,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/waste-basket-18.svg:#000000::16.0:16"
+      name: "symbols/nori/recycling-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/waste-basket-18.svg:#000000::16.0:16"
+      name: "symbols/nori/recycling-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4742,7 +5066,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/waste-basket-18.svg:#000000::16.0:16"
+      name: "symbols/nori/recycling-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4763,7 +5087,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/waste-basket-18.svg:#000000::16.0:16"
+      name: "symbols/nori/recycling-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4787,7 +5111,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000::16.0:16"
+      name: "symbols/maki/restaurant-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -4799,7 +5123,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000::16.0:16"
+      name: "symbols/maki/restaurant-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4820,7 +5144,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000::16.0:16"
+      name: "symbols/maki/restaurant-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4841,7 +5165,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000::16.0:16"
+      name: "symbols/maki/restaurant-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4865,7 +5189,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000::16.0:16"
+      name: "symbols/maki/lodging-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -4877,7 +5201,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000::16.0:16"
+      name: "symbols/maki/lodging-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4898,7 +5222,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000::16.0:16"
+      name: "symbols/maki/lodging-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4919,7 +5243,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000::16.0:16"
+      name: "symbols/maki/lodging-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4943,7 +5267,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000::16.0:16"
+      name: "symbols/maki/restaurant-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -4955,7 +5279,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000::16.0:16"
+      name: "symbols/maki/restaurant-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4976,7 +5300,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000::16.0:16"
+      name: "symbols/maki/restaurant-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -4997,7 +5321,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000::16.0:16"
+      name: "symbols/maki/restaurant-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5021,7 +5345,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000::16.0:16"
+      name: "symbols/maki/restaurant-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -5033,7 +5357,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000::16.0:16"
+      name: "symbols/maki/restaurant-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5054,7 +5378,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000::16.0:16"
+      name: "symbols/maki/restaurant-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5075,7 +5399,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/restaurant-18.svg:#000000::16.0:16"
+      name: "symbols/maki/restaurant-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5110,7 +5434,7 @@ cont {
       priority: -16032
     }
     symbol {
-      name: "symbols/maki/school-18.svg:#000000::16.0:16"
+      name: "symbols/maki/school-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -5121,7 +5445,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/school-18.svg:#000000::16.0:16"
+      name: "symbols/maki/school-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5146,7 +5470,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/school-18.svg:#000000::16.0:16"
+      name: "symbols/maki/school-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5171,7 +5495,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/school-18.svg:#000000::16.0:16"
+      name: "symbols/maki/school-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5195,7 +5519,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/shelter.svg:#000000::16.0:16"
+      name: "symbols/shelter.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -5207,7 +5531,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/shelter.svg:#000000::16.0:16"
+      name: "symbols/shelter.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -5219,7 +5543,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/shelter.svg:#000000::16.0:16"
+      name: "symbols/shelter.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -5231,7 +5555,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/shelter.svg:#000000::16.0:16"
+      name: "symbols/shelter.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5252,7 +5576,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/shelter.svg:#000000::16.0:16"
+      name: "symbols/shelter.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5273,7 +5597,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/shelter.svg:#000000::16.0:16"
+      name: "symbols/shelter.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5293,23 +5617,18 @@ cont {
   }
 }
 cont {
-  name: "amenity-speed_trap"
+  name: "amenity-shower"
   element {
     scale: 16
     symbol {
-      name: "symbols/speed_trap.svg:#000000::16.0:16"
+      name: "symbols/nori/shower-18.svg:#000000:::"
       priority: 16000
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/speed_trap.svg:#000000::16.0:16"
+      name: "symbols/nori/shower-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5321,16 +5640,11 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/speed_trap.svg:#000000::16.0:16"
+      name: "symbols/nori/shower-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5342,16 +5656,69 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/nori/shower-18.svg:#000000:::"
+      priority: 16008
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
+    }
+  }
+}
+cont {
+  name: "amenity-social_facility"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/social_facility-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/social_facility-18.svg:#000000:::"
+      priority: 16008
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/nori/social_facility-18.svg:#000000:::"
+      priority: 16008
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/speed_trap.svg:#000000::16.0:16"
+      name: "symbols/nori/social_facility-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5363,10 +5730,44 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
+  }
+}
+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
     }
   }
 }
@@ -5375,7 +5776,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/taxi.svg:#000000::16.0:16"
+      name: "symbols/nori/taxi-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -5387,7 +5788,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/taxi.svg:#000000::16.0:16"
+      name: "symbols/nori/taxi-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5408,7 +5809,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/taxi.svg:#000000::16.0:16"
+      name: "symbols/nori/taxi-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5429,7 +5830,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/taxi.svg:#000000::16.0:16"
+      name: "symbols/nori/taxi-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5453,7 +5854,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/telephone-18.svg:#000000::16.0:16"
+      name: "symbols/maki/telephone-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -5465,7 +5866,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/telephone-18.svg:#000000::16.0:16"
+      name: "symbols/maki/telephone-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5486,7 +5887,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/telephone-18.svg:#000000::16.0:16"
+      name: "symbols/maki/telephone-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5507,7 +5908,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/telephone-18.svg:#000000::16.0:16"
+      name: "symbols/maki/telephone-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5531,7 +5932,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/theatre-18.svg:#000000::16.0:16"
+      name: "symbols/maki/theatre-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -5543,7 +5944,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/theatre-18.svg:#000000::16.0:16"
+      name: "symbols/maki/theatre-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5564,7 +5965,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/theatre-18.svg:#000000::16.0:16"
+      name: "symbols/maki/theatre-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5585,7 +5986,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/theatre-18.svg:#000000::16.0:16"
+      name: "symbols/maki/theatre-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5609,14 +6010,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/toilets-18.svg:#000000::16.0:16"
+      name: "symbols/maki/toilets-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/toilets-18.svg:#000000::16.0:16"
+      name: "symbols/maki/toilets-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5637,7 +6038,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/toilets-18.svg:#000000::16.0:16"
+      name: "symbols/maki/toilets-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5658,7 +6059,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/toilets-18.svg:#000000::16.0:16"
+      name: "symbols/maki/toilets-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5743,7 +6144,7 @@ cont {
       priority: -16034
     }
     symbol {
-      name: "symbols/maki/college-18.svg:#000000::16.0:16"
+      name: "symbols/maki/college-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -5754,7 +6155,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/college-18.svg:#000000::16.0:16"
+      name: "symbols/maki/college-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5779,7 +6180,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/college-18.svg:#000000::16.0:16"
+      name: "symbols/maki/college-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5804,7 +6205,7 @@ cont {
       priority: -15992
     }
     symbol {
-      name: "symbols/maki/college-18.svg:#000000::16.0:16"
+      name: "symbols/maki/college-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -5823,6 +6224,64 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-waste_basket"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/waste_basket-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/waste_basket-18.svg:#000000:::"
+      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:::"
+      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:::"
+      priority: 16008
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
+    }
+  }
+}
 cont {
   name: "area:highway-cycleway"
   element {
@@ -7973,7 +8432,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/roadblock-12.svg:#000000::16.0:16"
+      name: "symbols/maki/roadblock-12.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -7985,7 +8444,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/roadblock-12.svg:#000000::16.0:16"
+      name: "symbols/maki/roadblock-12.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -7997,7 +8456,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/roadblock-12.svg:#000000::16.0:16"
+      name: "symbols/maki/roadblock-12.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -8009,7 +8468,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/roadblock-12.svg:#000000::16.0:16"
+      name: "symbols/maki/roadblock-12.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -8024,7 +8483,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/roadblock-12.svg:#000000::16.0:16"
+      name: "symbols/maki/roadblock-12.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -8036,7 +8495,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/roadblock-12.svg:#000000::16.0:16"
+      name: "symbols/maki/roadblock-12.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -8048,7 +8507,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/roadblock-12.svg:#000000::16.0:16"
+      name: "symbols/maki/roadblock-12.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -8060,7 +8519,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/roadblock-12.svg:#000000::16.0:16"
+      name: "symbols/maki/roadblock-12.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -8070,6 +8529,37 @@ cont {
     }
   }
 }
+cont {
+  name: "barrier-border_control"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/border_control-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/border_control-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/nori/border_control-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/nori/border_control-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+}
 cont {
   name: "barrier-city_wall"
   element {
@@ -8177,56 +8667,56 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/square-stroked-12.svg:#000000::16.0:16"
+      name: "symbols/maki/square-stroked-12.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/square-stroked-12.svg:#000000::16.0:16"
+      name: "symbols/maki/square-stroked-12.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/square-stroked-12.svg:#000000::16.0:16"
+      name: "symbols/maki/square-stroked-12.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/square-stroked-12.svg:#000000::16.0:16"
+      name: "symbols/maki/square-stroked-12.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/square-stroked-12.svg:#000000::16.0:16"
+      name: "symbols/maki/square-stroked-12.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/square-stroked-12.svg:#000000::16.0:16"
+      name: "symbols/maki/square-stroked-12.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/square-stroked-12.svg:#000000::16.0:16"
+      name: "symbols/maki/square-stroked-12.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/square-stroked-12.svg:#000000::16.0:16"
+      name: "symbols/maki/square-stroked-12.svg:#000000:::"
       priority: 16000
     }
   }
@@ -8295,28 +8785,28 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/barrier.svg:#000000::16.0:16"
+      name: "symbols/barrier.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/barrier.svg:#000000::16.0:16"
+      name: "symbols/barrier.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/barrier.svg:#000000::16.0:16"
+      name: "symbols/barrier.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/barrier.svg:#000000::16.0:16"
+      name: "symbols/barrier.svg:#000000:::"
       priority: 16000
     }
   }
@@ -10841,107 +11331,262 @@ cont {
   }
 }
 cont {
-  name: "earthquake:damage-spontaneous_camp"
-  element {
-    scale: 14
-    symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 15
-    symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
-  }
+  name: "craft"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/nori/craft-18.svg:#000000:::"
       priority: 16000
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/nori/craft-18.svg:#000000:::"
       priority: 16000
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/nori/craft-18.svg:#000000:::"
       priority: 16000
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/nori/craft-18.svg:#000000:::"
       priority: 16000
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
   }
 }
 cont {
-  name: "emergency-phone"
+  name: "craft-carpenter"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#000000::16.0:16"
+      name: "symbols/nori/carpenter-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#000000::16.0:16"
+      name: "symbols/nori/carpenter-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#000000::16.0:16"
+      name: "symbols/nori/carpenter-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/emergency-telephone-18.svg:#000000::16.0:16"
+      name: "symbols/nori/carpenter-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+}
+cont {
+  name: "craft-shoemaker"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/shoemaker-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/shoemaker-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/nori/shoemaker-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/nori/shoemaker-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+}
+cont {
+  name: "craft-tailor"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/tailor-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/tailor-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/nori/tailor-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/nori/tailor-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+}
+cont {
+  name: "earthquake:damage-spontaneous_camp"
+  element {
+    scale: 14
+    symbol {
+      name: "symbols/maki/campsite-18.svg:#000000:::"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "symbols/maki/campsite-18.svg:#000000:::"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/maki/campsite-18.svg:#000000:::"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/maki/campsite-18.svg:#000000:::"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/maki/campsite-18.svg:#000000:::"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/maki/campsite-18.svg:#000000:::"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+}
+cont {
+  name: "emergency-fire_hydrant"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/fire_hydrant-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/fire_hydrant-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/nori/fire_hydrant-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/nori/fire_hydrant-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+}
+cont {
+  name: "emergency-phone"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/maki/emergency-telephone-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/maki/emergency-telephone-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/maki/emergency-telephone-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/maki/emergency-telephone-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -10950,38 +11595,38 @@ cont {
   name: "entrance"
   element {
     scale: 17
-    path_text {
+    caption {
       primary {
         height: 9
         color: 0
         stroke_color: 16777215
         offset_x: 6
       }
-      priority: 16026
+      priority: 15026
     }
   }
   element {
     scale: 18
-    path_text {
+    caption {
       primary {
         height: 9
         color: 0
         stroke_color: 16777215
         offset_x: 6
       }
-      priority: 16026
+      priority: 15026
     }
   }
   element {
     scale: 19
-    path_text {
+    caption {
       primary {
         height: 9
         color: 0
         stroke_color: 16777215
         offset_x: 6
       }
-      priority: 16026
+      priority: 15026
     }
   }
 }
@@ -10990,28 +11635,90 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/harbor-18.svg:#000000::16.0:16"
+      name: "symbols/maki/harbor-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/maki/harbor-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/maki/harbor-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/maki/harbor-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+}
+cont {
+  name: "healthcare-dentist"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/dentist-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/harbor-18.svg:#000000::16.0:16"
+      name: "symbols/nori/dentist-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/harbor-18.svg:#000000::16.0:16"
+      name: "symbols/nori/dentist-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/harbor-18.svg:#000000::16.0:16"
+      name: "symbols/nori/dentist-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+}
+cont {
+  name: "healthcare-hospital"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/hospital-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/hospital-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/nori/hospital-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/nori/hospital-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -12196,7 +12903,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bus-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bus-18.svg:#000000:::"
       priority: 16034
     }
     caption {
@@ -12217,7 +12924,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bus-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bus-18.svg:#000000:::"
       priority: 16034
     }
     caption {
@@ -12238,7 +12945,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bus-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bus-18.svg:#000000:::"
       priority: 16034
     }
     caption {
@@ -12259,7 +12966,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bus-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bus-18.svg:#000000:::"
       priority: 16034
     }
     caption {
@@ -31334,6 +32041,65 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-street_lamp"
+  element {
+    scale: 16
+    lines {
+      width: 1.6
+      color: 12294468
+      priority: -15000
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+    symbol {
+      name: "symbols/nori/street_lamp-18.svg:#000000:::"
+      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:::"
+      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:::"
+      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:::"
+      priority: 16000
+    }
+  }
+}
 cont {
   name: "highway-tertiary"
   element {
@@ -39955,24 +40721,8 @@ cont {
 }
 cont {
   name: "historic-archaeological_site"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/museum.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
-  }
   element {
     scale: 17
-    symbol {
-      name: "symbols/museum.svg:#000000::16.0:16"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -39982,18 +40732,9 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/museum.svg:#000000::16.0:16"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -40003,18 +40744,9 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/museum.svg:#000000::16.0:16"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -40024,33 +40756,12 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
 }
 cont {
   name: "historic-battlefield"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/cannon.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
-  }
   element {
     scale: 17
-    symbol {
-      name: "symbols/cannon.svg:#000000::16.0:16"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -40060,18 +40771,9 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/cannon.svg:#000000::16.0:16"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -40081,18 +40783,9 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/cannon.svg:#000000::16.0:16"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -40102,33 +40795,12 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
 }
 cont {
   name: "historic-castle"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/castle.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
-  }
   element {
     scale: 17
-    symbol {
-      name: "symbols/castle.svg:#000000::16.0:16"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -40138,18 +40810,9 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/castle.svg:#000000::16.0:16"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -40159,18 +40822,9 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/castle.svg:#000000::16.0:16"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -40180,11 +40834,6 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
 }
 cont {
@@ -40192,7 +40841,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/monument-18.svg:#000000::16.0:16"
+      name: "symbols/maki/monument-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -40204,7 +40853,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/monument-18.svg:#000000::16.0:16"
+      name: "symbols/maki/monument-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -40225,7 +40874,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/monument-18.svg:#000000::16.0:16"
+      name: "symbols/maki/monument-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -40246,7 +40895,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/monument-18.svg:#000000::16.0:16"
+      name: "symbols/maki/monument-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -40270,7 +40919,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/monument-18.svg:#000000::16.0:16"
+      name: "symbols/maki/monument-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -40282,7 +40931,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/monument-18.svg:#000000::16.0:16"
+      name: "symbols/maki/monument-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -40303,7 +40952,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/monument-18.svg:#000000::16.0:16"
+      name: "symbols/maki/monument-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -40324,7 +40973,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/monument-18.svg:#000000::16.0:16"
+      name: "symbols/maki/monument-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -40348,19 +40997,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/museum-18.svg:#000000::16.0:16"
+      name: "symbols/maki/museum-18.svg:#000000:::"
       priority: 16000
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/museum-18.svg:#000000::16.0:16"
+      name: "symbols/maki/museum-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -40372,16 +41016,11 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/museum-18.svg:#000000::16.0:16"
+      name: "symbols/maki/museum-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -40393,16 +41032,11 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/museum-18.svg:#000000::16.0:16"
+      name: "symbols/maki/museum-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -40414,11 +41048,6 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
 }
 cont {
@@ -40426,7 +41055,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/ruins.svg:#000000::16.0:16"
+      name: "symbols/ruins.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -40438,7 +41067,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/ruins.svg:#000000::16.0:16"
+      name: "symbols/ruins.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -40459,7 +41088,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/ruins.svg:#000000::16.0:16"
+      name: "symbols/ruins.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -40480,7 +41109,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/ruins.svg:#000000::16.0:16"
+      name: "symbols/ruins.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -40922,7 +41551,7 @@ cont {
       priority: -16055
     }
     symbol {
-      name: "symbols/maki/cemetery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/cemetery-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -40941,7 +41570,7 @@ cont {
       priority: -16056
     }
     symbol {
-      name: "symbols/maki/cemetery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/cemetery-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -40960,7 +41589,7 @@ cont {
       priority: -16057
     }
     symbol {
-      name: "symbols/maki/cemetery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/cemetery-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -40979,7 +41608,7 @@ cont {
       priority: -16058
     }
     symbol {
-      name: "symbols/maki/cemetery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/cemetery-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -41037,7 +41666,7 @@ cont {
       priority: -16063
     }
     symbol {
-      name: "symbols/maki/religious-christian-18.svg:#000000::16.0:16"
+      name: "symbols/maki/religious-christian-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -41056,7 +41685,7 @@ cont {
       priority: -16064
     }
     symbol {
-      name: "symbols/maki/religious-christian-18.svg:#000000::16.0:16"
+      name: "symbols/maki/religious-christian-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -41075,7 +41704,7 @@ cont {
       priority: -16065
     }
     symbol {
-      name: "symbols/maki/religious-christian-18.svg:#000000::16.0:16"
+      name: "symbols/maki/religious-christian-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -41094,7 +41723,7 @@ cont {
       priority: -16066
     }
     symbol {
-      name: "symbols/maki/religious-christian-18.svg:#000000::16.0:16"
+      name: "symbols/maki/religious-christian-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -41847,7 +42476,7 @@ cont {
       priority: -16133
     }
     symbol {
-      name: "symbols/maki/park-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -41866,7 +42495,7 @@ cont {
       priority: -16134
     }
     symbol {
-      name: "symbols/maki/park-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -41885,7 +42514,7 @@ cont {
       priority: -16135
     }
     symbol {
-      name: "symbols/maki/park-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -41904,7 +42533,7 @@ cont {
       priority: -16136
     }
     symbol {
-      name: "symbols/maki/park-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -41976,7 +42605,7 @@ cont {
       priority: -16143
     }
     symbol {
-      name: "symbols/maki/park2-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park2-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -41996,7 +42625,7 @@ cont {
       priority: -16144
     }
     symbol {
-      name: "symbols/maki/park2-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park2-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -42016,7 +42645,7 @@ cont {
       priority: -16145
     }
     symbol {
-      name: "symbols/maki/park2-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park2-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -42036,7 +42665,7 @@ cont {
       priority: -16146
     }
     symbol {
-      name: "symbols/maki/park2-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park2-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -43866,6 +44495,37 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-beach_resort"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/beach_resort-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/beach_resort-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/nori/beach_resort-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/nori/beach_resort-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+}
 cont {
   name: "leisure-dog_park-tennis"
   element {
@@ -43896,7 +44556,7 @@ cont {
       priority: -16281
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000::16.0:16"
+      name: "symbols/maki/tennis-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -43907,7 +44567,7 @@ cont {
       priority: -16282
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000::16.0:16"
+      name: "symbols/maki/tennis-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -43923,7 +44583,7 @@ cont {
       priority: -16283
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000::16.0:16"
+      name: "symbols/maki/tennis-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -43939,7 +44599,7 @@ cont {
       priority: -16284
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000::16.0:16"
+      name: "symbols/maki/tennis-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -43990,77 +44650,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/golf-18.svg:#000000::16.0:16"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/golf-18.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/golf-18.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/golf-18.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-}
-cont {
-  name: "leisure-nature_reserve"
-  element {
-    scale: 15
-    symbol {
-      name: "symbols/bird.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/bird.svg:#000000::16.0:16"
+      name: "symbols/maki/golf-18.svg:#000000:::"
       priority: 16000
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/bird.svg:#000000::16.0:16"
+      name: "symbols/maki/golf-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -44072,7 +44669,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/bird.svg:#000000::16.0:16"
+      name: "symbols/maki/golf-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -44084,7 +44681,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/bird.svg:#000000::16.0:16"
+      name: "symbols/maki/golf-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -44419,28 +45016,28 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/pitch-18.svg:#000000::16.0:16"
+      name: "symbols/maki/pitch-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/pitch-18.svg:#000000::16.0:16"
+      name: "symbols/maki/pitch-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/pitch-18.svg:#000000::16.0:16"
+      name: "symbols/maki/pitch-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/pitch-18.svg:#000000::16.0:16"
+      name: "symbols/maki/pitch-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -44475,7 +45072,7 @@ cont {
       priority: -16288
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000::16.0:16"
+      name: "symbols/maki/tennis-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -44486,7 +45083,7 @@ cont {
       priority: -16289
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000::16.0:16"
+      name: "symbols/maki/tennis-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -44502,7 +45099,7 @@ cont {
       priority: -16290
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000::16.0:16"
+      name: "symbols/maki/tennis-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -44518,7 +45115,7 @@ cont {
       priority: -16291
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000::16.0:16"
+      name: "symbols/maki/tennis-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -44533,14 +45130,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/pitch-18.svg:#000000::16.0:16"
+      name: "symbols/nori/playground-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/pitch-18.svg:#000000::16.0:16"
+      name: "symbols/nori/playground-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -44552,7 +45149,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/pitch-18.svg:#000000::16.0:16"
+      name: "symbols/nori/playground-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -44564,7 +45161,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/pitch-18.svg:#000000::16.0:16"
+      name: "symbols/nori/playground-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -44604,7 +45201,7 @@ cont {
       priority: -16295
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000::16.0:16"
+      name: "symbols/nori/playground-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -44615,7 +45212,7 @@ cont {
       priority: -16296
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000::16.0:16"
+      name: "symbols/nori/playground-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -44631,7 +45228,7 @@ cont {
       priority: -16297
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000::16.0:16"
+      name: "symbols/nori/playground-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -44647,7 +45244,7 @@ cont {
       priority: -16298
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000::16.0:16"
+      name: "symbols/nori/playground-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -44687,7 +45284,7 @@ cont {
       priority: -16302
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000::16.0:16"
+      name: "symbols/maki/tennis-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -44698,7 +45295,7 @@ cont {
       priority: -16303
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000::16.0:16"
+      name: "symbols/maki/tennis-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -44714,7 +45311,7 @@ cont {
       priority: -16304
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000::16.0:16"
+      name: "symbols/maki/tennis-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -44730,7 +45327,7 @@ cont {
       priority: -16305
     }
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000::16.0:16"
+      name: "symbols/maki/tennis-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -44745,14 +45342,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/ferry-18.svg:#000000::16.0:16"
+      name: "symbols/maki/ferry-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/ferry-18.svg:#000000::16.0:16"
+      name: "symbols/maki/ferry-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -44764,7 +45361,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/ferry-18.svg:#000000::16.0:16"
+      name: "symbols/maki/ferry-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -44776,7 +45373,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/ferry-18.svg:#000000::16.0:16"
+      name: "symbols/maki/ferry-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -45213,41 +45810,64 @@ cont {
   }
 }
 cont {
-  name: "man_made-lighthouse"
+  name: "man_made-communication_tower"
   element {
-    scale: 17
+    scale: 16
     symbol {
-      name: "symbols/lighthouse.svg:#000000::16.0:16"
+      name: "symbols/nori/communication-tower-18.svg:#000000:::"
       priority: 16000
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/communication-tower-18.svg:#000000:::"
+      priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/lighthouse.svg:#000000::16.0:16"
+      name: "symbols/nori/communication-tower-18.svg:#000000:::"
       priority: 16000
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/lighthouse.svg:#000000::16.0:16"
+      name: "symbols/nori/communication-tower-18.svg:#000000:::"
       priority: 16000
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
+  }
+}
+cont {
+  name: "man_made-mast"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/communication-tower-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/communication-tower-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/nori/communication-tower-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/nori/communication-tower-18.svg:#000000:::"
+      priority: 16000
     }
   }
 }
@@ -45618,6 +46238,37 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-storage_tank"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/storage_tank-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/storage_tank-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/nori/storage_tank-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/nori/storage_tank-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+}
 cont {
   name: "man_made-wastewater_plant"
   element {
@@ -45678,41 +46329,188 @@ cont {
   }
 }
 cont {
-  name: "man_made-windmill"
+  name: "man_made-water_tower"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/water_tower-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
   element {
     scale: 17
     symbol {
-      name: "symbols/windmill.svg:#000000::16.0:16"
+      name: "symbols/nori/water_tower-18.svg:#000000:::"
       priority: 16000
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/nori/water_tower-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/nori/water_tower-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+}
+cont {
+  name: "man_made-water_well"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/bucket-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/bucket-18.svg:#000000:::"
+      priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/windmill.svg:#000000::16.0:16"
+      name: "symbols/nori/bucket-18.svg:#000000:::"
       priority: 16000
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/nori/bucket-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+}
+cont {
+  name: "man_made-water_well-drinking_water"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/drinking_water_well-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/drinking_water_well-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/nori/drinking_water_well-18.svg:#000000:::"
+      priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/windmill.svg:#000000::16.0:16"
+      name: "symbols/nori/drinking_water_well-18.svg:#000000:::"
       priority: 16000
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
+  }
+}
+cont {
+  name: "man_made-water_well-manual"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/pump-manual-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/pump-manual-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/nori/pump-manual-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/nori/pump-manual-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+}
+cont {
+  name: "man_made-water_well-powered"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/pump-powered-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/pump-powered-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/nori/pump-powered-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/nori/pump-powered-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+}
+cont {
+  name: "man_made-watermill"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/watermill-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/watermill-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/nori/watermill-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/nori/watermill-18.svg:#000000:::"
+      priority: 16000
     }
   }
 }
@@ -46096,45 +46894,6 @@ cont {
     }
   }
 }
-cont {
-  name: "military-bunker"
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/cannon.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/cannon.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/cannon.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-}
 cont {
   name: "natural-bay"
   element {
@@ -46278,21 +47037,21 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-stroked-12.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-stroked-12.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-stroked-12.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -46313,7 +47072,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-stroked-12.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -46334,7 +47093,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-stroked-12.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -46355,7 +47114,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-stroked-12.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -46376,7 +47135,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-stroked-12.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -46397,7 +47156,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/triangle-stroked-12.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-stroked-12.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -47208,14 +47967,14 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/peak-mini.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-12.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/peak-mini.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-12.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -47231,7 +47990,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/peak.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-12.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -47247,7 +48006,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/peak.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-12.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -47263,7 +48022,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/peak.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-12.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -47279,7 +48038,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/peak.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-12.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -47295,7 +48054,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/peak.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-12.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -47311,7 +48070,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/peak.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-12.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -47777,28 +48536,28 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/park2-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park2-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/park2-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park2-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/park2-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park2-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/park2-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park2-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -47866,7 +48625,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-12.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -47878,7 +48637,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-12.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -47890,7 +48649,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-12.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -47911,7 +48670,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-12.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -47932,7 +48691,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-12.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -47953,7 +48712,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-12.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -47974,7 +48733,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-12.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -47995,7 +48754,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/triangle-12.svg:#000000::16.0:16"
+      name: "symbols/maki/triangle-12.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -48441,7 +49200,7 @@ cont {
       priority: -16434
     }
     symbol {
-      name: "symbols/maki/park-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -48452,7 +49211,7 @@ cont {
       priority: -16435
     }
     symbol {
-      name: "symbols/maki/park-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -48463,7 +49222,7 @@ cont {
       priority: -16436
     }
     symbol {
-      name: "symbols/maki/park-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -48474,7 +49233,7 @@ cont {
       priority: -16437
     }
     symbol {
-      name: "symbols/maki/park-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -48530,7 +49289,7 @@ cont {
       priority: -16444
     }
     symbol {
-      name: "symbols/maki/park2-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park2-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -48541,7 +49300,7 @@ cont {
       priority: -16445
     }
     symbol {
-      name: "symbols/maki/park2-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park2-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -48552,7 +49311,7 @@ cont {
       priority: -16446
     }
     symbol {
-      name: "symbols/maki/park2-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park2-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -48563,7 +49322,7 @@ cont {
       priority: -16447
     }
     symbol {
-      name: "symbols/maki/park2-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park2-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -48760,8 +49519,19 @@ cont {
 }
 cont {
   name: "office-government"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/government-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
   element {
     scale: 17
+    symbol {
+      name: "symbols/nori/government-18.svg:#000000:::"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -48774,6 +49544,10 @@ cont {
   }
   element {
     scale: 18
+    symbol {
+      name: "symbols/nori/government-18.svg:#000000:::"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -48786,6 +49560,10 @@ cont {
   }
   element {
     scale: 19
+    symbol {
+      name: "symbols/nori/government-18.svg:#000000:::"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -48836,6 +49614,64 @@ cont {
     }
   }
 }
+cont {
+  name: "office-ngo"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/ngo-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/ngo-18.svg:#000000:::"
+      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:::"
+      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:::"
+      priority: 16008
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
+    }
+  }
+}
 cont {
   name: "office-telecommunication"
   element {
@@ -48952,13 +49788,13 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
       }
-      priority: 16000
+      priority: 15000
     }
   }
   element {
@@ -49142,13 +49978,13 @@ cont {
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
       }
-      priority: 16000
+      priority: 15000
     }
   }
   element {
@@ -49352,13 +50188,13 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0
         stroke_color: 16777215
       }
-      priority: 16000
+      priority: 15000
     }
   }
   element {
@@ -51900,7 +52736,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_generic.svg:#000000::16.0:16"
+      name: "symbols/nori/generator-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -51911,7 +52747,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_generic.svg:#000000::16.0:16"
+      name: "symbols/nori/generator-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -51922,7 +52758,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_generic.svg:#000000::16.0:16"
+      name: "symbols/nori/generator-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -51933,7 +52769,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_generic.svg:#000000::16.0:16"
+      name: "symbols/nori/generator-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -51944,7 +52780,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_generic.svg:#000000::16.0:16"
+      name: "symbols/nori/generator-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -51955,7 +52791,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_generic.svg:#000000::16.0:16"
+      name: "symbols/nori/generator-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -51969,7 +52805,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_hydro.svg:#000000::16.0:16"
+      name: "symbols/nori/generator-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -51980,7 +52816,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_hydro.svg:#000000::16.0:16"
+      name: "symbols/nori/generator-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -51991,7 +52827,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_hydro.svg:#000000::16.0:16"
+      name: "symbols/nori/generator-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -52002,7 +52838,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_hydro.svg:#000000::16.0:16"
+      name: "symbols/nori/generator-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -52013,7 +52849,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_hydro.svg:#000000::16.0:16"
+      name: "symbols/nori/generator-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -52024,7 +52860,76 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_hydro.svg:#000000::16.0:16"
+      name: "symbols/nori/generator-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+}
+cont {
+  name: "power-generator-nuclear"
+  element {
+    scale: 14
+    area {
+      color: 12303291
+      priority: 1001
+    }
+    symbol {
+      name: "symbols/nori/generator_nuclear-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12303291
+      priority: 1001
+    }
+    symbol {
+      name: "symbols/nori/generator_nuclear-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12303291
+      priority: 1001
+    }
+    symbol {
+      name: "symbols/nori/generator_nuclear-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12303291
+      priority: 1001
+    }
+    symbol {
+      name: "symbols/nori/generator_nuclear-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12303291
+      priority: 1001
+    }
+    symbol {
+      name: "symbols/nori/generator_nuclear-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12303291
+      priority: 1001
+    }
+    symbol {
+      name: "symbols/nori/generator_nuclear-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -52038,7 +52943,76 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_generic.svg:#000000::16.0:16"
+      name: "symbols/nori/generator-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12303291
+      priority: 1001
+    }
+    symbol {
+      name: "symbols/nori/generator-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12303291
+      priority: 1001
+    }
+    symbol {
+      name: "symbols/nori/generator-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12303291
+      priority: 1001
+    }
+    symbol {
+      name: "symbols/nori/generator-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12303291
+      priority: 1001
+    }
+    symbol {
+      name: "symbols/nori/generator-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12303291
+      priority: 1001
+    }
+    symbol {
+      name: "symbols/nori/generator-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+}
+cont {
+  name: "power-generator-solar"
+  element {
+    scale: 14
+    area {
+      color: 12303291
+      priority: 1001
+    }
+    symbol {
+      name: "symbols/nori/generator_solar-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -52049,7 +53023,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_generic.svg:#000000::16.0:16"
+      name: "symbols/nori/generator_solar-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -52060,7 +53034,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_generic.svg:#000000::16.0:16"
+      name: "symbols/nori/generator_solar-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -52071,7 +53045,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_generic.svg:#000000::16.0:16"
+      name: "symbols/nori/generator_solar-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -52082,7 +53056,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_generic.svg:#000000::16.0:16"
+      name: "symbols/nori/generator_solar-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -52093,7 +53067,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_generic.svg:#000000::16.0:16"
+      name: "symbols/nori/generator_solar-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -52107,7 +53081,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_wind.svg:#000000::16.0:16"
+      name: "symbols/nori/generator_wind-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -52118,7 +53092,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_wind.svg:#000000::16.0:16"
+      name: "symbols/nori/generator_wind-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -52129,7 +53103,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_wind.svg:#000000::16.0:16"
+      name: "symbols/nori/generator_wind-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -52140,7 +53114,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_wind.svg:#000000::16.0:16"
+      name: "symbols/nori/generator_wind-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -52151,7 +53125,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_wind.svg:#000000::16.0:16"
+      name: "symbols/nori/generator_wind-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -52162,7 +53136,7 @@ cont {
       priority: 1001
     }
     symbol {
-      name: "symbols/power_wind.svg:#000000::16.0:16"
+      name: "symbols/nori/generator_wind-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -52525,28 +53499,28 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/power-pole.svg:#000000::16.0:16"
+      name: "symbols/power-pole.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/power-pole.svg:#000000::16.0:16"
+      name: "symbols/power-pole.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/power-pole.svg:#000000::16.0:16"
+      name: "symbols/power-pole.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/power-pole.svg:#000000::16.0:16"
+      name: "symbols/power-pole.svg:#000000:::"
       priority: 16000
     }
   }
@@ -52646,28 +53620,28 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/power-tower.svg:#000000::16.0:16"
+      name: "symbols/nori/power_tower-12.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/power-tower.svg:#000000::16.0:16"
+      name: "symbols/nori/power_tower-12.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/power-tower.svg:#000000::16.0:16"
+      name: "symbols/nori/power_tower-12.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/power-tower.svg:#000000::16.0:16"
+      name: "symbols/nori/power_tower-12.svg:#000000:::"
       priority: 16000
     }
   }
@@ -53377,7 +54351,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/railway-crossing-small.svg:#000000::16.0:16"
+      name: "symbols/railway-crossing-small.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -53389,7 +54363,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/railway-crossing-small.svg:#000000::16.0:16"
+      name: "symbols/railway-crossing-small.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -53401,7 +54375,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/railway-crossing-small.svg:#000000::16.0:16"
+      name: "symbols/railway-crossing-small.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -53413,7 +54387,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/railway-crossing-small.svg:#000000::16.0:16"
+      name: "symbols/railway-crossing-small.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -54341,7 +55315,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/rail-above-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-above-12.svg:#000000:::"
       priority: 16172
     }
     circle {
@@ -54353,7 +55327,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/rail-above-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-above-12.svg:#000000:::"
       priority: 16172
     }
     circle {
@@ -54374,7 +55348,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-above-18.svg:#000000:::"
       priority: 16172
     }
     circle {
@@ -54395,7 +55369,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-above-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -54416,7 +55390,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-above-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -54437,7 +55411,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-above-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -54461,7 +55435,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/railway-crossing.svg:#000000::16.0:16"
+      name: "symbols/railway-crossing.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -54473,7 +55447,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/railway-crossing.svg:#000000::16.0:16"
+      name: "symbols/railway-crossing.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -54485,7 +55459,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/railway-crossing.svg:#000000::16.0:16"
+      name: "symbols/railway-crossing.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -54497,7 +55471,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/railway-crossing.svg:#000000::16.0:16"
+      name: "symbols/railway-crossing.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -55264,13 +56238,6 @@ cont {
   }
   element {
     scale: 14
-    lines {
-      width: 2.0
-      color: 5570645
-      priority: 1533
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
     lines {
       width: 1.7
       color: 5570645
@@ -55282,6 +56249,13 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+    lines {
+      width: 2.0
+      color: 5570645
+      priority: 1533
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
     lines {
       width: 1.7
       color: 14518408
@@ -55455,13 +56429,6 @@ cont {
   }
   element {
     scale: 14
-    lines {
-      width: 2.0
-      color: 5570645
-      priority: 1533
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
     lines {
       width: 1.7
       color: 5570645
@@ -55473,6 +56440,13 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+    lines {
+      width: 2.0
+      color: 5570645
+      priority: 1533
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
     lines {
       width: 1.7
       color: 14518408
@@ -55716,13 +56690,6 @@ cont {
   }
   element {
     scale: 14
-    lines {
-      width: 2.0
-      color: 5570645
-      priority: 1533
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
     lines {
       width: 1.7
       color: 5570645
@@ -55734,6 +56701,13 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+    lines {
+      width: 2.0
+      color: 5570645
+      priority: 1533
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
     lines {
       width: 1.7
       color: 14518408
@@ -56242,14 +57216,14 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
+      width: 7.2
       color: 7829367
       priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
+      width: 9.2
       color: 7829367
       priority: 11
       join: ROUNDJOIN
@@ -56284,14 +57258,14 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
+      width: 7.2
       color: 7829367
       priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
+      width: 9.2
       color: 7829367
       priority: 11
       join: ROUNDJOIN
@@ -56503,7 +57477,7 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 8.0
+      width: 9.2
       color: 7829367
       dashdot {
         dd: 5.0
@@ -56514,7 +57488,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 6.0
+      width: 7.2
       color: 7829367
       priority: 14
       join: ROUNDJOIN
@@ -56549,7 +57523,7 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 8.0
+      width: 9.2
       color: 7829367
       dashdot {
         dd: 5.0
@@ -56560,7 +57534,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 6.0
+      width: 7.2
       color: 7829367
       priority: 14
       join: ROUNDJOIN
@@ -57051,7 +58025,7 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 6.0
+      width: 7.2
       color: 7829367
       priority: 14
       join: ROUNDJOIN
@@ -57069,7 +58043,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
+      width: 9.2
       color: 7829367
       priority: 11
       join: ROUNDJOIN
@@ -57302,7 +58276,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 6.0
+      width: 7.2
       color: 7829367
       priority: 14
       join: ROUNDJOIN
@@ -57327,7 +58301,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 8.0
+      width: 9.2
       color: 7829367
       dashdot {
         dd: 5.0
@@ -57523,13 +58497,6 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 1.0
-      color: 13421772
-      priority: 1230
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
     lines {
       width: 1.0
       color: 5570645
@@ -57541,16 +58508,16 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 13
     lines {
-      width: 1.85
-      color: 12303291
-      priority: 1253
+      width: 1.0
+      color: 13421772
+      priority: 1230
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+  }
+  element {
+    scale: 13
     lines {
       width: 1.0
       color: 5570645
@@ -57562,6 +58529,13 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+    lines {
+      width: 1.85
+      color: 12303291
+      priority: 1253
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
   }
   element {
     scale: 14
@@ -57826,13 +58800,6 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 1.0
-      color: 13421772
-      priority: 1230
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
     lines {
       width: 1.0
       color: 5570645
@@ -57844,16 +58811,16 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 13
     lines {
-      width: 1.85
-      color: 12303291
-      priority: 1253
+      width: 1.0
+      color: 13421772
+      priority: 1230
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+  }
+  element {
+    scale: 13
     lines {
       width: 1.0
       color: 5570645
@@ -57865,6 +58832,13 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+    lines {
+      width: 1.85
+      color: 12303291
+      priority: 1253
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
   }
   element {
     scale: 14
@@ -58199,13 +59173,6 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 1.0
-      color: 13421772
-      priority: 1230
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
     lines {
       width: 1.0
       color: 5570645
@@ -58217,16 +59184,16 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 13
     lines {
-      width: 1.85
-      color: 12303291
-      priority: 1253
+      width: 1.0
+      color: 13421772
+      priority: 1230
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
+  }
+  element {
+    scale: 13
     lines {
       width: 1.0
       color: 5570645
@@ -58238,6 +59205,13 @@ cont {
       join: ROUNDJOIN
       cap: BUTTCAP
     }
+    lines {
+      width: 1.85
+      color: 12303291
+      priority: 1253
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
   }
   element {
     scale: 14
@@ -58909,14 +59883,14 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 5.4
+      width: 6.4
       color: 7829367
       priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.4
+      width: 8.4
       color: 7829367
       priority: 11
       join: ROUNDJOIN
@@ -58993,14 +59967,14 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 5.36
+      width: 6.4
       color: 7829367
       priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.36
+      width: 8.4
       color: 7829367
       priority: 11
       join: ROUNDJOIN
@@ -59035,14 +60009,14 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 5.36
+      width: 6.4
       color: 7829367
       priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.36
+      width: 8.4
       color: 7829367
       priority: 11
       join: ROUNDJOIN
@@ -59077,14 +60051,14 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 5.36
+      width: 6.4
       color: 7829367
       priority: 14
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.36
+      width: 8.4
       color: 7829367
       priority: 11
       join: ROUNDJOIN
@@ -59160,7 +60134,7 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 7.4
+      width: 8.4
       color: 7829367
       dashdot {
         dd: 5.0
@@ -59171,7 +60145,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 5.4
+      width: 6.4
       color: 7829367
       priority: 14
       join: ROUNDJOIN
@@ -59252,7 +60226,7 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 7.36
+      width: 8.4
       color: 7829367
       dashdot {
         dd: 5.0
@@ -59263,7 +60237,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 5.36
+      width: 6.4
       color: 7829367
       priority: 14
       join: ROUNDJOIN
@@ -59298,7 +60272,7 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 7.36
+      width: 8.4
       color: 7829367
       dashdot {
         dd: 5.0
@@ -59309,7 +60283,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 5.36
+      width: 6.4
       color: 7829367
       priority: 14
       join: ROUNDJOIN
@@ -59344,7 +60318,7 @@ cont {
       cap: ROUNDCAP
     }
     lines {
-      width: 7.36
+      width: 8.4
       color: 7829367
       dashdot {
         dd: 5.0
@@ -59355,7 +60329,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 5.36
+      width: 6.4
       color: 7829367
       priority: 14
       join: ROUNDJOIN
@@ -60041,14 +61015,14 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/rail-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-12.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/rail-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-18.svg:#000000:::"
       priority: 16183
     }
     caption {
@@ -60064,7 +61038,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-18.svg:#000000:::"
       priority: 16183
     }
     caption {
@@ -60080,7 +61054,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-18.svg:#000000:::"
       priority: 16183
     }
     caption {
@@ -60096,7 +61070,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-18.svg:#000000:::"
       priority: 16183
     }
     caption {
@@ -60112,7 +61086,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-18.svg:#000000:::"
       priority: 16183
     }
     caption {
@@ -60131,7 +61105,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60152,7 +61126,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60173,7 +61147,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60194,7 +61168,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60215,7 +61189,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60236,7 +61210,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60257,7 +61231,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60278,7 +61252,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60302,7 +61276,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60323,7 +61297,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60344,7 +61318,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60365,7 +61339,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60386,7 +61360,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60407,7 +61381,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60428,7 +61402,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60449,7 +61423,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60473,7 +61447,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60494,7 +61468,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60515,7 +61489,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60536,7 +61510,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60557,7 +61531,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60578,7 +61552,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60599,7 +61573,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60620,7 +61594,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60644,7 +61618,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60665,7 +61639,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60686,7 +61660,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60707,7 +61681,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60728,7 +61702,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60749,7 +61723,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60770,7 +61744,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60791,7 +61765,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60815,7 +61789,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60836,7 +61810,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60857,7 +61831,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60878,7 +61852,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60899,7 +61873,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60920,7 +61894,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60941,7 +61915,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60962,7 +61936,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -60986,7 +61960,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61007,7 +61981,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61028,7 +62002,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61049,7 +62023,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61070,7 +62044,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61091,7 +62065,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61112,7 +62086,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61133,7 +62107,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61157,7 +62131,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61178,7 +62152,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61199,7 +62173,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61220,7 +62194,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61241,7 +62215,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61262,7 +62236,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61283,7 +62257,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61304,7 +62278,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61328,7 +62302,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61349,7 +62323,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61370,7 +62344,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61391,7 +62365,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61412,7 +62386,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61433,7 +62407,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61454,7 +62428,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61475,7 +62449,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61499,7 +62473,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61520,7 +62494,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61541,7 +62515,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61562,7 +62536,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61583,7 +62557,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61604,7 +62578,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61625,7 +62599,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61646,7 +62620,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61670,7 +62644,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61691,7 +62665,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61712,7 +62686,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61733,7 +62707,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61754,7 +62728,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61775,7 +62749,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61796,7 +62770,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61817,7 +62791,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61841,7 +62815,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61862,7 +62836,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61883,7 +62857,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61904,7 +62878,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61925,7 +62899,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61946,7 +62920,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61967,7 +62941,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -61988,7 +62962,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62012,7 +62986,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62033,7 +63007,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62054,7 +63028,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62075,7 +63049,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62096,7 +63070,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62117,7 +63091,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62138,7 +63112,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62159,7 +63133,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62183,7 +63157,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62204,7 +63178,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62225,7 +63199,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62246,7 +63220,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62267,7 +63241,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62288,7 +63262,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62309,7 +63283,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62330,7 +63304,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62354,7 +63328,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62375,7 +63349,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62396,7 +63370,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/rail-underground-12.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-12.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62417,7 +63391,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62438,7 +63412,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62459,7 +63433,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62480,7 +63454,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -62501,7 +63475,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     caption {
@@ -64377,7 +65351,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64398,7 +65372,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64419,7 +65393,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64440,7 +65414,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64476,7 +65450,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64497,7 +65471,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64518,7 +65492,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64539,7 +65513,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64575,7 +65549,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64596,7 +65570,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64617,7 +65591,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64638,7 +65612,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64674,7 +65648,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64695,7 +65669,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64716,7 +65690,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64737,7 +65711,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64773,7 +65747,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64794,7 +65768,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64815,7 +65789,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64836,7 +65810,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64872,7 +65846,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64893,7 +65867,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64914,7 +65888,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64935,7 +65909,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64971,7 +65945,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -64992,7 +65966,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65013,7 +65987,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65034,7 +66008,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65070,7 +66044,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65091,7 +66065,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65112,7 +66086,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65133,7 +66107,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65169,7 +66143,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65190,7 +66164,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65211,7 +66185,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65232,7 +66206,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65268,7 +66242,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65289,7 +66263,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65310,7 +66284,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65331,7 +66305,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65367,7 +66341,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65388,7 +66362,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65409,7 +66383,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65430,7 +66404,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65466,7 +66440,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65487,7 +66461,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65508,7 +66482,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65529,7 +66503,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65565,7 +66539,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65586,7 +66560,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65607,7 +66581,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65628,7 +66602,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65664,7 +66638,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65685,7 +66659,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65706,7 +66680,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -65727,7 +66701,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-underground-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-underground-18.svg:#000000:::"
       priority: 19100
     }
     circle {
@@ -66276,7 +67250,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-above-18.svg:#000000:::"
       priority: 16034
     }
     caption {
@@ -66297,7 +67271,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-above-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -66318,7 +67292,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-above-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -66339,7 +67313,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/rail-above-18.svg:#000000::16.0:16"
+      name: "symbols/maki/rail-above-18.svg:#000000:::"
       priority: 16000
     }
     caption {
@@ -67096,28 +68070,59 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/religious-christian-18.svg:#000000::16.0:16"
+      name: "symbols/maki/religious-christian-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/maki/religious-christian-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/maki/religious-christian-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/maki/religious-christian-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+}
+cont {
+  name: "religion-hindu"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/hindu-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/religious-christian-18.svg:#000000::16.0:16"
+      name: "symbols/nori/hindu-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/religious-christian-18.svg:#000000::16.0:16"
+      name: "symbols/nori/hindu-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/religious-christian-18.svg:#000000::16.0:16"
+      name: "symbols/nori/hindu-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -67127,28 +68132,28 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/religious-jewish-18.svg:#000000::16.0:16"
+      name: "symbols/maki/religious-jewish-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/religious-jewish-18.svg:#000000::16.0:16"
+      name: "symbols/maki/religious-jewish-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/religious-jewish-18.svg:#000000::16.0:16"
+      name: "symbols/maki/religious-jewish-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/religious-jewish-18.svg:#000000::16.0:16"
+      name: "symbols/maki/religious-jewish-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -67158,28 +68163,28 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/religious-muslim-18.svg:#000000::16.0:16"
+      name: "symbols/maki/religious-muslim-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/religious-muslim-18.svg:#000000::16.0:16"
+      name: "symbols/maki/religious-muslim-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/religious-muslim-18.svg:#000000::16.0:16"
+      name: "symbols/maki/religious-muslim-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/religious-muslim-18.svg:#000000::16.0:16"
+      name: "symbols/maki/religious-muslim-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -67332,28 +68337,28 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/harbor-18.svg:#000000::16.0:16"
+      name: "symbols/maki/harbor-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/harbor-18.svg:#000000::16.0:16"
+      name: "symbols/maki/harbor-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/harbor-18.svg:#000000::16.0:16"
+      name: "symbols/maki/harbor-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/harbor-18.svg:#000000::16.0:16"
+      name: "symbols/maki/harbor-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -67402,14 +68407,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/alcohol-shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/alcohol-shop-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/alcohol-shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/alcohol-shop-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -67430,7 +68435,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/alcohol-shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/alcohol-shop-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -67451,7 +68456,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/alcohol-shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/alcohol-shop-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -67475,7 +68480,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bakery-18.svg:#000000::16.0:16"
+      name: "symbols/nori/bakery-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -67487,7 +68492,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bakery-18.svg:#000000::16.0:16"
+      name: "symbols/nori/bakery-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -67508,7 +68513,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bakery-18.svg:#000000::16.0:16"
+      name: "symbols/nori/bakery-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -67529,7 +68534,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bakery-18.svg:#000000::16.0:16"
+      name: "symbols/nori/bakery-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -67553,14 +68558,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/alcohol-shop-18.svg:#000000::16.0:16"
+      name: "symbols/nori/beverages-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/alcohol-shop-18.svg:#000000::16.0:16"
+      name: "symbols/nori/beverages-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -67576,7 +68581,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/alcohol-shop-18.svg:#000000::16.0:16"
+      name: "symbols/nori/beverages-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -67592,7 +68597,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/alcohol-shop-18.svg:#000000::16.0:16"
+      name: "symbols/nori/beverages-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -67611,7 +68616,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bicycle-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -67623,7 +68628,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bicycle-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -67644,7 +68649,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bicycle-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -67665,7 +68670,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/bicycle-18.svg:#000000::16.0:16"
+      name: "symbols/maki/bicycle-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -67689,14 +68694,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/library-18.svg:#000000::16.0:16"
+      name: "symbols/maki/library-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/library-18.svg:#000000::16.0:16"
+      name: "symbols/maki/library-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -67717,7 +68722,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/library-18.svg:#000000::16.0:16"
+      name: "symbols/maki/library-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -67738,7 +68743,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/library-18.svg:#000000::16.0:16"
+      name: "symbols/maki/library-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -67762,14 +68767,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/slaughterhouse-18.svg:#000000::16.0:16"
+      name: "symbols/nori/butcher-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/slaughterhouse-18.svg:#000000::16.0:16"
+      name: "symbols/nori/butcher-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -67790,7 +68795,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/slaughterhouse-18.svg:#000000::16.0:16"
+      name: "symbols/nori/butcher-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -67811,7 +68816,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/slaughterhouse-18.svg:#000000::16.0:16"
+      name: "symbols/nori/butcher-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -67871,8 +68876,19 @@ cont {
 }
 cont {
   name: "shop-car_parts"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/car_parts-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
   element {
     scale: 17
+    symbol {
+      name: "symbols/nori/car_parts-18.svg:#000000:::"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -67885,6 +68901,10 @@ cont {
   }
   element {
     scale: 18
+    symbol {
+      name: "symbols/nori/car_parts-18.svg:#000000:::"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -67897,6 +68917,10 @@ cont {
   }
   element {
     scale: 19
+    symbol {
+      name: "symbols/nori/car_parts-18.svg:#000000:::"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -67913,7 +68937,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/car_repair.svg:#000000::16.0:16"
+      name: "symbols/nori/car_repair-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -67925,7 +68949,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/car_repair.svg:#000000::16.0:16"
+      name: "symbols/nori/car_repair-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -67946,7 +68970,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/car_repair.svg:#000000::16.0:16"
+      name: "symbols/nori/car_repair-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -67967,7 +68991,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/car_repair.svg:#000000::16.0:16"
+      name: "symbols/nori/car_repair-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68030,7 +69054,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/clothes.svg:#000000::16.0:16"
+      name: "symbols/nori/clothes-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -68042,7 +69066,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/clothes.svg:#000000::16.0:16"
+      name: "symbols/nori/clothes-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68063,7 +69087,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/clothes.svg:#000000::16.0:16"
+      name: "symbols/nori/clothes-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68084,7 +69108,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/clothes.svg:#000000::16.0:16"
+      name: "symbols/nori/clothes-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68105,8 +69129,19 @@ cont {
 }
 cont {
   name: "shop-computer"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/computer-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
   element {
     scale: 17
+    symbol {
+      name: "symbols/nori/computer-18.svg:#000000:::"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -68119,6 +69154,10 @@ cont {
   }
   element {
     scale: 18
+    symbol {
+      name: "symbols/nori/computer-18.svg:#000000:::"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -68131,6 +69170,10 @@ cont {
   }
   element {
     scale: 19
+    symbol {
+      name: "symbols/nori/computer-18.svg:#000000:::"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -68186,7 +69229,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/nori/shop-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -68198,7 +69241,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/nori/shop-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68219,7 +69262,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/nori/shop-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68240,7 +69283,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/nori/shop-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68303,7 +69346,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/grocery-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -68315,7 +69358,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/grocery-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68336,7 +69379,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/grocery-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68357,7 +69400,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/grocery-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68381,14 +69424,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/grocery-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/grocery-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68409,7 +69452,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/grocery-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68430,7 +69473,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/grocery-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68449,19 +69492,77 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-dry_cleaning"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/dry_cleaning-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/nori/dry_cleaning-18.svg:#000000:::"
+      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:::"
+      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:::"
+      priority: 16008
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
+    }
+  }
+}
 cont {
   name: "shop-electronics"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/shop-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/shop-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68482,7 +69583,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/shop-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68503,7 +69604,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/shop-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68527,14 +69628,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/garden-18.svg:#000000::16.0:16"
+      name: "symbols/maki/garden-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/garden-18.svg:#000000::16.0:16"
+      name: "symbols/maki/garden-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68555,7 +69656,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/garden-18.svg:#000000::16.0:16"
+      name: "symbols/maki/garden-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68576,7 +69677,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/garden-18.svg:#000000::16.0:16"
+      name: "symbols/maki/garden-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68595,12 +69696,51 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-funeral_directors"
+  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-furniture"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/shop-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -68612,7 +69752,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/shop-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68633,7 +69773,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/shop-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68654,7 +69794,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/shop-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68675,8 +69815,19 @@ cont {
 }
 cont {
   name: "shop-garden_centre"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/maki/garden-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
   element {
     scale: 17
+    symbol {
+      name: "symbols/maki/garden-18.svg:#000000:::"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -68689,6 +69840,10 @@ cont {
   }
   element {
     scale: 18
+    symbol {
+      name: "symbols/maki/garden-18.svg:#000000:::"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -68701,6 +69856,10 @@ cont {
   }
   element {
     scale: 19
+    symbol {
+      name: "symbols/maki/garden-18.svg:#000000:::"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -68831,8 +69990,19 @@ cont {
 }
 cont {
   name: "shop-hairdresser"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/hairdresser-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
   element {
     scale: 17
+    symbol {
+      name: "symbols/nori/hairdresser-18.svg:#000000:::"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -68845,6 +70015,10 @@ cont {
   }
   element {
     scale: 18
+    symbol {
+      name: "symbols/nori/hairdresser-18.svg:#000000:::"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -68857,6 +70031,10 @@ cont {
   }
   element {
     scale: 19
+    symbol {
+      name: "symbols/nori/hairdresser-18.svg:#000000:::"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -68870,8 +70048,19 @@ cont {
 }
 cont {
   name: "shop-hardware"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/hardware-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
   element {
     scale: 17
+    symbol {
+      name: "symbols/nori/hardware-18.svg:#000000:::"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -68884,6 +70073,10 @@ cont {
   }
   element {
     scale: 18
+    symbol {
+      name: "symbols/nori/hardware-18.svg:#000000:::"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -68896,6 +70089,10 @@ cont {
   }
   element {
     scale: 19
+    symbol {
+      name: "symbols/nori/hardware-18.svg:#000000:::"
+      priority: 16008
+    }
     caption {
       primary {
         height: 11
@@ -68951,7 +70148,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/shop-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -68963,7 +70160,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/shop-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -68984,7 +70181,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/shop-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -69005,7 +70202,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/shop-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -69029,7 +70226,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/grocery-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -69041,7 +70238,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/grocery-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -69062,7 +70259,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/grocery-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -69083,7 +70280,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/grocery-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -69104,56 +70301,17 @@ cont {
 }
 cont {
   name: "shop-mobile_phone"
-  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-music"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/music-18.svg:#000000::16.0:16"
+      name: "symbols/nori/mobile_phone-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/music-18.svg:#000000::16.0:16"
+      name: "symbols/nori/mobile_phone-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -69169,7 +70327,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/music-18.svg:#000000::16.0:16"
+      name: "symbols/nori/mobile_phone-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -69185,7 +70343,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/music-18.svg:#000000::16.0:16"
+      name: "symbols/nori/mobile_phone-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -69200,18 +70358,18 @@ cont {
   }
 }
 cont {
-  name: "shop-musical_instrument"
+  name: "shop-motorcycle"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/music-18.svg:#000000::16.0:16"
+      name: "symbols/nori/motorcycle-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/music-18.svg:#000000::16.0:16"
+      name: "symbols/nori/motorcycle-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -69227,7 +70385,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/music-18.svg:#000000::16.0:16"
+      name: "symbols/nori/motorcycle-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -69243,7 +70401,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/music-18.svg:#000000::16.0:16"
+      name: "symbols/nori/motorcycle-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -69258,57 +70416,18 @@ cont {
   }
 }
 cont {
-  name: "shop-optician"
-  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-shoes"
+  name: "shop-music"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/music-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/music-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -69320,16 +70439,11 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/music-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -69341,16 +70455,11 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/shop-18.svg:#000000::16.0:16"
+      name: "symbols/maki/music-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -69362,31 +70471,21 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
 }
 cont {
-  name: "shop-supermarket"
+  name: "shop-musical_instrument"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/music-18.svg:#000000:::"
       priority: 16000
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/music-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -69398,16 +70497,11 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/music-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -69419,16 +70513,11 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/grocery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/music-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -69440,15 +70529,10 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
 }
 cont {
-  name: "shop-toys"
+  name: "shop-optician"
   element {
     scale: 17
     caption {
@@ -69487,219 +70571,200 @@ cont {
   }
 }
 cont {
-  name: "sport-american_football"
+  name: "shop-photo"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/america-football-18.svg:#000000::16.0:16"
+      name: "symbols/nori/photo-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/america-football-18.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/america-football-18.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/america-football-18.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-}
-cont {
-  name: "sport-athletics"
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/athletics-borderless.svg:#000000::16.0:16"
-      priority: 16000
+      name: "symbols/nori/photo-18.svg:#000000:::"
+      priority: 16008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/athletics-borderless.svg:#000000::16.0:16"
-      priority: 16000
+      name: "symbols/nori/photo-18.svg:#000000:::"
+      priority: 16008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/athletics-borderless.svg:#000000::16.0:16"
-      priority: 16000
+      name: "symbols/nori/photo-18.svg:#000000:::"
+      priority: 16008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
     }
   }
 }
 cont {
-  name: "sport-australian_football"
+  name: "shop-photo_studio"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/america-football-18.svg:#000000::16.0:16"
+      name: "symbols/nori/photo-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/america-football-18.svg:#000000::16.0:16"
-      priority: 16000
+      name: "symbols/nori/photo-18.svg:#000000:::"
+      priority: 16008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/america-football-18.svg:#000000::16.0:16"
-      priority: 16000
+      name: "symbols/nori/photo-18.svg:#000000:::"
+      priority: 16008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/america-football-18.svg:#000000::16.0:16"
-      priority: 16000
+      name: "symbols/nori/photo-18.svg:#000000:::"
+      priority: 16008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
     }
   }
 }
 cont {
-  name: "sport-baseball"
+  name: "shop-shoes"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/baseball-18.svg:#000000::16.0:16"
+      name: "symbols/maki/shop-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/baseball-18.svg:#000000::16.0:16"
-      priority: 16000
+      name: "symbols/maki/shop-18.svg:#000000:::"
+      priority: 16008
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
     }
     circle {
       radius: 13.0
       color: 16777215
-      priority: 14000
+      priority: 14008
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/baseball-18.svg:#000000::16.0:16"
-      priority: 16000
+      name: "symbols/maki/shop-18.svg:#000000:::"
+      priority: 16008
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
     }
     circle {
       radius: 13.0
       color: 16777215
-      priority: 14000
+      priority: 14008
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/baseball-18.svg:#000000::16.0:16"
-      priority: 16000
+      name: "symbols/maki/shop-18.svg:#000000:::"
+      priority: 16008
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
     }
     circle {
       radius: 13.0
       color: 16777215
-      priority: 14000
+      priority: 14008
     }
   }
 }
 cont {
-  name: "sport-basketball"
+  name: "shop-supermarket"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/basketball-18.svg:#000000::16.0:16"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/basketball-18.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/basketball-18.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/basketball-18.svg:#000000::16.0:16"
+      name: "symbols/maki/grocery-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -69708,151 +70773,122 @@ cont {
       priority: 14000
     }
   }
-}
-cont {
-  name: "sport-cricket"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/cricket-18.svg:#000000::16.0:16"
-      priority: 16000
-    }
-  }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/cricket-18.svg:#000000::16.0:16"
-      priority: 16000
+      name: "symbols/maki/grocery-18.svg:#000000:::"
+      priority: 16008
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
     }
     circle {
       radius: 13.0
       color: 16777215
-      priority: 14000
+      priority: 14008
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/cricket-18.svg:#000000::16.0:16"
-      priority: 16000
+      name: "symbols/maki/grocery-18.svg:#000000:::"
+      priority: 16008
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
     }
     circle {
       radius: 13.0
       color: 16777215
-      priority: 14000
+      priority: 14008
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/cricket-18.svg:#000000::16.0:16"
-      priority: 16000
+      name: "symbols/maki/grocery-18.svg:#000000:::"
+      priority: 16008
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
     }
     circle {
       radius: 13.0
       color: 16777215
-      priority: 14000
+      priority: 14008
     }
   }
 }
 cont {
-  name: "sport-football"
-  element {
-    scale: 16
-    symbol {
-      name: "symbols/maki/soccer-18.svg:#000000::16.0:16"
-      priority: 16000
-    }
-  }
+  name: "shop-toys"
   element {
     scale: 17
-    symbol {
-      name: "symbols/maki/soccer-18.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
     }
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/maki/soccer-18.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
     }
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/maki/soccer-18.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15008
     }
   }
 }
 cont {
-  name: "sport-golf"
+  name: "sport-american_football"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/golf-18.svg:#000000::16.0:16"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/maki/golf-18.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/maki/golf-18.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "symbols/maki/golf-18.svg:#000000::16.0:16"
+      name: "symbols/maki/america-football-18.svg:#000000:::"
       priority: 16000
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
   }
-}
-cont {
-  name: "sport-gymnastics"
   element {
     scale: 17
     symbol {
-      name: "symbols/gymnastics-borderless.svg:#000000::16.0:16"
+      name: "symbols/maki/america-football-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -69864,7 +70900,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/gymnastics-borderless.svg:#000000::16.0:16"
+      name: "symbols/maki/america-football-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -69876,7 +70912,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/gymnastics-borderless.svg:#000000::16.0:16"
+      name: "symbols/maki/america-football-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -69887,50 +70923,18 @@ cont {
   }
 }
 cont {
-  name: "sport-handball"
-  element {
-    scale: 17
-    symbol {
-      name: "symbols/handball-borderless.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "symbols/handball-borderless.svg:#000000::16.0:16"
-      priority: 16000
-    }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
-  }
+  name: "sport-australian_football"
   element {
-    scale: 19
+    scale: 16
     symbol {
-      name: "symbols/handball-borderless.svg:#000000::16.0:16"
+      name: "symbols/maki/america-football-18.svg:#000000:::"
       priority: 16000
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
   }
-}
-cont {
-  name: "sport-multi"
   element {
     scale: 17
     symbol {
-      name: "symbols/gymnastics-borderless.svg:#000000::16.0:16"
+      name: "symbols/maki/america-football-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -69942,7 +70946,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/gymnastics-borderless.svg:#000000::16.0:16"
+      name: "symbols/maki/america-football-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -69954,7 +70958,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/gymnastics-borderless.svg:#000000::16.0:16"
+      name: "symbols/maki/america-football-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -69965,49 +70969,64 @@ cont {
   }
 }
 cont {
-  name: "sport-skiing"
+  name: "sport-baseball"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/skiing-18.svg:#000000::16.0:16"
+      name: "symbols/maki/baseball-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/skiing-18.svg:#000000::16.0:16"
+      name: "symbols/maki/baseball-18.svg:#000000:::"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/skiing-18.svg:#000000::16.0:16"
+      name: "symbols/maki/baseball-18.svg:#000000:::"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/skiing-18.svg:#000000::16.0:16"
+      name: "symbols/maki/baseball-18.svg:#000000:::"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
-  name: "sport-soccer"
+  name: "sport-basketball"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/soccer-18.svg:#000000::16.0:16"
+      name: "symbols/maki/basketball-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/soccer-18.svg:#000000::16.0:16"
+      name: "symbols/maki/basketball-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -70019,7 +71038,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/soccer-18.svg:#000000::16.0:16"
+      name: "symbols/maki/basketball-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -70031,7 +71050,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/soccer-18.svg:#000000::16.0:16"
+      name: "symbols/maki/basketball-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -70042,49 +71061,64 @@ cont {
   }
 }
 cont {
-  name: "sport-swimming"
+  name: "sport-cricket"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/swimming-18.svg:#000000::16.0:16"
+      name: "symbols/maki/cricket-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/swimming-18.svg:#000000::16.0:16"
+      name: "symbols/maki/cricket-18.svg:#000000:::"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/swimming-18.svg:#000000::16.0:16"
+      name: "symbols/maki/cricket-18.svg:#000000:::"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/swimming-18.svg:#000000::16.0:16"
+      name: "symbols/maki/cricket-18.svg:#000000:::"
       priority: 16000
     }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
   }
 }
 cont {
-  name: "sport-tennis"
+  name: "sport-football"
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000::16.0:16"
+      name: "symbols/maki/soccer-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000::16.0:16"
+      name: "symbols/maki/soccer-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -70096,7 +71130,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000::16.0:16"
+      name: "symbols/maki/soccer-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -70108,7 +71142,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/tennis-18.svg:#000000::16.0:16"
+      name: "symbols/maki/soccer-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -70119,11 +71153,30 @@ cont {
   }
 }
 cont {
-  name: "tourism-alpine_hut"
+  name: "sport-golf"
   element {
-    scale: 15
+    scale: 16
+    symbol {
+      name: "symbols/maki/golf-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/maki/golf-18.svg:#000000:::"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
+    scale: 18
     symbol {
-      name: "symbols/alpine_hut.svg:#000000::16.0:16"
+      name: "symbols/maki/golf-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -70132,10 +71185,87 @@ cont {
       priority: 14000
     }
   }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/maki/golf-18.svg:#000000:::"
+      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:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/maki/skiing-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/maki/skiing-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/maki/skiing-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+}
+cont {
+  name: "sport-soccer"
   element {
     scale: 16
     symbol {
-      name: "symbols/alpine_hut.svg:#000000::16.0:16"
+      name: "symbols/maki/soccer-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/maki/soccer-18.svg:#000000:::"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/maki/soccer-18.svg:#000000:::"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/maki/soccer-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -70144,12 +71274,88 @@ cont {
       priority: 14000
     }
   }
+}
+cont {
+  name: "sport-swimming"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/maki/swimming-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
   element {
     scale: 17
     symbol {
-      name: "symbols/alpine_hut.svg:#000000::16.0:16"
-      priority: 16008
+      name: "symbols/maki/swimming-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/maki/swimming-18.svg:#000000:::"
+      priority: 16000
     }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/maki/swimming-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+}
+cont {
+  name: "sport-tennis"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/maki/tennis-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "symbols/maki/tennis-18.svg:#000000:::"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "symbols/maki/tennis-18.svg:#000000:::"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "symbols/maki/tennis-18.svg:#000000:::"
+      priority: 16000
+    }
+    circle {
+      radius: 13.0
+      color: 16777215
+      priority: 14000
+    }
+  }
+}
+cont {
+  name: "tourism-alpine_hut"
+  element {
+    scale: 17
     caption {
       primary {
         height: 11
@@ -70159,18 +71365,9 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 18
-    symbol {
-      name: "symbols/alpine_hut.svg:#000000::16.0:16"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -70180,18 +71377,9 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 19
-    symbol {
-      name: "symbols/alpine_hut.svg:#000000::16.0:16"
-      priority: 16008
-    }
     caption {
       primary {
         height: 11
@@ -70201,11 +71389,6 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
 }
 cont {
@@ -70213,7 +71396,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/star-18.svg:#000000::16.0:16"
+      name: "symbols/maki/star-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -70225,7 +71408,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/star-18.svg:#000000::16.0:16"
+      name: "symbols/maki/star-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -70237,7 +71420,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/star-18.svg:#000000::16.0:16"
+      name: "symbols/maki/star-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70258,7 +71441,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/star-18.svg:#000000::16.0:16"
+      name: "symbols/maki/star-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70279,7 +71462,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/star-18.svg:#000000::16.0:16"
+      name: "symbols/maki/star-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70384,21 +71567,21 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/maki/campsite-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/maki/campsite-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/maki/campsite-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -70410,7 +71593,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/maki/campsite-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -70422,7 +71605,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/maki/campsite-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -70434,7 +71617,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/maki/campsite-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70455,7 +71638,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/maki/campsite-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70476,7 +71659,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/maki/campsite-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70500,42 +71683,42 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/maki/campsite-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/maki/campsite-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/maki/campsite-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/maki/campsite-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/maki/campsite-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/maki/campsite-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70551,7 +71734,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/maki/campsite-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70567,7 +71750,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/maki/campsite-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70586,14 +71769,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/art-gallery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/art-gallery-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/art-gallery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/art-gallery-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70609,7 +71792,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/art-gallery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/art-gallery-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70625,7 +71808,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/art-gallery-18.svg:#000000::16.0:16"
+      name: "symbols/maki/art-gallery-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70644,7 +71827,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000::16.0:16"
+      name: "symbols/maki/lodging-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -70656,7 +71839,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000::16.0:16"
+      name: "symbols/maki/lodging-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70677,7 +71860,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000::16.0:16"
+      name: "symbols/maki/lodging-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70698,7 +71881,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000::16.0:16"
+      name: "symbols/maki/lodging-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70722,7 +71905,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000::16.0:16"
+      name: "symbols/maki/lodging-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -70734,7 +71917,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000::16.0:16"
+      name: "symbols/maki/lodging-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70755,7 +71938,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000::16.0:16"
+      name: "symbols/maki/lodging-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70776,7 +71959,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000::16.0:16"
+      name: "symbols/maki/lodging-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70800,7 +71983,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000::16.0:16"
+      name: "symbols/maki/lodging-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -70812,7 +71995,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000::16.0:16"
+      name: "symbols/maki/lodging-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70833,7 +72016,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000::16.0:16"
+      name: "symbols/maki/lodging-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70854,7 +72037,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000::16.0:16"
+      name: "symbols/maki/lodging-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70875,10 +72058,17 @@ cont {
 }
 cont {
   name: "tourism-information"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/information-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
   element {
     scale: 17
     symbol {
-      name: "symbols/information.svg:#000000::16.0:16"
+      name: "symbols/nori/information-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70899,7 +72089,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/information.svg:#000000::16.0:16"
+      name: "symbols/nori/information-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70920,7 +72110,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/information.svg:#000000::16.0:16"
+      name: "symbols/nori/information-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70941,10 +72131,17 @@ cont {
 }
 cont {
   name: "tourism-information-guidepost"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/information-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
   element {
     scale: 17
     symbol {
-      name: "symbols/information.svg:#000000::16.0:16"
+      name: "symbols/nori/information-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70965,7 +72162,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/information.svg:#000000::16.0:16"
+      name: "symbols/nori/information-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -70986,7 +72183,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/information.svg:#000000::16.0:16"
+      name: "symbols/nori/information-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -71007,10 +72204,17 @@ cont {
 }
 cont {
   name: "tourism-information-office"
+  element {
+    scale: 16
+    symbol {
+      name: "symbols/nori/information-18.svg:#000000:::"
+      priority: 16000
+    }
+  }
   element {
     scale: 17
     symbol {
-      name: "symbols/information.svg:#000000::16.0:16"
+      name: "symbols/nori/information-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -71031,7 +72235,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/information.svg:#000000::16.0:16"
+      name: "symbols/nori/information-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -71052,7 +72256,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/information.svg:#000000::16.0:16"
+      name: "symbols/nori/information-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -71076,7 +72280,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000::16.0:16"
+      name: "symbols/maki/lodging-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -71088,7 +72292,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000::16.0:16"
+      name: "symbols/maki/lodging-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -71109,7 +72313,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000::16.0:16"
+      name: "symbols/maki/lodging-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -71130,7 +72334,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/lodging-18.svg:#000000::16.0:16"
+      name: "symbols/maki/lodging-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -71154,19 +72358,14 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/museum-18.svg:#000000::16.0:16"
+      name: "symbols/maki/museum-18.svg:#000000:::"
       priority: 16000
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14000
-    }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/museum-18.svg:#000000::16.0:16"
+      name: "symbols/maki/museum-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -71178,16 +72377,11 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/museum-18.svg:#000000::16.0:16"
+      name: "symbols/maki/museum-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -71199,16 +72393,11 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/museum-18.svg:#000000::16.0:16"
+      name: "symbols/maki/museum-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -71220,11 +72409,6 @@ cont {
       }
       priority: 15008
     }
-    circle {
-      radius: 13.0
-      color: 16777215
-      priority: 14008
-    }
   }
 }
 cont {
@@ -71232,42 +72416,42 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/nori/camp_site-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 13
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/nori/camp_site-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 14
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/nori/camp_site-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/nori/camp_site-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/nori/camp_site-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/nori/camp_site-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -71288,7 +72472,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/nori/camp_site-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -71309,7 +72493,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/campsite-18.svg:#000000::16.0:16"
+      name: "symbols/nori/camp_site-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -71333,7 +72517,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "symbols/maki/star-stroked-18.svg:#000000::16.0:16"
+      name: "symbols/maki/star-stroked-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -71345,7 +72529,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/star-stroked-18.svg:#000000::16.0:16"
+      name: "symbols/nori/viewpoint-18.svg:#000000:::"
       priority: 16000
     }
     circle {
@@ -71357,7 +72541,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/star-stroked-18.svg:#000000::16.0:16"
+      name: "symbols/nori/viewpoint-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -71378,7 +72562,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/star-stroked-18.svg:#000000::16.0:16"
+      name: "symbols/nori/viewpoint-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -71399,7 +72583,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/star-stroked-18.svg:#000000::16.0:16"
+      name: "symbols/nori/viewpoint-18.svg:#000000:::"
       priority: 16008
     }
     caption {
@@ -72225,7 +73409,7 @@ cont {
       priority: 1158
     }
     symbol {
-      name: "symbols/maki/dam-18.svg:#000000::16.0:16"
+      name: "symbols/maki/dam-18.svg:#000000:::"
       priority: 16157
     }
   }
@@ -72243,7 +73427,7 @@ cont {
       priority: 1164
     }
     symbol {
-      name: "symbols/maki/dam-18.svg:#000000::16.0:16"
+      name: "symbols/maki/dam-18.svg:#000000:::"
       priority: 16163
     }
   }
@@ -72261,7 +73445,7 @@ cont {
       priority: 1164
     }
     symbol {
-      name: "symbols/maki/dam-18.svg:#000000::16.0:16"
+      name: "symbols/maki/dam-18.svg:#000000:::"
       priority: 16163
     }
   }
@@ -72279,7 +73463,7 @@ cont {
       priority: 1164
     }
     symbol {
-      name: "symbols/maki/dam-18.svg:#000000::16.0:16"
+      name: "symbols/maki/dam-18.svg:#000000:::"
       priority: 16163
     }
   }
@@ -75978,28 +77162,28 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/park-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/park-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/park-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/park-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park-18.svg:#000000:::"
       priority: 16000
     }
   }
@@ -76009,28 +77193,28 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "symbols/maki/park2-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park2-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 17
     symbol {
-      name: "symbols/maki/park2-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park2-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 18
     symbol {
-      name: "symbols/maki/park2-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park2-18.svg:#000000:::"
       priority: 16000
     }
   }
   element {
     scale: 19
     symbol {
-      name: "symbols/maki/park2-18.svg:#000000::16.0:16"
+      name: "symbols/maki/park2-18.svg:#000000:::"
       priority: 16000
     }
   }
-- 
cgit v1.2.3