diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 8231ff2906..ff4af56212 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -791,6 +791,7 @@
 	<string name="type.building.garage">جراج</string>
 	<string name="type.building.has_parts">مبنى</string>
 	<string name="type.building.train_station">محطة سكك حديدية</string>
+	<string name="type.cemetery.grave">ﺮﻴﻄﺧ</string>
 	<string name="type.craft.brewery">مصنع جعة</string>
 	<string name="type.craft.carpenter">نجار</string>
 	<string name="type.craft.electrician">كهربائي</string>
@@ -1126,6 +1127,7 @@
 	<string name="type.natural.glacier">كتلة جليدية</string>
 	<string name="type.natural.grassland">ملعب</string>
 	<string name="type.natural.water.lake">بحيرة</string>
+	<string name="type.natural.water.lock">ﻞﻔﻘﻟﺍ ﺔﻓﺮﻏ</string>
 	<string name="type.natural.water.pond">بركة</string>
 	<string name="type.natural.water.reservoir">خزان</string>
 	<string name="type.natural.water.basin">حوض المياه</string>
diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml
index 5f756cc8f5..4a07a66d82 100644
--- a/android/res/values-be/strings.xml
+++ b/android/res/values-be/strings.xml
@@ -747,6 +747,7 @@
 	<string name="type.barrier.chain">Ланцуг</string>
 	<string name="type.barrier.lift_gate">Шлагбаўм</string>
 	<string name="type.barrier.swing_gate">Шлагбаўм</string>
+	<string name="type.cemetery.grave">Магіла</string>
 	<string name="type.craft.metal_construction">Металаканструкцыі</string>
 	<string name="type.cuisine.bubble_tea">Чай з бурбалкамі</string>
 	<string name="type.emergency.defibrillator">Дэфібрылятар</string>
@@ -861,6 +862,7 @@
 	<string name="type.mountain_pass">Перавал</string>
 	<string name="type.natural.beach.sand">Пяшчаны пляж</string>
 	<string name="type.natural.beach.gravel">Галечны пляж</string>
+	<string name="type.natural.water.lock">Шлюзавая камера</string>
 	<string name="type.natural.water.pond">Сажалка</string>
 	<string name="type.natural.water.reservoir">Вадасховішча</string>
 	<string name="type.natural.water.basin">Рэзервуар</string>
diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml
index dbf5a1b15c..edf806eab5 100644
--- a/android/res/values-bg/strings.xml
+++ b/android/res/values-bg/strings.xml
@@ -639,6 +639,7 @@
 
 	<!-- SECTION: Types: Recycling -->
 	<string name="type.recycling.batteries">Батерии</string>
+	<string name="type.cemetery.grave">Гроб</string>
 	<string name="type.craft.metal_construction">Метални конструкции</string>
 	<string name="type.healthcare.laboratory">Медицинска лаборатория</string>
 
@@ -736,6 +737,7 @@
 	<string name="type.historic.archaeological_site">Археологически сайт</string>
 	<string name="type.landuse.basin">Резервоар</string>
 	<string name="type.leisure.picnic_table">Маса за пикник</string>
+	<string name="type.natural.water.lock">Заключваща камера</string>
 	<string name="type.natural.water.reservoir">Резервоар</string>
 	<string name="type.natural.water.basin">Резервоар</string>
 	<string name="type.natural.water">Воден басейн</string>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index cd7e018752..eacaa5686a 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -787,6 +787,7 @@
 	<string name="type.building.garage">Garáž</string>
 	<string name="type.building.has_parts">Stavba</string>
 	<string name="type.building.train_station">Železniční stanice</string>
+	<string name="type.cemetery.grave">Hrob</string>
 	<string name="type.craft.brewery">Pivovar</string>
 	<string name="type.craft.carpenter">Truhlář</string>
 	<string name="type.craft.electrician">Elektrikář</string>
@@ -1120,6 +1121,7 @@
 	<string name="type.natural.glacier">Ledovec</string>
 	<string name="type.natural.grassland">Pole</string>
 	<string name="type.natural.water.lake">Jezero</string>
+	<string name="type.natural.water.lock">Zámková komora</string>
 	<string name="type.natural.water.pond">Rybník</string>
 	<string name="type.natural.water.reservoir">Nádrž</string>
 	<string name="type.natural.water.basin">Vodní nádrž</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 91bbfb87fa..0e4dba1aef 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -781,6 +781,7 @@
 	<string name="type.building.address">Bygning</string>
 	<string name="type.building.has_parts">Bygning</string>
 	<string name="type.building.train_station">Togstation</string>
+	<string name="type.cemetery.grave">Grav</string>
 	<string name="type.craft.brewery">Bryggeri</string>
 	<string name="type.craft.carpenter">Tømrer</string>
 	<string name="type.craft.electrician">Elektriker</string>
@@ -1111,6 +1112,7 @@
 	<string name="type.natural.glacier">Gletsjer</string>
 	<string name="type.natural.grassland">Mark</string>
 	<string name="type.natural.water.lake">Sø</string>
+	<string name="type.natural.water.lock">Låsekammer</string>
 	<string name="type.natural.water.pond">Dam</string>
 	<string name="type.natural.water.reservoir">Reservoir</string>
 	<string name="type.natural.water.basin">Vandbassin</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 93e7c9a990..46cd02a581 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -852,6 +852,7 @@
 	<string name="type.building.address">Gebäude</string>
 	<string name="type.building.has_parts">Gebäude</string>
 	<string name="type.building.train_station">Bahnhof</string>
+	<string name="type.cemetery.grave">Grab</string>
 	<string name="type.craft.brewery">Brauerei</string>
 	<string name="type.craft.carpenter">Zimmermann</string>
 	<string name="type.craft.electrician">Elektriker</string>
@@ -1249,6 +1250,7 @@
 	<string name="type.natural.heath">Heide</string>
 	<string name="type.natural.hot_spring">Thermalquelle</string>
 	<string name="type.natural.water.lake">See</string>
+	<string name="type.natural.water.lock">Schleusenkammer</string>
 	<string name="type.natural.water.pond">Teich</string>
 	<string name="type.natural.water.reservoir">Reservoir</string>
 	<string name="type.natural.water.basin">Wasserbecken</string>
@@ -1528,7 +1530,6 @@
 	<string name="type.waterway.dock">Dock</string>
 	<string name="type.waterway.drain">Abfluss</string>
 	<string name="type.waterway.drain.tunnel">Abfluss</string>
-	<string name="type.waterway.lock">Schleuse</string>
 	<string name="type.waterway.lock_gate">Schleusentor</string>
 	<string name="type.waterway.river">Fluss</string>
 	<string name="type.waterway.river.tunnel">Fluss</string>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index 6c10e446a8..bd7ecf306c 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -787,6 +787,7 @@
 	<string name="type.building.garage">Γκαράζ</string>
 	<string name="type.building.has_parts">Κτίριο</string>
 	<string name="type.building.train_station">Σιδηροδρομικός σταθμός</string>
+	<string name="type.cemetery.grave">Τάφος</string>
 	<string name="type.craft.brewery">Ζυθοποιείο</string>
 	<string name="type.craft.carpenter">Ξυλουργός</string>
 	<string name="type.craft.electrician">Ηλεκτρολόγος</string>
@@ -1123,6 +1124,7 @@
 	<string name="type.natural.glacier">Παγετώνας</string>
 	<string name="type.natural.grassland">Λιβάδι</string>
 	<string name="type.natural.water.lake">Λίμνη</string>
+	<string name="type.natural.water.lock">Θάλαμος κλειδαριάς</string>
 	<string name="type.natural.water.pond">Δεξαμενή</string>
 	<string name="type.natural.water.reservoir">Δεξαμενή</string>
 	<string name="type.natural.water.basin">Μια λεκάνη νερού</string>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 3c39865654..2138c17d82 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -865,6 +865,7 @@
 	<string name="type.building.has_parts">Edificio</string>
 	<string name="type.building.train_station">Estación de tren</string>
 	<string name="type.building.warehouse">Almacén</string>
+	<string name="type.cemetery.grave">Tumba</string>
 	<string name="type.craft.brewery">Fábrica de cerveza</string>
 	<string name="type.craft.carpenter">Carpintero</string>
 	<string name="type.craft.electrician">Electricista</string>
@@ -1201,6 +1202,7 @@
 	<string name="type.natural.glacier">Glaciar</string>
 	<string name="type.natural.grassland">Campo</string>
 	<string name="type.natural.water.lake">Lago</string>
+	<string name="type.natural.water.lock">Cámara de bloqueo</string>
 	<string name="type.natural.water.pond">Estanque</string>
 	<string name="type.natural.water.reservoir">Embalse</string>
 	<string name="type.natural.water.basin">Cuenca</string>
diff --git a/android/res/values-eu/strings.xml b/android/res/values-eu/strings.xml
index bfb6ca1cd2..a9e16d11bd 100644
--- a/android/res/values-eu/strings.xml
+++ b/android/res/values-eu/strings.xml
@@ -848,6 +848,7 @@
 	<string name="type.building.has_parts">Eraikin</string>
 	<string name="type.building.train_station">Tren geltokian</string>
 	<string name="type.building.warehouse">Denda</string>
+	<string name="type.cemetery.grave">Hilobia</string>
 	<string name="type.craft.brewery">Garagardo fabrika</string>
 	<string name="type.craft.carpenter">Arotza</string>
 	<string name="type.craft.electrician">Elektrizista teknikaria</string>
@@ -1183,6 +1184,7 @@
 	<string name="type.natural.glacier">Glaziarra</string>
 	<string name="type.natural.grassland">Landa</string>
 	<string name="type.natural.water.lake">Lakua</string>
+	<string name="type.natural.water.lock">Sarraila Ganbera</string>
 	<string name="type.natural.water.pond">Urmaela</string>
 	<string name="type.natural.water.reservoir">Urtegia</string>
 	<string name="type.natural.water.basin">Arroa</string>
diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml
index 1a6c2afaac..96a74f9691 100644
--- a/android/res/values-fa/strings.xml
+++ b/android/res/values-fa/strings.xml
@@ -785,6 +785,7 @@
 	<string name="type.building.garage">گاراژ</string>
 	<string name="type.building.has_parts">ساختمان</string>
 	<string name="type.building.train_station">ایستگاه قطار</string>
+	<string name="type.cemetery.grave">ﺮﺒﻗ</string>
 	<string name="type.craft.brewery">کارخانه ابجوسازی</string>
 	<string name="type.craft.carpenter">نجار</string>
 	<string name="type.craft.electrician">برق کار</string>
@@ -1031,6 +1032,7 @@
 	<string name="type.natural.glacier">یخچال طبیعی</string>
 	<string name="type.natural.grassland">کشتزار</string>
 	<string name="type.natural.water.lake">دریاچه</string>
+	<string name="type.natural.water.lock">ﻞﻔﻗ ﻕﺎﺗﺍ</string>
 	<string name="type.natural.water.pond">تالاب</string>
 	<string name="type.natural.water.reservoir">مخزن</string>
 	<string name="type.natural.water.basin">حوضه آب</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 17a0ac7037..f36ca6676d 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -799,6 +799,7 @@
 	<string name="type.building.garage">Autotalli</string>
 	<string name="type.building.has_parts">Rakennus</string>
 	<string name="type.building.train_station">Rautatieasema</string>
+	<string name="type.cemetery.grave">Hauta</string>
 	<string name="type.craft.brewery">Panimo</string>
 	<string name="type.craft.carpenter">Puuseppä</string>
 	<string name="type.craft.electrician">Sähkömies</string>
@@ -1133,6 +1134,7 @@
 	<string name="type.natural.glacier">Jäätikkö</string>
 	<string name="type.natural.grassland">Pelto</string>
 	<string name="type.natural.water.lake">Järvi</string>
+	<string name="type.natural.water.lock">Lukko kammio</string>
 	<string name="type.natural.water.pond">Lampi</string>
 	<string name="type.natural.water.reservoir">Säiliö</string>
 	<string name="type.natural.water.basin">Vesisäiliö</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index b2d99f6c3e..0dcfbae83e 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -824,6 +824,7 @@
 	<string name="type.building.has_parts">Bâtiment</string>
 	<string name="type.building.train_station">Gare</string>
 	<string name="type.building.warehouse">Entrepôt</string>
+	<string name="type.cemetery.grave">La tombe</string>
 	<string name="type.craft">Artisanat</string>
 	<string name="type.craft.brewery">Brasserie artisanale</string>
 	<string name="type.craft.carpenter">Charpentier</string>
@@ -1202,6 +1203,7 @@
 	<string name="type.natural.heath">Lande</string>
 	<string name="type.natural.hot_spring">Source chaude</string>
 	<string name="type.natural.water.lake">Lac</string>
+	<string name="type.natural.water.lock">Chambre de verrouillage</string>
 	<string name="type.natural.water.pond">Étang</string>
 	<string name="type.natural.water.reservoir">Réservoir</string>
 	<string name="type.natural.water.basin">Réservoir</string>
@@ -1411,7 +1413,6 @@
 	<string name="type.waterway.ditch">Fossé</string>
 	<string name="type.waterway.ditch.tunnel">Fossé</string>
 	<string name="type.waterway.dock">Cale</string>
-	<string name="type.waterway.lock">Écluse</string>
 	<string name="type.waterway.lock_gate">Porte d\'écluse</string>
 	<string name="type.waterway.river">Rivière</string>
 	<string name="type.waterway.river.tunnel">Rivière</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index 6488b31e5e..c5e423a10d 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -786,6 +786,7 @@
 	<string name="type.building.garage">Garázs</string>
 	<string name="type.building.has_parts">Épület</string>
 	<string name="type.building.train_station">Vonatmegálló</string>
+	<string name="type.cemetery.grave">Sír</string>
 	<string name="type.craft.brewery">Sörfőzde</string>
 	<string name="type.craft.carpenter">Ács</string>
 	<string name="type.craft.electrician">Villanyszerelő</string>
@@ -1118,6 +1119,7 @@
 	<string name="type.natural.glacier">Gleccser</string>
 	<string name="type.natural.grassland">Mező</string>
 	<string name="type.natural.water.lake">Tó</string>
+	<string name="type.natural.water.lock">Zsilipkamra</string>
 	<string name="type.natural.water.pond">Tavacska</string>
 	<string name="type.natural.water.reservoir">Rezervoár</string>
 	<string name="type.natural.water.basin">Vízgyűjtő</string>
diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml
index 21aa0320a8..e84f7c5aa4 100644
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@@ -782,6 +782,7 @@
 	<string name="type.building.garage">Garasi</string>
 	<string name="type.building.has_parts">Gedung</string>
 	<string name="type.building.train_station">Rel kereta api</string>
+	<string name="type.cemetery.grave">Kuburan</string>
 	<string name="type.craft.brewery">Toko minuman</string>
 	<string name="type.craft.carpenter">Tukang kayu</string>
 	<string name="type.craft.electrician">Tukang listrik</string>
@@ -1113,6 +1114,7 @@
 	<string name="type.natural.glacier">Gletser</string>
 	<string name="type.natural.grassland">Ladang</string>
 	<string name="type.natural.water.lake">Danau</string>
+	<string name="type.natural.water.lock">Ruang Kunci</string>
 	<string name="type.natural.water.pond">Kolam</string>
 	<string name="type.natural.water.reservoir">Waduk</string>
 	<string name="type.natural.water.basin">Sebuah baskom air</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 98d3a58f31..da8543c9e7 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -812,6 +812,7 @@
 	<string name="type.building.address">Edificio</string>
 	<string name="type.building.has_parts">Edificio</string>
 	<string name="type.building.train_station">Stazione ferroviaria</string>
+	<string name="type.cemetery.grave">La tomba</string>
 	<string name="type.craft.brewery">Birrificio</string>
 	<string name="type.craft.carpenter">Falegname</string>
 	<string name="type.craft.electrician">Elettricista</string>
@@ -1145,6 +1146,7 @@
 	<string name="type.natural.glacier">Ghiacciaio</string>
 	<string name="type.natural.grassland">Campo</string>
 	<string name="type.natural.water.lake">Lago</string>
+	<string name="type.natural.water.lock">Camera di blocco</string>
 	<string name="type.natural.water.pond">Stagno</string>
 	<string name="type.natural.water.reservoir">Serbatoio</string>
 	<string name="type.natural.water.basin">Bacino d\'acqua</string>
diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml
index c51517338a..da1501f160 100644
--- a/android/res/values-iw/strings.xml
+++ b/android/res/values-iw/strings.xml
@@ -226,6 +226,7 @@
 
 	<!-- SECTION: Types: Recycling -->
 	<string name="type.recycling.batteries">תוללוס</string>
+	<string name="type.cemetery.grave">רבק</string>
 	<string name="type.cuisine.african">מטבח אפריקאי</string>
 	<string name="type.cuisine.american">מטבח אמריקאי</string>
 	<string name="type.cuisine.arab">מטבח ערבי</string>
