From 2f92e1345032e9747fde8d27ea016a74d3a18ad1 Mon Sep 17 00:00:00 2001
From: Emux <devemux86@gmail.com>
Date: Tue, 11 Mar 2025 09:47:53 +0200
Subject: [PATCH] Biker map theme improvements, #1192

---
 vtm-themes/resources/assets/vtm/biker.xml | 1621 ++++++++++++++-------
 1 file changed, 1084 insertions(+), 537 deletions(-)

diff --git a/vtm-themes/resources/assets/vtm/biker.xml b/vtm-themes/resources/assets/vtm/biker.xml
index c8a50f882..6c4da7c09 100644
--- a/vtm-themes/resources/assets/vtm/biker.xml
+++ b/vtm-themes/resources/assets/vtm/biker.xml
@@ -2,12 +2,16 @@
 <rendertheme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" map-background="#d8dbcb"
     version="1" xmlns="http://opensciencemap.org/rendertheme"
     xsi:schemaLocation="http://opensciencemap.org/rendertheme https://raw.githubusercontent.com/mapsforge/vtm/master/resources/rendertheme.xsd">
+	
+    <!-- This is the 2nd generation OpenGL/VTM "Biker" theme -->
+    <!-- Version 2.0 10th March 2025-->
 
-    <!-- Styles -->
+    <!-- Defines LAYERS Menu -->
     <stylemenu defaultlang="en" defaultvalue="normal" id="menu">
         <layer id="accommodation">
             <name lang="ar" value="أماكن إقامة" />
             <name lang="ca" value="Allotjament" />
+            <name lang="cs" value="Ubytování" />
             <name lang="de" value="Unterkunft" />
             <name lang="el" value="Διαμονή" />
             <name lang="en" value="Accommodation" />
@@ -17,39 +21,77 @@
             <name lang="ko" value="숙소" />
             <name lang="nl" value="Onderkomen" />
             <name lang="pl" value="Zakwaterowanie" />
+            <name lang="zh" value="住宿" />
             <cat id="accommodation" />
         </layer>
+        <layer id="money">
+            <name lang="ar" value="البنوك وأجهزة الصراف الآلي" />
+            <name lang="ca" value="Bancs i caixers automàtics" />
+            <name lang="cs" value="Banky a bankomaty" />
+            <name lang="de" value="Banken und Geldautomaten" />
+            <name lang="el" value="Τράπεζες και ΑΤΜ" />
+            <name lang="en" value="Banks and ATM" />
+            <name lang="es" value="Bancos y cajeros automáticos" />
+            <name lang="fr" value="Banques et distributeurs automatiques de billets" />
+            <name lang="it" value="Banche e bancomat" />
+            <name lang="ko" value="은행 및 ATM" />
+            <name lang="nl" value="Banken en geldautomaten" />
+            <name lang="pl" value="Banki i bankomaty" />
+            <name lang="zh" value="银行和 ATM" />
+            <cat id="money" />
+        </layer>
+        <layer id="entertainment">
+            <name lang="ar" value="ترفيه" />
+            <name lang="ca" value="Entreteniment" />
+            <name lang="cs" value="Zábava" />
+            <name lang="de" value="Unterhaltung" />
+            <name lang="el" value="Ψυχαγωγία" />
+            <name lang="en" value="Entertainment" />
+            <name lang="es" value="Entretenimiento" />
+            <name lang="fr" value="Divertissement" />
+            <name lang="it" value="Divertimento" />
+            <name lang="ko" value="오락" />
+            <name lang="nl" value="Vermaak" />
+            <name lang="pl" value="Rozrywka" />
+            <name lang="zh" value="娱乐" />
+            <cat id="entertainment" />
+        </layer>
         <layer id="food">
-            <name lang="ar" value="طعام" />
-            <name lang="ca" value="Menjar" />
-            <name lang="de" value="Speisen" />
-            <name lang="el" value="Φαγητό" />
-            <name lang="en" value="Food" />
-            <name lang="es" value="Alimentación" />
-            <name lang="fr" value="Alimentation" />
-            <name lang="it" value="Alimentari" />
-            <name lang="ko" value="음식" />
-            <name lang="nl" value="Eten" />
-            <name lang="pl" value="Wyżywienie" />
+            <name lang="ar" value="الطعام والشراب" />
+            <name lang="ca" value="Menjar i beure" />
+            <name lang="cs" value="Jídlo a nápoje" />
+            <name lang="de" value="Essen und Trinken" />
+            <name lang="el" value="Φαγητό και ποτό" />
+            <name lang="en" value="Food and drink" />
+            <name lang="es" value="Comida y bebida" />
+            <name lang="fr" value="Nourriture et boisson" />
+            <name lang="it" value="Cibo e bevande" />
+            <name lang="ko" value="주식" />
+            <name lang="nl" value="Eten en drinken" />
+            <name lang="pl" value="Jedzenie i picie" />
+            <name lang="zh" value="餐饮" />
             <cat id="food" />
         </layer>
-        <layer id="health">
-            <name lang="ar" value="رعاية صحية" />
-            <name lang="ca" value="Salut" />
-            <name lang="de" value="Gesundheit" />
-            <name lang="el" value="Υγεία" />
-            <name lang="en" value="Health" />
-            <name lang="es" value="Salud" />
-            <name lang="fr" value="Santé" />
-            <name lang="it" value="Sanità" />
-            <name lang="ko" value="보건소" />
-            <name lang="nl" value="Gezondheid" />
-            <name lang="pl" value="Zdrowie" />
-            <cat id="health" />
+        <layer id="emergency">
+            <name lang="ar" value="خدمات الطوارئ" />
+            <name lang="ca" value="Serveis d'emergència" />
+            <name lang="cs" value="Pohotovostní služby" />
+            <name lang="de" value="Gesundheit und Notdienste" />
+            <name lang="el" value="Υπηρεσίες έκτακτης ανάγκης" />
+            <name lang="en" value="Emergency services" />
+            <name lang="es" value="Servicios de emergencia" />
+            <name lang="fr" value="Services d'urgence" />
+            <name lang="it" value="Servizi di emergenza" />
+            <name lang="ko" value="응급 서비스" />
+            <name lang="nl" value="Hulpdiensten" />
+            <name lang="pl" value="Służby ratunkowe" />
+            <name lang="zh" value="紧急服务" />
+            <cat id="emergency" />
         </layer>
         <layer id="fuel">
             <name lang="ar" value="محطات وقود" />
             <name lang="ca" value="Benzineres" />
+            <name lang="cs" value="Čerpací stanice" />
             <name lang="de" value="Tankstellen" />
             <name lang="el" value="Πρατήρια καυσίμων" />
             <name lang="en" value="Fuel stations" />
@@ -59,11 +101,13 @@
             <name lang="ko" value="주유소" />
             <name lang="nl" value="Tankstations" />
             <name lang="pl" value="Stacje paliw" />
+            <name lang="zh" value="加油站" />
             <cat id="fuel" />
         </layer>
         <layer id="charging_station">
             <name lang="ar" value="محطات شحن" />
             <name lang="ca" value="Estacions de càrrega" />
+            <name lang="cs" value="Nabíjecí stanice" />
             <name lang="de" value="Ladestationen" />
             <name lang="el" value="Πρατήρια φόρτισης" />
             <name lang="en" value="Charging stations" />
@@ -73,11 +117,13 @@
             <name lang="ko" value="충전소" />
             <name lang="nl" value="Laadstations" />
             <name lang="pl" value="Stacje ładowania" />
+            <name lang="zh" value="充电站" />
             <cat id="charging_station" />
         </layer>
         <layer id="parking">
             <name lang="ar" value="مواقف" />
             <name lang="ca" value="Zones d'aparcament" />
+            <name lang="cs" value="Parkovací plochy" />
             <name lang="de" value="Parkplätze" />
             <name lang="el" value="Χώροι στάθμευσης" />
             <name lang="en" value="Parking areas" />
@@ -87,11 +133,29 @@
             <name lang="ko" value="주차장" />
             <name lang="nl" value="Parkeerplaatsen" />
             <name lang="pl" value="Miejsca parkingowe" />
+            <name lang="zh" value="停车场" />
             <cat id="parking" />
         </layer>
+        <layer id="misc">
+            <name lang="ar" value="متنوع" />
+            <name lang="ca" value="Diversos" />
+            <name lang="cs" value="Různé" />
+            <name lang="de" value="Verschiedenes" />
+            <name lang="el" value="Διάφορα" />
+            <name lang="en" value="Miscellaneous" />
+            <name lang="es" value="Misceláneos" />
+            <name lang="fr" value="Divers" />
+            <name lang="it" value="Varie" />
+            <name lang="ko" value="여러 가지 잡다한" />
+            <name lang="nl" value="Gemengd" />
+            <name lang="pl" value="Różnorodny" />
+            <name lang="zh" value="杂项" />
+            <cat id="misc" />
+        </layer>
         <layer id="mountain_pass">
             <name lang="ar" value="معابر جبلية" />
             <name lang="ca" value="Passos de muntanya" />
+            <name lang="cs" value="Horské průsmyky" />
             <name lang="de" value="Bergpässe" />
             <name lang="el" value="Ορεινά περάσματα" />
             <name lang="en" value="Mountain passes" />
@@ -101,11 +165,13 @@
             <name lang="ko" value="산악 패스" />
             <name lang="nl" value="Bergpassen" />
             <name lang="pl" value="Przełęcze górskie" />
+            <name lang="zh" value="垭口" />
             <cat id="mountain_pass" />
         </layer>
         <layer id="mountain_peak">
             <name lang="ar" value="قمم الجبال" />
             <name lang="ca" value="Cims de muntanya" />
+            <name lang="cs" value="Horské vrcholy" />
             <name lang="de" value="Bergspitzen" />
             <name lang="el" value="Ορεινές κορυφές" />
             <name lang="en" value="Mountain peaks" />
@@ -115,25 +181,45 @@
             <name lang="ko" value="산봉우리" />
             <name lang="nl" value="Bergpieken" />
             <name lang="pl" value="Szczyty górskie" />
+            <name lang="zh" value="山峰" />
             <cat id="mountain_peak" />
         </layer>
-        <layer id="motorcycle_shop">
-            <name lang="ar" value="متاجر الدراجات النارية" />
-            <name lang="ca" value="Botigues de motos" />
-            <name lang="de" value="Motorradwerkstätten" />
-            <name lang="el" value="Καταστήματα μοτοσικλετών" />
-            <name lang="en" value="Motorcycle shops" />
-            <name lang="es" value="Tiendas de motos" />
-            <name lang="fr" value="Magasins de motos" />
-            <name lang="it" value="Negozi di moto" />
-            <name lang="ko" value="오토바이 상점" />
-            <name lang="nl" value="Motorwinkels" />
-            <name lang="pl" value="Sklepy motocyklowe" />
-            <cat id="motorcycle_shop" />
+        <layer id="public_transport">
+            <name lang="ar" value="المواصلات العامة" />
+            <name lang="ca" value="Transport públic" />
+            <name lang="cs" value="Veřejná doprava" />
+            <name lang="de" value="Öffentliche Verkehrsmittel" />
+            <name lang="el" value="Μέσα μαζικής μεταφοράς" />
+            <name lang="en" value="Public transport" />
+            <name lang="es" value="Transporte público" />
+            <name lang="fr" value="Transports en commun" />
+            <name lang="it" value="Trasporto pubblico" />
+            <name lang="ko" value="대중 교통" />
+            <name lang="nl" value="Openbaar vervoer" />
+            <name lang="pl" value="Transport publiczny" />
+            <name lang="zh" value="公共交通" />
+            <cat id="public_transport" />
+        </layer>
+        <layer id="shop">
+            <name lang="ar" value="محل" />
+            <name lang="ca" value="Botigues" />
+            <name lang="cs" value="Obchody" />
+            <name lang="de" value="Shops" />
+            <name lang="el" value="Καταστήματα" />
+            <name lang="en" value="Shops" />
+            <name lang="es" value="Tiendas" />
+            <name lang="fr" value="Boutiques" />
+            <name lang="it" value="Negozi" />
+            <name lang="ko" value="상점" />
+            <name lang="nl" value="Winkels" />
+            <name lang="pl" value="Sklepy" />
+            <name lang="zh" value="商店" />
+            <cat id="shop" />
         </layer>
         <layer id="attraction">
             <name lang="ar" value="أماكن جذب سياحي" />
             <name lang="ca" value="Atraccions turístiques" />
+            <name lang="cs" value="Turistické atrakce" />
             <name lang="de" value="Touristenattraktionen" />
             <name lang="el" value="Τουριστικά αξιοθέατα" />
             <name lang="en" value="Tourist attractions" />
@@ -143,11 +229,13 @@
             <name lang="ko" value="관광 명소" />
             <name lang="nl" value="Touristische attracties" />
             <name lang="pl" value="Atrakcje turystyczne" />
+            <name lang="zh" value="旅游景点" />
             <cat id="attraction" />
         </layer>
         <layer id="view">
             <name lang="ar" value="مطلات" />
             <name lang="ca" value="Miradors" />
+            <name lang="cs" value="Vyhlídky" />
             <name lang="de" value="Aussichtspunkte" />
             <name lang="el" value="Σημεία θέασης" />
             <name lang="en" value="Viewpoints" />
@@ -157,11 +245,29 @@
             <name lang="ko" value="뷰 포인트" />
             <name lang="nl" value="Uitzichtspunten" />
             <name lang="pl" value="Punkty widokowe" />
+            <name lang="zh" value="观景点" />
             <cat id="view" />
         </layer>
+        <layer id="contour">
+            <name lang="ar" value="خطوط الكنتور" />
+            <name lang="ca" value="Línies de contorn" />
+            <name lang="cs" value="Vrstevnice" />
+            <name lang="de" value="Höhenlinien" />
+            <name lang="el" value="Γραμμές περιγράμματος" />
+            <name lang="en" value="Contour lines" />
+            <name lang="es" value="Líneas de contorno" />
+            <name lang="fr" value="Courbes de niveau" />
+            <name lang="it" value="Linee di contorno" />
+            <name lang="ko" value="등고선" />
+            <name lang="nl" value="Contourlijnen" />
+            <name lang="pl" value="Linie konturowe" />
+            <name lang="zh" value="等高线" />
+            <cat id="contour" />
+        </layer>
         <layer id="housenumber">
             <name lang="ar" value="أرقام المنازل" />
             <name lang="ca" value="Números de casa" />
+            <name lang="cs" value="Čísla domů" />
             <name lang="de" value="Hausnummern" />
             <name lang="el" value="Αριθμοί κατοικιών" />
             <name lang="en" value="House numbers" />
@@ -171,161 +277,192 @@
             <name lang="ko" value="집 번호" />
             <name lang="nl" value="Huis nummers" />
             <name lang="pl" value="Numery domów" />
+            <name lang="zh" value="门牌号" />
             <cat id="housenumber" />
         </layer>
-        <layer enabled="true" id="nature">
-            <name lang="ar" value="الغطاء النباتي" />
-            <name lang="ca" value="Vegetació" />
-            <name lang="de" value="Vegetation" />
-            <name lang="el" value="Βλάστηση" />
-            <name lang="en" value="Vegetation" />
-            <name lang="es" value="Vegetación" />
-            <name lang="fr" value="Végétation" />
-            <name lang="it" value="Vegetazione" />
-            <name lang="ko" value="식생" />
-            <name lang="nl" value="Vegetatie" />
-            <name lang="pl" value="Wegetacja" />
-            <cat id="nature" />
+        <layer id="off_road">
+            <name lang="ar" value="مسارات الطرق الوعرة" />
+            <name lang="ca" value="Pistes fora de carretera" />
+            <name lang="cs" value="Terénní cesty" />
+            <name lang="de" value="Offroad-Strecken" />
+            <name lang="el" value="Διαδρομές εκτός δρόμου" />
+            <name lang="en" value="Off road tracks" />
+            <name lang="es" value="Pistas todoterreno" />
+            <name lang="fr" value="Pistes hors route" />
+            <name lang="it" value="Piste fuoristrada" />
+            <name lang="ko" value="오프로드 트랙" />
+            <name lang="nl" value="Off-road/circuitdetails" />
+            <name lang="pl" value="Trasy terenowe" />
+            <name lang="zh" value="非铺装/越野路线" />
+            <cat id="off_road" />
+        </layer>
+        <layer id="road_detail">
+            <name lang="ar" value="المزيد من تفاصيل الطريق" />
+            <name lang="ca" value="Més detalls de la carretera" />
+            <name lang="cs" value="Další podrobnosti o silnicích" />
+            <name lang="de" value="Weitere Straßendetails" />
+            <name lang="el" value="Περισσότερες οδικές λεπτομέρειες" />
+            <name lang="en" value="More road details" />
+            <name lang="es" value="Más detalles de la carretera" />
+            <name lang="fr" value="Plus de détails sur la route" />
+            <name lang="it" value="Maggiori dettagli stradali" />
+            <name lang="ko" value="자세한 도로 정보" />
+            <name lang="nl" value="Meer wegdetails" />
+            <name lang="pl" value="Więcej szczegółów drogi" />
+            <name lang="zh" value="更多道路详情" />
+            <cat id="road_detail" />
         </layer>
         <layer id="normal" visible="true">
             <overlay id="accommodation" />
+            <overlay id="money" />
+            <overlay id="entertainment" />
             <overlay id="food" />
-            <overlay id="health" />
+            <overlay id="emergency" />
             <overlay id="fuel" />
             <overlay id="charging_station" />
             <overlay id="parking" />
+            <overlay id="misc" />
             <overlay id="mountain_pass" />
             <overlay id="mountain_peak" />
-            <overlay id="motorcycle_shop" />
+            <overlay id="public_transport" />
+            <overlay id="shop" />
             <overlay id="attraction" />
             <overlay id="view" />
+            <overlay id="contour" />
             <overlay id="housenumber" />
-            <overlay id="nature" />
+            <overlay id="off_road" />
+            <overlay id="road_detail" />
         </layer>
     </stylemenu>
 
-    <!-- base style for fixed width lines -->
+	<!-- base style for fixed width lines -->
     <style-line cap="butt" fix="true" id="fix" width="1.0" />
 
-    <!-- Road Text -->
-    <style-text fill="#606060" font-family="medium" id="road" k="name" priority="9" size="14"
-        stroke="#ffffff" stroke-width="2.0" />
+    <!-- Road name/ref caption/text definitions -->
+    <!--<style-text bg-fill="#003399" fill="#FFFFFF" font-family="medium" id="junction" k="name" priority="5" size="12" style="bold_italic" />-->
+    <style-text fill="#003399" font-family="medium" id="junction" k="name" priority="5" size="12" style="bold_italic" stroke="#FFFFFF" stroke-width="2.0" />
+    <style-text caption="true" id="junction-caption" use="junction" />
+
+    <style-text fill="#000000" font-family="medium" id="residential-road" k="name" priority="5" size="11" stroke="#FFFFFF" stroke-width="2.0" />
+    <style-text fill="#000000" font-family="medium" id="road" k="name" priority="10" size="11" stroke="#FFFFFF" stroke-width="2.0" />
+
     <style-text caption="true" id="road-caption" use="road" />
-    <style-text style="bold" fill="#606060" id="major-road" k="name" priority="7" size="16"
-        stroke="#ffffff" stroke-width="2.0" />
-    <style-text style="bold" fill="#606060" id="road-ref" k="ref" priority="8" size="14"
-        stroke="#ffffff" stroke-width="2.0" />
-    <style-text caption="true" style="bold" fill="#ffffff" id="road-ref-caption" k="ref"
-        priority="8" size="12" bg-fill="#6c9f43" />
+
+    <style-text font-family="medium" fill="#000000" id="major-road" k="name" priority="6" size="11" stroke="#FFFFFF" stroke-width="2.0" />
+
+    <style-text fill="#000000" id="road-ref" k="ref" priority="6" size="11" style="bold" stroke="#FFFFFF" stroke-width="2.0" />
+    <style-text caption="true" style="bold" fill="#FFFFFF" id="road-ref-caption" k="ref" priority="5" size="11" bg-fill="#006600" />
+
+    <style-text caption="true" bg-fill="#ffdeb3" fill="#000000" id="primary-road-box" k="ref" priority="5" size="11" style="bold" />
+    <style-text fill="#000000" id="primary-road-name" k="name" priority="6" size="12" style="bold" stroke="#FFFFFF" stroke-width="2.0" />
+    <style-text fill="#000000" id="primary-road-ref" k="ref" priority="6" size="12" style="bold" stroke="#FFFFFF" stroke-width="2.0" />
+
+    <style-text caption="true" bg-fill="#fffbb3" fill="#000000" id="secondary-road-box" k="ref" priority="6" size="11" style="bold" />
+    <style-text fill="#000000" id="secondary-road-name" k="name" priority="6" size="12" style="bold" stroke="#FFFFFF" stroke-width="2.0" />
+    <style-text fill="#000000" id="secondary-road-ref" k="ref" priority="6" size="12" style="bold" stroke="#FFFFFF" stroke-width="2.0" />
+
+    <style-text caption="true" bg-fill="#006600" fill="#ffff00" id="trunk-road-box" k="ref" priority="5" size="11" style="bold" />
+    <style-text caption="true" fill="#ffff00" id="trunk-road-caption" k="ref" priority="6" size="11" style="normal" stroke="#006600" stroke-width="8.0" />
+    <style-text fill="#000000" id="trunk-road-name" k="name" priority="6" size="12" style="bold" stroke="#FFFFFF" stroke-width="2.0" />
+    <style-text fill="#000000" id="trunk-road-ref" k="ref" priority="5" size="12" style="bold" stroke="#FFFFFF" stroke-width="2.0" />
+
+    <style-text caption="true" bg-fill="#42618a" fill="#FFFFFF" id="motorway-road-box" k="ref" priority="4" size="11" style="bold" />
+    <style-text caption="true" fill="#000000" id="motorway-road-caption" k="ref" priority="6" size="12" style="normal" stroke="#FFFFFF" stroke-width="8.0" />
+    <style-text fill="#000000" id="motorway-road-ref" k="ref" priority="6" size="12" style="bold" stroke="#FFFFFF" stroke-width="2.0" />
 
     <!-- Water -->
-    <style-text caption="true" fill="#2d51bc" font-family="light" id="caption-major-water-name"
-        k="name" size="16" />
-    <style-text caption="true" fill="#2d51bc" font-family="light" id="caption-water-name" k="name"
-        size="14" />
-    <style-text style="bold" fill="#606060" id="ferry" k="name" size="12" stroke="#ffffff"
-        stroke-width="2.0" />
+    <style-text caption="true" fill="#2d51bc" font-family="light" id="caption-major-water-name" k="name" size="16" />
+    <style-text caption="true" fill="#2d51bc" font-family="light" id="caption-water-name" k="name" size="14" />
+    <style-text fill="#606060" id="ferry" k="name" size="12" style="bold" stroke="#FFFFFF" stroke-width="2.0" />
     <style-text fill="#2d51bc" font-family="light" id="river" k="name" size="12" />
 
     <!-- Places -->