@@ -406,6 +407,7 @@
 	<!-- SECTION: Types: Historic -->
 	<string name="type.landuse.basin">אגן מים</string>
 	<string name="type.leisure.picnic_table">קינקיפ ןחלוש</string>
+	<string name="type.natural.water.lock">לוענמ את</string>
 	<string name="type.natural.water.reservoir">מאגר</string>
 	<string name="type.natural.water.basin">אגן מים</string>
 	<string name="type.natural.water">גוף מים</string>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index ae7f28f33d..f367764d5f 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -817,6 +817,7 @@
 	<string name="type.building.garage">車庫</string>
 	<string name="type.building.has_parts">建物</string>
 	<string name="type.building.train_station">鉄道駅</string>
+	<string name="type.cemetery.grave">墓</string>
 	<string name="type.craft">工房</string>
 	<string name="type.craft.brewery">醸造所</string>
 	<string name="type.craft.carpenter">大工</string>
@@ -1214,6 +1215,7 @@
 	<string name="type.natural.heath">ヒース</string>
 	<string name="type.natural.hot_spring">温泉</string>
 	<string name="type.natural.water.lake">湖</string>
+	<string name="type.natural.water.lock">ロックチャンバー</string>
 	<string name="type.natural.water.pond">池</string>
 	<string name="type.natural.water.reservoir">貯水池</string>
 	<string name="type.natural.water.basin">水地</string>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index 6de0befdc4..defb884cb2 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -786,6 +786,7 @@
 	<string name="type.building.garage">차고</string>
 	<string name="type.building.has_parts">건물</string>
 	<string name="type.building.train_station">기차역</string>
+	<string name="type.cemetery.grave">무덤</string>
 	<string name="type.craft.brewery">양조장</string>
 	<string name="type.craft.carpenter">목수</string>
 	<string name="type.craft.electrician">전기기술자</string>
@@ -1120,6 +1121,7 @@
 	<string name="type.natural.glacier">빙하</string>
 	<string name="type.natural.grassland">밭</string>
 	<string name="type.natural.water.lake">호수</string>
+	<string name="type.natural.water.lock">잠금 챔버</string>
 	<string name="type.natural.water.pond">연못이</string>
 	<string name="type.natural.water.reservoir">저수지</string>
 	<string name="type.natural.water.basin">저수지</string>
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index 8998dcd21d..aaf6185c2e 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -783,6 +783,7 @@
 	<string name="type.building.garage">Verksted</string>
 	<string name="type.building.has_parts">Bygning</string>
 	<string name="type.building.train_station">Togstasjon</string>
+	<string name="type.cemetery.grave">Grav</string>
 	<string name="type.craft.brewery">Bryggeri</string>
 	<string name="type.craft.carpenter">Snekker</string>
 	<string name="type.craft.electrician">Elektriker</string>
@@ -1114,6 +1115,7 @@
 	<string name="type.natural.glacier">Isbre</string>
 	<string name="type.natural.grassland">Slette</string>
 	<string name="type.natural.water.lake">Innsjø</string>
+	<string name="type.natural.water.lock">Låsekammer</string>
 	<string name="type.natural.water.pond">Dam</string>
 	<string name="type.natural.water.reservoir">Reservoar</string>
 	<string name="type.natural.water.basin">Vannvask</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index b5a6eac054..fef5ca5fd4 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -787,6 +787,7 @@
 	<string name="type.building.address">Gebouw</string>
 	<string name="type.building.has_parts">Gebouw</string>
 	<string name="type.building.train_station">Station</string>
+	<string name="type.cemetery.grave">Graf</string>
 	<string name="type.craft.brewery">Brouwerij</string>
 	<string name="type.craft.carpenter">Timmerman</string>
 	<string name="type.craft.electrician">Elektricien</string>
@@ -1124,6 +1125,7 @@
 	<string name="type.natural.heath">Heide</string>
 	<string name="type.natural.hot_spring">Heetwaterbron</string>
 	<string name="type.natural.water.lake">Meer</string>
+	<string name="type.natural.water.lock">Slotkamer</string>
 	<string name="type.natural.water.pond">Plas</string>
 	<string name="type.natural.water.reservoir">Reservoir</string>
 	<string name="type.natural.water.basin">Waterbassin</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index 54f327a6ae..4b3ce96364 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -846,6 +846,7 @@
 	<string name="type.building.garage">Garaż</string>
 	<string name="type.building.has_parts">Część budynku</string>
 	<string name="type.building.train_station">Dworzec kolejowy</string>
+	<string name="type.cemetery.grave">Mogiła</string>
 	<string name="type.craft">Rzemiosło</string>
 	<string name="type.craft.brewery">Browar</string>
 	<string name="type.craft.carpenter">Stolarz</string>
@@ -1237,6 +1238,7 @@
 	<string name="type.natural.heath">Wrzosowisko</string>
 	<string name="type.natural.hot_spring">Gorące źródło</string>
 	<string name="type.natural.water.lake">Jezioro</string>
+	<string name="type.natural.water.lock">Komora zamka</string>
 	<string name="type.natural.water.pond">Staw</string>
 	<string name="type.natural.water.reservoir">Zbiornik</string>
 	<string name="type.natural.water.basin">Zbiornik</string>
diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml
index 558ab34174..8861b7f19d 100644
--- a/android/res/values-pt-rBR/strings.xml
+++ b/android/res/values-pt-rBR/strings.xml
@@ -864,6 +864,7 @@
 	<string name="type.building.has_parts">Edifício</string>
 	<string name="type.building.train_station">Estação de trem</string>
 	<string name="type.building.warehouse">Armazém</string>
+	<string name="type.cemetery.grave">Túmulo</string>
 	<string name="type.craft">Ofícios</string>
 	<string name="type.craft.brewery">Cervejaria artesanal</string>
 	<string name="type.craft.carpenter">Carpinteiro</string>
@@ -1263,6 +1264,7 @@
 	<string name="type.natural.heath">Charneca</string>
 	<string name="type.natural.hot_spring">Nascente de água quente</string>
 	<string name="type.natural.water.lake">Lago</string>
+	<string name="type.natural.water.lock">Câmara de Bloqueio</string>
 	<string name="type.natural.water.pond">Lagoa</string>
 	<string name="type.natural.water.basin">Reservatório</string>
 	<string name="type.natural.water.river">Rio</string>
@@ -1544,7 +1546,6 @@
 	<string name="type.waterway.dock">Doca</string>
 	<string name="type.waterway.drain">Valeta de drenagem</string>
 	<string name="type.waterway.drain.tunnel">Valeta de drenagem</string>
-	<string name="type.waterway.lock">Eclusa</string>
 	<string name="type.waterway.lock_gate">Comporta de eclusa</string>
 	<string name="type.waterway.river">Rio</string>
 	<string name="type.waterway.river.tunnel">Rio</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index aca9e5f623..681f5281f0 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -846,6 +846,7 @@
 	<string name="type.building.has_parts">Edifício</string>
 	<string name="type.building.train_station">Estação de comboios</string>
 	<string name="type.building.warehouse">Armazém</string>
+	<string name="type.cemetery.grave">Túmulo</string>
 	<string name="type.craft">Ofícios</string>
 	<string name="type.craft.brewery">Cervejaria artesanal</string>
 	<string name="type.craft.carpenter">Carpinteiro</string>
@@ -1245,6 +1246,7 @@
 	<string name="type.natural.heath">Charneca</string>
 	<string name="type.natural.hot_spring">Nascente de água quente</string>
 	<string name="type.natural.water.lake">Lago</string>
+	<string name="type.natural.water.lock">Câmara de Bloqueio</string>
 	<string name="type.natural.water.pond">Lagoa</string>
 	<string name="type.natural.water.reservoir">Reservatório</string>
 	<string name="type.natural.water.basin">Reservatório</string>
@@ -1527,7 +1529,6 @@
 	<string name="type.waterway.dock">Doca</string>
 	<string name="type.waterway.drain">Valeta de drenagem</string>
 	<string name="type.waterway.drain.tunnel">Valeta de drenagem</string>
-	<string name="type.waterway.lock">Eclusa</string>
 	<string name="type.waterway.lock_gate">Comporta de eclusa</string>
 	<string name="type.waterway.river">Rio</string>
 	<string name="type.waterway.river.tunnel">Rio</string>
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index 695f9d4979..03cf3b2879 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -809,6 +809,7 @@
 	<string name="type.building.garage">Garaj</string>
 	<string name="type.building.has_parts">Clădire</string>
 	<string name="type.building.train_station">Feroviar</string>
+	<string name="type.cemetery.grave">Mormânt</string>
 	<string name="type.craft.brewery">Berărie</string>
 	<string name="type.craft.carpenter">Tâmplar</string>
 	<string name="type.craft.gardener">Peisagist</string>
@@ -1139,6 +1140,7 @@
 	<string name="type.natural.glacier">Ghețar</string>
 	<string name="type.natural.grassland">Câmp</string>
 	<string name="type.natural.water.lake">Lac</string>
+	<string name="type.natural.water.lock">Camera de blocare</string>
 	<string name="type.natural.water.pond">Heleșteu</string>
 	<string name="type.natural.water.reservoir">Rezervor</string>
 	<string name="type.natural.water.basin">Bazin de apă</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 0cf22eb4d0..796e82c1ef 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -903,17 +903,25 @@
 	<string name="type.building.has_parts">Здание</string>
 	<string name="type.building.train_station">Ж/д вокзал</string>
 	<string name="type.building.warehouse">Склад</string>
+	<string name="type.cemetery.grave">Могила</string>
 	<string name="type.craft">Мастерская</string>
+	<string name="type.craft.beekeeper">Пчеловод</string>
+	<string name="type.craft.blacksmith">Кузнец</string>
 	<string name="type.craft.brewery">Крафтовое пиво</string>
 	<string name="type.craft.carpenter">Столяр</string>
+	<string name="type.craft.confectionery">Кондитер</string>
 	<string name="type.craft.electrician">Электрик</string>
+	<string name="type.craft.electronics_repair">Ремонт электроники</string>
 	<string name="type.craft.gardener">Садовник</string>
+	<string name="type.craft.handicraft">Декоративный мастер</string>
 	<string name="type.craft.hvac">Кондиционеры</string>
 	<string name="type.craft.metal_construction">Металлоконструкции</string>
 	<string name="type.craft.painter">Маляр</string>
 	<string name="type.craft.photographer">Фотограф</string>
 	<string name="type.craft.plumber">Сантехник</string>
+	<string name="type.craft.sawmill">Лесопилка</string>
 	<string name="type.craft.shoemaker">Ремонт обуви</string>
+	<string name="type.craft.winery">Винодельня</string>
 	<string name="type.craft.tailor">Ателье</string>
 	<string name="type.cuisine.african">Африканская кухня</string>
 	<string name="type.cuisine.american">Американская кухня</string>
@@ -1314,6 +1322,7 @@
 	<string name="type.natural.heath">Пустошь</string>
 	<string name="type.natural.hot_spring">Горячий источник</string>
 	<string name="type.natural.water.lake">Озеро</string>
+	<string name="type.natural.water.lock">Шлюзовая камера</string>
 	<string name="type.natural.water.pond">Пруд</string>
 	<string name="type.natural.water.reservoir">Водохранилище</string>
 	<string name="type.natural.water.basin">Резервуар</string>
@@ -1603,7 +1612,6 @@
 	<string name="type.waterway.dock">Причал</string>
 	<string name="type.waterway.drain">Водоотвод</string>
 	<string name="type.waterway.drain.tunnel">Водоотвод</string>
-	<string name="type.waterway.lock">Шлюз</string>
 	<string name="type.waterway.lock_gate">Шлюз</string>
 	<string name="type.waterway.river">Река</string>
 	<string name="type.waterway.river.tunnel">Река</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index 2d48855b0a..dfedbfa85a 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -785,6 +785,7 @@
 	<string name="type.building.garage">Garáž</string>
 	<string name="type.building.has_parts">Budova</string>
 	<string name="type.building.train_station">Železničná stanica</string>
+	<string name="type.cemetery.grave">Hrob</string>
 	<string name="type.craft.brewery">Pivovar</string>
 	<string name="type.craft.carpenter">Tesár</string>
 	<string name="type.craft.electrician">Elektrikár</string>
@@ -1116,6 +1117,7 @@
 	<string name="type.natural.glacier">Ľadovec</string>
 	<string name="type.natural.grassland">Lúka</string>
 	<string name="type.natural.water.lake">Jazero</string>
+	<string name="type.natural.water.lock">Uzamykacia komora</string>
 	<string name="type.natural.water.pond">Rybník</string>
 	<string name="type.natural.water.reservoir">Nádrž</string>
 	<string name="type.natural.water.basin">Vodná nádrž</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index 29cc4bb1e2..48ed6ca7a7 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -782,6 +782,7 @@
 	<string name="type.building.address">Byggnad</string>
 	<string name="type.building.has_parts">Byggnad</string>
 	<string name="type.building.train_station">Tågstation</string>
+	<string name="type.cemetery.grave">Grav</string>
 	<string name="type.craft.brewery">Bryggeri</string>
 	<string name="type.craft.carpenter">Snickare</string>
 	<string name="type.craft.electrician">Elektriker</string>
@@ -1112,6 +1113,7 @@
 	<string name="type.natural.glacier">Glaciär</string>
 	<string name="type.natural.grassland">Fältet</string>
 	<string name="type.natural.water.lake">Sjö</string>
+	<string name="type.natural.water.lock">Låskammare</string>
 	<string name="type.natural.water.pond">Damm</string>
 	<string name="type.natural.water.reservoir">Reservoar</string>
 	<string name="type.natural.water.basin">Vattenbassäng</string>
diff --git a/android/res/values-sw/strings.xml b/android/res/values-sw/strings.xml
index 7aa5958a4a..7874885221 100644
--- a/android/res/values-sw/strings.xml
+++ b/android/res/values-sw/strings.xml
@@ -233,6 +233,7 @@
 	<string name="type.recycling.batteries">Betri</string>
 	<string name="type.amenity.vending_machine.public_transport_tickets">Mashine ya kuuzia tiketi za usafiri wa umma</string>
 	<string name="type.boundary.national_park">Hifadhi ya taifa</string>
+	<string name="type.cemetery.grave">Kaburi</string>
 	<string name="type.cuisine.coffee_shop">Kahawa</string>
 	<string name="type.healthcare.laboratory">Maabara ya Matibabu</string>
 
@@ -346,6 +347,7 @@
 	<string name="type.natural.geyser">Chemchem ya maji moto</string>
 	<string name="type.natural.glacier">Mto barafu</string>
 	<string name="type.natural.grassland">Shamba</string>
+	<string name="type.natural.water.lock">Chumba cha kufuli</string>
 	<string name="type.natural.water.reservoir">Hifadhi</string>
 	<string name="type.natural.water.basin">Bonde la Maji</string>
 	<string name="type.natural.scrub">Eneo la Vichaka</string>
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index 89e81bddfe..ceb2034b5c 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -789,6 +789,7 @@
 	<string name="type.building.garage">อาคารจอดรถ</string>
 	<string name="type.building.has_parts">อาคาร</string>
 	<string name="type.building.train_station">สถานีรถไฟ</string>
+	<string name="type.cemetery.grave">หลุมฝังศพ</string>
 	<string name="type.craft.brewery">โรงเบียร์</string>
 	<string name="type.craft.carpenter">ช่างไม้</string>
 	<string name="type.craft.electrician">ช่างไฟฟ้า</string>
@@ -1124,6 +1125,7 @@
 	<string name="type.natural.glacier">ธารน้ำแข็ง</string>
 	<string name="type.natural.grassland">ทุ่งหญ้า</string>
 	<string name="type.natural.water.lake">ทะเลสาบ</string>
+	<string name="type.natural.water.lock">ห้องล็อค</string>
 	<string name="type.natural.water.pond">บ่อ</string>
 	<string name="type.natural.water.reservoir">อ่างเก็บน้ำ</string>
 	<string name="type.natural.water.basin">อ่างน้ำ</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index de5f1da82a..8aab56ba71 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -877,6 +877,7 @@
 	<string name="type.building.has_parts">Bina</string>
 	<string name="type.building.train_station">Tren İstasyonu</string>
 	<string name="type.building.warehouse">Depo</string>
+	<string name="type.cemetery.grave">Mezar</string>
 	<string name="type.craft">Zanaat</string>
 	<string name="type.craft.brewery">Bira Fabrikası</string>
 	<string name="type.craft.carpenter">Marangoz</string>
@@ -1285,6 +1286,7 @@
 	<string name="type.natural.heath">Çalı</string>
 	<string name="type.natural.hot_spring">Kaplıca</string>
 	<string name="type.natural.water.lake">Göl</string>
+	<string name="type.natural.water.lock">Kilit Odası</string>
 	<string name="type.natural.water.pond">Gölet</string>
 	<string name="type.natural.water.reservoir">Rezervuar</string>
 	<string name="type.natural.water.basin">Havza</string>