-    <style-text style="bold" caption="true" fill="#000000" id="country-caption" k="name"
-        priority="0" size="20" stroke="#ffffff" stroke-width="2.0" />
-    <style-text caption="true" fill="#000000" id="city-lz-caption" k="name" priority="3" size="18"
-        stroke="#ffffff" stroke-width="2.0" />
-    <style-text style="bold" caption="true" fill="#000000" id="city-caption" k="name" priority="1"
-        size="18" stroke="#ffffff" stroke-width="2.0" />
-    <style-text caption="true" fill="#000000" id="town-caption" k="name" priority="4" size="18"
-        stroke="#ffffff" stroke-width="2.0" />
-    <style-text caption="true" fill="#000000" id="village-caption" k="name" priority="5" size="16"
-        stroke="#ffffff" stroke-width="2.0" />
-    <style-text caption="true" fill="#000000" id="suburb-caption" k="name" priority="5" size="16"
-        stroke="#ffffff" stroke-width="2.0" />
-    <style-text caption="true" fill="#000000" id="hamlet-caption" k="name" priority="6" size="14"
-        stroke="#ffffff" stroke-width="2.0" />
-
-    <!-- Pois -->
-    <style-text caption="true" dy="20" fill="#606060" font-family="medium" id="poi" k="name"
-        size="14" stroke="#ffffff" stroke-width="2.0" />
-    <style-text style="bold" caption="true" dy="12" fill="#4D2F08" id="peak-name-caption" k="name"
-        size="14" stroke="#ffffff" stroke-width="2.0" />
-    <style-text style="bold" caption="true" dy="-12" fill="#4D2F08" id="peak-ele-caption" k="ele"
-        size="12" stroke="#ffffff" stroke-width="2.0" />
-    <style-text style="bold" caption="true" cat="housenumber" fill="#606060" font-family="condensed"
-        id="housenumber-caption" k="addr:housenumber" priority="12" size="12" />
-    <style-text style="bold" caption="true" fill="#606060" font-family="condensed"
-        id="house-name-caption" k="name" priority="11" size="12" stroke="#ffffff"
-        stroke-width="2.0" />
-
-    <!-- De Area Styles -->
-    <style-area fade="10" fill="#c5c6be" id="de-residential" />
+    <style-text caption="true" fill="#000000" id="country-caption" k="name" priority="0" size="20" style="bold" stroke="#e8eae1" stroke-width="2.0" />
+    <style-text caption="true" fill="#000000" id="city-lz-caption" k="name" priority="3" size="18" style="bold" stroke="#e8eae1" stroke-width="2.0" />
+    <style-text caption="true" fill="#000000" id="city-caption" k="name" priority="1" size="16" style="bold" stroke="#e8eae1" stroke-width="2.0" />
+    <style-text caption="true" fill="#000000" id="town-caption" k="name" priority="4" size="12" style="bold" stroke="#e8eae1" stroke-width="2.0" />
+    <style-text caption="true" fill="#000000" id="town-lz-caption" k="name" priority="4" size="13" style="bold" stroke="#e8eae1" stroke-width="2.0" />
+    <style-text caption="true" fill="#000000" id="village-caption" k="name" priority="6" size="12" stroke="#e8eae1" stroke-width="2.0" />
+    <style-text caption="true" fill="#000000" id="suburb-caption" k="name" priority="5" size="12" style="italic" stroke="#e8eae1" stroke-width="2.0" />
+    <style-text caption="true" fill="#000000" id="hamlet-caption" k="name" priority="6" size="12" stroke="#e8eae1" stroke-width="2.0" />
+
+    <!-- POI captions/labels -->
+    <style-text priority="3" caption="true" dy="-20" fill="#b35900" font-family="medium" id="poi" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
+    <style-text priority="5" caption="true" dy="-20" fill="#006633" font-family="medium" id="poi-misc" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
+    <style-text priority="1" caption="true" dy="-20" fill="#ff0000" font-family="medium" id="poi-emergency" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
+    <style-text priority="4" caption="true" dy="-20" fill="#ff0066" font-family="medium" id="poi-accommodation" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
+    <style-text priority="5" caption="true" dy="20" fill="#af3a3a" font-family="medium" id="poi-transport" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
+    <style-text priority="2" caption="true" dy="-20" fill="#ac39ac" font-family="medium" id="poi-fuel" k="name" size="12" stroke="#FFFFFF" stroke-width="2.0" />
+    <style-text style="bold" caption="true" dy="-12" fill="#4D2F08" id="peak-name-caption" k="name" size="14" stroke="#FFFFFF" stroke-width="2.0" />
+    <style-text style="bold" caption="true" dy="-12" fill="#4D2F08" id="peak-ele-caption" k="ele" size="12" stroke="#FFFFFF" stroke-width="2.0" />
+    <style-text style="bold" caption="true" cat="housenumber" fill="#606060" font-family="condensed" id="housenumber-caption" k="addr:housenumber" priority="12" size="12" />
+    <style-text style="bold" caption="true" fill="#606060" font-family="condensed" id="house-name-caption" k="name" priority="8" size="12" stroke="#FFFFFF" stroke-width="2.0" />
+
+    <!-- Area Fill Colors -->
+    <style-area fade="10" fill="#e6e6e6" id="de-residential" />
+    <style-area fade="10" fill="#eddeea" id="de-commercial" />
+    <style-area fade="10" fill="#f8e7d3" id="de-retail" />
     <style-area fade="13" fill="#b8b8c1" id="de-pedestrian" />
-    <style-area fade="10" fill="#ebdbe8" id="de-industrial" />
+    <style-area fade="13" fill="#b8b8c1" id="de-offroad" />
+    <style-area fade="10" fill="#eddeea" id="de-industrial" />
     <style-area fade="6" fill="#e0e0b8" id="de-school" />
+    <style-area fade="6" fill="#ffcccc" id="de-hospital" />
     <style-area fade="6" fill="#ace0b0" id="de-park" />
-    <style-area fade="6" fill="#add19e" id="de-forest" />
+    <style-area fade="6" fill="#BBE9FCE6" id="de-fell" />
+    <style-area fade="6" fill="#a6cd98" id="de-forest" />
     <style-area fade="6" fill="#c3dbad" id="de-grass" />
-    <style-area fade="6" fill="#def6c0" id="de-campsite" />
+    <style-area fade="6" fill="#E6FFDB" id="de-meadow" />
+    <style-area fade="6" fill="#b6d6a9" id="de-heath" />
+    <style-area fade="6" fill="#BBF5F5F5" id="de-scree" />
+    <style-area fade="6" fill="#c4deba" id="de-scrub" />
+    <style-area fade="6" fill="#e5efdc" id="de-field" />
+    <style-area fade="6" fill="#BBC7F1A3" id="de-campsite" />
     <style-area fade="6" fill="#aacbaf" id="de-cemetery" />
-    <style-area fade="6" fill="#d6aa95" id="de-military" />
-    <style-area fade="6" fill="#e6dcd1" id="de-mud" />
+    <style-area fade="6" fill="#bbffe6e6" id="de-military" />
+    <style-area fade="6" fill="#D0D9BF" id="de-mud" />
     <style-area fade="6" fill="#e8eff2" id="de-ice" />
     <style-area fade="6" fill="#c5c3c3" id="de-quarry" />
+    <style-area fade="6" fill="#BBF1F1F1" id="de-rock" />
     <style-area fade="6" fill="#f5e9c6" id="de-sand" />
     <style-area fade="6" fill="#f5e9c6" id="de-rail" />
     <style-area fade="6" fill="#ccccb3" id="de-station" />
-
-    <!-- Avoid patterns and textures because of old GPU issues -->
-    <!--<style-area id="tex1" src="assets:textures/rough.png" />-->
-
-    <!-- Colors from OSM-DE Style -->
-    <style-line cap="butt" id="de-motorway" stroke="#e892a2" width="2.1" />
-    <style-line cap="butt" id="de-trunk" stroke="#f9b29c" width="2.1" />
-    <style-line id="de-primary" stroke="#ffc982" width="2.1" />
-    <style-line id="de-secondary" stroke="#fffa9b" width="2.1" />
-    <style-line id="de-tertiary" stroke="#fdffd1" width="2.1" />
-    <style-line id="de-unclassified" stroke="#ffffff" width="1.1" />
-    <style-line id="de-residential" stroke="#ffffff" width="1.1" />
-    <style-line id="de-service" stroke="#ffffff" width="0.5" />
+	
+    <!-- Road and Rail Colors -->
+    <style-line cap="butt" id="de-motorway" stroke="#e892a2" width="2.5" />
+    <style-line cap="butt" id="de-trunk" stroke="#f9b29c" width="2.5" />
+    <style-line id="de-primary" stroke="#ffc982" width="2.2" />
+    <style-line id="de-secondary" stroke="#fffa9b" width="2.2" />
+    <style-line id="de-tertiary" stroke="#FFFFFF" width="2.2" />
+    <style-line id="de-unclassified" stroke="#FFFFFF" width="1.8" />
+    <style-line id="de-residential" stroke="#FFFFFF" width="1.4" />
+    <style-line id="de-service" stroke="#FFFFFF" width="0.3" />
     <style-line cap="butt" id="de-motorway-link" use="de-motorway" width="-0.8" />
     <style-line cap="butt" id="de-trunk-link" use="de-trunk" width="-0.8" />
-    <style-line cap="butt" fix="true" id="de-steps" stipple="2" stipple-stroke="#be6253"
-        stipple-width="1.0" stroke="#aaffffff" width="4.2" />
+    <style-line cap="butt" fix="true" id="de-steps" stipple="2" stipple-stroke="#be6253" stipple-width="1.0" stroke="#FFFFFF" width="4.2" />
     <style-line id="de-pedestrian" stroke="#b8b8c1" width="0.5" />
     <style-line cap="butt" fix="true" id="de-rail" stroke="#4d4d4d" width="1.2" />
-    <style-line cap="butt" id="de-station" stroke="#000000" width="0.3" />
+    <style-line cap="butt" id="de-station" stroke="#000000" width="0.2" />
 
     <!-- Tunnels -->
-    <style-line cap="butt" id="de-motorway-tunnel" stipple="10" stipple-stroke="#c5c6be"
-        use="de-motorway" width="1.1" />
-    <style-line cap="butt" id="de-trunk-tunnel" stipple="10" stipple-stroke="#c5c6be" use="de-trunk"
-        width="0.7" />
-    <style-line cap="butt" id="de-primary-tunnel" stipple="10" stipple-stroke="#c5c6be"
-        use="de-primary" width="0.7" />
-    <style-line cap="butt" id="de-secondary-tunnel" stipple="10" stipple-stroke="#c5c6be"
-        use="de-secondary" />
-    <style-line cap="butt" id="de-tertiary-tunnel" stipple="10" stipple-stroke="#c5c6be"
-        use="de-tertiary" />
-    <style-line cap="butt" id="de-unclassified-tunnel" stipple="10" stipple-stroke="#c5c6be"
-        use="de-unclassified" />
-    <style-line cap="butt" id="de-residential-tunnel" stipple="10" stipple-stroke="#c5c6be"
-        use="de-residential" />
-    <style-line cap="butt" id="de-service-tunnel" stipple="10" stipple-stroke="#c5c6be"
-        use="de-service" />
-    <style-line cap="butt" id="de-motorway-link-tunnel" stipple="10" stipple-stroke="#c5c6be"
-        use="de-motorway-link" width="1.1" />
-    <style-line cap="butt" id="de-trunk-link-tunnel" stipple="10" stipple-stroke="#c5c6be"
-        use="de-trunk-link" width="0.7" />
-
-
-    <!-- Not for motorcycle -->
+    <style-line cap="butt" id="de-motorway-tunnel" stipple="10" stipple-stroke="#c5c6be" use="de-motorway" width="1.1" />
+    <style-line cap="butt" id="de-trunk-tunnel" stipple="10" stipple-stroke="#c5c6be" use="de-trunk" width="0.7" />
+    <style-line cap="butt" id="de-primary-tunnel" stipple="10" stipple-stroke="#c5c6be" use="de-primary" width="0.7" />
+    <style-line cap="butt" id="de-secondary-tunnel" stipple="10" stipple-stroke="#c5c6be" use="de-secondary" />
+    <style-line cap="butt" id="de-tertiary-tunnel" stipple="10" stipple-stroke="#c5c6be" use="de-tertiary" />
+    <style-line cap="butt" id="de-unclassified-tunnel" stipple="10" stipple-stroke="#c5c6be" use="de-unclassified" />
+    <style-line cap="butt" id="de-residential-tunnel" stipple="10" stipple-stroke="#c5c6be" use="de-residential" />
+    <style-line cap="butt" id="de-service-tunnel" stipple="10" stipple-stroke="#c5c6be" use="de-service" />
+    <style-line cap="butt" id="de-motorway-link-tunnel" stipple="10" stipple-stroke="#c5c6be" use="de-motorway-link" width="1.1" />
+    <style-line cap="butt" id="de-trunk-link-tunnel" stipple="10" stipple-stroke="#c5c6be" use="de-trunk-link" width="0.7" />
 
     <!-- when inheriting another style with 'from' then 'width' is relative to the parent -->
-    <style-line id="residential" stroke="#ffffff" width="1.3" />
+    <style-line id="residential" stroke="#FFFFFF" width="1.3" />
     <style-line id="construction" stroke="#e0e0e0" width="1.2" />
+
     <!-- track|footway|path|cycleway -->
-    <style-line cap="butt" fix="true" id="footway" stipple="2" stipple-stroke="#a39b68"
-        stipple-width="0.6" stroke="#aaffffff" width="1.8" />
-    <style-line id="highway:cycleway" stipple-stroke="#4040ee" use="footway" width="0.1" />
+    <style-line cap="butt" fix="true" id="footway" stipple="2" stipple-stroke="#a39b68" stipple-width="0.6" stroke="#aaffffff" width="1.8" />
+    <style-line cap="butt" fix="true" id="cycleway" stipple="2" stipple-stroke="#a39b68" stipple-width="0.6" stroke="#aaffffff" width="2.8" />
+    <style-line id="highway:cycleway" stipple-stroke="#4040ee" use="cycleway" width="0.1" />
     <style-line id="highway:track" stipple="3" stipple-stroke="#a39b68" use="footway" width="0.1" />
     <style-line id="highway:path" stipple="2" stipple-stroke="#837b58" use="footway" width="0.1" />
     <style-line id="footway:z17" stroke="#faf8f5" width="0.3" />
@@ -334,87 +471,125 @@
     <style-line cap="butt" fix="true" id="water:outline" stroke="#a4bbcc" width="1.0" />
     <style-line cap="butt" fix="true" id="water" stroke="#a4bbcc" width="1.0" />
     <style-line fix="false" id="river" stroke="#a4bbcc" use="water" />
-    <style-area fade="-1" fill="#99badf" id="water" />
+    <!-- set mesh=true to display some water features correctly, but does lead to java console errors -->
+    <style-area fade="-1" fill="#99badf" id="water" mesh="false" />
 
-    <!-- Building -->
+    <!-- Building fill/line -->
     <style-line fade="15" id="building" stroke="#eeb7b6b3" use="fix" />
-    <style-area fade="15" fill="#e2e1dc" id="building" />
+    <style-area fade="15" fill="#cccccc" id="building" />
 
+    <!-- color of the ocean/sea -->
     <m e="way" k="natural" v="issea|sea">
         <area mesh="true" use="water" />
     </m>
+    <m e="way" k="freizeitkarte" v="meer">
+        <area mesh="true" use="water" />
+    </m>
+	<m closed="yes" k="natural" v="water">
+		<area use="water" />
+		<text area-size="0.2" use="caption-water-name" />
+	</m>
 
+    <!-- main background colour -->
     <m e="way" k="natural" v="nosea">
-        <area fill="#d8dbcb" mesh="true" />
+        <area fill="#e8eae1" mesh="true" />
+    </m>
+    <m e="way" k="freizeitkarte" v="land">
+        <area fill="#e8eae1" mesh="true" />
+    </m>
+    <m e="way" k="natural" v="land">
+        <area fill="#BBF8F8F8" stroke="#F8F8F8" stroke-width="0.1" />
     </m>
 
-    <!-- all closed ways that are not 'highway' or 'building' -->
+    <!-- all closed areas/land/ways that are not 'highway' or 'building' -->
     <m closed="yes" e="way" k="highway|building" v="~">
-        <m cat="nature" k="landuse|natural|leisure">
-            <m v="glacier">
-                <area use="de-ice" />
+        <m k="landuse|natural|leisure">
+            <m v="common|conservation|garden|grass|recreation_ground|village_green">
+                <area use="de-grass" />
             </m>
-            <m v="quarry">
-                <area use="de-quarry" />
+            <m v="farm|farmland|field|orchard|vineyard">
+                <area use="de-field" />
+            </m>
+            <m v="fell">
+                <area use="de-fell" />
             </m>
             <m v="forest|wood">
                 <area use="de-forest" />
             </m>
-            <m v="meadow|conservation|grass|recreation_ground|village_green|grassland|scrub|heath|garden">
-                <area use="de-grass" />
+            <m v="glacier">
+                <area use="de-ice" />
+            </m>
+            <m v="grassland|meadow">
+                <area use="de-meadow" />
+            </m>
+            <m v="heath">
+                <area use="de-heath" />
             </m>
-            <m v="marsh|wetland|mud">
+            <m v="marsh|mud|wetland">
                 <area use="de-mud" />
+            </m>
+			<m v="allotments|green|greenfield|golf_course|park">
+				<area use="de-park" />
+			</m>
+            <m v="landfill|quarry">
+                <area use="de-quarry" />
+            </m>
+			<m e="way" k="natural" v="rock|stone|bare_rock|bedrock">
+                <area use="de-rock" />
+			</m>
+            <m v="scree">
+                <area use="de-scree" />
+            </m>
+            <m v="scrub">
+                <area use="de-scrub" />
             </m>
         </m>
 
-        <!-- Residential -->
+        <!-- landuse, human -->
         <m k="landuse">
-            <m v="residential|commercial|retail|farmyard|urban">
+            <m v="residential|urban" zoom-min="12">
                 <area use="de-residential" />
             </m>
-            <m v="industrial|railway">
+            <m v="commercial" zoom-min="12">
+                <area use="de-commercial" />
+            </m>
+            <m v="retail" zoom-min="12">
+                <area use="de-retail" />
+            </m>
+            <m v="industrial|brownfield|railway|garages|construction" zoom-min="12">
                 <area use="de-industrial" />
             </m>
         </m>
-
-        <m k="tourism">
-            <m v="zoo|picnic_site|caravan_site|camp_site">
+        <m k="landuse|leisure|tourism">
+            <m v="camp_site|caravan_site|park|picnic_site|zoo">
                 <area use="de-campsite" />
             </m>
         </m>
-
         <m k="landuse">
             <m v="military">
                 <area use="de-military" />
             </m>
-            <m v="cemetery" zoom-min="11">
+            <m v="cemetery|grave_yard" zoom-min="11">
                 <area use="de-cemetery" />
             </m>
-            <m v="allotments" zoom-min="12">
-                <area use="de-grass" />
-            </m>
-        </m>
-
-        <m k="leisure" v="park|common|green|golf_course" zoom-min="11">
-            <area use="de-park" />
         </m>
-
         <m k="natural">
-            <m v="beach">
+            <m v="beach|sand">
                 <area use="de-sand" />
             </m>
         </m>
-
         <m k="landuse" v="reservoir|basin">
             <area use="water" />
         </m>
 
         <!-- amenity -->
-        <m k="amenity" zoom-min="14">
-            <m v="kindergarten|school|college|university|hospital">
+        <m k="amenity" zoom-min="12">
+            <m v="kindergarten|school|college|university">
                 <area use="de-school" />
             </m>
+            <m v="hospital">
+                <area use="de-hospital" />
+            </m>
             <m v="public_bath">
                 <area use="water" />
             </m>
@@ -422,97 +597,15 @@
 
         <!-- leisure -->
         <m k="leisure" zoom-min="14">
-            <m v="stadium|sports_centre|water_park|playground|miniature_golf|playing_fields|pitch">
+            <m v="stadium|sports_centre|water_park|playground|miniature_golf|playing_fields|pitch|track">
                 <area use="de-park" />
             </m>
             <m v="swimming_pool">
                 <area use="water" />
             </m>
         </m>
-
-
-        <!-- Motorcycle POIs -->
-        <m select="first">
-            <m k="amenity">
-                <m cat="fuel" v="fuel" zoom-min="10">
-                    <symbol src="assets:symbols/transport/fuel.svg" />
-                </m>
-                <m cat="charging_station" v="charging_station" zoom-min="10">
-                    <symbol src="assets:symbols/custom/transport/charging_station.svg" />
-                </m>
-                <m cat="parking" v="motorcycle_parking" zoom-min="13">
-                    <symbol src="assets:symbols/custom/transport/parking_motorcycle.svg" />
-                </m>
-                <m cat="parking" v="parking" zoom-min="16">
-                    <symbol src="assets:symbols/transport/parking.svg" />
-                </m>
-            </m>
-            <m k="tourism">
-                <m cat="view" v="viewpoint" zoom-min="10">
-                    <symbol src="assets:symbols/tourist/view_point.svg" />
-                </m>
-            </m>
-            <m k="shop">
-                <m cat="motorcycle_shop" v="motorcycle|motorcycle_repair" zoom-min="10">
-                    <symbol src="assets:symbols/shopping/diy.svg" />
-                </m>
-            </m>
-            <m cat="mountain_pass" k="mountain_pass" v="yes" zoom-min="10">
-                <symbol src="assets:symbols/poi/mountain_pass.svg" symbol-percent="60" />
-            </m>
-            <m select="when-matched">
-                <text use="poi" />
-            </m>
-        </m>
-        <m k="name" select="first">
-            <m k="historic">
-                <m cat="attraction" v="castle" zoom-min="10">
-                    <symbol src="assets:symbols/tourist/castle2.svg" />
-                </m>
-            </m>
-            <m k="tourism">
-                <m cat="attraction" v="attraction|picnic_site" zoom-min="10">
-                    <symbol src="assets:symbols/tourist/attraction.svg" />
-                </m>
-                <m cat="accommodation" v="hotel" zoom-min="16">
-                    <symbol src="assets:symbols/accommodation/hotel2.svg" />
-                </m>
-                <m cat="accommodation" v="hostel" zoom-min="16">
-                    <symbol src="assets:symbols/accommodation/hostel.svg" />
-                </m>
-                <m cat="accommodation" v="camp_site" zoom-min="12">
-                    <symbol src="assets:symbols/accommodation/camping.svg" />
-                </m>
-                <m cat="accommodation" v="caravan_site" zoom-min="12">
-                    <symbol src="assets:symbols/accommodation/caravan_park.svg" />
-                </m>
-            </m>
-            <m k="amenity">
-                <m cat="health" v="hospital" zoom-min="15">
-                    <symbol src="assets:symbols/health/hospital.svg" />
-                </m>
-                <m cat="health" v="pharmacy" zoom-min="16">
-                    <symbol src="assets:symbols/health/pharmacy.svg" />
-                </m>
-                <m cat="food" v="restaurant" zoom-min="16">
-                    <symbol src="assets:symbols/food/restaurant.svg" />
-                </m>
-                <m cat="food" v="cafe" zoom-min="16">
-                    <symbol src="assets:symbols/food/cafe.svg" />
-                </m>
-                <m cat="food" v="pub" zoom-min="16">
-                    <symbol src="assets:symbols/food/pub.svg" />
-                </m>
-                <m cat="food" v="fast_food" zoom-min="16">
-                    <symbol src="assets:symbols/food/fastfood.svg" />
-                </m>
-            </m>
-            <m select="when-matched">
-                <text use="poi" />
-            </m>
-        </m>
     </m>
-
+	
     <!-- waterways -->
     <m e="way" k="waterway">
         <m v="ditch|drain" zoom-min="14">
@@ -528,7 +621,6 @@
             <m zoom-min="12">
                 <line use="river" width="0.3" />
             </m>
-            <!-- zoom <= 11 -->
             <m k="rank" v="~|-1" zoom-min="9">
                 <line fade="9" use="water" width="0.2" />
             </m>
@@ -570,10 +662,71 @@
         <m k="lock" v="yes|true">
             <line stroke="#f8f8f8" use="fix" width="0.5" />
         </m>
-
-        <text use="river" />
+		<m zoom-min="11">
+			<text use="river" />
+		</m>
     </m>
 
+	<!-- contour lines LAYER, to work with Freizeitkarte and OpenAndroMaps -->
+	<m cat="contour" k="contour_ext">
+		<m zoom-max="12">
+			<m v="elevation_major">
+				<line stroke="#8E8072" width="0.5" />
+			</m>
+		</m>
+		<m zoom-min="12" zoom-max="13">
+			<m v="elevation_medium">
+				<line stroke="#8E8072" width="0.4" />
+			</m>
+			<m v="elevation_major">
+				<line stroke="#8E8072" width="0.8" />
+			</m>
+		</m>
+		<m zoom-min="14" zoom-max="15">
+			<m v="elevation_minor" zoom-max="15">
+				<line stroke="#8E8072" width="0.2" />
+			</m>
+			<m v="elevation_medium|elevation_major">
+				<line stroke="#8E8072" width="0.4" />
+			</m>
+		</m>
+		<m zoom-min="16" zoom-max="16">
+			<m v="elevation_minor">
+				<line stroke="#8E8072" width="0.2" />
+			</m>
+			<m v="elevation_medium|elevation_major">
+				<line stroke="#8E8072" width="0.3" />
+			</m>
+		</m>
+		<m zoom-min="17">
+			<m v="elevation_minor">
+				<line stroke="#8E8072" width="0.15" />
+			</m>
+			<m v="elevation_medium|elevation_major">
+				<line stroke="#8E8072" width="0.2" />
+			</m>
+		</m>
+		<!-- captions -->
+		<m zoom-min="13" zoom-max="13">
+			<m v="elevation_major">
+				<text k="ele" style="bold" size="10" fill="#734A08" stroke="#FFFFFF" stroke-width="1" />
+				<text k="name" style="bold" size="10" fill="#734A08" stroke="#FFFFFF" stroke-width="1" />
+			</m>
+		</m>
+		<m zoom-min="14" zoom-max="15">
+			<m v="elevation_medium|elevation_major">
+				<text k="ele" style="bold" size="11" fill="#734A08" stroke="#FFFFFF" stroke-width="1" />
+				<text k="name" style="bold" size="11" fill="#734A08" stroke="#FFFFFF" stroke-width="1" />
+			</m>
+		</m>
+		<m zoom-min="16">
+			<m v="elevation_medium|elevation_major">
+				<text k="ele" style="bold" size="11" fill="#734A08" stroke="#FFFFFF" stroke-width="2" />
+				<text k="name" style="bold" size="11" fill="#734A08" stroke="#FFFFFF" stroke-width="2" />
+			</m>
+		</m>
+	</m>
+
     <!-- roads -->
     <m e="way">
         <!-- Airport/Airfield -->