@@ -1567,7 +1569,6 @@
 	<string name="type.waterway.dock">Rıhtım</string>
 	<string name="type.waterway.drain">Lağım</string>
 	<string name="type.waterway.drain.tunnel">Lağım</string>
-	<string name="type.waterway.lock">Kanal Havuzu</string>
 	<string name="type.waterway.lock_gate">Kilit Kapısı</string>
 	<string name="type.waterway.river">Nehir</string>
 	<string name="type.waterway.river.tunnel">Nehir</string>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index b79c7f4182..458dac6edb 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -874,6 +874,7 @@
 	<string name="type.building.has_parts">Будівля</string>
 	<string name="type.building.train_station">Залізничний вокзал</string>
 	<string name="type.building.warehouse">Склад</string>
+	<string name="type.cemetery.grave">Могила</string>
 	<string name="type.craft">Майстерня</string>
 	<string name="type.craft.brewery">Пивоварня</string>
 	<string name="type.craft.carpenter">Столяр</string>
@@ -1282,6 +1283,7 @@
 	<string name="type.natural.heath">Пустище</string>
 	<string name="type.natural.hot_spring">Горяче джерело</string>
 	<string name="type.natural.water.lake">Озеро</string>
+	<string name="type.natural.water.lock">Замкова камера</string>
 	<string name="type.natural.water.pond">Ставок</string>
 	<string name="type.natural.water.reservoir">Водосховище</string>
 	<string name="type.natural.water.basin">Резервуар</string>
@@ -1564,7 +1566,6 @@
 	<string name="type.waterway.dock">Причал</string>
 	<string name="type.waterway.drain">Водовiдвiд</string>
 	<string name="type.waterway.drain.tunnel">Водовiдвiд</string>
-	<string name="type.waterway.lock">Шлюз</string>
 	<string name="type.waterway.lock_gate">Шлюз</string>
 	<string name="type.waterway.river">Річка</string>
 	<string name="type.waterway.river.tunnel">Річка</string>
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index 6534bd1123..4bfb8f6c9c 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -786,6 +786,7 @@
 	<string name="type.building.garage">Gara</string>
 	<string name="type.building.has_parts">Tòa nhà</string>
 	<string name="type.building.train_station">Đường tàu hỏa</string>
+	<string name="type.cemetery.grave">Phần mộ</string>
 	<string name="type.craft.brewery">Nhà máy bia</string>
 	<string name="type.craft.carpenter">Thợ mộc</string>
 	<string name="type.craft.electrician">Thợ điện</string>
@@ -1119,6 +1120,7 @@
 	<string name="type.natural.glacier">Sông băng</string>
 	<string name="type.natural.grassland">Cánh đồng</string>
 	<string name="type.natural.water.lake">Hồ</string>
+	<string name="type.natural.water.lock">Khoang khóa</string>
 	<string name="type.natural.water.pond">Ao</string>
 	<string name="type.natural.water.reservoir">Hồ chứa</string>
 	<string name="type.natural.water.basin">Một chậu nước</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index f24f549be4..4c7a8f7f03 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -821,6 +821,7 @@
 	<string name="type.building.garage">車庫</string>
 	<string name="type.building.has_parts">建築物</string>
 	<string name="type.building.train_station">鐵道</string>
+	<string name="type.cemetery.grave">墓穴</string>
 	<string name="type.craft.brewery">釀酒廠</string>
 	<string name="type.craft.carpenter">木工</string>
 	<string name="type.craft.electrician">電工</string>
@@ -1164,6 +1165,7 @@
 	<string name="type.natural.glacier">冰川</string>
 	<string name="type.natural.grassland">田野</string>
 	<string name="type.natural.water.lake">湖泊</string>
+	<string name="type.natural.water.lock">鎖室</string>
 	<string name="type.natural.water.pond">潭</string>
 	<string name="type.natural.water.reservoir">水庫</string>
 	<string name="type.natural.water.basin">水庫</string>
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index a6596eb361..55a058f2a7 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -839,6 +839,7 @@
 	<string name="type.building.has_parts">建筑物</string>
 	<string name="type.building.train_station">火车站建筑</string>
 	<string name="type.building.warehouse">仓库</string>
+	<string name="type.cemetery.grave">墓穴</string>
 	<string name="type.craft">工艺作坊</string>
 	<string name="type.craft.brewery">酿酒厂</string>
 	<string name="type.craft.carpenter">木匠</string>
@@ -1232,6 +1233,7 @@
 	<string name="type.natural.heath">荒野</string>
 	<string name="type.natural.hot_spring">温泉</string>
 	<string name="type.natural.water.lake">湖</string>
+	<string name="type.natural.water.lock">锁室</string>
 	<string name="type.natural.water.pond">池塘</string>
 	<string name="type.natural.water.reservoir">水库</string>
 	<string name="type.natural.water.basin">水盆地</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 096cccf69e..49245b6448 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -917,17 +917,25 @@
 	<string name="type.building.has_parts">Building</string>
 	<string name="type.building.train_station">Train Station</string>
 	<string name="type.building.warehouse">Warehouse</string>
+	<string name="type.cemetery.grave">Grave</string>
 	<string name="type.craft">Craft</string>
+	<string name="type.craft.beekeeper">beekeeper</string>
+	<string name="type.craft.blacksmith">Blacksmith</string>
 	<string name="type.craft.brewery">Craft Brewery</string>
 	<string name="type.craft.carpenter">Carpenter</string>
+	<string name="type.craft.confectionery">Confectionery</string>
 	<string name="type.craft.electrician">Electrician</string>
+	<string name="type.craft.electronics_repair">Electronics repair</string>
 	<string name="type.craft.gardener">Gardener</string>
+	<string name="type.craft.handicraft">Handicraft</string>
 	<string name="type.craft.hvac">Hvac</string>
 	<string name="type.craft.metal_construction">Metal Worker</string>
 	<string name="type.craft.painter">Painter</string>
 	<string name="type.craft.photographer">Photographer</string>
 	<string name="type.craft.plumber">Plumber</string>
+	<string name="type.craft.sawmill">Sawmill</string>
 	<string name="type.craft.shoemaker">Shoe Repair</string>
+	<string name="type.craft.winery">Winery</string>
 	<string name="type.craft.tailor">Tailor</string>
 	<string name="type.cuisine.african">African</string>
 	<string name="type.cuisine.american">American</string>
@@ -1345,6 +1353,7 @@
 	<string name="type.natural.heath">Heath</string>
 	<string name="type.natural.hot_spring">Hot Spring</string>
 	<string name="type.natural.water.lake">Lake</string>
+	<string name="type.natural.water.lock">Lock Chamber</string>
 	<string name="type.natural.water.pond">Pond</string>
 	<string name="type.natural.water.reservoir">Reservoir</string>
 	<string name="type.natural.water.basin">Basin</string>
@@ -1634,7 +1643,6 @@
 	<string name="type.waterway.dock">Waterway Dock</string>
 	<string name="type.waterway.drain">Drain</string>
 	<string name="type.waterway.drain.tunnel">Drain</string>
-	<string name="type.waterway.lock">Waterway Lock</string>
 	<string name="type.waterway.lock_gate">Lock Gate</string>
 	<string name="type.waterway.river">River</string>
 	<string name="type.waterway.river.tunnel">River</string>
diff --git a/data/categories.txt b/data/categories.txt
index 2ca778537e..fc9a2bff48 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -1767,7 +1767,7 @@ el:Κατάστημα πληροφορικής
 sk:Obchod s výpočtovou technikou
 fa:فروشگاه کامپیوتر
 
-shop-confectionery|@food
+shop-confectionery|craft-confectionery
 en:4Sweets|4confectionery|candies|candy store|U+1F36C|U+1F36D|cake shop|sweetshop|tuck shop|pastry|candy shop|cake shop
 en-AU:Lollies|Candy
 ru:4Кондитерская|кондитерские изделия|сладости|торты|десерты|пирожные
@@ -7085,6 +7085,14 @@ sk:Mobilný operátor
 fa:اپراتور تلفن همراه
 mr:दूरसंचार कंपनी
 
+craft-beekeeper
+en:Beekeeper
+ru:Пчеловод
+
+craft-blacksmith
+en:Blacksmith
+ru:Кузнец
+
 craft-brewery
 en:Craft brewery|4Brewery|brew house|beer|beer bar|craft beer
 ru:5Пивоварня|пивзавод|производство пива|пивоваренный завод
@@ -7190,6 +7198,14 @@ sk:4Elektrikár
 fa:برق کار
 mr:इलेक्ट्रिशियन|विद्युत कामगार
 
+craft-electronics_repair
+en:Electronics repair
+ru:Ремонт электроники
+
+craft-handicraft
+en:Handicraft
+ru:Декоратор
+
 craft-metal_construction
 en:5Metal Worker
 ru:5Металлоконструкции|кузнец
@@ -7296,6 +7312,10 @@ sk:Oprava obuvy
 fa:کفاش
 mr:चांभार
 
+craft-winery
+en:4Winery|Wine
+ru:4Винодельня|Вино
+
 craft-tailor
 en:4Tailor|clothes alteration|alterations
 ru:4Ателье|портной|4ремонт одежды|швейная мастерская|5пошив одежды
diff --git a/data/classificator.txt b/data/classificator.txt
index 02ac1e57a7..c941203625 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -199,19 +199,29 @@ world  +
         train_station  -
         {}
     building:part  -
+    cemetery  +
+        grave  -
+        {}
     complex_entry  -
     craft  +
+        beekeeper  -
+        blacksmith  -
         brewery  -
         carpenter  -
+        confectionery  -
         electrician  -
+        electronics_repair  -
         gardener  -
+        handicraft  -
         hvac  -
         metal_construction  -
         painter  -
         photographer  -
         plumber  -
+        sawmill  -
         shoemaker  -
         tailor  -
+        winery  -
         {}
     cuisine  +
         african  -
@@ -578,6 +588,7 @@ world  +
         cairn  -
         chimney  -
         cutline  -
+        embankment  -
         flagpole  -
         lighthouse  -
         mast  -
@@ -613,6 +624,7 @@ world  +
         cave_entrance  -
         cliff  -
         coastline  -
+        earth_bank  -
         geyser  -
         glacier  -
         grassland  -
@@ -631,6 +643,7 @@ world  +
         water  +
             basin  -
             lake  -
+            lock  -
             pond  -
             reservoir  -
             river  -
@@ -981,7 +994,6 @@ world  +
         drain  +
             tunnel  -
             {}
-        lock  -
         lock_gate  -
         river  +
             tunnel  -
diff --git a/data/colors.txt b/data/colors.txt
index 4537723866..d13043eedd 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -296,11 +296,9 @@
 67108863
 436207616
 437326080
-439563059
 440681540
 442260561
 444234362
-448970931
 451800027
 452984831
 609045837
@@ -333,7 +331,6 @@
 1074860288
 1090519039
 1216522952
-1291845632
 1292174597
 1292964096
 1295201075
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 3babf86aee..f54a45fa9c 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 12f4efe43d..911cfbc0b3 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -9649,7 +9649,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 1.0
       color: 2157549977
       dashdot {
         dd: 1.0
@@ -9661,11 +9661,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
+      width: 1.5
       color: 1301911961
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1456
     }
@@ -9673,11 +9673,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -9685,11 +9685,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -9763,7 +9763,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 1.0
       color: 2157549977
       dashdot {
         dd: 1.0
@@ -9775,11 +9775,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
+      width: 1.5
       color: 1301911961
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1456
     }
@@ -9787,11 +9787,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -9799,11 +9799,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -9877,7 +9877,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 1.0
       color: 2157549977
       dashdot {
         dd: 1.0
@@ -9889,11 +9889,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
+      width: 1.5
       color: 1301911961
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1456
     }
@@ -9901,11 +9901,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -9913,11 +9913,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -9998,7 +9998,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 1.0
       color: 2157549977
       dashdot {
         dd: 1.0
@@ -10010,11 +10010,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
+      width: 1.5
       color: 1301911961
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1456
     }
@@ -10022,11 +10022,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -10034,11 +10034,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -10302,7 +10302,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 1.0
       color: 2157549977
       dashdot {
         dd: 1.0
@@ -10314,11 +10314,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
+      width: 1.5
       color: 1301911961
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1456
     }
@@ -10326,11 +10326,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -10338,11 +10338,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -11646,6 +11646,124 @@ cont {
     }
   }
 }
+cont {
+  name: "cemetery-grave"
+  element {
+    scale: 17
+    symbol {
+      name: "cemetery-m"
+      priority: 16398
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15398
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "cemetery-m"
+      priority: 16398
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15398
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "cemetery-m"
+      priority: 16398
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15398
+    }
+  }
+}
+cont {
+  name: "craft-beekeeper"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+}
+cont {
+  name: "craft-blacksmith"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+}
 cont {
   name: "craft-brewery"
   element {
@@ -11716,6 +11834,41 @@ cont {
     }
   }
 }
+cont {
+  name: "craft-confectionery"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+}
 cont {
   name: "craft-electrician"
   element {
@@ -11751,6 +11904,41 @@ cont {
     }
   }
 }
+cont {
+  name: "craft-electronics_repair"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+}
 cont {
   name: "craft-gardener"
   element {
@@ -11786,6 +11974,41 @@ cont {
     }
   }
 }
+cont {
+  name: "craft-handicraft"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+}
 cont {
   name: "craft-hvac"
   element {
@@ -11961,6 +12184,41 @@ cont {
     }
   }
 }
+cont {
+  name: "craft-sawmill"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+}
 cont {
   name: "craft-shoemaker"
   element {
@@ -12031,6 +12289,41 @@ cont {
     }
   }
 }