@@ -588,16 +741,14 @@
         </m>
         <m e="way" k="aeroway" v="runway" closed="no" zoom-min="11">
             <line cap="square" stroke="#a6a6a6" width="5" />
-            <line cap="square" stroke="#ffffff" width="0.8" />
+            <line cap="square" stroke="#FFFFFF" width="0.8" />
         </m>
 
-        <m closed="yes" k="natural" v="water">
-            <area use="water" />
-            <!--caption-water-name"-->
-            <text area-size="0.2" use="caption-water-name" />
+		<m k="highway" v="turning_circle">
+			<circle radius="1.5" scale-radius="true" fill="#707070" />
         </m>
 
-        <!-- building -->
+		<!-- building -->
         <m k="building|building:part">
             <m k="building">
                 <m zoom-min="15">
@@ -626,69 +777,8 @@
             </m>
 
             <m select="first">
-                <m select="first">
-                    <m k="amenity">
-                        <m cat="fuel" v="fuel" zoom-min="10">
-                            <symbol src="assets:symbols/transport/fuel.svg" />
-                        </m>
-                        <m cat="charging_station" v="charging_station" zoom-min="10">
-                            <symbol src="assets:symbols/custom/transport/charging_station.svg" />
-                        </m>
-                    </m>
-                    <m k="shop">
-                        <m cat="motorcycle_shop" v="motorcycle|motorcycle_repair" zoom-min="10">
-                            <symbol src="assets:symbols/shopping/diy.svg" />
-                        </m>
-                    </m>
-                    <m select="when-matched">
-                        <text use="poi" />
-                    </m>
-                </m>
-
-                <m k="name" select="first">
-                    <m k="historic">
-                        <m cat="attraction" v="castle" zoom-min="10">
-                            <symbol src="assets:symbols/tourist/castle2.svg" />
-                        </m>
-                    </m>
-                    <m k="tourism">
-                        <m cat="attraction" v="attraction" zoom-min="10">
-                            <symbol src="assets:symbols/tourist/attraction.svg" />
-                        </m>
-                        <m cat="accommodation" v="hotel" zoom-min="16">
-                            <symbol src="assets:symbols/accommodation/hotel2.svg" />
-                        </m>
-                        <m cat="accommodation" v="hostel" zoom-min="16">
-                            <symbol src="assets:symbols/accommodation/hostel.svg" />
-                        </m>
-                    </m>
-                    <m k="amenity">
-                        <m cat="health" v="hospital" zoom-min="15">
-                            <symbol src="assets:symbols/health/hospital.svg" />
-                        </m>
-                        <m cat="health" v="pharmacy" zoom-min="16">
-                            <symbol src="assets:symbols/health/pharmacy.svg" />
-                        </m>
-                        <m cat="food" v="restaurant" zoom-min="16">
-                            <symbol src="assets:symbols/food/restaurant.svg" />
-                        </m>
-                        <m cat="food" v="cafe" zoom-min="16">
-                            <symbol src="assets:symbols/food/cafe.svg" />
-                        </m>
-                        <m cat="food" v="pub" zoom-min="16">
-                            <symbol src="assets:symbols/food/pub.svg" />
-                        </m>
-                        <m cat="food" v="fast_food" zoom-min="16">
-                            <symbol src="assets:symbols/food/fastfood.svg" />
-                        </m>
-                    </m>
-                    <m select="when-matched">
-                        <text use="poi" />
-                    </m>
-                </m>
-
                 <m zoom-min="17">
-                    <text use="house-name-caption" />
+                    <!--<text use="house-name-caption" />-->
                     <text use="housenumber-caption" />
                 </m>
             </m>
@@ -706,23 +796,25 @@
         </m>
         <!-- non-physical routes -->
         <m k="route" v="ferry">
-            <line stroke="#2d51bc" width="1" />
+			<line dasharray="5,5" cap="butt" stroke="#5b7ad7" width="0.8" />
             <m zoom-min="13">
                 <text use="ferry" />
             </m>
         </m>
 
-        <!-- Seldomly used for some footpaths construction etc... -->
+        <!-- seldomly used for some footpaths construction etc... -->
         <outline-layer id="0" stroke="#44000000" width="0.1" />
         <outline-layer id="1" stroke="#aa807040" width="0.1" />
 
-        <!-- Outlines for DE-Style -->
-        <outline-layer id="de-motorway-outline" stroke="#dc2a67" width=".5" />
-        <outline-layer id="de-trunk-outline" stroke="#c84e2f" width=".5" />
-        <outline-layer id="de-primary-outline" stroke="#c49a64" width=".5" />
-        <outline-layer id="de-secondary-outline" stroke="#a09c60" width=".5" />
-        <outline-layer id="de-tertiary-outline" stroke="#95995a" width=".5" />
-        <outline-layer id="de-unclassified-outline" stroke="#868e8b" width=".5" />
+        <!-- outlines for roads -->
+        <outline-layer id="de-motorway-outline" stroke="#000000" width=".3" />
+        <outline-layer id="de-trunk-outline" stroke="#000000" width=".3" />
+        <outline-layer id="de-primary-outline" stroke="#000000" width=".3" />
+        <outline-layer id="de-secondary-outline" stroke="#000000" width=".3" />
+        <outline-layer id="de-tertiary-outline" stroke="#000000" width=".2" />
+        <outline-layer id="de-unclassified-outline" stroke="#000000" width=".2" />
+        <outline-layer id="de-residential-outline" stroke="#000000" width=".2" />
+        <outline-layer id="de-service-outline" stroke="#000000" width=".1" />
 
         <!-- match tunnel-tag (to ensure tunnel key is present) -->
         <m k="tunnel" zoom-min="8">
@@ -754,7 +846,7 @@
                             </m>
                         </m>
                         <m zoom-min="14">
-                            <m v="footway|cycleway|">
+                            <m v="footway|cycleway">
                                 <line use="footway" />
                             </m>
                             <m v="track">
@@ -799,33 +891,40 @@
                             <line use="de-motorway-tunnel" />
                         </m>
                     </m>
-                    <m k="railway"
-                        v="rail|tram|light_rail|narrow_gauge|preserved|funicular|miniature|disused|abandoned">
-                        <line use="de-rail" />
-                    </m>
+					<!-- railway tunnel -->
+					<m e="way" k="railway"
+						v="tram|subway|light_rail|narrow_gauge|preserved|funicular|miniature|monorail">
+						<line stroke="#CCCCCC" width="0.4" />
+						<line stroke="#808080" dasharray="4,6" cap="butt" width="0.25" />
+					</m>
+					<m e="way" k="railway" v="rail" zoom-min="11">
+						<line stroke="#CCCCCC" width="0.6" />
+						<line stroke="#999999" dasharray="6,6" cap="butt" width="0.5" />
+					</m>
                 </m>
             </m>
         </m><!-- end tunnel -->
 
-        <!-- railway -->
-        <m k="railway"
-            v="rail|tram|light_rail|narrow_gauge|preserved|funicular|miniature|disused|abandoned">
-            <line cap="butt" fade="12" fix="true" stipple="10" stipple-stroke="#e6e6e6"
-                stipple-width="0.8" stroke="#333333" width="1.6" />
-        </m>
-        <m k="railway"
-            v="station|platform">
-            <area use="de-station" />
-            <line use="de-station" />
-        </m>
-
-        <!-- highway -->
+        <!-- railway tracks, not in a tunnel -->
+		<m e="way" k="tunnel" v="~|no|false">
+			<m k="railway" v="rail|tram|light_rail|narrow_gauge|preserved|funicular|miniature|disused|abandoned">
+				<m zoom-min="11" zoom-max="15">
+					<line cap="butt" fade="12" fix="true" stipple="10" stipple-stroke="#e6e6e6" stipple-width="0.8" stroke="#333333" width="1.8" />
+				</m>
+				<m zoom-min="16">
+					<line cap="butt" fade="12" fix="true" stipple="10" stipple-stroke="#e6e6e6" stipple-width="0.8" stroke="#333333" width="2.5" />
+				</m>
+			</m>
+		</m>
+
+        <!-- highways/roads -->
         <m k="highway">
-            <m select="first" zoom-max="7" zoom-min="4">
+            <m select="first" zoom-max="8" zoom-min="4">
                 <m k="area" v="~|no|false">
                     <!-- Low Zoom, only motorways -->
                     <m v="motorway">
-                        <line cap="butt" outline="de-motorway-outline" use="de-motorway" />
+						<line cap="butt" stroke="#000000" width="2.2" />
+						<line cap="butt" stroke="#e892a2" width="2.0" />
                     </m>
                 </m>
             </m>
@@ -835,7 +934,7 @@
                     <!-- highway area -->
                     <m k="area" v="yes|true" zoom-min="14">
                         <m v="service|unclassified|residential|road">
-                            <area fill="#ffffff" />
+                            <area fill="#FFFFFF" />
                             <line cap="butt" fix="true" stroke="#44000000" width="1.0" />
                         </m>
                         <m v="pedestrian|footway|living_street">
@@ -845,22 +944,6 @@
                     </m>
 
                     <m k="area" v="~|no|false">
-                        <!-- links have to appear as first element -->
-                        <m v="tertiary_link">
-                            <line outline="de-tertiary-outline" use="de-tertiary" />
-                        </m>
-                        <m v="secondary_link">
-                            <line outline="de-secondary-outline" use="de-secondary" />
-                        </m>
-                        <m v="primary_link">
-                            <line outline="de-primary-outline" use="de-primary" />
-                        </m>
-                        <m v="trunk_link">
-                            <line outline="de-trunk-outline" use="de-trunk-link" />
-                        </m>
-                        <m v="motorway_link">
-                            <line outline="de-motorway-outline" use="de-motorway-link" />
-                        </m>
                         <m zoom-min="16">
                             <m v="steps">
                                 <line use="de-steps" />
@@ -876,53 +959,116 @@
                             <m v="cycleway">
                                 <line use="highway:cycleway" />
                             </m>
-                            <m v="track">
-                                <line use="highway:track" />
-                            </m>
+                            <m cat="off_road" v="byway|track">
+								<m e="way" k="tracktype" v="grade1">
+									<line stroke="#cbc0b3" width="0.6" />
+								</m>
+								<m e="way" k="tracktype" v="grade2">
+									<line stroke="#cc9966" width="0.6" />
+								</m>
+								<m e="way" k="tracktype" v="grade3">
+									<line stroke="#8c8c8c" dasharray="25,5" cap="butt" width="0.6" />
+								</m>
+								<m e="way" k="tracktype" v="grade4">
+									<line stroke="#669900" dasharray="20,5,8,5" cap="butt" width="0.6" />
+								</m>
+								<m e="way" k="tracktype" v="grade5">
+									<line stroke="#669900" dasharray="8,5" cap="butt" width="0.6" />
+								</m>
+								<m e="way" k="tracktype" v="~">
+									<line stroke="#cbc0b3" dasharray="15,5" cap="butt" width="0.6" />
+								</m>                            
+							</m>
+							<m cat="off_road" e="way" k="highway" v="bridleway" zoom-min="14">
+								<line stroke="#cbc0b3" dasharray="10,12" cap="round" width="0.6" />
+							</m>
                             <m v="path">
                                 <line use="highway:path" />
                             </m>
-                            <m v="bridleway">
-                                <line use="bridleway" />
-                            </m>
                             <m v="construction">
                                 <line outline="1" use="construction" />
                             </m>
                             <m v="service">
-                                <!-- matches every service but parking_isle -->
-                                <line use="de-service" />
+								<line cap="butt" stroke="#000000" width="1.0" />
+								<line cap="butt" stroke="#ffffff" width="0.9" />
+								<m zoom-min="13">
+									<text style="bold" fill="#000000" k="name" priority="8" size="12" stroke="#FFFFFF" stroke-width="2.0" />
+								</m>
                             </m>
-                            <m v="byway|pedestrian|living_street">
+                            <m v="pedestrian|living_street">
                                 <line outline="0" use="de-pedestrian" />
                             </m>
                         </m>
                         <m v="residential|road">
-                            <line outline="0" use="de-residential" />
+							<line outline="de-residential-outline" use="de-residential" />
+                        </m>
+                        <m v="service">
+							<line outline="de-service-outline" use="de-service" />
                         </m>
                         <m v="unclassified">
-                            <line outline="de-unclassified-outline" use="de-unclassified" />
+							<m zoom-min="11" zoom-max="11">
+								<line cap="butt" stroke="#000000" width="1.2" />
+								<line cap="butt" stroke="#ffffff" width="1.0" />
+							</m>
+							<m zoom-min="12">
+								<line cap="butt" stroke="#000000" width="1.8" />
+								<line cap="butt" stroke="#ffffff" width="1.6" />
+							</m>
                         </m>
-                        <m v="tertiary">
-                            <line outline="de-tertiary-outline" use="de-tertiary" />
+                        <m v="tertiary|tertiary_link">
+							<m zoom-min="10" zoom-max="10">
+								<line cap="butt" stroke="#000000" width="1.2" />
+								<line cap="butt" stroke="#ffffff" width="1.0" />
+							</m>
+							<m zoom-min="11">
+								<line cap="butt" stroke="#000000" width="2.2" />
+								<line cap="butt" stroke="#ffffff" width="2.0" />
+							</m>
                         </m>
-                        <m v="secondary">
-                            <line outline="de-secondary-outline" use="de-secondary" />
+                        <m v="secondary|secondary_link">
+							<m zoom-min="9" zoom-max="9">
+								<line cap="butt" stroke="#000000" width="1.2" />
+								<line cap="butt" stroke="#fffa9b" width="1.0" />
+							</m>
+							<m zoom-min="10">
+								<line cap="butt" stroke="#000000" width="2.2" />
+								<line cap="butt" stroke="#fffa9b" width="1.9" />
+							</m>
                         </m>
-                        <m v="primary">
-                            <line outline="de-primary-outline" use="de-primary" />
+                        <m v="primary|primary_link">
+							<m zoom-min="8" zoom-max="8">
+								<line cap="butt" stroke="#000000" width="1.0" />
+								<line cap="butt" stroke="#ffc982" width="0.8" />
+							</m>
+							<m zoom-min="9" zoom-max="9">
+								<line cap="butt" stroke="#000000" width="1.8" />
+								<line cap="butt" stroke="#ffc982" width="1.6" />
+							</m>
+							<m zoom-min="10">
+								<line cap="butt" stroke="#000000" width="2.2" />
+								<line cap="butt" stroke="#ffc982" width="1.9" />
+							</m>
                         </m>
-                        <m v="trunk">
-                            <line outline="de-trunk-outline" use="de-trunk" />
+                        <m v="trunk|trunk_link">
+							<m zoom-min="7" zoom-max="8">
+								<line cap="butt" stroke="#000000" width="1.8" />
+								<line cap="butt" stroke="#f9b29c" width="1.5" />
+							</m>
+							<m zoom-min="9">
+								<line cap="butt" stroke="#000000" width="2.8" />
+								<line cap="butt" stroke="#f9b29c" width="2.5" />
+							</m>
                         </m>
-                        <m v="motorway">
-                            <line outline="de-motorway-outline" use="de-motorway" />
+                        <m v="motorway|motorway_link">
+							<line cap="butt" stroke="#000000" width="2.8" />
+							<line cap="butt" stroke="#e892a2" width="2.5" />
                         </m>
                     </m> <!-- end area=~|no|false -->
                 </m><!-- end tunnel|bridge=~|no|false -->
 
                 <!-- Bridge casings should be above other roads -->
                 <outline-layer id="bridge" stroke="#000000" width="0.08" />
-                <outline-layer id="de-bridge" stroke="#000000" width="0.2" />
+                <outline-layer id="de-bridge" stroke="#000000" width="0.5" />
 
                 <!-- must contain bridge -->
                 <m k="bridge">
@@ -950,7 +1096,6 @@
                             <m zoom-min="16">
                                 <m v="steps">
                                     <line use="steps" />
-                                    <!-- <outline use="bridge"/> -->
                                 </m>
                             </m>
 
@@ -983,7 +1128,7 @@
                             </m>
 
                             <m select="first" zoom-min="13">
-                                <m v="byway|pedestrian|living_street">
+                                <m v="pedestrian|living_street">
                                     <line cap="butt" outline="bridge" use="de-pedestrian" />
                                 </m>
                                 <m v="residential|road">
@@ -1015,7 +1160,7 @@
 
                         <m k="area" select="first" v="yes|true" zoom-min="14">
                             <m v="service|unclassified|residential|road">
-                                <area fill="#ffffff" />
+                                <area fill="#FFFFFF" />
                                 <line cap="butt" fix="true" stroke="#44000000" width="1.0" />
                             </m>
                             <m v="pedestrian|footway|living_street">
@@ -1026,50 +1171,98 @@
                     </m>
                 </m> <!-- end bridge=yes -->
 
-                <!-- Render Highway Names -->
+                <!-- Highway Captions/Names -->
                 <m k="area" v="~|no|false">
-                    <!-- highway tunnels -->
                     <m k="highway">
-                        <m v="motorway|trunk|primary">
-                            <text use="major-road" />
-                            <m zoom-max="12">
-                                <text use="road-ref-caption" />
+						<m v="services">
+							<text use="junction-caption" />
+						</m>
+                        <m v="motorway|motorway_link">
+							<m cat="road_detail" v="motorway" zoom-min="10" zoom-max="10">
+                                <text use="motorway-road-box" />
+							</m>
+                            <m zoom-min="11" zoom-max="12">
+								<text use="motorway-road-box" />
                             </m>
                             <m zoom-min="13">
-                                <text use="road-ref" />
+                                <text use="motorway-road-ref" />
                             </m>
                         </m>
-                        <m v="secondary|motorway_link|trunk_link|primary_link|secondary_link">
-                            <text use="major-road" />
-                            <text use="road-ref" />
+                        <m v="trunk|trunk_link">
+							<m cat="road_detail" v="trunk" zoom-min="11" zoom-max="11">
+                                <text use="trunk-road-box" />
+							</m>
+                            <m zoom-min="12" zoom-max="12">
+                                <text use="trunk-road-box" />
+                            </m>
+                            <m zoom-min="13">
+                                <text use="trunk-road-name" />
+                                <text use="trunk-road-ref" />
+                            </m>
                         </m>
-                        <m v="tertiary|tertiary_link">
-                            <text use="road" />
-                            <text use="road-ref" />
+                        <m v="primary|primary_link">
+							<m cat="road_detail" v="primary|primary_link" zoom-min="12" zoom-max="12">
+                                <text use="primary-road-box" />
+                            </m>
+							<!--<m zoom-min="13" zoom-max="13">
+                                <text use="primary-road-box" />
+                            </m>-->
+                            <m zoom-min="13">
+								<text use="primary-road-name" />
+								<text use="primary-road-ref" />
+                            </m>
                         </m>
-                        <m v="unclassified|residential|road">
-                            <text use="road" />
+                        <m v="secondary|secondary_link">
+							<m cat="road_detail" v="secondary|secondary_link" zoom-min="12" zoom-max="12">
+                                <text use="secondary-road-box" />
+                            </m>
+							<!--<m zoom-min="13" zoom-max="13">
+                                <text use="secondary-road-box" />
+                            </m>-->
+                            <m zoom-min="13">
+								<text use="secondary-road-name" />
+								<text use="secondary-road-ref" />
+                            </m>
                         </m>
-                        <m v="byway|pedestrian|living_street" zoom-min="14">
+                        <m v="tertiary|tertiary_link" zoom-min="14">
                             <text use="road" />
+                            <text use="road-ref" />
+                        </m>
+                        <m v="byway|pedestrian|residential|living_street|unclassified" zoom-min="14">
+                            <text use="residential-road" />
                         </m>
                     </m>
                 </m>
-            </m> <!-- zoom min 8 -->
+            </m>
         </m><!-- end highway -->
 
-        <!-- Borders -->
-        <m k="boundary" v="administrative">
-            <m k="admin_level">
-                <m v="4">
-                    <line fix="true" stipple="4" stipple-stroke="#888888" stipple-width="1.0"
-                        stroke="#dadada" width="1.5" />
-                </m>
-                <m v="2">
-                    <line fix="true" stipple="6" stipple-stroke="#647b9c" stipple-width="1.0"
-                        stroke="#dadada" width="2" />
-                </m>
-            </m>
+        <!-- railway tracks, not on a bridge or in a tunnel -->
+		<m e="way" k="bridge|tunnel" v="no|false">
+			<m k="railway" v="rail|tram|light_rail|narrow_gauge|preserved|funicular|miniature|disused|abandoned">
+				<m zoom-min="11" zoom-max="15">
+					<line cap="butt" fade="12" fix="true" stipple="10" stipple-stroke="#e6e6e6" stipple-width="0.8" stroke="#333333" width="1.8" />
+				</m>
+				<m zoom-min="16">
+					<line cap="butt" fade="12" fix="true" stipple="10" stipple-stroke="#e6e6e6" stipple-width="0.8" stroke="#333333" width="2.2" />
+				</m>
+			</m>
+		</m>
+
+		<!-- railway bridges -->
+		<m e="way" k="bridge" v="yes|true|viaduct|aqueduct|suspension|culvert|swing">
+			<m e="way" k="railway" v="subway|narrow_gauge|preserved|funicular|miniature|tram|light_rail|monorail">
+				<line stroke="#666666" cap="butt" width="1.2" />
+				<line stroke="#EEEEEE" cap="butt" width="0.8" />
+			</m>
+			<m e="way" k="railway" v="rail">
+				<line stroke="#666666" cap="butt" width="1.2" />
+				<line stroke="#EEEEEE" cap="butt" width="1.0" />
+			</m>
+		</m>
+        <m k="railway"
+            v="station|platform">
+            <area use="de-station" />
+            <line use="de-station" />
         </m>
 
         <!-- highway one-way markers -->
@@ -1086,94 +1279,20 @@
     </m><!-- end e="way" -->
 
     <m e="node" select="first">