+cont {
+  name: "craft-winery"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+}
 cont {
   name: "emergency-defibrillator"
   element {
@@ -29879,7 +30172,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 1.0
       color: 2157549977
       dashdot {
         dd: 1.0
@@ -29891,11 +30184,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
+      width: 1.5
       color: 1301911961
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1456
     }
@@ -29903,11 +30196,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -29915,11 +30208,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -38218,6 +38511,41 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-embankment"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2157549977
+      priority: 1000
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1301911961
+      priority: 1000
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 10066329
+      priority: 1000
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.0
+      color: 10066329
+      priority: 1000
+    }
+  }
+}
 cont {
   name: "man_made-flagpole"
   element {
@@ -39704,6 +40032,41 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-cliff"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2157549977
+      priority: 1000
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1301911961
+      priority: 1000
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 10066329
+      priority: 1000
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.0
+      color: 10066329
+      priority: 1000
+    }
+  }
+}
 cont {
   name: "natural-coastline"
   element {
@@ -39846,6 +40209,41 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-earth_bank"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2157549977
+      priority: 1000
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1301911961
+      priority: 1000
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 10066329
+      priority: 1000
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.0
+      color: 10066329
+      priority: 1000
+    }
+  }
+}
 cont {
   name: "natural-geyser"
   element {
@@ -42224,6 +42622,350 @@ cont {
     apply_if: "bbox_area<4000000"
   }
 }
+cont {
+  name: "natural-water-lock"
+  element {
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 1
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 10
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 10
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
 cont {
   name: "natural-water-pond"
   element {
@@ -68517,14 +69259,6 @@ cont {
   }
   element {
     scale: 16
-    lines {
-      width: 5.0
-      color: 10592406
-      dashdot {
-      }
-      priority: 1969
-      cap: BUTTCAP
-    }
     lines {
       width: 3.0
       color: 1304608947
@@ -68548,17 +69282,9 @@ cont {
   }
   element {
     scale: 17
-    lines {
-      width: 6.5
-      color: 10197647
-      dashdot {
-      }
-      priority: 1969
-      cap: BUTTCAP
-    }
     lines {
       width: 4.5
-      color: 448970931
+      color: 1304608947
       priority: 1970
     }
     area {
@@ -68579,17 +69305,9 @@ cont {
   }
   element {
     scale: 18
-    lines {
-      width: 8.0
-      color: 10197647
-      dashdot {
-      }
-      priority: 1969
-      cap: BUTTCAP
-    }
     lines {
       width: 6.0
-      color: 12763315
+      color: 1304608947
       priority: 1970
     }
     area {
@@ -68610,17 +69328,9 @@ cont {
   }
   element {
     scale: 19
-    lines {
-      width: 10.0
-      color: 10197647
-      dashdot {
-      }
-      priority: 1969
-      cap: BUTTCAP
-    }
     lines {
       width: 8.0
-      color: 12763315
+      color: 1304608947
       priority: 1970
     }
     area {
@@ -68860,41 +69570,6 @@ cont {
     }
   }
 }
-cont {
-  name: "waterway-lock"
-  element {
-    scale: 16
-    lines {
-      width: 1.5
-      color: 3584191
-      priority: -15600
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.5
-      color: 3584191
-      priority: -15600
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.5
-      color: 3584191
-      priority: -15600
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.5
-      color: 3584191
-      priority: -15600
-    }
-  }
-}
 cont {
   name: "waterway-lock_gate"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 98348b8275..dd4547be87 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 2fbcd2f498..401ba813d3 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -9439,7 +9439,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 1.0
       color: 2157549977
       dashdot {
         dd: 1.0
@@ -9451,11 +9451,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
+      width: 1.5
       color: 1301911961
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1456
     }
@@ -9463,11 +9463,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -9475,11 +9475,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -9553,7 +9553,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 1.0
       color: 2157549977
       dashdot {
         dd: 1.0
@@ -9565,11 +9565,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
+      width: 1.5
       color: 1301911961
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1456
     }
@@ -9577,11 +9577,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -9589,11 +9589,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -9667,7 +9667,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 1.0
       color: 2157549977
       dashdot {
         dd: 1.0
@@ -9679,11 +9679,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
+      width: 1.5
       color: 1301911961
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1456
     }
@@ -9691,11 +9691,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -9703,11 +9703,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -9788,7 +9788,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 1.0
       color: 2157549977
       dashdot {
         dd: 1.0
@@ -9800,11 +9800,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
+      width: 1.5
       color: 1301911961
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1456
     }
@@ -9812,11 +9812,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -9824,11 +9824,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -10092,7 +10092,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 1.0
       color: 2157549977
       dashdot {
         dd: 1.0
@@ -10104,11 +10104,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
+      width: 1.5
       color: 1301911961
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1456
     }
@@ -10116,11 +10116,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -10128,11 +10128,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -11436,6 +11436,124 @@ cont {
     }
   }
 }
+cont {
+  name: "cemetery-grave"
+  element {
+    scale: 17
+    symbol {
+      name: "cemetery-m"
+      priority: 16398
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15398
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "cemetery-m"
+      priority: 16398
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15398
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "cemetery-m"
+      priority: 16398
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15398
+    }
+  }
+}
+cont {
+  name: "craft-beekeeper"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+}
+cont {
+  name: "craft-blacksmith"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+}
 cont {
   name: "craft-brewery"
   element {
@@ -11506,6 +11624,41 @@ cont {
     }
   }
 }
+cont {
+  name: "craft-confectionery"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+}
 cont {
   name: "craft-electrician"
   element {
@@ -11541,6 +11694,41 @@ cont {
     }
   }
 }
+cont {
+  name: "craft-electronics_repair"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+}
 cont {
   name: "craft-gardener"
   element {
@@ -11576,6 +11764,41 @@ cont {
     }
   }
 }
+cont {
+  name: "craft-handicraft"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+}
 cont {
   name: "craft-hvac"
   element {
@@ -11751,6 +11974,41 @@ cont {
     }
   }
 }
+cont {
+  name: "craft-sawmill"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+}
 cont {
   name: "craft-shoemaker"
   element {
@@ -11821,6 +12079,41 @@ cont {
     }
   }
 }
+cont {
+  name: "craft-winery"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+}
 cont {
   name: "emergency-defibrillator"
   element {
@@ -29541,7 +29834,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 1.0
       color: 2157549977
       dashdot {
         dd: 1.0
@@ -29553,11 +29846,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
+      width: 1.5
       color: 1301911961
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1456
     }
@@ -29565,11 +29858,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -29577,11 +29870,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1301911961
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -37880,6 +38173,41 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-embankment"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2157549977
+      priority: 1000
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1301911961
+      priority: 1000
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 10066329
+      priority: 1000
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.0
+      color: 10066329
+      priority: 1000
+    }
+  }
+}
 cont {
   name: "man_made-flagpole"
   element {
@@ -39366,6 +39694,41 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-cliff"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2157549977
+      priority: 1000
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1301911961
+      priority: 1000
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 10066329
+      priority: 1000
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.0
+      color: 10066329
+      priority: 1000
+    }
+  }
+}
 cont {
   name: "natural-coastline"
   element {
@@ -39508,6 +39871,41 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-earth_bank"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2157549977
+      priority: 1000
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1301911961
+      priority: 1000
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 10066329
+      priority: 1000
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.0
+      color: 10066329
+      priority: 1000
+    }
+  }
+}
 cont {
   name: "natural-geyser"
   element {
@@ -41886,6 +42284,350 @@ cont {
     apply_if: "bbox_area<4000000"
   }
 }
+cont {
+  name: "natural-water-lock"
+  element {
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 1
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 10
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 10
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
 cont {
   name: "natural-water-pond"
   element {
@@ -67948,14 +68690,6 @@ cont {
   }
   element {
     scale: 16
-    lines {
-      width: 5.0
-      color: 10592406
-      dashdot {
-      }
-      priority: 1969
-      cap: BUTTCAP
-    }
     lines {
       width: 3.0
       color: 1304608947
@@ -67979,17 +68713,9 @@ cont {
   }
   element {
     scale: 17
-    lines {
-      width: 6.5
-      color: 10197647
-      dashdot {
-      }
-      priority: 1969
-      cap: BUTTCAP
-    }
     lines {
       width: 4.5
-      color: 448970931
+      color: 1304608947
       priority: 1970
     }
     area {
@@ -68010,17 +68736,9 @@ cont {
   }
   element {
     scale: 18
-    lines {
-      width: 8.0
-      color: 10197647
-      dashdot {
-      }
-      priority: 1969
-      cap: BUTTCAP
-    }
     lines {
       width: 6.0
-      color: 12763315
+      color: 1304608947
       priority: 1970
     }
     area {
@@ -68041,17 +68759,9 @@ cont {
   }
   element {
     scale: 19
-    lines {
-      width: 10.0
-      color: 10197647
-      dashdot {
-      }
-      priority: 1969
-      cap: BUTTCAP
-    }
     lines {
       width: 8.0
-      color: 12763315
+      color: 1304608947
       priority: 1970
     }
     area {
@@ -68291,41 +69001,6 @@ cont {
     }
   }
 }
-cont {
-  name: "waterway-lock"
-  element {
-    scale: 16
-    lines {
-      width: 1.5
-      color: 3584191
-      priority: -15600
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.5
-      color: 3584191
-      priority: -15600
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.5
-      color: 3584191
-      priority: -15600
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.5
-      color: 3584191
-      priority: -15600
-    }
-  }
-}
 cont {
   name: "waterway-lock_gate"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 096e66b4f1..af8cb1c3db 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 0459837b58..b3ba6d4f40 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -9439,7 +9439,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 1.0
       color: 2151957572
       dashdot {
         dd: 1.0
@@ -9451,11 +9451,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
+      width: 1.5
       color: 1296319556
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1456
     }
@@ -9463,11 +9463,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1296319556
+      width: 2.0
+      color: 4473924
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -9475,11 +9475,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1296319556
+      width: 2.0
+      color: 4473924
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -9553,7 +9553,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 1.0
       color: 2151957572
       dashdot {
         dd: 1.0
@@ -9565,11 +9565,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
+      width: 1.5
       color: 1296319556
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1456
     }
@@ -9577,11 +9577,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1296319556
+      width: 2.0
+      color: 4473924
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -9589,11 +9589,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1296319556
+      width: 2.0
+      color: 4473924
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -9667,7 +9667,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 1.0
       color: 2151957572
       dashdot {
         dd: 1.0
@@ -9679,11 +9679,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
+      width: 1.5
       color: 1296319556
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1456
     }
@@ -9691,11 +9691,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1296319556
+      width: 2.0
+      color: 4473924
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -9703,11 +9703,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1296319556
+      width: 2.0
+      color: 4473924
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -9788,7 +9788,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 1.0
       color: 2151957572
       dashdot {
         dd: 1.0
@@ -9800,11 +9800,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
+      width: 1.5
       color: 1296319556
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1456
     }
@@ -9812,11 +9812,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1296319556
+      width: 2.0
+      color: 4473924
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -9824,11 +9824,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1296319556
+      width: 2.0
+      color: 4473924
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -10092,7 +10092,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 1.0
       color: 2151957572
       dashdot {
         dd: 1.0
@@ -10104,11 +10104,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
+      width: 1.5
       color: 1296319556
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1456
     }
@@ -10116,11 +10116,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1296319556
+      width: 2.0
+      color: 4473924
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -10128,11 +10128,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1296319556
+      width: 2.0
+      color: 4473924
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -11436,6 +11436,124 @@ cont {
     }
   }
 }
+cont {
+  name: "cemetery-grave"
+  element {
+    scale: 17
+    symbol {
+      name: "cemetery-m"
+      priority: 16398
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15398
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "cemetery-m"
+      priority: 16398
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15398
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "cemetery-m"
+      priority: 16398
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15398
+    }
+  }
+}
+cont {
+  name: "craft-beekeeper"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+}
+cont {
+  name: "craft-blacksmith"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+}
 cont {
   name: "craft-brewery"
   element {
@@ -11506,6 +11624,41 @@ cont {
     }
   }
 }
+cont {
+  name: "craft-confectionery"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+}
 cont {
   name: "craft-electrician"
   element {
@@ -11541,6 +11694,41 @@ cont {
     }
   }
 }
+cont {
+  name: "craft-electronics_repair"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+}
 cont {
   name: "craft-gardener"
   element {
@@ -11576,6 +11764,41 @@ cont {
     }
   }
 }
+cont {
+  name: "craft-handicraft"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+}
 cont {
   name: "craft-hvac"
   element {
@@ -11751,6 +11974,41 @@ cont {
     }
   }
 }
+cont {
+  name: "craft-sawmill"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+}
 cont {
   name: "craft-shoemaker"
   element {
@@ -11821,6 +12079,41 @@ cont {
     }
   }
 }
+cont {
+  name: "craft-winery"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16601
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15601
+    }
+  }
+}
 cont {
   name: "emergency-defibrillator"
   element {
@@ -29689,7 +29982,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 1.0
       color: 2151957572
       dashdot {
         dd: 1.0
@@ -29701,11 +29994,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
+      width: 1.5
       color: 1296319556
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1456
     }
@@ -29713,11 +30006,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1296319556
+      width: 2.0
+      color: 4473924
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -29725,11 +30018,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1296319556
+      width: 2.0
+      color: 4473924
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1456
     }
@@ -38009,6 +38302,41 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-embankment"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2151957572
+      priority: 1000
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1296319556
+      priority: 1000
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 4473924
+      priority: 1000
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.0
+      color: 4473924
+      priority: 1000
+    }
+  }
+}
 cont {
   name: "man_made-flagpole"
   element {
@@ -39481,6 +39809,41 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-cliff"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2151957572
+      priority: 1000
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1296319556
+      priority: 1000
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 4473924
+      priority: 1000
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.0
+      color: 4473924
+      priority: 1000
+    }
+  }
+}
 cont {
   name: "natural-coastline"
   element {
@@ -39623,6 +39986,41 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-earth_bank"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2151957572
+      priority: 1000
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1296319556
+      priority: 1000
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 4473924
+      priority: 1000
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.0
+      color: 4473924
+      priority: 1000
+    }
+  }
+}
 cont {
   name: "natural-geyser"
   element {
@@ -41981,6 +42379,350 @@ cont {
     apply_if: "bbox_area<4000000"
   }
 }
+cont {
+  name: "natural-water-lock"
+  element {
+    area {
+      color: 8738
+      priority: -15030
+    }
+  }
+  element {
+    scale: 1
+    area {
+      color: 8738
+      priority: -15030
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 8738
+      priority: -15030
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 8738
+      priority: -15030
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 8738
+      priority: -15030
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 8738
+      priority: -15030
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 8738
+      priority: -15030
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 8738
+      priority: -15030
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 8738
+      priority: -15030
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 8738
+      priority: -15030
+    }
+  }
+  element {
+    scale: 10
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 10
+    area {
+      color: 8738
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 8738
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 8738
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 8738
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
 cont {
   name: "natural-water-pond"
   element {
@@ -68033,14 +68775,6 @@ cont {
   }
   element {
     scale: 16
-    lines {
-      width: 5.0
-      color: 3158064
-      dashdot {
-      }
-      priority: 1969
-      cap: BUTTCAP
-    }
     lines {
       width: 3.0
       color: 1295201075
@@ -68064,17 +68798,9 @@ cont {
   }
   element {
     scale: 17
-    lines {
-      width: 6.5
-      color: 4671303
-      dashdot {
-      }
-      priority: 1969
-      cap: BUTTCAP
-    }
     lines {
       width: 4.5
-      color: 439563059
+      color: 1295201075
       priority: 1970
     }
     area {
@@ -68095,17 +68821,9 @@ cont {
   }
   element {
     scale: 18
-    lines {
-      width: 8.0
-      color: 4671303
-      dashdot {
-      }
-      priority: 1969
-      cap: BUTTCAP
-    }
     lines {
       width: 6.0
-      color: 3355443
+      color: 1295201075
       priority: 1970
     }
     area {
@@ -68126,17 +68844,9 @@ cont {
   }
   element {
     scale: 19
-    lines {
-      width: 10.0
-      color: 4671303
-      dashdot {
-      }
-      priority: 1969
-      cap: BUTTCAP
-    }
     lines {
       width: 8.0
-      color: 3355443
+      color: 1295201075
       priority: 1970
     }
     area {
@@ -68376,41 +69086,6 @@ cont {
     }
   }
 }
-cont {
-  name: "waterway-lock"
-  element {
-    scale: 16
-    lines {
-      width: 1.5
-      color: 401446
-      priority: -15600
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.5
-      color: 401446
-      priority: -15600
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.5
-      color: 401446
-      priority: -15600
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.5
-      color: 401446
-      priority: -15600
-    }
-  }
-}
 cont {
   name: "waterway-lock_gate"
   element {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 89064a12d9..196c3461db 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 8ed81410f0..cd30994ef7 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -4077,8 +4077,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
-      color: 2147483648
+      width: 1.0
+      color: 2157549977
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -4089,11 +4089,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 1291845632
+      width: 1.5
+      color: 1301911961
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1505
     }
@@ -4101,11 +4101,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1291845632
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1505
     }
@@ -4113,11 +4113,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1291845632
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1505
     }
@@ -4128,8 +4128,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
-      color: 2147483648
+      width: 1.0
+      color: 2157549977
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -4140,11 +4140,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 1291845632
+      width: 1.5
+      color: 1301911961
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1505
     }
@@ -4152,11 +4152,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1291845632
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1505
     }
@@ -4164,11 +4164,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1291845632
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1505
     }
@@ -4179,8 +4179,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
-      color: 2147483648
+      width: 1.0
+      color: 2157549977
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -4191,11 +4191,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 1291845632
+      width: 1.5
+      color: 1301911961
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1505
     }
@@ -4203,11 +4203,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1291845632
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1505
     }
@@ -4215,11 +4215,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1291845632
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1505
     }
@@ -4292,6 +4292,57 @@ cont {
     }
   }
 }
+cont {
+  name: "barrier-retaining_wall"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2157549977
+      dashdot {
+        dd: 1.0
+        dd: 1.0
+      }
+      priority: 1505
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.5
+      color: 1301911961
+      dashdot {
+        dd: 2.0
+        dd: 2.0
+      }
+      priority: 1505
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 2.0
+      color: 10066329
+      dashdot {
+        dd: 2.4
+        dd: 2.4
+      }
+      priority: 1505
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2.0
+      color: 10066329
+      dashdot {
+        dd: 2.4
+        dd: 2.4
+      }
+      priority: 1505
+    }
+  }
+}
 cont {
   name: "barrier-toll_booth"
   element {
@@ -4412,8 +4463,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
-      color: 2147483648
+      width: 1.0
+      color: 2157549977
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -4424,11 +4475,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 1291845632
+      width: 1.5
+      color: 1301911961
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1505
     }
@@ -4436,11 +4487,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1291845632
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1505
     }
@@ -4448,11 +4499,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1291845632
+      width: 2.0
+      color: 10066329
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1505
     }
@@ -17493,6 +17544,57 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-citywalls"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2157549977
+      dashdot {
+        dd: 1.0
+        dd: 1.0
+      }
+      priority: 1505
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.5
+      color: 1301911961
+      dashdot {
+        dd: 2.0
+        dd: 2.0
+      }
+      priority: 1505
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 2.0
+      color: 10066329
+      dashdot {
+        dd: 2.4
+        dd: 2.4
+      }
+      priority: 1505
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2.0
+      color: 10066329
+      dashdot {
+        dd: 2.4
+        dd: 2.4
+      }
+      priority: 1505
+    }
+  }
+}
 cont {
   name: "historic-fort"
   element {
@@ -22320,6 +22422,41 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-embankment"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2157549977
+      priority: 1000
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1301911961
+      priority: 1000
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 10066329
+      priority: 1000
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.0
+      color: 10066329
+      priority: 1000
+    }
+  }
+}
 cont {
   name: "man_made-pier"
   element {
@@ -22907,6 +23044,41 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-cliff"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2157549977
+      priority: 1000
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1301911961
+      priority: 1000
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 10066329
+      priority: 1000
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.0
+      color: 10066329
+      priority: 1000
+    }
+  }
+}
 cont {
   name: "natural-coastline"
   element {
@@ -23049,6 +23221,41 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-earth_bank"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2157549977
+      priority: 1000
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1301911961
+      priority: 1000
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 10066329
+      priority: 1000
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.0
+      color: 10066329
+      priority: 1000
+    }
+  }
+}
 cont {
   name: "natural-glacier"
   element {
@@ -24957,6 +25164,478 @@ cont {
     apply_if: "bbox_area>=1000000"
   }
 }
+cont {
+  name: "natural-water-lock"
+  element {
+    area {
+      color: 9163744
+      priority: -15071
+    }
+  }
+  element {
+    scale: 1
+    area {
+      color: 9163744
+      priority: -15071
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 9163744
+      priority: -15071
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 9163744
+      priority: -15071
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 9163744
+      priority: -15071
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 9163744
+      priority: -15071
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 9163744
+      priority: -15071
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 9163744
+      priority: -15071
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 9163744
+      priority: -15071
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 9163744
+      priority: -15071
+    }
+  }
+  element {
+    scale: 10
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 10
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 10
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+}
 cont {
   name: "natural-water-pond"
   element {
@@ -42432,14 +43111,6 @@ cont {
   name: "waterway-dam"
   element {
     scale: 15
-    lines {
-      width: 4.0
-      color: 13947850
-      dashdot {
-      }
-      priority: 1928
-      cap: BUTTCAP
-    }
     lines {
       width: 2.0
       color: 2160576191
@@ -42457,14 +43128,6 @@ cont {
   }
   element {
     scale: 16
-    lines {
-      width: 5.0
-      color: 13947850
-      dashdot {
-      }
-      priority: 1928
-      cap: BUTTCAP
-    }
     lines {
       width: 3.0
       color: 2160576191
@@ -42481,14 +43144,6 @@ cont {
   }
   element {
     scale: 17
-    lines {
-      width: 6.5
-      color: 13947850
-      dashdot {
-      }
-      priority: 1928
-      cap: BUTTCAP
-    }
     lines {
       width: 4.5
       color: 2160576191
@@ -42505,14 +43160,6 @@ cont {
   }
   element {
     scale: 18
-    lines {
-      width: 8.0
-      color: 13947850
-      dashdot {
-      }
-      priority: 1928
-      cap: BUTTCAP
-    }
     lines {
       width: 6.0
       color: 2160576191
@@ -42529,14 +43176,6 @@ cont {
   }
   element {
     scale: 19
-    lines {
-      width: 10.0
-      color: 13947850
-      dashdot {
-      }
-      priority: 1928
-      cap: BUTTCAP
-    }
     lines {
       width: 8.0
       color: 2160576191
@@ -42772,41 +43411,6 @@ cont {
     }
   }
 }
-cont {
-  name: "waterway-lock"
-  element {
-    scale: 16
-    lines {
-      width: 1.5
-      color: 3584191
-      priority: 1929
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.5
-      color: 3584191
-      priority: 1929
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.5
-      color: 3584191
-      priority: 1929
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.5
-      color: 3584191
-      priority: 1929
-    }
-  }
-}
 cont {
   name: "waterway-lock_gate"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index e3cd818115..618d5e6916 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 2285816128..24a244f5ab 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -4077,8 +4077,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
-      color: 2147483648
+      width: 1.0
+      color: 2151957572
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -4089,11 +4089,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 1291845632
+      width: 1.5
+      color: 1296319556
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1505
     }
@@ -4101,11 +4101,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1291845632
+      width: 2.0
+      color: 4473924
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1505
     }
@@ -4113,11 +4113,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1291845632
+      width: 2.0
+      color: 4473924
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1505
     }
@@ -4128,8 +4128,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
-      color: 2147483648
+      width: 1.0
+      color: 2151957572
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -4140,11 +4140,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 1291845632
+      width: 1.5
+      color: 1296319556
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1505
     }
@@ -4152,11 +4152,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1291845632
+      width: 2.0
+      color: 4473924
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1505
     }
@@ -4164,11 +4164,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1291845632
+      width: 2.0
+      color: 4473924
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1505
     }
@@ -4179,8 +4179,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
-      color: 2147483648
+      width: 1.0
+      color: 2151957572
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -4191,11 +4191,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 1291845632
+      width: 1.5
+      color: 1296319556
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1505
     }
@@ -4203,11 +4203,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1291845632
+      width: 2.0
+      color: 4473924
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1505
     }
@@ -4215,11 +4215,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1291845632
+      width: 2.0
+      color: 4473924
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1505
     }
@@ -4292,6 +4292,57 @@ cont {
     }
   }
 }
+cont {
+  name: "barrier-retaining_wall"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2151957572
+      dashdot {
+        dd: 1.0
+        dd: 1.0
+      }
+      priority: 1505
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.5
+      color: 1296319556
+      dashdot {
+        dd: 2.0
+        dd: 2.0
+      }
+      priority: 1505
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 2.0
+      color: 4473924
+      dashdot {
+        dd: 2.4
+        dd: 2.4
+      }
+      priority: 1505
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2.0
+      color: 4473924
+      dashdot {
+        dd: 2.4
+        dd: 2.4
+      }
+      priority: 1505
+    }
+  }
+}
 cont {
   name: "barrier-toll_booth"
   element {
@@ -4412,8 +4463,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
-      color: 2147483648
+      width: 1.0
+      color: 2151957572
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -4424,11 +4475,11 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 1291845632
+      width: 1.5
+      color: 1296319556
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.0
+        dd: 2.0
       }
       priority: 1505
     }
@@ -4436,11 +4487,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
-      color: 1291845632
+      width: 2.0
+      color: 4473924
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1505
     }
@@ -4448,11 +4499,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
-      color: 1291845632
+      width: 2.0
+      color: 4473924
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.4
+        dd: 2.4
       }
       priority: 1505
     }
@@ -17817,6 +17868,57 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-citywalls"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2151957572
+      dashdot {
+        dd: 1.0
+        dd: 1.0
+      }
+      priority: 1505
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.5
+      color: 1296319556
+      dashdot {
+        dd: 2.0
+        dd: 2.0
+      }
+      priority: 1505
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 2.0
+      color: 4473924
+      dashdot {
+        dd: 2.4
+        dd: 2.4
+      }
+      priority: 1505
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2.0
+      color: 4473924
+      dashdot {
+        dd: 2.4
+        dd: 2.4
+      }
+      priority: 1505
+    }
+  }
+}
 cont {
   name: "historic-fort"
   element {
@@ -22644,6 +22746,41 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-embankment"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2151957572
+      priority: 1000
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1296319556
+      priority: 1000
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 4473924
+      priority: 1000
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.0
+      color: 4473924
+      priority: 1000
+    }
+  }
+}
 cont {
   name: "man_made-pier"
   element {
@@ -23231,6 +23368,41 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-cliff"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2151957572
+      priority: 1000
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1296319556
+      priority: 1000
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 4473924
+      priority: 1000
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.0
+      color: 4473924
+      priority: 1000
+    }
+  }
+}
 cont {
   name: "natural-coastline"
   element {
@@ -23373,6 +23545,41 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-earth_bank"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2151957572
+      priority: 1000
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1296319556
+      priority: 1000
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 4473924
+      priority: 1000
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.0
+      color: 4473924
+      priority: 1000
+    }
+  }
+}
 cont {
   name: "natural-glacier"
   element {
@@ -25281,6 +25488,478 @@ cont {
     apply_if: "bbox_area>=1000000"
   }
 }
+cont {
+  name: "natural-water-lock"
+  element {
+    area {
+      color: 8738
+      priority: -15071
+    }
+  }
+  element {
+    scale: 1
+    area {
+      color: 8738
+      priority: -15071
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 8738
+      priority: -15071
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 8738
+      priority: -15071
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 8738
+      priority: -15071
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 8738
+      priority: -15071
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 8738
+      priority: -15071
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 8738
+      priority: -15071
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 8738
+      priority: -15071
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 8738
+      priority: -15071
+    }
+  }
+  element {
+    scale: 10
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 10
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 10
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 9
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 9
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 9
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 9
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+}
 cont {
   name: "natural-water-pond"
   element {
@@ -42756,14 +43435,6 @@ cont {
   name: "waterway-dam"
   element {
     scale: 15
-    lines {
-      width: 4.0
-      color: 1842204
-      dashdot {
-      }
-      priority: 1928
-      cap: BUTTCAP
-    }
     lines {
       width: 2.0
       color: 2149128473
@@ -42781,14 +43452,6 @@ cont {
   }
   element {
     scale: 16
-    lines {
-      width: 5.0
-      color: 1842204
-      dashdot {
-      }
-      priority: 1928
-      cap: BUTTCAP
-    }
     lines {
       width: 3.0
       color: 2149128473
@@ -42805,14 +43468,6 @@ cont {
   }
   element {
     scale: 17
-    lines {
-      width: 6.5
-      color: 1842204
-      dashdot {
-      }
-      priority: 1928
-      cap: BUTTCAP
-    }
     lines {
       width: 4.5
       color: 2149128473
@@ -42829,14 +43484,6 @@ cont {
   }
   element {
     scale: 18
-    lines {
-      width: 8.0
-      color: 1842204
-      dashdot {
-      }
-      priority: 1928
-      cap: BUTTCAP
-    }
     lines {
       width: 6.0
       color: 2149128473
@@ -42853,14 +43500,6 @@ cont {
   }
   element {
     scale: 19
-    lines {
-      width: 10.0
-      color: 1842204
-      dashdot {
-      }
-      priority: 1928
-      cap: BUTTCAP
-    }
     lines {
       width: 8.0
       color: 2149128473
@@ -43096,41 +43735,6 @@ cont {
     }
   }
 }
-cont {
-  name: "waterway-lock"
-  element {
-    scale: 16
-    lines {
-      width: 1.5
-      color: 401446
-      priority: 1929
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.5
-      color: 401446
-      priority: 1929
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.5
-      color: 401446
-      priority: 1929
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.5
-      color: 401446
-      priority: 1929
-    }
-  }
-}
 cont {
   name: "waterway-lock_gate"
   element {
diff --git a/data/editor.config b/data/editor.config
index e0cd8a9f6d..23f3775e57 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -370,18 +370,33 @@
       <type id="craft" can_add="no">
         <include group="poi" />
       </type>
+      <type id="craft-beekeeper" can_add="no">
+        <include group="poi" />
+      </type>
+      <type id="craft-blacksmith" can_add="no">
+        <include group="poi" />
+      </type>
       <type id="craft-brewery" group="shop" can_add="no">
         <include group="poi" />
       </type>
       <type id="craft-carpenter" can_add="no">
         <include group="poi" />
       </type>
+      <type id="craft-confectionery" group="shop" can_add="no">
+        <include group="poi" />
+      </type>
       <type id="craft-electrician" can_add="no">
         <include group="poi" />
       </type>
+      <type id="craft-electronics_repair">
+        <include group="poi" />
+      </type>
       <type id="craft-gardener" can_add="no">
         <include group="poi" />
       </type>
+      <type id="craft-handicraft" can_add="no">
+        <include group="poi" />
+      </type>
       <type id="craft-hvac" group="shop" can_add="no">
         <include group="poi" />
       </type>
@@ -391,18 +406,24 @@
       <type id="craft-painter" can_add="no">
         <include group="poi" />
       </type>
-      <type id="craft-photographer" can_add="no">
+      <type id="craft-photographer">
         <include group="poi" />
       </type>
       <type id="craft-plumber" can_add="no">
         <include group="poi" />
       </type>
+      <type id="craft-sawmill" can_add="no">
+        <include group="poi" />
+      </type>
       <type id="craft-shoemaker">
         <include group="poi" />
       </type>
       <type id="craft-tailor">
         <include group="poi" />
       </type>
+      <type id="craft-winery" group="shop" can_add="no">
+        <include group="poi" />
+      </type>
       <type id="healthcare-laboratory" group="health">
         <include group="poi" />
         <include field="internet" />
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 5158fd89f8..9907852950 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -465,7 +465,7 @@ deprecated|deprecated;464;x
 deprecated|deprecated;465;x
 piste:type|downhill|expert;[piste:type=downhill][piste:difficulty=expert];;name;int_name;466;
 landuse|salt_pond;467;
-deprecated|deprecated;468;x
+cemetery|grave;468;
 railway|monorail|bridge;[railway=monorail][bridge?];;name;int_name;469;
 area:highway|steps;470;
 deprecated|deprecated;471;x
@@ -495,8 +495,8 @@ deprecated|deprecated;494;x
 amenity|parking|park_and_ride;[amenity=parking][parking=park_and_ride];;name;int_name;495;
 deprecated|deprecated;496;x
 deprecated|deprecated;497;x
-deprecated|deprecated;498;x
-waterway|lock;499;
+natural|water|lock;[natural=water][water=lock];;name;int_name;498;
+waterway|lock;499;waterway|canal
 deprecated|deprecated;500;x
 deprecated|deprecated;501;x
 deprecated|deprecated;502;x
@@ -947,14 +947,14 @@ office|government;947;
 office|estate_agent;[office=estate_agent],[shop=estate_agent];;name;int_name;948;
 office|lawyer;949;
 office;[office];;name;int_name;950;
-deprecated|deprecated;951;x
-deprecated|deprecated;952;x
+natural|earth_bank;951;
+man_made|embankment;952;
 amenity|ferry_terminal;953;
 amenity;[amenity];;name;int_name;954;
 shop|furniture;955;
-deprecated|deprecated;956;x
+craft|winery;956;
 waterway|waterfall;957;
-deprecated|deprecated;958;x
+craft|electronics_repair;958;
 amenity|casino;960;
 amenity|brothel;961;
 place|neighbourhood;[place=neighbourhood],[place=quarter];;name;int_name;962;
@@ -983,7 +983,7 @@ internet_access;[internet_access];;name;int_name;984;
 internet_access|wlan;985;
 amenity|waste_disposal;986;
 amenity|bbq;987;
-deprecated|deprecated;988;x
+craft|sawmill;988;
 route|ferry|motorcar;[route=ferry][motorcar];x;name;int_name;989;route|ferry
 junction|roundabout;990;
 highway|speed_camera;991;
@@ -1056,16 +1056,16 @@ shop|photo;1057;
 shop|travel_agency;[shop=travel_agency],[office=travel_agent];;name;int_name;1058;
 highway|elevator;1059;
 shop|outdoor;1060;
-deprecated|deprecated;1061;x
-deprecated|deprecated;1062;x
+craft|confectionery;1061;
+craft|handicraft;1062;
 shop|dry_cleaning;1063;
 shop|tyres;1064;
-deprecated|deprecated;1065;x
+craft|beekeeper;1065;
 amenity|car_wash;1066;
 amenity|veterinary;1067;
 amenity|charging_station;1068;
 amenity|childcare;1069;
-deprecated|deprecated;1070;x
+craft|blacksmith;1070;
 amenity|bicycle_parking;1071;
 amenity|community_centre;1072;
 amenity|courthouse;1073;
diff --git a/data/patterns.txt b/data/patterns.txt
index db9bb3a875..38129ae965 100644
--- a/data/patterns.txt
+++ b/data/patterns.txt
@@ -1,5 +1,7 @@
 1.0 18.0
 1.0 1.0
+2.0 2.0
+2.4 2.4
 1.35 1.0
 1.8 1.0
 1.44 1.44
@@ -11,7 +13,6 @@
 10.8 4.5
 13.5 5.4
 18.0 6.2
-2.0 2.0
 2.0 1.0
 3.6 1.6
 5.0 2.2
diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt
index 219a518818..fa5cd21288 100644
--- a/data/replaced_tags.txt
+++ b/data/replaced_tags.txt
@@ -73,6 +73,8 @@ cliff=yes         : natural=cliff
 office=notary : office=lawyer
 office=administrative : office=government
 
+craft=dressmaker : craft=tailor
+
 cycleway=opposite_lane : oneway:bicycle=no
 
 power=transformer : power=substation
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 804c99fc46..a0c7556586 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -4762,6 +4762,43 @@
     uk = Склад
     zh-Hans = 仓库
 
+  [type.cemetery.grave]
+    en = Grave
+    ar = ﺮﻴﻄﺧ
+    be = Магіла
+    bg = Гроб
+    cs = Hrob
+    da = Grav
+    de = Grab
+    el = Τάφος
+    es = Tumba
+    eu = Hilobia
+    fa = ﺮﺒﻗ
+    fi = Hauta
+    fr = La tombe
+    he = רבק
+    hu = Sír
+    id = Kuburan
+    it = La tomba
+    ja = 墓
+    ko = 무덤
+    nb = Grav
+    nl = Graf
+    pl = Mogiła
+    pt = Túmulo
+    pt-BR = Túmulo
+    ro = Mormânt
+    ru = Могила
+    sk = Hrob
+    sv = Grav
+    sw = Kaburi
+    th = หลุมฝังศพ
+    tr = Mezar
+    uk = Могила
+    vi = Phần mộ
+    zh-Hans = 墓穴
+    zh-Hant = 墓穴
+
   [type.craft]
     en = Craft
     fr = Artisanat
@@ -4775,6 +4812,14 @@
     uk = Майстерня
     zh-Hans = 工艺作坊
 
+  [type.craft.beekeeper]
+    en = beekeeper
+    ru = Пчеловод
+
+  [type.craft.blacksmith]
+    en = Blacksmith
+    ru = Кузнец
+
   [type.craft.brewery]
     en = Craft Brewery
     ar = مصنع جعة
@@ -4843,6 +4888,10 @@
     zh-Hans = 木匠
     zh-Hant = 木工
 
+  [type.craft.confectionery]
+    en = Confectionery
+    ru = Кондитер
+
   [type.craft.electrician]
     en = Electrician
     ar = كهربائي
@@ -4876,6 +4925,10 @@
     zh-Hans = 电工
     zh-Hant = 電工
 
+  [type.craft.electronics_repair]
+    en = Electronics repair
+    ru = Ремонт электроники
+
   [type.craft.gardener]
     en = Gardener
     ar = مهندس مناظر
@@ -4910,6 +4963,10 @@
     zh-Hans = 园艺工
     zh-Hant = 園藝師
 
+  [type.craft.handicraft]
+    en = Handicraft
+    ru = Декоративный мастер
+
   [type.craft.hvac]
     en = Hvac
     ar = تكييف
@@ -5078,6 +5135,10 @@
     zh-Hans = 管道工
     zh-Hant = 水管工人
 
+  [type.craft.sawmill]
+    en = Sawmill
+    ru = Лесопилка
+
   [type.craft.shoemaker]
     en = Shoe Repair
     ar = تصليح الاحذية
@@ -5112,6 +5173,10 @@
     zh-Hans = 鞋匠
     zh-Hant = 修鞋工
 
+  [type.craft.winery]
+    en = Winery
+    ru = Винодельня
+
   [type.craft.tailor]
     en = Tailor
     ar = خياط
@@ -12601,6 +12666,43 @@
     zh-Hans = 湖
     zh-Hant = 湖泊
 
+  [type.natural.water.lock]
+    en = Lock Chamber
+    ar = ﻞﻔﻘﻟﺍ ﺔﻓﺮﻏ
+    be = Шлюзавая камера
+    bg = Заключваща камера
+    cs = Zámková komora
+    da = Låsekammer
+    de = Schleusenkammer
+    el = Θάλαμος κλειδαριάς
+    es = Cámara de bloqueo
+    eu = Sarraila Ganbera
+    fa = ﻞﻔﻗ ﻕﺎﺗﺍ
+    fi = Lukko kammio
+    fr = Chambre de verrouillage
+    he = לוענמ את
+    hu = Zsilipkamra
+    id = Ruang Kunci
+    it = Camera di blocco
+    ja = ロックチャンバー
+    ko = 잠금 챔버
+    nb = Låsekammer
+    nl = Slotkamer
+    pl = Komora zamka
+    pt = Câmara de Bloqueio
+    pt-BR = Câmara de Bloqueio
+    ro = Camera de blocare
+    ru = Шлюзовая камера
+    sk = Uzamykacia komora
+    sv = Låskammare
+    sw = Chumba cha kufuli
+    th = ห้องล็อค
+    tr = Kilit Odası
+    uk = Замкова камера
+    vi = Khoang khóa
+    zh-Hans = 锁室
+    zh-Hant = 鎖室
+
   [type.natural.water.pond]
     en = Pond
     ar = بركة
@@ -19668,16 +19770,6 @@
     uk = Водовiдвiд
     zh-Hans = 渠
 
-  [type.waterway.lock]
-    en = Waterway Lock
-    de = Schleuse
-    fr = Écluse
-    pt = Eclusa
-    pt-BR = Eclusa
-    ru = Шлюз
-    tr = Kanal Havuzu
-    uk = Шлюз
-
   [type.waterway.lock_gate]
     en = Lock Gate
     ar = بوابة هويس
diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss
index 3cc9b8ba6b..984b97d300 100644
--- a/data/styles/clear/include/Basemap.mapcss
+++ b/data/styles/clear/include/Basemap.mapcss
@@ -127,7 +127,6 @@ line[waterway=riverbank],
 line[waterway=stream],
 line[waterway=canal],
 line[natural=strait],
-line[waterway=lock],
 line[waterway=ditch],
 line[waterway=drain],
 {z-index: 50;}
@@ -360,7 +359,6 @@ line|z13-[waterway=stream],
 line|z13-[waterway=stream][intermittent=yes],
 line|z13-[waterway=canal],
 line|z13-[natural=strait],
-line|z16-[waterway=lock],
 {opacity: 1;color: @river;-x-me-line-priority: -15600;}
 
 /* 6.1 Area water(lake,pond etc.) */
@@ -418,8 +416,6 @@ line|z15-[natural=strait],
 line|z15-[waterway=stream][intermittent=yes]
 {width: 1.4;dashes: 4.95,4.95;}
 
-line|z16-[waterway=lock],
-{width: 1.5;}
 node|z16-[waterway=lock_gate],
 {icon-image: dot-m.svg;}
 
@@ -641,6 +637,7 @@ line|z18[man_made=cutline],
 line|z19-[man_made=cutline],
 {width: 6;}
 
+
 /* 8.2 Building */
 
 area|z14[building],
@@ -669,7 +666,7 @@ area|z17[building:part],
 area|z17[waterway=dam],
 area|z17[landuse=garages],
 area|z17[building=train_station],
-{fill-color: @building_dark;opacity: 0.9;casing-width: 1;casing-color: @building_dark_border;}
+{fill-color: @building_dark;casing-width: 1;casing-color: @building_dark_border;}
 
 area|z17-[aeroway=terminal],
 area|z18-[building],
@@ -677,39 +674,50 @@ area|z18-[building:part],
 area|z18-[waterway=dam],
 area|z18-[landuse=garages],
 area|z18-[building=train_station],
-{fill-color: @building_dark;opacity: 1;casing-width: 1;casing-color: @building_dark_border;}
+{fill-color: @building_dark;casing-width: 1;casing-color: @building_dark_border;}
+
 
 /* 8.3 Barrier */
 
-line|z16-[barrier=wall],
 line|z16-[barrier=city_wall],
-line|z16-[barrier=retaining_wall],
-line|z16-[barrier=hedge],
 line|z16-[barrier=fence],
+line|z16-[barrier=hedge],
+line|z16-[barrier=retaining_wall],
+line|z16-[barrier=wall],
 line|z16-[historic=citywalls],
-{color: @fence;opacity: 1;}
+{color: @fence; width: 1.0; dashes: 1.0,1.0; opacity: 0.5;}
 
-line|z16[barrier=wall],
-line|z16[barrier=city_wall],
-line|z16[barrier=retaining_wall],
-line|z16[barrier=fence],
-line|z16[barrier=hedge],
-line|z16[historic=citywalls],
-{width: 0.7;dashes: 0.12,0.12;opacity: 0.5;}
-line|z17-[barrier=wall],
 line|z17-[barrier=city_wall],
-line|z17-[barrier=retaining_wall],
 line|z17-[barrier=fence],
 line|z17-[barrier=hedge],
+line|z17-[barrier=retaining_wall],
+line|z17-[barrier=wall],
 line|z17-[historic=citywalls],
-{width: 1.0;dashes: 0.25,0.25;opacity:0.7;}
-line|z18-[barrier=wall],
+{width: 1.5; dashes: 2.0,2.0; opacity:0.7;}
+
 line|z18-[barrier=city_wall],
-line|z18-[barrier=retaining_wall],
 line|z18-[barrier=fence],
 line|z18-[barrier=hedge],
+line|z18-[barrier=retaining_wall],
+line|z18-[barrier=wall],
 line|z18-[historic=citywalls],
-{width: 1.4;dashes: 0.3,0.3;}
+{width: 2.0; dashes: 2.4,2.4; opacity: 1;}
+
+/* ToDo: Make linear style with small triangles pointing downwards, when drape will be ready */
+line|z16-[natural=cliff],
+line|z16-[natural=earth_bank],
+line|z16-[man_made=embankment],
+{color: @fence; width: 1.0; opacity: 0.5;}
+
+line|z17[natural=cliff],
+line|z17[natural=earth_bank],
+line|z17[man_made=embankment],
+{width: 2.0; opacity: 0.7;}
+
+line|z18-[natural=cliff],
+line|z18-[natural=earth_bank],
+line|z18-[man_made=embankment],
+{width: 3.0; opacity: 1;}
 
 /* 9. ISOLINES */
 
diff --git a/data/styles/clear/include/Basemap_label.mapcss b/data/styles/clear/include/Basemap_label.mapcss
index 72a6273726..53870e98f9 100644
--- a/data/styles/clear/include/Basemap_label.mapcss
+++ b/data/styles/clear/include/Basemap_label.mapcss
@@ -47,6 +47,8 @@ area[landuse=cemetery],
 node[landuse=cemetery],
 area[amenity=grave_yard],
 node[amenity=grave_yard],
+node[cemetery=grave],
+area[cemetery=grave],
 {z-index: 800;}
 
 line[isoline],
@@ -626,18 +628,12 @@ node|z15-[landuse=quarry],
 /* 	7.4 Cemetry */
 
 area|z15-[landuse=cemetery],
-node|z15-[landuse=cemetery],
-area|z17-[amenity=grave_yard],
-node|z17-[amenity=grave_yard],
-{text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
-
-area|z15-16[landuse=cemetery]
-{icon-image: cemetery-m.svg;}
-area|z17-[landuse=cemetery],
 node|z17-[landuse=cemetery],
 area|z17-[amenity=grave_yard],
 node|z17-[amenity=grave_yard],
-{icon-image: cemetery-m.svg;}
+node|z17-[cemetery=grave],
+area|z17-[cemetery=grave],
+{icon-image: cemetery-m.svg; text: name; text-offset: 1; font-size: 10; text-color: @poi_label;}
 
 /* 	7.5 Pedestrian areas */
 
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 1586a24f35..1085ce173d 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -988,7 +988,7 @@ area|z17-[historic=wayside_shrine],
 node|z17-[historic=archaeological_site],
 area|z17-[historic=archaeological_site],
 node|z17-[amenity=arts_centre],
-area|z17-[amenity=arts_centre]
+area|z17-[amenity=arts_centre],
 {text: name;text-offset: 1;font-size: 10;text-color: @poi_label;text-optional: true;}
 
 node|z12-14[historic=fort],
diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss
index f2d991eb13..bf575738fd 100644
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -113,7 +113,6 @@ line[waterway=riverbank],
 line[waterway=stream],
 line[waterway=canal],
 line[natural=strait],
-line[waterway=lock],
 line[waterway=ditch],
 line[waterway=drain],
 {z-index: 50;}
@@ -328,7 +327,6 @@ line|z10-[waterway=river],
 line|z10-[waterway=riverbank],
 line|z13-[waterway=canal],
 line|z13-[natural=strait],
-line|z16-[waterway=lock],
 {opacity: 1;color: @river;}
 
 /* 6.1 Area water(lake,pond etc.) */
@@ -385,8 +383,6 @@ line|z15-[natural=strait],
 line|z15-[waterway=stream][intermittent=yes]
 {width: 1.4;dashes: 4.95,4.95;}*/
 
-line|z16-[waterway=lock],
-{width: 1.5;}
 node|z16-[waterway=lock_gate],
 {icon-image: dot-m.svg;}
 
@@ -571,8 +567,8 @@ line|z18[man_made=cutline],
 line|z19-[man_made=cutline],
 {width: 6;}
 
-/* 8.2 Building */
 
+/* 8.2 Building */
 
 area|z15[building],
 area|z15[waterway=dam],
@@ -588,25 +584,45 @@ area|z16-[landuse=garages],
 area|z16-[building=train_station],
 {fill-color: @building;fill-opacity: 0.55;casing-width: 1;casing-color: @building_border;}
 
+
 /* 8.3 Barrier */
 
+line|z16-[barrier=city_wall],
+line|z16-[barrier=fence],
+line|z16-[barrier=hedge],
+line|z16-[barrier=retaining_wall],
+line|z16-[barrier=wall],
+line|z16-[historic=citywalls],
+{color: @fence; width: 1.0; dashes: 1.0,1.0; opacity: 0.5;}
 
-
-line|z16[barrier=wall],
-line|z16[barrier=city_wall],
-line|z16[barrier=fence],
-line|z16[barrier=hedge],
-/*line|z16[historic=citywalls],*/
-{width: 0.7;dashes: 0.12,0.12;opacity: 0.5;}
-line|z17-[barrier=wall],
 line|z17-[barrier=city_wall],
 line|z17-[barrier=fence],
 line|z17-[barrier=hedge],
-/*line|z17-[historic=citywalls],*/
-{width: 1.0;dashes: 0.25,0.25;opacity:0.7;}
-line|z18-[barrier=wall],
+line|z17-[barrier=retaining_wall],
+line|z17-[barrier=wall],
+line|z17-[historic=citywalls],
+{width: 1.5; dashes: 2.0,2.0; opacity: 0.7;}
+
 line|z18-[barrier=city_wall],
 line|z18-[barrier=fence],
 line|z18-[barrier=hedge],
-/*line|z18-[historic=citywalls],*/
-{width: 1.4;dashes: 0.3,0.3;}
+line|z18-[barrier=retaining_wall],
+line|z18-[barrier=wall],
+line|z18-[historic=citywalls],
+{width: 2.0; dashes: 2.4,2.4; opacity: 1;}
+
+/* ToDo: Make linear style with small triangles pointing downwards, when drape will be ready */
+line|z16-[natural=cliff],
+line|z16-[natural=earth_bank],
+line|z16-[man_made=embankment],
+{color: @fence; width: 1.0; opacity: 0.5;}
+
+line|z17[natural=cliff],
+line|z17[natural=earth_bank],
+line|z17[man_made=embankment],
+{width: 2.0; opacity: 0.7;}
+
+line|z18-[natural=cliff],
+line|z18-[natural=earth_bank],
+line|z18-[man_made=embankment],
+{width: 3.0; opacity: 1;}
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index afb06f7bbb..11167a013f 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -482,7 +482,7 @@ area|z15[historic=memorial]
 node|z16-[historic=monument],
 area|z16-[historic=monument],
 node|z16-[historic=memorial],
-area|z16-[historic=memorial]
+area|z16-[historic=memorial],
 {icon-image: monument-m.svg;icon-min-distance: 12;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 
 node|z15-[historic=memorial][memorial=plaque],
diff --git a/data/types.txt b/data/types.txt
index 2b1170d6f2..31a9c1e73c 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -465,7 +465,7 @@ mapswithme
 mapswithme
 *piste:type|downhill|expert
 *landuse|salt_pond
-mapswithme
+*cemetery|grave
 *railway|monorail|bridge
 *area:highway|steps
 mapswithme
@@ -495,8 +495,8 @@ mapswithme
 *amenity|parking|park_and_ride
 mapswithme
 mapswithme
-mapswithme
-*waterway|lock
+*natural|water|lock
+waterway|canal
 mapswithme
 mapswithme
 mapswithme
@@ -948,14 +948,14 @@ mapswithme
 *office|estate_agent
 *office|lawyer
 *office
-mapswithme
-mapswithme
+*natural|earth_bank
+*man_made|embankment
 *amenity|ferry_terminal
 *amenity
 *shop|furniture
-mapswithme
+*craft|winery
 *waterway|waterfall
-mapswithme
+*craft|electronics_repair
 mapswithme
 *amenity|casino
 *amenity|brothel
@@ -985,7 +985,7 @@ mapswithme
 *internet_access|wlan
 *amenity|waste_disposal
 *amenity|bbq
-mapswithme
+*craft|sawmill
 route|ferry
 *junction|roundabout
 *highway|speed_camera
@@ -1058,16 +1058,16 @@ route|ferry
 *shop|travel_agency
 *highway|elevator
 *shop|outdoor
-mapswithme
-mapswithme
+*craft|confectionery
+*craft|handicraft
 *shop|dry_cleaning
 *shop|tyres
-mapswithme
+*craft|beekeeper
 *amenity|car_wash
 *amenity|veterinary
 *amenity|charging_station
 *amenity|childcare
-mapswithme
+*craft|blacksmith
 *amenity|bicycle_parking
 *amenity|community_centre
 *amenity|courthouse
diff --git a/data/visibility.txt b/data/visibility.txt
index ed0dac1335..42b4f6300d 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -163,7 +163,7 @@ world  00000000000000000000  +
         gate  00000000000000000000  -
         hedge  00000000000000001111  -
         lift_gate  00000000000000001111  -
-        retaining_wall  00000000000000000000  -
+        retaining_wall  00000000000000001111  -
         stile  00000000000000000000  -
         swing_gate  00000000000000000000  -
         toll_booth  00000000000011111111  -
@@ -199,19 +199,29 @@ world  00000000000000000000  +
         train_station  00000000000011111111  -
         {}
     building:part  00000000000000001111  -
+    cemetery  00000000000000000000  +
+        grave  00000000000000000000  -
+        {}
     complex_entry  00000000000000000000  -
     craft  00000000000000000000  +
+        beekeeper  00000000000000000000  -
+        blacksmith  00000000000000000000  -
         brewery  00000000000000000000  -
         carpenter  00000000000000000000  -
+        confectionery  00000000000000000000  -
         electrician  00000000000000000000  -
+        electronics_repair  00000000000000000000  -
         gardener  00000000000000000000  -
+        handicraft  00000000000000000000  -
         hvac  00000000000000000000  -
         metal_construction  00000000000000000000  -
         painter  00000000000000000000  -
         photographer  00000000000000000000  -
         plumber  00000000000000000000  -
+        sawmill  00000000000000000000  -
         shoemaker  00000000000000000000  -
         tailor  00000000000000000000  -
+        winery  00000000000000000000  -
         {}
     cuisine  00000000000000000000  +
         african  00000000000000000000  -
@@ -456,7 +466,7 @@ world  00000000000000000000  +
             defensive  00000000000011111111  -
             stately  00000000000011111111  -
             {}
-        citywalls  00000000000000000000  -
+        citywalls  00000000000000001111  -
         fort  00000000000011111111  -
         memorial  00000000000000011111  +
             plaque  00000000000000011111  -
@@ -578,6 +588,7 @@ world  00000000000000000000  +
         cairn  00000000000000000000  -
         chimney  00000000000000000000  -
         cutline  00000000000000011111  -
+        embankment  00000000000000001111  -
         flagpole  00000000000000000000  -
         lighthouse  00000000000000000000  -
         mast  00000000000000000000  -
@@ -611,8 +622,9 @@ world  00000000000000000000  +
             {}
         cape  00000000000000111111  -
         cave_entrance  00000000000000000000  -
-        cliff  00000000000000000000  -
+        cliff  00000000000000001111  -
         coastline  11111111111111111111  -
+        earth_bank  00000000000000001111  -
         geyser  00000000000000000000  -
         glacier  11111111111111111111  -
         grassland  00000000000000111111  -
@@ -631,6 +643,7 @@ world  00000000000000000000  +
         water  11111111111111111111  +
             basin  11111111111111111111  -
             lake  11111111111111111111  -
+            lock  11111111111111111111  -
             pond  11111111111111111111  -
             reservoir  11111111111111111111  -
             river  11111111111111111111  -
@@ -981,7 +994,6 @@ world  00000000000000000000  +
         drain  00000000000000000111  +
             tunnel  00000000000000000000  -
             {}
-        lock  00000000000000001111  -
         lock_gate  00000000000000001111  -
         river  00000000001111111111  +
             tunnel  00000000000111111111  -
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index bdb8b6a775..dfa17790da 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -1414,9 +1414,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Cliff)
 
     auto const params = GetFeatureBuilderParams(tags);
 
-    /// @todo natural=cliff is not drawable now ..
-    TEST_EQUAL(params.m_types.size(), 0, (params));
-    //TEST(params.IsTypeExist(GetType({"natural", "cliff"})), (params));
+    TEST(params.IsTypeExist(GetType({"natural", "cliff"})), (params));
   }
 }
 
@@ -1664,17 +1662,25 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"boundary", "national_park"},
     {"building", "has_parts"},
     {"building", "train_station"},
+    {"cemetery", "grave"},
+    {"craft", "beekeeper"},
+    {"craft", "blacksmith"},
     {"craft", "brewery"},
     {"craft", "carpenter"},
+    {"craft", "confectionery"},
     {"craft", "electrician"},
+    {"craft", "electronics_repair"},
     {"craft", "gardener"},
+    {"craft", "handicraft"},
     {"craft", "hvac"},
     {"craft", "metal_construction"},
     {"craft", "painter"},
     {"craft", "photographer"},
     {"craft", "plumber"},
+    {"craft", "sawmill"},
     {"craft", "shoemaker"},
     {"craft", "tailor"},
+    {"craft", "winery"},
     {"cuisine", "african"},
     {"cuisine", "american"},
     {"cuisine", "arab"},
@@ -1867,6 +1873,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"man_made", "breakwater"},
     {"man_made", "chimney"},
     {"man_made", "cutline"},
+    {"man_made", "embankment"},
     {"man_made", "lighthouse"},
     {"man_made", "survey_point"},
     {"man_made", "pier"},
@@ -1880,7 +1887,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"natural", "beach"},
     {"natural", "cape"},
     {"natural", "cave_entrance"},
+    {"natural", "cliff"},
     {"natural", "coastline"},
+    {"natural", "earth_bank"},
     {"natural", "geyser"},
     {"natural", "glacier"},
     {"natural", "grassland"},
@@ -2066,7 +2075,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"waterway", "ditch"},
     {"waterway", "dock"},
     {"waterway", "drain"},
-    {"waterway", "lock"},
     {"waterway", "lock_gate"},
     {"waterway", "river"},
     {"waterway", "riverbank"},
@@ -2296,6 +2304,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
     {{"natural", "water", "reservoir"}, {{"natural", "water"}, {"water", "reservoir"}}},
     {{"natural", "water", "river"}, {{"natural", "water"}, {"water", "river"}}},
     {{"natural", "water", "basin"}, {{"natural", "water"}, {"water", "basin"}}},
+    {{"natural", "water", "lock"}, {{"natural", "water"}, {"water", "lock"}}},
     {{"natural", "wetland", "bog"}, {{"natural", "wetland"}, {"wetland", "bog"}}},
     {{"natural", "wetland", "marsh"}, {{"natural", "wetland"}, {"wetland", "marsh"}}},
     {{"office"}, {{"office", "any_value"}}},
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index 72d34a90af..3d80b56235 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "ﺮﻴﻄﺧ";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "مصنع جعة";
 
 "type.craft.carpenter" = "نجار";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "كهربائي";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "مهندس مناظر";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "تكييف";
 
 "type.craft.metal_construction" = "عامل معادن";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "سمكري";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "تصليح الاحذية";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "خياط";
 
 "type.cuisine.african" = "مطبخ أفريقي";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "بحيرة";
 
+"type.natural.water.lock" = "ﻞﻔﻘﻟﺍ ﺔﻓﺮﻏ";
+
 "type.natural.water.pond" = "بركة";
 
 "type.natural.water.reservoir" = "خزان";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "بوابة هويس";
 
 "type.waterway.river" = "نهر";
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index 3407e24a60..d1fddf6025 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Магіла";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Craft Brewery";
 
 "type.craft.carpenter" = "Carpenter";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Electrician";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Gardener";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Hvac";
 
 "type.craft.metal_construction" = "Металаканструкцыі";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Plumber";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Shoe Repair";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Tailor";
 
 "type.cuisine.african" = "African";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lake";
 
+"type.natural.water.lock" = "Шлюзавая камера";
+
 "type.natural.water.pond" = "Сажалка";
 
 "type.natural.water.reservoir" = "Вадасховішча";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Lock Gate";
 
 "type.waterway.river" = "Рака";
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index c3dd6b2531..b8b93fa8e9 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Гроб";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Craft Brewery";
 
 "type.craft.carpenter" = "Carpenter";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Electrician";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Gardener";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Hvac";
 
 "type.craft.metal_construction" = "Метални конструкции";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Plumber";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Shoe Repair";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Tailor";
 
 "type.cuisine.african" = "African";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lake";
 
+"type.natural.water.lock" = "Заключваща камера";
+
 "type.natural.water.pond" = "Pond";
 
 "type.natural.water.reservoir" = "Резервоар";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Lock Gate";
 
 "type.waterway.river" = "River";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 6d3319ac04..0e1d0a5606 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Hrob";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Pivovar";
 
 "type.craft.carpenter" = "Truhlář";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elektrikář";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Zahradník";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "HVAC";
 
 "type.craft.metal_construction" = "Kovodílna";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Instalatér";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Opravna obuvi";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Krejčí";
 
 "type.cuisine.african" = "Africká kuchyně";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Jezero";
 
+"type.natural.water.lock" = "Zámková komora";
+
 "type.natural.water.pond" = "Rybník";
 
 "type.natural.water.reservoir" = "Nádrž";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Stavidlo";
 
 "type.waterway.river" = "Řeka";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index a661d9fdf2..61bdd609ae 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Grav";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Bryggeri";
 
 "type.craft.carpenter" = "Tømrer";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elektriker";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Gartner";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Blikkenslager";
 
 "type.craft.metal_construction" = "Metalarbejder";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "VVS-mand";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Skomager";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Skrædder";
 
 "type.cuisine.african" = "Afrikansk";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Sø";
 
+"type.natural.water.lock" = "Låsekammer";
+
 "type.natural.water.pond" = "Dam";
 
 "type.natural.water.reservoir" = "Reservoir";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Låseport";
 
 "type.waterway.river" = "Flod";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 40b4505124..a347ef7d7f 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Grab";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Brauerei";
 
 "type.craft.carpenter" = "Zimmermann";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elektriker";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Landschaftsgärtner";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Heizung";
 
 "type.craft.metal_construction" = "Schlosser";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Installateur";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Schuhmacher";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Schneider";
 
 "type.cuisine.african" = "Afrikanische Küche";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "See";
 
+"type.natural.water.lock" = "Schleusenkammer";
+
 "type.natural.water.pond" = "Teich";
 
 "type.natural.water.reservoir" = "Reservoir";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Abfluss";
 
-"type.waterway.lock" = "Schleuse";
-
 "type.waterway.lock_gate" = "Schleusentor";
 
 "type.waterway.river" = "Fluss";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 3342b32d47..96e575ff53 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Τάφος";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Ζυθοποιείο";
 
 "type.craft.carpenter" = "Ξυλουργός";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Ηλεκτρολόγος";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Κηπουρός";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Ψυκτικός";
 
 "type.craft.metal_construction" = "Μεταλλουργός";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Υδραυλικός";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Υποδηματοποιός";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Ράφτης";
 
 "type.cuisine.african" = "Αφρικανική";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Λίμνη";
 
+"type.natural.water.lock" = "Θάλαμος κλειδαριάς";
+
 "type.natural.water.pond" = "Δεξαμενή";
 
 "type.natural.water.reservoir" = "Δεξαμενή";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Φράγμα";
 
 "type.waterway.river" = "Ποταμός";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 2a133f1ce7..0d289aaf32 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Grave";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Craft Brewery";
 
 "type.craft.carpenter" = "Carpenter";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Electrician";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Gardener";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Hvac";
 
 "type.craft.metal_construction" = "Metal Worker";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Plumber";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Shoe Repair";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Tailor";
 
 "type.cuisine.african" = "African";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lake";
 
+"type.natural.water.lock" = "Lock Chamber";
+
 "type.natural.water.pond" = "Pond";
 
 "type.natural.water.reservoir" = "Reservoir";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Lock Gate";
 
 "type.waterway.river" = "River";
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index 15105ce892..b873665ad7 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Grave";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Craft Brewery";
 
 "type.craft.carpenter" = "Carpenter";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Electrician";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Gardener";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Hvac";
 
 "type.craft.metal_construction" = "Metal Worker";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Plumber";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Shoe Repair";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Tailor";
 
 "type.cuisine.african" = "African";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lake";
 
+"type.natural.water.lock" = "Lock Chamber";
+
 "type.natural.water.pond" = "Pond";
 
 "type.natural.water.reservoir" = "Reservoir";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Lock Gate";
 
 "type.waterway.river" = "River";
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index b0878c1ccc..9378934609 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Almacén";
 
+"type.cemetery.grave" = "Tumba";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Fábrica de cerveza";
 
 "type.craft.carpenter" = "Carpintero";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Electricista";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Paisajista";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Aire acondicionado";
 
 "type.craft.metal_construction" = "Trabajador del metal";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Fontanero";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Zapatero";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Sastre";
 
 "type.cuisine.african" = "Cocina africana";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lago";
 
+"type.natural.water.lock" = "Cámara de bloqueo";
+
 "type.natural.water.pond" = "Estanque";
 
 "type.natural.water.reservoir" = "Embalse";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Compuerta";
 
 "type.waterway.river" = "Río";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 05187e4f6b..c2903350f4 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Almacén";
 
+"type.cemetery.grave" = "Tumba";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Fábrica de cerveza";
 
 "type.craft.carpenter" = "Carpintero";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Electricista";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Paisajista";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Aire acondicionado";
 
 "type.craft.metal_construction" = "Trabajador del metal";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Fontanero";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Zapatero";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Sastre";
 
 "type.cuisine.african" = "Cocina africana";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lago";
 
+"type.natural.water.lock" = "Cámara de bloqueo";
+
 "type.natural.water.pond" = "Estanque";
 
 "type.natural.water.reservoir" = "Embalse";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Compuerta";
 
 "type.waterway.river" = "Río";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index 0d98d2469f..d1404c3813 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Denda";
 
+"type.cemetery.grave" = "Hilobia";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Garagardo fabrika";
 
 "type.craft.carpenter" = "Arotza";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elektrizista teknikaria";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Paisaia";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Aire girotua";
 
 "type.craft.metal_construction" = "Metalgintzako langilea";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Iturgina";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Zapataria";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Jostun";
 
 "type.cuisine.african" = "Afrikako sukaldaritza";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lakua";
 
+"type.natural.water.lock" = "Sarraila Ganbera";
+
 "type.natural.water.pond" = "Urmaela";
 
 "type.natural.water.reservoir" = "Urtegia";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Atea";
 
 "type.waterway.river" = "Ibai";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 9540887636..27ad60914b 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "ﺮﺒﻗ";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "کارخانه ابجوسازی";
 
 "type.craft.carpenter" = "نجار";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "برق کار";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "باغبان";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Hvac";
 
 "type.craft.metal_construction" = "اهن کار";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "لوله کش";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "کفاش";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "خیاطی";
 
 "type.cuisine.african" = "African";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "دریاچه";
 
+"type.natural.water.lock" = "ﻞﻔﻗ ﻕﺎﺗﺍ";
+
 "type.natural.water.pond" = "تالاب";
 
 "type.natural.water.reservoir" = "مخزن";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Lock Gate";
 
 "type.waterway.river" = "رودخانه";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 88800c48ba..3d2f8d1e85 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Hauta";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Panimo";
 
 "type.craft.carpenter" = "Puuseppä";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Sähkömies";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Puutarhuri";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Ilmastointilaite";
 
 "type.craft.metal_construction" = "Metallimies";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Putkimies";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Suutari";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Räätäli";
 
 "type.cuisine.african" = "Afrikkalainen keittiö";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Järvi";
 
+"type.natural.water.lock" = "Lukko kammio";
+
 "type.natural.water.pond" = "Lampi";
 
 "type.natural.water.reservoir" = "Säiliö";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Kanavasulku";
 
 "type.waterway.river" = "Joki";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 6837c9d66e..ccc0a445b9 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Entrepôt";
 
+"type.cemetery.grave" = "La tombe";
+
 "type.craft" = "Artisanat";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Brasserie artisanale";
 
 "type.craft.carpenter" = "Charpentier";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Électricien";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Paysagiste";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Climatiseur";
 
 "type.craft.metal_construction" = "Métallo";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Plombier";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Cordonnier";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Tailleur";
 
 "type.cuisine.african" = "Cuisine africaine";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lac";
 
+"type.natural.water.lock" = "Chambre de verrouillage";
+
 "type.natural.water.pond" = "Étang";
 
 "type.natural.water.reservoir" = "Réservoir";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Écluse";
-
 "type.waterway.lock_gate" = "Porte d'écluse";
 
 "type.waterway.river" = "Rivière";
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index 529a4c77e4..95d699bb76 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "רבק";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Craft Brewery";
 
 "type.craft.carpenter" = "Carpenter";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Electrician";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Gardener";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Hvac";
 
 "type.craft.metal_construction" = "Metal Worker";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Plumber";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Shoe Repair";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Tailor";
 
 "type.cuisine.african" = "מטבח אפריקאי";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lake";
 
+"type.natural.water.lock" = "לוענמ את";
+
 "type.natural.water.pond" = "Pond";
 
 "type.natural.water.reservoir" = "מאגר";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Lock Gate";
 
 "type.waterway.river" = "River";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index c892401379..5b6bcca806 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Sír";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Sörfőzde";
 
 "type.craft.carpenter" = "Ács";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Villanyszerelő";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Kertész";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Hűtés-fűtés szerelő";
 
 "type.craft.metal_construction" = "Lakatos";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Vízvezeték-szerelő";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Cipész";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Szabó";
 
 "type.cuisine.african" = "Afrikai konyha";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Tó";
 
+"type.natural.water.lock" = "Zsilipkamra";
+
 "type.natural.water.pond" = "Tavacska";
 
 "type.natural.water.reservoir" = "Rezervoár";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Zsilip";
 
 "type.waterway.river" = "Folyó";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index f19449f82f..264ddd7e5b 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Kuburan";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Toko minuman";
 
 "type.craft.carpenter" = "Tukang kayu";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Tukang listrik";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Tukang kebun";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Hvac";
 
 "type.craft.metal_construction" = "Tukang besi";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Tukang pipa";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Tukang sepatu";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Tukang jahit";
 
 "type.cuisine.african" = "Masakan afrika";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Danau";
 
+"type.natural.water.lock" = "Ruang Kunci";
+
 "type.natural.water.pond" = "Kolam";
 
 "type.natural.water.reservoir" = "Waduk";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Gerbang pengunci";
 
 "type.waterway.river" = "Sungai";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 1c896fd872..059de12e05 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "La tomba";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Birrificio";
 
 "type.craft.carpenter" = "Falegname";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elettricista";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Giardiniere";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Impianti HVAC";
 
 "type.craft.metal_construction" = "Fabbro";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Idraulico";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Calzolaio";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Sarto";
 
 "type.cuisine.african" = "Cucina africana";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lago";
 
+"type.natural.water.lock" = "Camera di blocco";
+
 "type.natural.water.pond" = "Stagno";
 
 "type.natural.water.reservoir" = "Serbatoio";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Sbarramento";
 
 "type.waterway.river" = "Fiume";
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index e73f6714d5..a87f6961b6 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "墓";
+
 "type.craft" = "工房";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "醸造所";
 
 "type.craft.carpenter" = "大工";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "電気技師";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "造園家";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "冷暖房空調";
 
 "type.craft.metal_construction" = "金属工";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "配管工";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "靴修理";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "仕立て屋";
 
 "type.cuisine.african" = "アフリカ料理";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "湖";
 
+"type.natural.water.lock" = "ロックチャンバー";
+
 "type.natural.water.pond" = "池";
 
 "type.natural.water.reservoir" = "貯水池";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "用水路";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "水門";
 
 "type.waterway.river" = "河川";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 7ef5c0bc51..c444dea004 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "무덤";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "양조장";
 
 "type.craft.carpenter" = "목수";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "전기기술자";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "조경사";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "냉난방기";
 
 "type.craft.metal_construction" = "금속공";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "배관공";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "구두수선";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "양복점";
 
 "type.cuisine.african" = "아프리카식 음식";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "호수";
 
+"type.natural.water.lock" = "잠금 챔버";
+
 "type.natural.water.pond" = "연못이";
 
 "type.natural.water.reservoir" = "저수지";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "수문";
 
 "type.waterway.river" = "강";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 83c7b990d7..aa9bd2581c 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Grav";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Bryggeri";
 
 "type.craft.carpenter" = "Snekker";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elektriker";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Anleggsgartner";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Klimaanlegg";
 
 "type.craft.metal_construction" = "Metallarbeider";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Rørlegger";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Skoreparasjon";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Skredder";
 
 "type.cuisine.african" = "Afrikansk mat";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Innsjø";
 
+"type.natural.water.lock" = "Låsekammer";
+
 "type.natural.water.pond" = "Dam";
 
 "type.natural.water.reservoir" = "Reservoar";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Sluseport";
 
 "type.waterway.river" = "Elv";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index ff1599f33f..c96ad37875 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Graf";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Brouwerij";
 
 "type.craft.carpenter" = "Timmerman";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elektricien";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Tuinarchitect";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Airconditioning";
 
 "type.craft.metal_construction" = "Metaalarbeider";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Loodgieter";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Schoenmaker";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Kleermaker";
 
 "type.cuisine.african" = "Afrikaans";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Meer";
 
+"type.natural.water.lock" = "Slotkamer";
+
 "type.natural.water.pond" = "Plas";
 
 "type.natural.water.reservoir" = "Reservoir";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Gesloten poort";
 
 "type.waterway.river" = "Rivier";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index de2d5ea62d..5d8603ae0e 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Mogiła";
+
 "type.craft" = "Rzemiosło";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Browar";
 
 "type.craft.carpenter" = "Stolarz";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elektryk";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Ogrodnik";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Klimatyzacja";
 
 "type.craft.metal_construction" = "Ślusarz, obrabiacz metalu";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Hydraulik";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Szewc";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Krawiec";
 
 "type.cuisine.african" = "Kuchnia afrykańska";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Jezioro";
 
+"type.natural.water.lock" = "Komora zamka";
+
 "type.natural.water.pond" = "Staw";
 
 "type.natural.water.reservoir" = "Zbiornik";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Wrota śluzy";
 
 "type.waterway.river" = "Rzeka";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index b09de541ac..ce80ad7e2c 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Armazém";
 
+"type.cemetery.grave" = "Túmulo";
+
 "type.craft" = "Ofícios";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Cervejaria artesanal";
 
 "type.craft.carpenter" = "Carpinteiro";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Eletricista";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Jardineiro";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Ar-condicionado";
 
 "type.craft.metal_construction" = "Serralheiro metálico";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Encanador";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Sapateiro";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Alfaiate";
 
 "type.cuisine.african" = "Cozinha africana";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lago";
 
+"type.natural.water.lock" = "Câmara de Bloqueio";
+
 "type.natural.water.pond" = "Lagoa";
 
 "type.natural.water.reservoir" = "Reservatório";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Valeta de drenagem";
 
-"type.waterway.lock" = "Eclusa";
-
 "type.waterway.lock_gate" = "Comporta de eclusa";
 
 "type.waterway.river" = "Rio";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index da9ffeee47..08899cd1ee 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Armazém";
 
+"type.cemetery.grave" = "Túmulo";
+
 "type.craft" = "Ofícios";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Cervejaria artesanal";
 
 "type.craft.carpenter" = "Carpinteiro";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Eletricista";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Jardineiro";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Instalador de ar-condicionado";
 
 "type.craft.metal_construction" = "Serralheiro metálico";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Picheleiro";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Sapateiro";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Alfaiate";
 
 "type.cuisine.african" = "Cozinha africana";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lago";
 
+"type.natural.water.lock" = "Câmara de Bloqueio";
+
 "type.natural.water.pond" = "Lagoa";
 
 "type.natural.water.reservoir" = "Reservatório";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Valeta de drenagem";
 
-"type.waterway.lock" = "Eclusa";
-
 "type.waterway.lock_gate" = "Comporta de eclusa";
 
 "type.waterway.river" = "Rio";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 7b09b01077..7484eeb853 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Mormânt";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Berărie";
 
 "type.craft.carpenter" = "Tâmplar";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Electrician";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Peisagist";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Hvac";
 
 "type.craft.metal_construction" = "Metalurgist";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Instalator";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Reparații încălțăminte";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Croitor";
 
 "type.cuisine.african" = "Bucătărie african";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lac";
 
+"type.natural.water.lock" = "Camera de blocare";
+
 "type.natural.water.pond" = "Heleșteu";
 
 "type.natural.water.reservoir" = "Rezervor";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Ecluză";
 
 "type.waterway.river" = "Râu";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 940b138ee1..f138042eed 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Склад";
 
+"type.cemetery.grave" = "Могила";
+
 "type.craft" = "Мастерская";
 
+"type.craft.beekeeper" = "Пчеловод";
+
+"type.craft.blacksmith" = "Кузнец";
+
 "type.craft.brewery" = "Крафтовое пиво";
 
 "type.craft.carpenter" = "Столяр";
 
+"type.craft.confectionery" = "Кондитер";
+
 "type.craft.electrician" = "Электрик";
 
+"type.craft.electronics_repair" = "Ремонт электроники";
+
 "type.craft.gardener" = "Садовник";
 
+"type.craft.handicraft" = "Декоративный мастер";
+
 "type.craft.hvac" = "Кондиционеры";
 
 "type.craft.metal_construction" = "Металлоконструкции";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Сантехник";
 
+"type.craft.sawmill" = "Лесопилка";
+
 "type.craft.shoemaker" = "Ремонт обуви";
 
+"type.craft.winery" = "Винодельня";
+
 "type.craft.tailor" = "Ателье";
 
 "type.cuisine.african" = "Африканская кухня";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Озеро";
 
+"type.natural.water.lock" = "Шлюзовая камера";
+
 "type.natural.water.pond" = "Пруд";
 
 "type.natural.water.reservoir" = "Водохранилище";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Водоотвод";
 
-"type.waterway.lock" = "Шлюз";
-
 "type.waterway.lock_gate" = "Шлюз";
 
 "type.waterway.river" = "Река";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index 4e192edbde..aa790474c9 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Hrob";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Pivovar";
 
 "type.craft.carpenter" = "Tesár";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elektrikár";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Záhradníctvo";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Vzduchotechnika";
 
 "type.craft.metal_construction" = "Kovorobotník";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Klampiarstvo";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Oprava obuvy";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Krajčírstvo";
 
 "type.cuisine.african" = "Africká kuchyňa";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Jazero";
 
+"type.natural.water.lock" = "Uzamykacia komora";
+
 "type.natural.water.pond" = "Rybník";
 
 "type.natural.water.reservoir" = "Nádrž";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Stavidlo";
 
 "type.waterway.river" = "Rieka";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 3a3fe14067..97a6a91a13 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Grav";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Bryggeri";
 
 "type.craft.carpenter" = "Snickare";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elektriker";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Trädgårdsmästare";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Vvs";
 
 "type.craft.metal_construction" = "Metallarbetare";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Vvs-montör";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Skomakare";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Skräddare";
 
 "type.cuisine.african" = "Afrikansk mat";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Sjö";
 
+"type.natural.water.lock" = "Låskammare";
+
 "type.natural.water.pond" = "Damm";
 
 "type.natural.water.reservoir" = "Reservoar";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Slussport";
 
 "type.waterway.river" = "Flod";
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index 6c66e7c5c9..339245793d 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Kaburi";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Craft Brewery";
 
 "type.craft.carpenter" = "Carpenter";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Electrician";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Gardener";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Hvac";
 
 "type.craft.metal_construction" = "Metal Worker";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Plumber";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Shoe Repair";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Tailor";
 
 "type.cuisine.african" = "African";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Lake";
 
+"type.natural.water.lock" = "Chumba cha kufuli";
+
 "type.natural.water.pond" = "Pond";
 
 "type.natural.water.reservoir" = "Hifadhi";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Lock Gate";
 
 "type.waterway.river" = "River";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index af2c584f14..47022e80b0 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "หลุมฝังศพ";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "โรงเบียร์";
 
 "type.craft.carpenter" = "ช่างไม้";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "ช่างไฟฟ้า";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "คนจัดสวน";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "ระบบปรับอากาศ";
 
 "type.craft.metal_construction" = "ช่างเหล็ก";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "ช่างประปา";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "ช่างซ่อมรองเท้า";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "ช่างตัดเสื้อ";
 
 "type.cuisine.african" = "อาหารแอฟริกัน";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "ทะเลสาบ";
 
+"type.natural.water.lock" = "ห้องล็อค";
+
 "type.natural.water.pond" = "บ่อ";
 
 "type.natural.water.reservoir" = "อ่างเก็บน้ำ";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "ประตูระบายน้ำ";
 
 "type.waterway.river" = "แม่น้ำ";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index 39092677bb..6d9c857825 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Depo";
 
+"type.cemetery.grave" = "Mezar";
+
 "type.craft" = "Zanaat";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Bira Fabrikası";
 
 "type.craft.carpenter" = "Marangoz";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Elektrikçi";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Bahçe Düzenleyici";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Klimacı";
 
 "type.craft.metal_construction" = "Dökümcü";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Tesisatçı";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Ayakkabı Tamircisi";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Terzi";
 
 "type.cuisine.african" = "Afrika mutfağı";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Göl";
 
+"type.natural.water.lock" = "Kilit Odası";
+
 "type.natural.water.pond" = "Gölet";
 
 "type.natural.water.reservoir" = "Rezervuar";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Lağım";
 
-"type.waterway.lock" = "Kanal Havuzu";
-
 "type.waterway.lock_gate" = "Kilit Kapısı";
 
 "type.waterway.river" = "Nehir";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 438848570e..f08f5f2c76 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Склад";
 
+"type.cemetery.grave" = "Могила";
+
 "type.craft" = "Майстерня";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Пивоварня";
 
 "type.craft.carpenter" = "Столяр";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Електрик";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Садівник";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Кондиціонери";
 
 "type.craft.metal_construction" = "Металоконструкції";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Сантехнік";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Ремонт взуття";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Ательє";
 
 "type.cuisine.african" = "Африканська кухня";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Озеро";
 
+"type.natural.water.lock" = "Замкова камера";
+
 "type.natural.water.pond" = "Ставок";
 
 "type.natural.water.reservoir" = "Водосховище";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Водовiдвiд";
 
-"type.waterway.lock" = "Шлюз";
-
 "type.waterway.lock_gate" = "Шлюз";
 
 "type.waterway.river" = "Річка";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 9717dc0255..28e1404c77 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "Phần mộ";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "Nhà máy bia";
 
 "type.craft.carpenter" = "Thợ mộc";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "Thợ điện";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "Người thiết kế và xây dựng cảnh quan";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "Điều hòa nhiệt độ";
 
 "type.craft.metal_construction" = "Nhà kim khí";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "Thợ đường ống";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "Sửa giày";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "Thợ may";
 
 "type.cuisine.african" = "Ẩm thực châu phi";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "Hồ";
 
+"type.natural.water.lock" = "Khoang khóa";
+
 "type.natural.water.pond" = "Ao";
 
 "type.natural.water.reservoir" = "Hồ chứa";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "Cổng Khóa";
 
 "type.waterway.river" = "Sông";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index ab5afb876b..4e12a1d461 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "仓库";
 
+"type.cemetery.grave" = "墓穴";
+
 "type.craft" = "工艺作坊";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "酿酒厂";
 
 "type.craft.carpenter" = "木匠";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "电工";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "园艺工";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "暖通工程师";
 
 "type.craft.metal_construction" = "金属制造工";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "管道工";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "鞋匠";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "裁缝";
 
 "type.cuisine.african" = "非洲菜";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "湖";
 
+"type.natural.water.lock" = "锁室";
+
 "type.natural.water.pond" = "池塘";
 
 "type.natural.water.reservoir" = "水库";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "渠";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "闸门";
 
 "type.waterway.river" = "河流";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index dc332c614e..2463152f1e 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -1569,16 +1569,28 @@
 
 "type.building.warehouse" = "Warehouse";
 
+"type.cemetery.grave" = "墓穴";
+
 "type.craft" = "Craft";
 
+"type.craft.beekeeper" = "beekeeper";
+
+"type.craft.blacksmith" = "Blacksmith";
+
 "type.craft.brewery" = "釀酒廠";
 
 "type.craft.carpenter" = "木工";
 
+"type.craft.confectionery" = "Confectionery";
+
 "type.craft.electrician" = "電工";
 
+"type.craft.electronics_repair" = "Electronics repair";
+
 "type.craft.gardener" = "園藝師";
 
+"type.craft.handicraft" = "Handicraft";
+
 "type.craft.hvac" = "空調設備";
 
 "type.craft.metal_construction" = "鐵工";
@@ -1589,8 +1601,12 @@
 
 "type.craft.plumber" = "水管工人";
 
+"type.craft.sawmill" = "Sawmill";
+
 "type.craft.shoemaker" = "修鞋工";
 
+"type.craft.winery" = "Winery";
+
 "type.craft.tailor" = "裁縫師";
 
 "type.cuisine.african" = "非洲料理";
@@ -2377,6 +2393,8 @@
 
 "type.natural.water.lake" = "湖泊";
 
+"type.natural.water.lock" = "鎖室";
+
 "type.natural.water.pond" = "潭";
 
 "type.natural.water.reservoir" = "水庫";
@@ -2955,8 +2973,6 @@
 
 "type.waterway.drain.tunnel" = "Drain";
 
-"type.waterway.lock" = "Waterway Lock";
-
 "type.waterway.lock_gate" = "閘門";
 
 "type.waterway.river" = "河流";
diff --git a/search/search_integration_tests/smoke_test.cpp b/search/search_integration_tests/smoke_test.cpp
index a62a19f255..cf187cde85 100644
--- a/search/search_integration_tests/smoke_test.cpp
+++ b/search/search_integration_tests/smoke_test.cpp
@@ -117,8 +117,11 @@ UNIT_CLASS_TEST(SmokeTest, Smoke)
 
   SetViewport(m2::RectD(m2::PointD(0, 0), m2::PointD(100, 100)));
   {
-    Rules rules = {ExactMatch(id, wineShop)};
-    TEST(ResultsMatch("wine ", rules), ());
+    Rules rules = {ExactMatch(id, tequilaShop)};
+    /// @todo Passing "wine" will interpret request as "categorial" only
+    /// (see IsCategorialRequest() after adding craft-winery category).
+    /// Should avoid this strange logic in search core and pass "categorial" request flag via input SearchParams.
+    TEST(ResultsMatch("tequila ", rules), ());
   }
 
   {
diff --git a/tools/kothic b/tools/kothic
index 89b59de837..d6a507cfc0 160000
--- a/tools/kothic
+++ b/tools/kothic
@@ -1 +1 @@
-Subproject commit 89b59de837d5751c3247cd20a803b55a7b320f05
+Subproject commit d6a507cfc09638d489588f2cbd32569f34004318