-
-        <!-- Motorcycle POIs -->
-        <m select="first">
-            <m k="amenity">
-                <m cat="fuel" v="fuel" zoom-min="10">
-                    <symbol src="assets:symbols/transport/fuel.svg" />
-                </m>
-                <m cat="charging_station" v="charging_station" zoom-min="10">
-                    <symbol src="assets:symbols/custom/transport/charging_station.svg" />
-                </m>
-                <m cat="parking" v="motorcycle_parking" zoom-min="13">
-                    <symbol src="assets:symbols/custom/transport/parking_motorcycle.svg" />
-                </m>
-                <m cat="parking" v="parking" zoom-min="16">
-                    <symbol src="assets:symbols/transport/parking.svg" />
-                </m>
-            </m>
-            <m k="tourism">
-                <m cat="view" v="viewpoint" zoom-min="10">
-                    <symbol src="assets:symbols/tourist/view_point.svg" />
-                </m>
-            </m>
-            <m k="shop">
-                <m cat="motorcycle_shop" v="motorcycle|motorcycle_repair" zoom-min="10">
-                    <symbol src="assets:symbols/shopping/diy.svg" />
-                </m>
-            </m>
-            <m cat="mountain_pass" k="mountain_pass" v="yes" zoom-min="10">
-                <symbol src="assets:symbols/poi/mountain_pass.svg" symbol-percent="60" />
-            </m>
-            <m select="when-matched">
-                <text use="poi" />
-            </m>
-        </m>
-        <m k="name" select="first">
-            <m k="historic">
-                <m cat="attraction" v="castle" zoom-min="10">
-                    <symbol src="assets:symbols/tourist/castle2.svg" />
-                </m>
-            </m>
-            <m k="tourism">
-                <m cat="attraction" v="attraction|picnic_site" zoom-min="10">
-                    <symbol src="assets:symbols/tourist/attraction.svg" />
-                </m>
-                <m cat="accommodation" v="hotel" zoom-min="16">
-                    <symbol src="assets:symbols/accommodation/hotel2.svg" />
-                </m>
-                <m cat="accommodation" v="hostel" zoom-min="16">
-                    <symbol src="assets:symbols/accommodation/hostel.svg" />
-                </m>
-                <m cat="accommodation" v="camp_site" zoom-min="12">
-                    <symbol src="assets:symbols/accommodation/camping.svg" />
-                </m>
-                <m cat="accommodation" v="caravan_site" zoom-min="12">
-                    <symbol src="assets:symbols/accommodation/caravan_park.svg" />
-                </m>
-            </m>
-            <m k="amenity">
-                <m cat="health" v="hospital" zoom-min="15">
-                    <symbol src="assets:symbols/health/hospital.svg" />
-                </m>
-                <m cat="health" v="pharmacy" zoom-min="16">
-                    <symbol src="assets:symbols/health/pharmacy.svg" />
-                </m>
-                <m cat="food" v="restaurant" zoom-min="16">
-                    <symbol src="assets:symbols/food/restaurant.svg" />
-                </m>
-                <m cat="food" v="cafe" zoom-min="16">
-                    <symbol src="assets:symbols/food/cafe.svg" />
-                </m>
-                <m cat="food" v="pub" zoom-min="16">
-                    <symbol src="assets:symbols/food/pub.svg" />
-                </m>
-                <m cat="food" v="fast_food" zoom-min="16">
-                    <symbol src="assets:symbols/food/fastfood.svg" />
-                </m>
-            </m>
-            <m select="when-matched">
-                <text use="poi" />
-            </m>
-        </m>
-
+		<!-- motorway junctions -->
         <m k="highway">
             <m v="motorway_junction" zoom-min="14">
-                <text use="road-caption" />
+                <text use="junction-caption" />
             </m>
         </m>
 
+		<m e="node" k="railway" v="crossing" zoom-min="15">
+			<symbol src="assets:symbols/railway-crossing-small.svg" />
+		</m>
+		<m e="node" k="railway" v="level_crossing" zoom-min="15">
+			<symbol src="assets:symbols/railway-crossing.svg" />
+		</m>
+
         <m k="barrier" zoom-min="16">
             <m v="bollard">
                 <symbol src="assets:symbols/barrier/bollard.svg" />
@@ -1191,40 +1310,38 @@
 
         <!-- place -->
         <m k="place">
-            <m v="hamlet|locality|isolated_dwelling" zoom-min="14">
+            <m v="hamlet" zoom-min="14">
+                <text use="hamlet-caption" />
+            </m>
+            <m v="locality|isolated_dwelling|neighbourhood" zoom-min="15">
                 <text use="hamlet-caption" />
             </m>
-            <m v="suburb" zoom-max="15" zoom-min="13">
+            <m v="suburb" zoom-min="13">
                 <text use="suburb-caption" />
             </m>
-            <m v="village|island" zoom-max="15" zoom-min="12">
+            <m v="village|island|islet" zoom-min="11" zoom-max="15">
                 <text use="village-caption" />
             </m>
-            <m v="town" zoom-max="15">
+            <m v="town" zoom-min="9" zoom-max="12">
+                <text use="town-lz-caption" />
+            </m>
+            <m v="town" zoom-min="13" zoom-max="14">
                 <text use="town-caption" />
             </m>
-            <m v="city" zoom-max="15">
-                <m zoom-min="7">
-                    <text use="city-caption" />
-                </m>
-                <m zoom-max="6">
-                    <text use="city-lz-caption" />
-                </m>
+            <m v="city" zoom-min="6" zoom-max="9">
+				<text use="city-lz-caption" />
+            </m>
+            <m v="city" zoom-min="10" zoom-max="15">
+				<text use="city-caption" />
             </m>
             <m v="country" zoom-max="6">
                 <text use="country-caption" />
             </m>
         </m>
 
-        <m cat="mountain_peak" k="natural" v="peak" zoom-min="10">
-            <symbol src="assets:symbols/peak.svg" />
-            <text use="peak-name-caption" />
-            <text use="peak-ele-caption" />
-        </m>
-
         <!-- house numbers -->
         <m k="addr:housenumber" zoom-min="17">
-            <text use="house-name-caption" />
+            <!--<text use="house-name-caption" />-->
             <text use="housenumber-caption" />
         </m>
 
@@ -1235,4 +1352,434 @@
         </m>
     </m>
 
+	<!-- Borders -->
+	<m k="boundary" v="administrative">
+		<m k="admin_level">
+			<m v="2"> <!-- country border -->
+				<m zoom-min="6" zoom-max="11">
+					<line fix="true" stipple="6" stipple-stroke="#647b9c" stipple-width="2.5" stroke="#737373" width="1.5" />
+				</m>
+				<m zoom-min="12">
+					<line fix="true" stipple="6" stipple-stroke="#647b9c" stipple-width="1.0" stroke="#dadada" width="2.0" />
+				</m>
+			</m>
+			<m v="4"> <!-- state border -->
+				<m zoom-min="6" zoom-max="11">
+					<line fix="true" stipple="6" stipple-stroke="#647b9c" stipple-width="2.5" stroke="#737373" width="1.5" />
+				</m>
+				<m zoom-min="12">
+					<line fix="true" stipple="6" stipple-stroke="#647b9c" stipple-width="1.0" stroke="#dadada" width="2.0" />
+				</m>
+			</m>
+			<m v="5" zoom-min="12">
+				<line fix="true" stipple="4" stipple-stroke="#888888" stipple-width="1.0" stroke="#dadada" width="2" />
+			</m>
+			<m v="6" zoom-min="12"> <!-- county border -->
+				<line fix="true" stipple="4" stipple-stroke="#888888" stipple-width="1.0" stroke="#dadada" width="1.5" />
+			</m>
+			<m v="8" zoom-min="12">
+				<line fix="true" stipple="4" stipple-stroke="#888888" stipple-width="1.0" stroke="#dadada" width="1.5" />
+			</m>
+			<m v="9" zoom-min="12">
+				<line fix="true" stipple="4" stipple-stroke="#888888" stipple-width="1.0" stroke="#dadada" width="1.5" />
+			</m>
+		</m>
+	</m>
+
+    <!-- accommodation LAYER -->
+	<m k="name" select="first">
+		<m k="building|tourism">
+			<m cat="accommodation" v="camp_site" zoom-min="15">
+				<symbol src="assets:symbols/accommodation/camping.svg" />
+			</m>
+			<m cat="accommodation" v="caravan_site" zoom-min="15">
+				<symbol src="assets:symbols/accommodation/caravan_park.svg" />
+			</m>
+			<m cat="accommodation" v="guest_house|hotel" zoom-min="15">
+				<symbol src="assets:symbols/accommodation/hotel2.svg" />
+			</m>
+			<m cat="accommodation" v="hostel" zoom-min="15">
+				<symbol src="assets:symbols/accommodation/hostel.svg" />
+			</m>
+		</m>
+		<m select="when-matched">
+			<text use="poi-accommodation" />
+		</m>
+    </m>
+
+    <!-- emergency services LAYER -->
+	<m k="name" select="first">
+		<m k="amenity|building">
+			<m cat="emergency" v="hospital" zoom-min="15">
+				<symbol src="assets:symbols/health/hospital.svg" />
+			</m>
+			<m cat="emergency" v="pharmacy" zoom-min="15">
+				<symbol src="assets:symbols/health/pharmacy.svg" />
+			</m>
+			<m cat="emergency" v="doctors" zoom-min="15">
+				<symbol src="assets:symbols/health/doctors2.svg" />
+			</m>
+			<m cat="emergency" v="fire_station" zoom-min="15">
+				<symbol src="assets:symbols/amenity/firestation3.svg" />
+			</m>
+			<m cat="emergency" v="police" zoom-min="15">
+				<symbol src="assets:symbols/amenity/police2.svg" />
+			</m>
+			<m cat="emergency" v="embassy" zoom-min="15">
+				<symbol src="assets:symbols/poi/embassy2.svg" />
+			</m>
+		</m>
+		<m select="when-matched">
+			<text use="poi-emergency" />
+		</m>
+    </m>
+
+	<!-- entertainment venues LAYER -->
+	<m k="name" select="first">
+		<m cat="entertainment" k="amenity" v="cinema" zoom-min="16">
+			<symbol src="assets:symbols/tourist/cinema2.svg" />
+		</m>
+		<m cat="entertainment" k="amenity" v="theatre" zoom-min="16">
+			<symbol src="assets:symbols/tourist/theatre.svg" />
+		</m>
+		<m select="when-matched">
+			<text use="poi" />
+		</m>
+	</m>
+
+    <!-- food and drink LAYER -->
+	<m k="name" select="first">
+		<m k="amenity">
+			<m cat="food" v="bar|pub" zoom-min="15">
+				<symbol src="assets:symbols/food/pub.svg" />
+			</m>
+			<m cat="food" v="biergarten" zoom-min="15">
+				<symbol src="assets:symbols/food/biergarten.svg" />
+			</m>
+			<m cat="food" v="cafe" zoom-min="15">
+				<symbol src="assets:symbols/food/cafe.svg" />
+			</m>
+			<m cat="food" v="fast_food" zoom-min="15">
+				<symbol src="assets:symbols/food/fastfood.svg" />
+			</m>
+			<m cat="food" v="restaurant" zoom-min="15">
+				<symbol src="assets:symbols/food/restaurant.svg" />
+			</m>
+		</m>
+		<m select="when-matched">
+			<text use="poi" />
+		</m>
+    </m>
+
+    <!-- fuel and charging stations LAYER -->
+	<m select="first">
+		<m k="amenity">
+			<m cat="fuel" v="fuel" zoom-min="10">
+				<symbol src="assets:symbols/transport/fuel.svg" />
+			</m>
+			<m cat="charging_station" v="charging_station" zoom-min="10">
+				<symbol src="assets:symbols/custom/transport/charging_station.svg" />
+			</m>
+		</m>
+		<m select="when-matched" zoom-min="16">
+			<text use="poi-fuel" />
+		</m>
+    </m>
+	
+	<!-- mountain peak LAYER -->
+	<m select="first">
+		<m cat="mountain_peak" k="natural" v="peak" zoom-min="10">
+            <symbol src="assets:symbols/peak.svg" />
+            <text use="peak-name-caption" />
+            <text use="peak-ele-caption" />
+        </m>
+	</m>
+
+	<!-- parking LAYER -->
+	<m select="first">
+		<m k="amenity">
+			<m cat="parking" v="motorcycle_parking" zoom-min="14">
+				<symbol src="assets:symbols/custom/transport/parking_motorcycle.svg" />
+			</m>
+			<m cat="parking" v="parking" zoom-min="14">
+				<symbol src="assets:symbols/transport/parking.svg" />
+			</m>
+		</m>
+		<m select="when-matched">
+			<text use="poi" />
+		</m>
+	</m>
+	
+	<!-- POI miscellaneous and holding area LAYER -->
+	<m select="first">
+        <m cat="misc" e="any" k="amenity" v="kindergarten" zoom-min="16">
+            <symbol id="nursery" src="assets:symbols/education/nursery3.svg" />
+        </m>
+        <m cat="misc" e="any" k="amenity|building" v="school" zoom-min="16">
+            <symbol id="school" src="assets:symbols/education/school.svg" />
+        </m>
+        <m cat="misc" e="any" k="amenity|building" v="university|college" zoom-min="16">
+            <symbol id="university" src="assets:symbols/education/university.svg" />
+        </m>
+        <m cat="misc" e="any" k="amenity" v="post_box" zoom-min="16">
+            <symbol src="assets:symbols/amenity/post_box.svg" />
+        </m>
+        <m cat="misc" e="any" k="amenity" v="post_office" zoom-min="16">
+            <symbol id="post_office" src="assets:symbols/amenity/post_office.svg" />
+        </m>
+        <m cat="misc" e="any" k="amenity" v="telephone" zoom-min="16">
+            <symbol src="assets:symbols/amenity/telephone.svg" />
+        </m>
+        <m cat="misc" e="any" k="amenity" v="toilets" zoom-min="16">
+            <symbol src="assets:symbols/amenity/toilets.svg" />
+        </m>
+        <m cat="misc" e="any" k="amenity|building" v="library" zoom-min="16">
+            <symbol id="library" src="assets:symbols/amenity/library.svg" />
+        </m>
+		<!-- sports -->
+		<m e="any" k="*" v="*">
+			<m cat="misc" e="any" k="leisure" v="water_park" zoom-min="16">
+				<symbol src="assets:symbols/sport/swimming_outdoor.svg" />
+			</m>
+			<m cat="misc" e="way" k="leisure" v="~" zoom-min="16">
+				<m e="way" k="sport" v="swimming">
+					<symbol src="assets:symbols/sport/swimming_outdoor.svg" />
+				</m>
+			</m>
+			<m cat="misc" e="node" k="sport" v="swimming" zoom-min="16">
+				<symbol src="assets:symbols/sport/swimming_outdoor.svg" />
+			</m>
+			<m cat="misc" e="any" k="sport" v="soccer" zoom-min="16">
+				<symbol src="assets:symbols/sport/soccer.svg" />
+			</m>
+			<m cat="misc" e="any" k="sport" v="tennis" zoom-min="16">
+				<symbol src="assets:symbols/sport/tennis.svg" />
+			</m>
+			<m cat="misc" e="any" k="sport|leisure" v="golf|golf_course" zoom-min="16">
+				<symbol src="assets:symbols/sport/golf.svg" />
+			</m>
+			<m cat="misc" e="any" k="sport" v="shooting" zoom-min="16">
+				<symbol src="assets:symbols/sport/shooting.svg" />
+			</m>
+			<m cat="misc" e="any" k="leisure" v="stadium" zoom-min="16">
+				<symbol src="assets:symbols/sport/stadium.svg" />
+			</m>
+		</m>
+        <m cat="misc" e="any" k="leisure" v="playground" zoom-min="16">
+            <symbol id="playground" src="assets:symbols/amenity/playground.svg" />
+        </m>
+        <m cat="misc" e="any" k="amenity" v="drinking_water" zoom-min="16">
+            <symbol src="assets:symbols/food/drinkingtap.svg" />
+        </m>
+        <m cat="misc" e="any" k="tourism" v="picnic_site" zoom-min="15">
+            <symbol src="assets:symbols/tourist/picnic.svg" />
+        </m>
+        <!--<m cat="misc" e="node" k="amenity" v="bench" zoom-min="17">
+            <symbol src="assets:symbols/bench.svg" />
+        </m>-->
+        <m cat="misc" e="any" k="amenity" v="recycling" zoom-min="15">
+            <symbol src="assets:symbols/amenity/recycling.svg" />
+        </m>
+        <m cat="misc" e="any" k="amenity" v="fountain" zoom-min="15">
+            <m e="any" k="drinking_water" v="yes">
+                <symbol src="assets:symbols/food/drinkingtap.svg" />
+            </m>
+            <m e="any" k="*" v="*">
+                <symbol src="assets:symbols/amenity/fountain2.svg" />
+            </m>
+        </m>
+        <m cat="misc" e="any" k="amenity" v="bicycle_rental" zoom-min="16">
+            <symbol src="assets:symbols/transport/rental_bicycle.svg" />
+        </m>
+        <m cat="misc" e="any" k="leisure" v="slipway" zoom-min="17">
+            <symbol src="assets:symbols/transport/slipway.svg" />
+        </m>
+        <m cat="misc" e="node" k="natural" v="cave_entrance" zoom-min="16">
+            <symbol id="cave" src="assets:symbols/poi/cave.svg" />
+        </m>
+		<m select="when-matched">
+			<text use="poi-misc" />
+		</m>
+	</m>
+
+	<!-- public transport, bus, train, tram etc LAYER -->
+	<m select="first">
+		<m cat="public_transport" k="railway" v="station" zoom-min="14">
+			<symbol src="assets:symbols/transport/train_station2.svg" />
+		</m>
+		<m cat="public_transport" k="station" v="light_rail|subway" zoom-min="14">
+			<symbol src="assets:symbols/transport/train_station2.svg" />
+		</m>
+		<m cat="public_transport" v="halt|tram_stop" zoom-min="14">
+			<symbol src="assets:symbols/transport/tram_stop.svg" />
+		</m>
+		<m cat="public_transport" k="amenity" v="bus_station" zoom-min="14">
+			<symbol src="assets:symbols/transport/bus_station.svg" />
+		</m>
+		<m cat="public_transport" k="highway" v="bus_stop" zoom-min="14">
+			<symbol src="assets:symbols/transport/bus_stop.svg" />
+		</m>
+		<m cat="public_transport" e="way" k="aeroway" v="helipad" zoom-min="14">
+			<symbol id="helipad" src="assets:symbols/transport/helicopter.svg" />
+			<caption fill="#0092DA" size="12" style="bold" k="name" priority="-20" stroke="#FFFFFF" stroke-width="2.0" />
+		</m>
+		<m cat="public_transport" e="way" k="aeroway" v="aerodrome|airport" zoom-min="14">
+			<symbol id="airport" src="assets:symbols/transport/airport2.svg" />
+		</m>
+		<m cat="public_transport" e="way" k="aeroway" v="runway" zoom-min="14">
+			<caption fill="#000000" size="12" style="bold" k="ref" priority="-10" stroke="#FFFFFF" stroke-width="2.0" />
+		</m>
+		<m select="when-matched">
+			<text use="poi-transport" />
+		</m>
+	</m>
+
+    <!-- shops LAYER -->
+	<m select="first">
+		<m cat="shop" k="amenity|shop" >
+			<m v="marketplace" zoom-min="16">
+				<symbol id="marketplace" src="assets:symbols/shopping/marketplace.svg" />
+			</m>
+			<m v="supermarket|department_store|frozen_food|mall|wholesale" zoom-min="16">
+				<symbol src="assets:symbols/shopping/supermarket.svg" />
+			</m>
+			<m v="confectionery|convenience|general|kiosk" zoom-min="16">
+				<symbol src="assets:symbols/shopping/convenience.svg" />
+			</m>
+			<m v="bakery" zoom-min="16">
+				<symbol src="assets:symbols/shopping/bakery.svg" />
+			</m>
+			<m k="shop" v="doityourself|electrical|garden_centre|hardware|houseware|locksmith|paint|tool_hire" zoom-min="16">
+				<symbol src="assets:symbols/shopping/diy.svg" />
+			</m>
+			<m k="shop" v="bicycle" zoom-min="16">
+				<symbol src="assets:symbols/shopping/bicycle.svg" />
+			</m>
+			<m v="organic|farm|greengrocer|cheese|health_food" zoom-min="16">
+				<symbol src="assets:symbols/shopping/greengrocer.svg" />
+			</m>
+			<m v="butcher|seafood|deli" zoom-min="16">
+				<symbol src="assets:symbols/shopping/butcher.svg" />
+			</m>
+			<m v="laundry|dry_cleaning" zoom-min="16">
+				<symbol src="assets:symbols/shopping/laundrette.svg" />
+			</m>
+			<m v="beverages|alcohol" zoom-min="16">
+				<symbol src="assets:symbols/shopping/alcohol.svg" />
+			</m>
+			<m v="books|newsagent" zoom-min="16">
+				<symbol src="assets:symbols/shopping/book.svg" />
+			</m>
+			<m v="car|car_repair|car_parts|motorcycle|motorcycle_repair|motorcycle_parts" zoom-min="15">
+				<symbol src="assets:symbols/shopping/car_repair.svg" />
+			</m>
+			<m v="beauty|boutique|charity|clothes|computer|electronics|hairdresser|optician|second_hand|shoes|tattoo" zoom-min="16">
+				<symbol id="shop" src="assets:symbols/dot_magenta.svg" />
+			</m>
+		</m>
+		<m select="when-matched" >
+			<text use="poi-fuel" />
+		</m>
+    </m>
+
+	<!-- tourist attractions LAYER -->
+	<m select="first">
+		<m cat="attraction" k="tourism" zoom-min="15">
+			<m v="attraction">
+				<symbol src="assets:symbols/tourist/attraction.svg" />
+			</m>
+			<m v="attraction|picnic_site">
+				<symbol src="assets:symbols/tourist/attraction.svg" />
+			</m>
+			<m v="information">
+				<symbol src="assets:symbols/tourist/information.svg" />
+			</m>
+			<m v="zoo">
+				<symbol src="assets:symbols/tourist/zoo.svg" />
+			</m>
+		</m>
+        <m cat="attraction" e="any" k="tourism|building" v="museum" zoom-min="15">
+            <symbol id="museum" src="assets:symbols/tourist/museum.svg" />
+        </m>
+        <m cat="attraction" e="any" k="historic|building" zoom-min="15">
+			<m v="castle">
+				<symbol src="assets:symbols/tourist/castle2.svg" />
+			</m>
+			<m v="ruins">
+				<symbol src="assets:symbols/tourist/ruin.svg" />
+			</m>
+		</m>
+        <m cat="attraction" e="any" k="historic" zoom-min="15">
+			<m v="archaeological_site">
+				<symbol src="assets:symbols/tourist/archaeological2.svg" />
+			</m>
+			<m v="castle">
+				<symbol src="assets:symbols/tourist/castle2.svg" />
+			</m>
+			<m v="memorial">
+				<symbol src="assets:symbols/tourist/memorial.svg" />
+			</m>
+			<m v="monument">
+				<symbol src="assets:symbols/tourist/monument.svg" />
+			</m>
+		</m>
+        <m cat="attraction" e="any" k="historic|building" zoom-min="15">
+			<m v="ruins|castle|monument">
+				<symbol src="assets:symbols/tourist/castle2.svg" />
+			</m>
+			<m v="church|cathedral|chapel" zoom-min="15">
+				<symbol src="assets:symbols/place_of_worship/christian.svg" />
+			</m>
+		</m>
+        <m cat="attraction" e="any" k="amenity" v="place_of_worship" zoom-min="15">
+            <m e="any" k="religion" v="buddhist">
+                <symbol id="buddhist" src="assets:symbols/place_of_worship/buddhist.svg" />
+            </m>
+            <m e="any" k="religion" v="christian">
+                <symbol id="christian" src="assets:symbols/place_of_worship/christian.svg" />
+            </m>
+            <m e="any" k="religion" v="hindu">
+                <symbol id="hindu" src="assets:symbols/place_of_worship/hindu.svg" />
+            </m>
+            <m e="any" k="religion" v="jewish">
+                <symbol id="jewish" src="assets:symbols/place_of_worship/jewish.svg" />
+            </m>
+            <m e="any" k="religion" v="muslim">
+                <symbol id="muslim" src="assets:symbols/place_of_worship/islamic.svg" />
+            </m>
+            <m e="any" k="religion" v="shinto">
+                <symbol id="shinto" src="assets:symbols/place_of_worship/shinto.svg" />
+            </m>
+            <m e="any" k="religion" v="~|*">
+                <symbol id="religion-unknown" src="assets:symbols/place_of_worship/unknown.svg" />
+            </m>
+        </m>
+        <m cat="attraction" e="any" k="man_made" zoom-min="15">
+			<m v="windmill">
+				<symbol src="assets:symbols/tourist/windmill.svg" />
+			</m>
+			<m v="lighthouse">
+				<symbol id="lighthouse" src="assets:symbols/transport/lighthouse.svg" />
+			</m>
+		</m>
+		<m select="when-matched" >
+			<text use="poi" />
+		</m>
+    </m>
+
+	<!-- viewpoint LAYER -->
+	<m select="first">
+		<m k="tourism">
+			<m cat="view" v="viewpoint" zoom-min="13">
+				<symbol src="assets:symbols/tourist/view_point.svg" />
+			</m>
+		</m>
+		<m cat="mountain_pass" k="mountain_pass" v="yes" zoom-min="13">
+			<symbol src="assets:symbols/poi/mountain_pass.svg" symbol-percent="60" />
+		</m>
+		<m select="when-matched">
+			<text use="poi" />
+		</m>
+	</m>
+		
 </rendertheme>