[android] Add setting to hide speed limit during navigation

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
[styles] Show emergency assembly points one zoom level later
2026-01-13 23:54:29 +00:00 · 2026-01-13 18:28:07 +01:00 · 2026-01-13 17:57:31 +01:00 · 2026-01-13 17:55:29 +01:00 · 2026-01-13 17:55:15 +01:00 · 2026-01-13 17:51:45 +01:00
50 changed files with 768 additions and 1211 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -31,10 +31,9 @@ data/types.txt*
 data/visibility.txt*
 data/colors.txt*
 data/patterns.txt*
-# TODO: designer is not used at the moment
-# data/symbols/*/design/
-# data/colors_design.txt
-# data/patterns_design.txt
+data/symbols/*/design/
+data/colors_design.txt
+data/patterns_design.txt

 # Auto-generated from data/categories-strings/* by tools/unix/generate_categories.sh
 data/categories.txt
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -1196,7 +1196,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
    if (mOnmapDownloader != null)
      mOnmapDownloader.onResume();

-    mNavigationController.refresh();
+    mNavigationController.refresh(getApplicationContext(), Framework.nativeGetRouteFollowingInfo());
    refreshLightStatusBar();

    MwmApplication.from(this).getSensorHelper().addListener(this);
--- a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
@@ -1,7 +1,10 @@
 package app.organicmaps.routing;

+import static androidx.core.content.ContextCompat.getString;
 import static app.organicmaps.sdk.util.Utils.dimen;

+import android.content.Context;
+import android.content.SharedPreferences;
 import android.location.Location;
 import android.text.TextUtils;
 import android.view.View;
@@ -13,6 +16,7 @@ import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.preference.PreferenceManager;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.maplayer.MapButtonsViewModel;
@@ -58,6 +62,8 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav

  private final NavMenu mNavMenu;
  View.OnClickListener mOnSettingsClickListener;
+  private final SharedPreferences sharedPreferences;
+  private final boolean speedLimitEnabled;

  private void addWindowsInsets(@NonNull View topFrame)
  {
@@ -72,6 +78,8 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
  public NavigationController(AppCompatActivity activity, View.OnClickListener onSettingsClickListener,
                              NavMenu.OnMenuSizeChangedListener onMenuSizeChangedListener)
  {
+    sharedPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
+    speedLimitEnabled = sharedPreferences.getBoolean(getString(activity, R.string.pref_speedlimit),true);
    mMapButtonsViewModel = new ViewModelProvider(activity).get(MapButtonsViewModel.class);

    mFrame = activity.findViewById(R.id.navigation_frame);
@@ -97,6 +105,16 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav

    mSpeedLimit = topFrame.findViewById(R.id.nav_speed_limit);
    mCurrentSpeed = topFrame.findViewById(R.id.nav_current_speed);
+    if (speedLimitEnabled)
+    {
+        UiUtils.show(mSpeedLimit);
+        UiUtils.show(mCurrentSpeed);
+    }
+    else
+    {
+        UiUtils.hide(mSpeedLimit);
+        UiUtils.hide(mCurrentSpeed);
+    }

    View mTopbar = topFrame.findViewById(R.id.statutbar);
    ViewCompat.setOnApplyWindowInsetsListener(mTopbar,(v, windowInsets) -> {
@@ -136,7 +154,8 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav

    mLanesView.setLanes(info.lanes);

-    updateSpeedWidgets(info);
+    if (speedLimitEnabled)
+        updateSpeedWidgets(info);
  }

  private void updatePedestrian(@NonNull RoutingInfo info)
@@ -144,7 +163,8 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
    mNextTurnDistance.setText(Utils.formatDistance(mFrame.getContext(), info.distToTurn));

    info.pedestrianTurnDirection.setTurnDrawable(mNextTurnImage);
-    updateSpeedWidgets(info);
+    if (speedLimitEnabled)
+        updateSpeedWidgets(info);
  }

  public void updateNorth()
@@ -205,9 +225,22 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
    mNavMenu.collapseNavBottomSheet();
  }

-  public void refresh()
+  public void refresh(Context context, RoutingInfo info)
  {
-    mNavMenu.refreshTts();
+      mNavMenu.refreshTts();
+      if (speedLimitEnabled != sharedPreferences.getBoolean(getString(context, R.string.pref_speedlimit),true)) {
+          if (speedLimitEnabled)
+          {
+              UiUtils.show(mSpeedLimit);
+              UiUtils.show(mCurrentSpeed);
+              updateSpeedWidgets(info);
+          }
+          else
+          {
+              UiUtils.hide(mSpeedLimit);
+              UiUtils.hide(mCurrentSpeed);
+          }
+      }
  }

  @Override
--- a/android/app/src/main/res/drawable/ic_speed.xml
+++ b/android/app/src/main/res/drawable/ic_speed.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?iconTint">
+  <path
+      android:pathData="M418,620q24,24 62,23.5t56,-27.5l224,-336 -336,224q-27,18 -28.5,55t22.5,61ZM480,160q59,0 113.5,16.5T696,226l-76,48q-33,-17 -68.5,-25.5T480,240q-133,0 -226.5,93.5T160,560q0,42 11.5,83t32.5,77h552q23,-38 33.5,-79t10.5,-85q0,-36 -8.5,-70T766,420l48,-76q30,47 47.5,100T880,554q1,57 -13,109t-41,99q-11,18 -30,28t-40,10L204,800q-21,0 -40,-10t-30,-28q-26,-45 -40,-95.5T80,560q0,-83 31.5,-155.5t86,-127Q252,223 325,191.5T480,160ZM487,473Z"
+      android:fillColor="#FFFFFF"/>
+</vector>
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -927,4 +927,6 @@
    <string name="download_resources_custom_url_error_scheme">Veuillez saisir une URL complète commençant par http:// ou https://</string>
    <string name="download_resources_custom_url_message">Serveur pour télécharger les cartes. Laissez vide pour utiliser le serveur par défaut CoMaps.</string>
    <string name="pref_maplanguage_local">Langue locale</string>
+    <string name="pref_speedlimit_title">Compteur de vitesse</string>
+    <string name="pref_speedlimit_summary">Affichage de la vitesse durant la navigation</string>
 </resources>
--- a/android/app/src/main/res/values/donottranslate.xml
+++ b/android/app/src/main/res/values/donottranslate.xml
@@ -45,6 +45,7 @@
  <string name="pref_power" translatable="false">pref_power</string>
  <string name="pref_custom_map_download_url" translatable="false">CustomMapDownloadUrl</string>
  <string name="pref_advanced" translatable="false">pref_advanced</string>
+  <string name="pref_speedlimit" translatable="false">pref_speedlimit</string>

  <string name="notification_ticker_ltr" translatable="false">%1$s: %2$s</string>
  <string name="notification_ticker_rtl" translatable="false">%2$s :%1$s</string>
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -975,4 +975,6 @@
    <string name="download_resources_custom_url_message">Override the default map download server used for map downloads. Leave empty to use CoMaps default server.</string>
    <string name="download_resources_custom_url_summary_none">Not set</string>
    <string name="download_resources_custom_url_error_scheme">Please enter a URL starting with http:// or https://</string>
+    <string name="pref_speedlimit_title">Speed limit</string>
+    <string name="pref_speedlimit_summary">Show speed limit during navigation</string>
 </resources>
--- a/android/app/src/main/res/xml/prefs_main.xml
+++ b/android/app/src/main/res/xml/prefs_main.xml
@@ -143,6 +143,14 @@
        <extra android:name="from" android:value="settings" />
      </intent>
    </PreferenceScreen>
+    <SwitchPreferenceCompat
+        android:key="@string/pref_speedlimit"
+        android:title="@string/pref_speedlimit_title"
+        android:summary="@string/pref_speedlimit_summary"
+        android:defaultValue="true"
+        android:widgetLayout="@layout/preference_switch"
+        app:singleLineTitle="true"
+        app:icon="@drawable/ic_speed"/>
  </androidx.preference.PreferenceCategory>

  <PreferenceCategory
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -131,6 +131,12 @@ dependencies {
  testImplementation libs.junit
 }

+android {
+  androidResources {
+    ignoreAssetsPatterns.add("!design")
+  }
+}
+
 // TODO: Running lint task triggers native build. Find a better solution.
 project.afterEvaluate {
  boolean isLintRun = project.gradle.startParameter.taskNames.any { it.toLowerCase().contains('lint') }
--- a/android/sdk/src/main/res/values-de/types_strings.xml
+++ b/android/sdk/src/main/res/values-de/types_strings.xml
@@ -340,6 +340,7 @@
    <string name="type.emergency">Notfall</string>
    <string name="type.emergency.access_point">Rettungspunkt</string>
    <string name="type.emergency.assembly_point">Notfall-Sammelpunkt</string>
+    <string name="type.emergency.disaster_help_point">Notfall-Treffpunkt</string>
    <string name="type.emergency.life_ring">Rettungsring</string>
    <string name="type.emergency.defibrillator">Defibrillator</string>
    <string name="type.emergency.fire_hydrant">Hydrant</string>
--- a/android/sdk/src/main/res/values/types_strings.xml
+++ b/android/sdk/src/main/res/values/types_strings.xml
@@ -377,6 +377,7 @@
    <string name="type.emergency">Emergency</string>
    <string name="type.emergency.access_point">Emergency Rescue Point</string>
    <string name="type.emergency.assembly_point">Emergency Assembly Point</string>
+    <string name="type.emergency.disaster_help_point">Emergency Disaster Help Point</string>
    <string name="type.emergency.life_ring">Lifebuoy</string>
    <string name="type.emergency.defibrillator">Defibrillator</string>
    <string name="type.emergency.fire_hydrant">Fire Hydrant</string>
--- a/data/categories-strings/de.json/localize.json
+++ b/data/categories-strings/de.json/localize.json
@@ -405,8 +405,9 @@
 "amenity-payment_terminal": "3Bezahlterminal",
 "amenity-public_bath": "4Öffentliches Bad|4Hallenbad|5Schwimmen|5Schwimmbad|U+1F3CA",
 "amenity-shower": "Dusche",
-"emergency-access_point": "4Rettungspunkt|Notfallpunkt|Notfall-Rettungspunkt|Notfall-Treffpunkt",
-"emergency-assembly_point": "4Notfall-Sammelpunkt|4Sammelstelle|U+1F46A|U+2795",
+"emergency-access_point": "4Rettungspunkt|Notfallpunkt|Notfall-Rettungspunkt|Notfalltrettungspunkt",
+"emergency-assembly_point": "4Notfall-Sammelpunkt|4Sammelstelle|Notfallsammelpunkt|U+1F46A|U+2795",
+"emergency-disaster_help_point": "4Notfall-Treffpunkt|Notfalltreffpunkt|4Notfall-Infopunkt|Notfallinfopunkt|7Katastrophenschutz-Leuchtturm|Katastrophenschutzleuchtturm",
 "emergency-life_ring": "4Rettungsring",
 "emergency-defibrillator": "4Defibrillator",
 "emergency-fire_hydrant": "4Hydrant|4Feuerhydrant|4Löschwasser",
--- a/data/categories-strings/en.json/localize.json
+++ b/data/categories-strings/en.json/localize.json
@@ -440,6 +440,7 @@
 "amenity-shower": "Shower",
 "emergency-access_point": "5Emergency Rescue Point|Emergency Location|Emergency Marker|Emergency Access Point",
 "emergency-assembly_point": "5Emergency assembly point",
+"emergency-disaster_help_point": "5Emergency Disaster Help Point|5Disaster Help Point",
 "emergency-life_ring": "5Lifebuoy|6Life Ring|life-ring|lifering|flotation device|floatation device",
 "emergency-defibrillator": "4Defibrillator|AED",
 "emergency-fire_hydrant": "4Fire Hydrant|Fire Plug|Hydrant",
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -541,7 +541,7 @@ healthcare|psychotherapist;426;
 # TODO: deprecated, migrate to ford=*
 highway|ford;427;
 area:highway|path;428;
-deprecated:railway|siding:06.2023;429;x
+emergency|disaster_help_point;429;
 highway|track|area;[highway=track][area?];;name;int_name;430;
 amenity|sanitary_dump_station;431;
 railway|funicular;432;
--- a/data/opening_hours_how_to_edit.html
+++ b/data/opening_hours_how_to_edit.html
@@ -23,7 +23,7 @@
    @media screen and (prefers-color-scheme: dark) {
      :root {
        --primary-color: #b5b5b5;
-        --secondary-color: #858585;
+        --secondary-color: #959595;
        --link-color: #659464;
        --background-color: black;
        --separator-color: #0a0a0a;
--- a/data/styles/default/dark/colors.mapcss
+++ b/data/styles/default/dark/colors.mapcss
@@ -162,19 +162,11 @@
@path: #944A12;
@path_expert: #523E33;
@bridleway: #2B2827;
-@motorway1_border: #784606;
-@trunk1_border: #79511D;
-@primary1_border: #7C5E24;
-@primary2_border: #7C622F;
-@secondary0_border: #7F6730;
-@secondary1_border: #7F6B3C;
-@minor_road_border: #b2b2b2;

 /* 5.2 Bridges */

@bridge_background: #2C2C1A;
@bridge_casing: #505050;
-@bridge_minor_road_border: #393928;

 /* 5.3 Tunnels */

--- a/data/styles/default/dark/symbols/defibrillator-m.svg
+++ b/data/styles/default/dark/symbols/defibrillator-m.svg
@@ -1,11 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>defibrillator-m</title>
- <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
-  <g id="defibrillator-m" fill-rule="nonzero">
-   <g id="defibrillator" transform="translate(5 5)" fill="#983E44">
-    <path id="Shape" d="m9.5476 0.89855c-0.93747 0-1.8267 0.3139-2.5476 0.89211-0.72089-0.57821-1.6101-0.89211-2.5476-0.89211-1.0901 0-2.1151 0.42456-2.886 1.1954-1.5913 1.5914-1.5913 4.1808 0 5.7721l5.0953 5.0952c0.093335 0.09346 0.21583 0.14019 0.33833 0.14019s0.24487-0.04673 0.33833-0.14019l5.0952-5.0952c1.5914-1.5914 1.5914-4.1808 0-5.7721-0.77086-0.77086-1.7957-1.1954-2.8859-1.1954zm2.2093 6.2907-4.7569 4.7569-4.7569-4.7569c-1.2182-1.2182-1.2182-3.2003 0-4.4185 0.59017-0.59017 1.3747-0.91516 2.2093-0.91516 0.83466 0 1.6192 0.32512 2.2093 0.91516 0.089722 0.089722 0.21147 0.14019 0.33833 0.14019s0.2486-0.050468 0.33833-0.14019c0.59017-0.59017 1.3747-0.91516 2.2093-0.91516 0.83454 0 1.6191 0.32512 2.2093 0.91516 1.2182 1.2181 1.2182 3.2003 0 4.4185z"/>
-    <path id="Shape" d="m9.3128 5.6781h-0.93959l0.77958-1.601c0.072151-0.14829 0.06293-0.32337-0.024549-0.46319-0.087479-0.13982-0.24075-0.2248-0.40574-0.2248h-2.2287c-0.20511 0-0.3873 0.13059-0.45322 0.32487l-1.1685 3.4454c-0.049845 0.14667-0.025546 0.30829 0.065173 0.4339 0.089971 0.12461 0.23427 0.19838 0.38792 0.19838h0.0033646l1.1499-0.0079753-0.45384 2.2543c-0.044612 0.22156 0.071902 0.444 0.27938 0.53372 0.061434 0.026418 0.12586 0.039129 0.18954 0.039129 0.15141 0 0.29857-0.071902 0.39054-0.20175l2.819-3.9757c0.10355-0.14592 0.11701-0.33745 0.034767-0.49646-0.08212-0.15888-0.24611-0.25882-0.42506-0.25882zm-1.9048 2.3377 0.12486-0.6202c0.028412-0.14119-0.0083491-0.28773-0.09994-0.39889-0.090968-0.11028-0.22642-0.17409-0.36923-0.17409h-0.00324l-1.0661 0.0073522 0.84239-2.4838h1.1206l-0.77958 1.601c-0.072151 0.14829-0.06293 0.32337 0.024549 0.46319 0.087479 0.13982 0.24075 0.2248 0.40574 0.2248h0.77883l-0.97896 1.3806z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m10.910745 4.4239125c.81765 0 1.58628.318405 2.164425.89655 1.19355 1.193475 1.19355 3.135525 0 4.329075l-3.8214 3.8214c-.070095.070095-.1618725.1051425-.2537475.1051425s-.18374625-.0350475-.2537475-.1051425l-3.821475-3.8214c-1.193475-1.193475-1.193475-3.135525 0-4.329075.578175-.57813 1.346925-.89655 2.1645-.89655.703125 0 1.3700325.235425 1.9107.6690825.4806-.38547333 1.0609511-.61431852 1.677796-.66041407zm0 .71778c-.62595 0-1.2143475.2437425-1.656975.68637-.0672975.0672915-.1586025.1051425-.2537475.1051425s-.186456-.037851-.2537475-.1051425c-.442575-.44253-1.03098-.68637-1.656975-.68637-.62595 0-1.2143475.2437425-1.656975.68637-.91365.91365-.91365 2.400225 0 3.313875l3.567675 3.567675 3.56772-3.567675c.91365-.91365.91365-2.4003 0-3.313875-.44265-.44253-1.03107-.68637-1.656975-.68637zm-.7272766 1.3583075c.1142317 0 .2203497.05883637.2809163.15564151.0605665.09680515.0669508.21802274.0169966.32069214l-.53974647 1.10846113.65050647.00000256c.123897 0 .2374364.06919401.2942926.17919544.0569414.11009145.0476223.2426983-.0240711.34372681l-1.95175011 2.75259771c-.06367593.089901-.16556297.1396827-.27039251.1396827-.0440892 0-.08869489-.0088005-.13122906-.0270912-.14364853-.0621181-.22431764-.2161257-.19343027-.3695239l.31421861-1.56077701-.79613957.00552174c-.10870992 0-.20861612-.05107506-.27090804-.13734948-.0628098-.08696677-.07963334-.19886526-.04512288-.30041304l.80901738-2.38544158c.04564007-.13451083.17178032-.22492553.31378935-.22492553z" fill="#983E44" opacity=".6"/></svg>
--- a/data/styles/default/dark/symbols/disaster_help_point-m.svg
+++ b/data/styles/default/dark/symbols/disaster_help_point-m.svg
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -1101,7 +1101,8 @@ node|z17-[amenity=fire_station],
 node|z18-[amenity=internet_cafe],
 node|z18-[emergency=defibrillator],
 node|z18-[emergency=access_point],
-node|z18-[emergency=assembly_point],
+node|z19-[emergency=assembly_point],
+node|z18-[emergency=disaster_help_point],
 node|z19-[emergency=life_ring],
 node|z18-[emergency=lifeguard],
 node|z18-[amenity=toilets],
@@ -1710,9 +1711,12 @@ node|z18-[emergency=defibrillator],
 node|z18-[emergency=access_point],
 {icon-image: access_point-m.svg;font-size: 11;}

-node|z18-[emergency=assembly_point],
+node|z19-[emergency=assembly_point],
 {icon-image: assembly_point-m.svg;font-size: 11;}

+node|z18-[emergency=disaster_help_point],
+{icon-image: disaster_help_point-m.svg;font-size: 11;}
+
 node|z19-[emergency=life_ring],
 {icon-image: lifebuoy-m.svg; font-size: 11;}

--- a/data/styles/default/include/Roads.mapcss
+++ b/data/styles/default/include/Roads.mapcss
@@ -35,9 +35,7 @@
  8.7 Footway 15-22 ZOOM
  8.8 Steps 15-22 ZOOM
  8.9 Bridleway 14-22 ZOOM
-  8.10 Major road borders
-  8.11 Minor road borders
-  8.12 Runway 12-22 ZOOM
+  8.10 Runway 12-22 ZOOM
 9.RAIL 11-22 ZOOM
  9.1 RAIL 11-22 ZOOM
  9.2 Rail tunnel 14-22 ZOOM
@@ -139,17 +137,17 @@ line|z12[highway=motorway],
 line|z13[highway=motorway],
 {width: 4.0;}
 line|z14[highway=motorway],
-{width: 3.4;}
+{width: 4.4;}
 line|z15[highway=motorway],
-{width: 4.6;}
+{width: 5.6;}
 line|z16[highway=motorway],
-{width: 6.8;}
+{width: 7.8;}
 line|z17[highway=motorway],
-{width: 8.0;}
+{width: 9.0;}
 line|z18[highway=motorway],
-{width: 11.0;}
+{width: 12.0;}
 line|z19-[highway=motorway],
-{width: 15.0;}
+{width: 16.0;}

 line|z6[highway=motorway],
 line|z6[highway=trunk],
@@ -172,17 +170,17 @@ line|z12[highway=trunk],
 line|z13[highway=trunk],
 {width: 3.6;}
 line|z14[highway=trunk],
-{width: 3.0;}
+{width: 4.0;}
 line|z15[highway=trunk],
-{width: 3.8;}
+{width: 4.8;}
 line|z16[highway=trunk],
-{width: 5.2;}
+{width: 6.2;}
 line|z17[highway=trunk],
-{width: 7.2;}
+{width: 8.2;}
 line|z18[highway=trunk],
-{width: 10;}
+{width: 11;}
 line|z19-[highway=trunk],
-{width: 12.5;}
+{width: 13.5;}

 line|z10[highway=motorway_link],
 line|z10[highway=trunk_link]
@@ -198,22 +196,22 @@ line|z13[highway=trunk_link]
 {width: 1.9;}
 line|z14[highway=motorway_link],
 line|z14[highway=trunk_link]
-{width: 1.7;}
+{width: 2.7;}
 line|z15[highway=motorway_link],
 line|z15[highway=trunk_link]
-{width: 2.7;}
+{width: 3.7;}
 line|z16[highway=motorway_link],
 line|z16[highway=trunk_link]
-{width: 4.1;}
+{width: 5.1;}
 line|z17[highway=motorway_link],
 line|z17[highway=trunk_link]
-{width: 5.7;}
+{width: 6.7;}
 line|z18[highway=motorway_link],
 line|z18[highway=trunk_link]
-{width: 8.5;}
+{width: 9.5;}
 line|z19-[highway=motorway_link],
 line|z19-[highway=trunk_link]
-{width: 10.7;}
+{width: 11.7;}

 /* 3.2 Trunk & Motorway tunnel 12-22 ZOOM */

@@ -302,23 +300,23 @@ line|z9[highway=primary],
 line|z10[highway=primary],
 {width: 1.8;}
 line|z11[highway=primary],
-{width: 1.3;}
+{width: 2.3;}
 line|z12[highway=primary],
-{width: 1.7;}
+{width: 2.7;}
 line|z13[highway=primary],
-{width: 2.0;}
+{width: 3.0;}
 line|z14[highway=primary],
-{width: 2.8;}
+{width: 3.8;}
 line|z15[highway=primary],
-{width: 3.4;}
-line|z16[highway=primary],
 {width: 4.4;}
+line|z16[highway=primary],
+{width: 5.4;}
 line|z17[highway=primary],
-{width: 6;}
+{width: 7;}
 line|z18[highway=primary],
-{width: 9;}
+{width: 10;}
 line|z19-[highway=primary],
-{width: 11;}
+{width: 12;}


 line|z11[highway=primary_link],
@@ -330,15 +328,15 @@ line|z13[highway=primary_link],
 line|z14[highway=primary_link],
 {width: 1.8;}
 line|z15[highway=primary_link],
-{width: 1.5;}
+{width: 2.5;}
 line|z16[highway=primary_link],
-{width: 2.2;}
+{width: 3.2;}
 line|z17[highway=primary_link],
-{width: 3.7;}
+{width: 4.7;}
 line|z18[highway=primary_link],
-{width: 5.4;}
+{width: 6.4;}
 line|z19-[highway=primary_link],
-{width: 7.2;}
+{width: 8.2;}

 /* 4.2 Primary tunnel 14-22 ZOOM */

@@ -396,38 +394,38 @@ line|z14-[highway=secondary_link][bridge?]::bridgeblack,
 line|z10[highway=secondary],
 {width: 1.4;}
 line|z11[highway=secondary],
-{width: 1.2;}
-line|z12[highway=secondary],
-{width: 1.5;}
-line|z13[highway=secondary],
-{width: 1.7;}
-line|z14[highway=secondary],
 {width: 2.2;}
+line|z12[highway=secondary],
+{width: 2.5;}
+line|z13[highway=secondary],
+{width: 2.7;}
+line|z14[highway=secondary],
+{width: 3.2;}
 line|z15[highway=secondary],
-{width: 2.8;}
+{width: 3.8;}
 line|z16[highway=secondary],
-{width: 4;}
+{width: 5;}
 line|z17[highway=secondary],
-{width: 5.6;}
+{width: 6.6;}
 line|z18[highway=secondary],
-{width: 8.4;}
+{width: 9.4;}
 line|z19-[highway=secondary],
-{width: 10.6;}
+{width: 11.6;}

 line|z13[highway=secondary_link],
 {width: 1.3;}
 line|z14[highway=secondary_link],
 {width: 1.8;}
 line|z15[highway=secondary_link],
-{width: 1.5;}
+{width: 2.5;}
 line|z16[highway=secondary_link],
-{width: 2.2;}
+{width: 3.2;}
 line|z17[highway=secondary_link],
-{width: 3.7;}
+{width: 4.7;}
 line|z18[highway=secondary_link],
-{width: 5.4;}
+{width: 6.4;}
 line|z19-[highway=secondary_link],
-{width: 7.2;}
+{width: 8.2;}

 /* 5.2 Secondary tunnel 16-22 ZOOM */

@@ -1139,329 +1137,7 @@ line|z15-[highway=bridleway][bridge?]::bridgewhite
 line|z17-[highway=bridleway][bridge?]::bridgeblack
 {casing-width-add: 1;}

-
-/* 8.10 Major road borders */
-
-line|z14-[highway=motorway]::border,
-line|z14-[highway=motorway_link]::border,
-{color: @motorway1_border; opacity: 1;}
-
-line|z14-[highway=trunk]::border,
-line|z14-[highway=trunk_link]::border,
-{color: @trunk1_border; opacity: 1;}
-
-line|z11-13[highway=primary]::border,
-{color: @primary1_border; opacity: 1;}
-line|z14-[highway=primary]::border,
-line|z15-[highway=primary_link]::border,
-{color: @primary2_border; opacity: 1;}
-
-line|z11-13[highway=secondary]::border,
-{color: @secondary0_border; opacity: 1;}
-line|z14-[highway=secondary]::border,
-line|z15-[highway=secondary_link]::border,
-{color: @secondary1_border; opacity: 1;}
-
-/* Width is like the original road, but increased by 1. Then set everything smaller or equal 2 to 0. Finally subtract 0.5 from everything smaller than 3. */
-
-line|z14[highway=motorway]::border,
-{width: 4.4;}
-line|z15[highway=motorway]::border,
-{width: 5.6;}
-line|z16[highway=motorway]::border,
-{width: 7.8;}
-line|z17[highway=motorway]::border,
-{width: 9.0;}
-line|z18[highway=motorway]::border,
-{width: 12.0;}
-line|z19-[highway=motorway]::border,
-{width: 16.0;}
-
-line|z14[highway=trunk]::border,
-{width: 4.0;}
-line|z15[highway=trunk]::border,
-{width: 4.8;}
-line|z16[highway=trunk]::border,
-{width: 6.2;}
-line|z17[highway=trunk]::border,
-{width: 8.2;}
-line|z18[highway=trunk]::border,
-{width: 11;}
-line|z19-[highway=trunk]::border,
-{width: 13.5;}
-
-line|z14[highway=motorway_link]::border,
-line|z14[highway=trunk_link]::border,
-{width: 2.2;}
-line|z15[highway=motorway_link]::border,
-line|z15[highway=trunk_link]::border,
-{width: 3.7;}
-line|z16[highway=motorway_link]::border,
-line|z16[highway=trunk_link]::border,
-{width: 5.1;}
-line|z17[highway=motorway_link]::border,
-line|z17[highway=trunk_link]::border,
-{width: 6.7;}
-line|z18[highway=motorway_link]::border,
-line|z18[highway=trunk_link]::border,
-{width: 9.5;}
-line|z19-[highway=motorway_link]::border,
-line|z19-[highway=trunk_link]::border,
-{width: 11.7;}
-
-line|z11[highway=primary]::border,
-{width: 1.8;}
-line|z12[highway=primary]::border,
-{width: 2.2;}
-line|z13[highway=primary]::border,
-{width: 3.0;}
-line|z14[highway=primary]::border,
-{width: 3.8;}
-line|z15[highway=primary]::border,
-{width: 4.4;}
-line|z16[highway=primary]::border,
-{width: 5.4;}
-line|z17[highway=primary]::border,
-{width: 7;}
-line|z18[highway=primary]::border,
-{width: 10;}
-line|z19-[highway=primary]::border,
-{width: 12;}
-
-line|z15[highway=primary_link]::border,
-{width: 2;}
-line|z16[highway=primary_link]::border,
-{width: 3.2;}
-line|z17[highway=primary_link]::border,
-{width: 4.7;}
-line|z18[highway=primary_link]::border,
-{width: 6.4;}
-line|z19-[highway=primary_link]::border,
-{width: 8.2;}
-
-line|z11[highway=secondary]::border,
-{width: 1.7;}
-line|z12[highway=secondary]::border,
-{width: 2;}
-line|z13[highway=secondary]::border,
-{width: 2.2;}
-line|z14[highway=secondary]::border,
-{width: 3.2;}
-line|z15[highway=secondary]::border,
-{width: 3.8;}
-line|z16[highway=secondary]::border,
-{width: 5;}
-line|z17[highway=secondary]::border,
-{width: 6.6;}
-line|z18[highway=secondary]::border,
-{width: 9.4;}
-line|z19-[highway=secondary]::border,
-{width: 11.6;}
-
-line|z15[highway=secondary_link]::border,
-{width: 2;}
-line|z16[highway=secondary_link]::border,
-{width: 3.2;}
-line|z17[highway=secondary_link]::border,
-{width: 4.7;}
-line|z18[highway=secondary_link]::border,
-{width: 6.4;}
-line|z19-[highway=secondary_link]::border,
-{width: 8.2;}
-
-
-/* 8.11 Minor road borders */
-
-line|z11-[highway=tertiary]::border,
-line|z14-[highway=tertiary_link]::border,
-line|z13-[highway=unclassified]::border,
-line|z14-[highway=residential]::border,
-line|z14-[highway=road]::border,
-line|z14-[highway=living_street]::border,
-line|z14-[highway=pedestrian]::border,
-line|z14-[highway=ford]::border,
-line|z15-[highway=service]::border,
-line|z15-[highway=service][service=busway]::border,
-line|z15-[highway=busway]::border,
-line|z15-[highway=footway]::border,
-line|z15-[highway=ladder]::border,
-line|z15-[highway=steps]::border,
-{color: @minor_road_border; opacity: 0.1;}
-
-line|z11-[highway=tertiary][bridge?]::border,
-line|z14-[highway=tertiary_link][bridge?]::border,
-line|z13-[highway=unclassified][bridge?]::border,
-line|z14-[highway=residential][bridge?]::border,
-line|z14-[highway=road][bridge?]::border,
-line|z14-[highway=living_street][bridge?]::border,
-line|z14-[highway=pedestrian][bridge?]::border,
-line|z15-[highway=service][bridge?]::border,
-line|z15-[highway=service][service=busway][bridge?]::border,
-line|z15-[highway=busway][bridge?]::border,
-line|z15-[highway=footway][bridge?]::border,
-line|z15-[highway=steps][bridge?]::border,
-{color: @bridge_minor_road_border; opacity: 1; linecap: butt}
-
-/* Width is like the original road, but increased by 1. Then set everything smaller or equal 2 to 0. Finally subtract 0.5 from everything smaller than 3. */
-
-line|z11[highway=tertiary]::border,
-{width: 1.7;}
-line|z12[highway=tertiary]::border,
-{width: 2.1;}
-line|z13[highway=tertiary]::border,
-{width: 2.3;}
-line|z14[highway=tertiary]::border,
-{width: 3.7;}
-line|z15[highway=tertiary]::border,
-{width: 4.8;}
-line|z16[highway=tertiary]::border,
-{width: 6;}
-line|z17[highway=tertiary]::border,
-{width: 7.6;}
-line|z18[highway=tertiary]::border,
-{width: 10.4;}
-line|z19-[highway=tertiary]::border,
-{width: 12.6;}
-
-line|z14[highway=tertiary_link]::border,
-{width: 2.3;}
-line|z15[highway=tertiary_link]::border,
-{width: 3.5;}
-line|z16[highway=tertiary_link]::border,
-{width: 4.2;}
-line|z17[highway=tertiary_link]::border,
-{width: 5.7;}
-line|z18[highway=tertiary_link]::border,
-{width: 7.4;}
-line|z19-[highway=tertiary_link]::border,
-{width: 9.2;}
-
-line|z13[highway=unclassified]::border,
-{width: 1.9;}
-line|z14[highway=unclassified]::border,
-{width: 3.3;}
-line|z15[highway=unclassified]::border,
-{width: 4.2;}
-line|z16[highway=unclassified]::border,
-{width: 5.2;}
-line|z17[highway=unclassified]::border,
-{width: 7;}
-line|z18[highway=unclassified]::border,
-{width: 9;}
-line|z19-[highway=unclassified]::border,
-{width: 11;}
-
-line|z14[highway=residential]::border,
-line|z14[highway=road]::border,
-line|z14[highway=living_street]::border,
-{width: 2.1;}
-line|z15[highway=residential]::border,
-line|z15[highway=road]::border,
-line|z15[highway=living_street]::border,
-{width: 3.4;}
-line|z16[highway=residential]::border,
-line|z16[highway=road]::border,
-line|z16[highway=living_street]::border,
-{width: 4.2;}
-line|z17[highway=residential]::border,
-line|z17[highway=road]::border,
-line|z17[highway=living_street]::border,
-{width: 5.7;}
-line|z18[highway=residential]::border,
-line|z18[highway=road]::border,
-line|z18[highway=living_street]::border,
-{width: 7.4;}
-line|z19-[highway=residential]::border,
-line|z19-[highway=road]::border,
-line|z19-[highway=living_street]::border,
-{width: 9.2;}
-
-line|z14[highway=pedestrian]::border,
-line|z14[highway=ford]::border,
-{width: 2.1;dashes: 6,1.3;}
-line|z15[highway=pedestrian]::border,
-line|z15[highway=ford]::border,
-{width: 3;dashes: 8,1.5;}
-line|z16[highway=pedestrian]::border,
-line|z16[highway=ford]::border,
-{width: 3.4;dashes: 8,1.5;}
-line|z17[highway=pedestrian]::border,
-line|z17[highway=ford]::border,
-{width: 4;dashes: 9,1.8;}
-line|z18[highway=pedestrian]::border,
-line|z18[highway=ford]::border,
-{width: 5;dashes: 11,2.3;}
-line|z19-[highway=pedestrian]::border,
-line|z19-[highway=ford]::border,
-{width: 6;dashes: 13,2.7;}
-
-line|z15[highway=service]::border,
-line|z15[highway=service][service=busway]::border,
-line|z15[highway=busway]::border,
-{width: 1.7;}
-line|z15[highway=service][service=driveway]::border,
-{width: 0;}
-line|z16[highway=service]::border,
-line|z16[highway=service][service=busway]::border,
-line|z16[highway=busway]::border,
-{width: 2.1;}
-line|z17[highway=service]::border,
-line|z17[highway=service][service=busway]::border,
-line|z17[highway=busway]::border,
-{width: 3;}
-line|z18[highway=service]::border,
-line|z18[highway=service][service=busway]::border,
-line|z18[highway=busway]::border,
-{width: 4;}
-line|z19-[highway=service]::border,
-line|z19-[highway=service][service=busway]::border,
-line|z19-[highway=busway]::border,
-{width: 5;}
-
-line|z15[highway=footway]::border,
-{width: 2; dashes: 5,1.5;}
-line|z16[highway=footway]::border,
-{width: 3; dashes: 5,1.5;}
-line|z17[highway=footway]::border,
-{width: 3.4; dashes: 6,1.8;}
-line|z18[highway=footway]::border,
-{width: 4.2; dashes: 8,2.3;}
-line|z19-[highway=footway]::border,
-{width: 5.2; dashes: 10,2.7;}
-
-line|z15[highway=footway][bicycle=designated]::border,
-{width: 2; dashes: 6,9;}
-line|z16[highway=footway][bicycle=designated]::border,
-{width: 3; dashes: 8,10;}
-line|z17[highway=footway][bicycle=designated]::border,
-{width: 3.4; dashes: 10,11;}
-line|z18[highway=footway][bicycle=designated]::border,
-{width: 4.2; dashes: 15,15;}
-line|z19-[highway=footway][bicycle=designated]::border,
-{width: 5.2; dashes: 20,20;}
-
-/* Don't display sidewalks and pedestrian crossings on z15. */
-line|z15[highway=footway][footway=sidewalk]::border,
-line|z15[highway=footway][footway=crossing]::border,
-{width: 0;}
-
-line|z15[highway=ladder]::border,
-line|z15[highway=steps]::border,
-{width: 3.4; dashes: 1.5,1.3;}
-line|z16[highway=ladder]::border,
-line|z16[highway=steps]::border,
-{width: 5; dashes: 1.8,1.6;}
-line|z17-[highway=ladder]::border,
-line|z17-[highway=steps]::border,
-{width: 7; dashes: 2.5,2.2;}
-line|z18[highway=ladder]::border,
-line|z18[highway=steps]::border,
-{width: 9; dashes: 3.2,2.8;}
-line|z19-[highway=ladder]::border,
-line|z19-[highway=steps]::border,
-{width: 11; dashes: 4,3.5;}
-
-/* 8.12 Runway 12-22 ZOOM */
+/* 8.10 Runway 12-22 ZOOM */

 line|z12-[aeroway=runway],
 line|z14-[aeroway=taxiway],
--- a/data/styles/default/include/Subways.mapcss
+++ b/data/styles/default/include/Subways.mapcss
@@ -44,6 +44,14 @@ node|z14-[railway=station][station=light_rail]::int_name,
 node|z14-[railway=station][station=monorail]::int_name,
 {text: int_name;text-offset: 1;font-size: 9;text-color: @label_dark;text-halo-radius: 1;text-halo-color: @label_halo_light;text-halo-opacity: 0.8;}

+node[railway=station][station=light_rail][!city],
+node[railway=station][station=light_rail][!city]::int_name,
+node[railway=station][station=monorail],
+node[railway=station][station=monorail]::int_name,
+node[railway=station][transport=subway][!city],
+node[railway=station][transport=subway][!city]::int_name,
+{text-color: @public_transport_label;}
+
 node|z15-[railway=station][transport=subway],
 node|z15-[railway=station][station=light_rail],
 node|z15-[railway=station][station=monorail],
--- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
@@ -101,8 +101,8 @@ amenity-recycling-centre                            # area z15- (also has icon z
 amenity-social_facility                             # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
 emergency-mountain_rescue                           # area z13- (also has icon z16-, caption(optional) z16-)
-highway-pedestrian-area                             # area z14- (also has line z13-, line::border z14-, pathtext z14-)
-highway-pedestrian-square                           # area z14- (also has line z13-, line::border z14-, pathtext z14-)
+highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
+highway-pedestrian-square                           # area z14- (also has line z13-, pathtext z14-)
 highway-rest_area                                   # area z13- (also has icon z15-, caption(optional) z15-)
 highway-services                                    # area z13- (also has icon z14-, caption(optional) z14-)
 landuse-garages                                     # area z13- (also has caption z15-)
@@ -115,7 +115,7 @@ tourism-information-office                          # area z15- (also has icon z
 tourism-information-visitor_centre                  # area z13- (also has icon z15-, caption(optional) z15-)
 === 170

-highway-footway-area                                # area z14- (also has line z15-, line::border z15-, pathtext z15-)
+highway-footway-area                                # area z14- (also has line z15-, pathtext z15-)
 leisure-track-area                                  # area z15- (also has caption z16-)
 === 160

--- a/data/styles/default/include/priorities_3_FG.prio.txt
+++ b/data/styles/default/include/priorities_3_FG.prio.txt
@@ -45,10 +45,10 @@ power-line                                          # line z19- (also has line::
 power-line::dash                                    # line::dash z19- (also has line z19-)
 === 340

-highway-ladder                                      # line z15- (also has line::border z15-, icon z17-, pathtext z17-)
-highway-steps                                       # line z15- (also has line::border z15-, pathtext z16-)
-highway-steps-bridge                                # line z15- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
-highway-steps-tunnel                                # line z15- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
+highway-ladder                                      # line z15- (also has icon z17-, pathtext z17-)
+highway-steps                                       # line z15- (also has pathtext z16-)
+highway-steps-bridge                                # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
+highway-steps-tunnel                                # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
 hwtag-oneway::arrows                                # line::arrows z15-
 waterway-weir                                       # line z14- (also has pathtext z15-)
 === 330
@@ -73,23 +73,23 @@ railway-tram-bridge                                 # line z13-
 railway-tram-tunnel                                 # line z13-
 === 320

-highway-motorway                                    # line z6- (also has line::border z14-, pathtext z10-, shield::shield z10-)
-highway-motorway-bridge                             # line z6- (also has line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway-tunnel                             # line z6- (also has line::border z14-, line(casing) z12-, pathtext z10-, shield::shield z10-)
-highway-trunk                                       # line z6- (also has line::border z14-, pathtext z10-, shield::shield z10-)
-highway-trunk-bridge                                # line z6- (also has line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk-tunnel                                # line z6- (also has line::border z14-, line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-motorway                                    # line z6- (also has pathtext z10-, shield::shield z10-)
+highway-motorway-bridge                             # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway-tunnel                             # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk                                       # line z6- (also has pathtext z10-, shield::shield z10-)
+highway-trunk-bridge                                # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk-tunnel                                # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
 highway-world_level                                 # line z4-9
 highway-world_towns_level                           # line z6-9
 === 310

-# highway-motorway-tunnel                           # line(casing) z12- (also has line z6-, line::border z14-, pathtext z10-, shield::shield z10-)
-# highway-trunk-tunnel                              # line(casing) z12- (also has line z6-, line::border z14-, pathtext z10-, shield::shield z10-)
+# highway-motorway-tunnel                           # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
+# highway-trunk-tunnel                              # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
 # === 309

-highway-primary                                     # line z8- (also has line::border z11-, pathtext z10-, shield::shield z10-)
-highway-primary-bridge                              # line z8- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary-tunnel                              # line z8- (also has line::border z11-, line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-primary                                     # line z8- (also has pathtext z10-, shield::shield z10-)
+highway-primary-bridge                              # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary-tunnel                              # line z8- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
 railway-rail-branch::dash                           # line::dash z16- (also has line z11-)
 railway-rail-branch-bridge::dash                    # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-)
 railway-rail-branch-tunnel::dash                    # line::dash z16- (also has line z11-, line(casing) z14-)
@@ -104,7 +104,7 @@ railway-rail-tourism-bridge::dash                   # line::dash z16- (also has
 railway-rail-tourism-tunnel::dash                   # line::dash z16- (also has line z10-, line(casing) z14-, pathtext z14-)
 === 290

-# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, line::border z11-, pathtext z10-, shield::shield z10-)
+# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, pathtext z10-, shield::shield z10-)
 # === 289

 railway-rail-branch                                 # line z11- (also has line::dash z16-)
@@ -127,88 +127,88 @@ railway-rail-tourism-tunnel                         # line z10- (also has line::
 # railway-rail-tourism-tunnel                       # line(casing) z14- (also has line z10-, line::dash z16-, pathtext z14-)
 # === 279

-highway-secondary                                   # line z10- (also has line::border z11-, pathtext z10-, shield::shield z12-)
-highway-secondary-bridge                            # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary-tunnel                            # line z10- (also has line::border z11-, line(casing) z16-, pathtext z10-, shield::shield z12-)
+highway-secondary                                   # line z10- (also has pathtext z10-, shield::shield z12-)
+highway-secondary-bridge                            # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary-tunnel                            # line z10- (also has line(casing) z16-, pathtext z10-, shield::shield z12-)
 === 270

-# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z12-)
+# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, pathtext z10-, shield::shield z12-)
 # === 269

-highway-tertiary                                    # line z11- (also has line::border z11-, pathtext z12-, shield::shield z13-)
-highway-tertiary-bridge                             # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary-tunnel                             # line z11- (also has line::border z11-, line(casing) z16-, pathtext z12-, shield::shield z13-)
-highway-unclassified                                # line z11- (also has line::border z13-, pathtext z13-)
-highway-unclassified-area                           # line z11- (also has line::border z13-, pathtext z13-)
-highway-unclassified-bridge                         # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
-highway-unclassified-tunnel                         # line z11- (also has line::border z13-, line(casing) z16-, pathtext z13-)
+highway-tertiary                                    # line z11- (also has pathtext z12-, shield::shield z13-)
+highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary-tunnel                             # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-)
+highway-unclassified                                # line z11- (also has pathtext z13-)
+highway-unclassified-area                           # line z11- (also has pathtext z13-)
+highway-unclassified-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
+highway-unclassified-tunnel                         # line z11- (also has line(casing) z16-, pathtext z13-)
 === 250

-# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, line::border z11-, pathtext z12-, shield::shield z13-)
-# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, line::border z13-, pathtext z13-)
+# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-)
+# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, pathtext z13-)
 # === 249

-highway-living_street                               # line z12- (also has line::border z14-, pathtext z14-)
-highway-living_street-bridge                        # line z12- (also has line::border z14-, pathtext z14-)
-highway-living_street-tunnel                        # line z12- (also has line::border z14-, line(casing) z16-, pathtext z14-)
-highway-residential                                 # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
-highway-residential-area                            # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
-highway-residential-bridge                          # line z12- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-residential-tunnel                          # line z12- (also has line::border z14-, line(casing) z16-, pathtext z13-, shield::shield z15-)
-highway-road                                        # line z12- (also has line::border z14-, pathtext z14-)
-highway-road-bridge                                 # line z12- (also has line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
-highway-road-tunnel                                 # line z12- (also has line::border z14-, pathtext z14-)
+highway-living_street                               # line z12- (also has pathtext z14-)
+highway-living_street-bridge                        # line z12- (also has pathtext z14-)
+highway-living_street-tunnel                        # line z12- (also has line(casing) z16-, pathtext z14-)
+highway-residential                                 # line z12- (also has pathtext z13-, shield::shield z15-)
+highway-residential-area                            # line z12- (also has pathtext z13-, shield::shield z15-)
+highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-residential-tunnel                          # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-)
+highway-road                                        # line z12- (also has pathtext z14-)
+highway-road-bridge                                 # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
+highway-road-tunnel                                 # line z12- (also has pathtext z14-)
 === 230

-# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, line::border z14-, pathtext z14-)
-# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, line::border z14-, pathtext z13-, shield::shield z15-)
+# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, pathtext z14-)
+# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-)
 # === 229

-highway-motorway_link                               # line z10- (also has line::border z14-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge                        # line z10- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-tunnel                        # line z10- (also has line::border z14-, line(casing) z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link                                  # line z10- (also has line::border z14-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge                           # line z10- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-tunnel                           # line z10- (also has line::border z14-, line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link                               # line z10- (also has pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-tunnel                        # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link                                  # line z10- (also has pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-tunnel                           # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
 === 228

-# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, line::border z14-, pathtext z10-, shield::shield z10-)
-# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, line::border z14-, pathtext z10-, shield::shield z10-)
+# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
 # === 227

-highway-primary_link                                # line z11- (also has line::border z15-, pathtext z11-, shield::shield z11-)
-highway-primary_link-bridge                         # line z11- (also has line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-primary_link-tunnel                         # line z11- (also has line::border z15-, line(casing) z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link                                # line z11- (also has pathtext z11-, shield::shield z11-)
+highway-primary_link-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link-tunnel                         # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-)
 === 226

-# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, line::border z15-, pathtext z11-, shield::shield z11-)
+# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-)
 # === 225

-highway-secondary_link                              # line z13- (also has line::border z15-, pathtext z16-)
-highway-secondary_link-bridge                       # line z13- (also has line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
-highway-secondary_link-tunnel                       # line z13- (also has line::border z15-, line(casing) z16-, pathtext z16-)
+highway-secondary_link                              # line z13- (also has pathtext z16-)
+highway-secondary_link-bridge                       # line z13- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
+highway-secondary_link-tunnel                       # line z13- (also has line(casing) z16-, pathtext z16-)
 === 224

-# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, line::border z15-, pathtext z16-)
-highway-tertiary_link                               # line z14- (also has line::border z14-, pathtext z18-)
-highway-tertiary_link-bridge                        # line z14- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
-highway-tertiary_link-tunnel                        # line z14- (also has line::border z14-, line(casing) z16-, pathtext z18-)
+# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, pathtext z16-)
+highway-tertiary_link                               # line z14- (also has pathtext z18-)
+highway-tertiary_link-bridge                        # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
+highway-tertiary_link-tunnel                        # line z14- (also has line(casing) z16-, pathtext z18-)
 === 223

-highway-busway                                      # line z15- (also has line::border z15-, pathtext z16-)
-highway-busway-bridge                               # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-busway-tunnel                               # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-)
-highway-service                                     # line z15- (also has line::border z15-, pathtext z16-)
-highway-service-area                                # line z15- (also has line::border z15-, pathtext z16-)
-highway-service-bridge                              # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-service-driveway                            # line z16- (also has line::border z16-, pathtext z16-)
-highway-service-parking_aisle                       # line z15- (also has line::border z15-, pathtext z16-)
-highway-service-tunnel                              # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-)
-# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, line::border z14-, pathtext z18-)
+highway-busway                                      # line z15- (also has pathtext z16-)
+highway-busway-bridge                               # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-busway-tunnel                               # line z15- (also has line(casing) z15-, pathtext z16-)
+highway-service                                     # line z15- (also has pathtext z16-)
+highway-service-area                                # line z15- (also has pathtext z16-)
+highway-service-bridge                              # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-service-driveway                            # line z16- (also has pathtext z16-)
+highway-service-parking_aisle                       # line z15- (also has pathtext z16-)
+highway-service-tunnel                              # line z15- (also has line(casing) z15-, pathtext z16-)
+# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, pathtext z18-)
 === 222

-# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-)
-# highway-service-tunnel                            # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-)
+# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, pathtext z16-)
+# highway-service-tunnel                            # line(casing) z15- (also has line z15-, pathtext z16-)
 railway-light_rail::dash                            # line::dash z16- (also has line z13-)
 railway-light_rail-bridge::dash                     # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
 railway-rail::dash                                  # line::dash z16- (also has line z11-)
@@ -227,11 +227,11 @@ railway-subway::dash                                # line::dash z16- (also has
 railway-subway-bridge::dash                         # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
 === 221

-highway-footway-bicycle                             # line z15- (also has line::border z15-, line::cycleline z15-, pathtext z15-)
+highway-footway-bicycle                             # line z15- (also has line::cycleline z15-, pathtext z15-)
 highway-path-bicycle                                # line z15- (also has line::cycleline z14-, pathtext z15-)
 === 220

-highway-footway-bicycle::cycleline                  # line::cycleline z15- (also has line z15-, line::border z15-, pathtext z15-)
+highway-footway-bicycle::cycleline                  # line::cycleline z15- (also has line z15-, pathtext z15-)
 highway-path-bicycle::cycleline                     # line::cycleline z14- (also has line z15-, pathtext z15-)
 === 219

@@ -264,23 +264,23 @@ railway-subway-bridge                               # line z13- (also has line::
 # railway-rail-utility-tunnel                       # line(casing) z14- (also has line z13-, line::dash z17-)
 # === 209

-highway-ford                                        # line z13- (also has line::border z14-, icon z16-, pathtext z16-)
-highway-pedestrian                                  # line z13- (also has line::border z14-, pathtext z14-)
-highway-pedestrian-area                             # line z13- and area z14- (also has line::border z14-, pathtext z14-)
-highway-pedestrian-bridge                           # line z13- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
-highway-pedestrian-square                           # line z13- and area z14- (also has line::border z14-, pathtext z14-)
-highway-pedestrian-tunnel                           # line z13- (also has line::border z14-, line(casing) z16-, pathtext z14-)
+highway-ford                                        # line z13- (also has icon z16-, pathtext z16-)
+highway-pedestrian                                  # line z13- (also has pathtext z14-)
+highway-pedestrian-area                             # line z13- and area z14- (also has pathtext z14-)
+highway-pedestrian-bridge                           # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
+highway-pedestrian-square                           # line z13- and area z14- (also has pathtext z14-)
+highway-pedestrian-tunnel                           # line z13- (also has line(casing) z16-, pathtext z14-)
 === 200

-# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, line::border z14-, pathtext z14-)
+# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, pathtext z14-)
 # === 199

 highway-bridleway                                   # line z14- (also has pathtext z15-)
 highway-bridleway-bridge                            # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
 highway-bridleway-tunnel                            # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-highway-footway                                     # line z15- (also has line::border z15-, pathtext z15-)
-highway-footway-area                                # line z15- and area z14- (also has line::border z15-, pathtext z15-)
-highway-footway-crossing                            # line z16- (also has line::border z16-)
+highway-footway                                     # line z15- (also has pathtext z15-)
+highway-footway-area                                # line z15- and area z14- (also has pathtext z15-)
+highway-footway-crossing                            # line z16-
 highway-path                                        # line z15- (also has pathtext z15-)
 highway-path-difficult                              # line z15- (also has pathtext z15-)
 highway-path-expert                                 # line z15- (also has pathtext z15-)
@@ -290,7 +290,7 @@ highway-track-area                                  # line z15- (also has pathte
 highway-track-bridge                                # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
 highway-track-no-access                             # line z15- (also has pathtext z15-)
 highway-track-tunnel                                # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-=== 190
+=== 180

 highway-construction                                # line z13- (also has pathtext z15-)
 leisure-track                                       # line z15- (also has caption z16-)
@@ -306,172 +306,54 @@ railway-preserved                                   # line z15-
 railway-preserved-bridge                            # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-)
 railway-preserved-tunnel                            # line z15-
 railway-turntable                                   # line z17-
-=== 180
+=== 160

-highway-footway-bridge                              # line z15- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-footway-sidewalk                            # line z16- (also has line::border z16-)
-highway-footway-tunnel                              # line z15- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+highway-footway-bridge                              # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-footway-sidewalk                            # line z16-
+highway-footway-tunnel                              # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
 highway-path-bridge                                 # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
 highway-path-horse                                  # line z15- (also has pathtext z15-)
 highway-path-tunnel                                 # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-=== 170
+=== 155

 highway-bridleway-tunnel::tunnelBackground          # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-)
 highway-cycleway-tunnel::tunnelBackground           # line::tunnelBackground z17- (also has line z13-, line::tunnelCasing z17-, pathtext z15-)
-highway-footway-tunnel::tunnelBackground            # line::tunnelBackground z17- (also has line z15-, line::border z15-, line::tunnelCasing z17-, pathtext z15-)
+highway-footway-tunnel::tunnelBackground            # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
 highway-path-tunnel::tunnelBackground               # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
-highway-steps-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::border z15-, line::tunnelCasing z17-, pathtext z16-)
+highway-steps-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z16-)
 highway-track-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
-=== 169
+=== 154

 highway-bridleway-tunnel::tunnelCasing              # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-)
 highway-cycleway-tunnel::tunnelCasing               # line::tunnelCasing z17- (also has line z13-, line::tunnelBackground z17-, pathtext z15-)
-highway-footway-tunnel::tunnelCasing                # line::tunnelCasing z17- (also has line z15-, line::border z15-, line::tunnelBackground z17-, pathtext z15-)
+highway-footway-tunnel::tunnelCasing                # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
 highway-path-tunnel::tunnelCasing                   # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
-highway-steps-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::border z15-, line::tunnelBackground z17-, pathtext z16-)
+highway-steps-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z16-)
 highway-track-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
-=== 168
-
-highway-motorway::border                            # line::border z14- (also has line z6-, pathtext z10-, shield::shield z10-)
-highway-trunk::border                               # line::border z14- (also has line z6-, pathtext z10-, shield::shield z10-)
-=== 163
-
-highway-primary::border                             # line::border z11- (also has line z8-, pathtext z10-, shield::shield z10-)
-=== 162
-
-highway-secondary::border                           # line::border z11- (also has line z10-, pathtext z10-, shield::shield z12-)
-=== 161
-
-highway-motorway_link::border                       # line::border z14- (also has line z10-, pathtext z10-, shield::shield z10-)
-highway-trunk_link::border                          # line::border z14- (also has line z10-, pathtext z10-, shield::shield z10-)
-=== 160
-
-highway-primary_link::border                        # line::border z15- (also has line z11-, pathtext z11-, shield::shield z11-)
-=== 159
-
-highway-secondary_link::border                      # line::border z15- (also has line z13-, pathtext z16-)
-=== 158
-
-highway-motorway-bridge::border                     # line::border z14- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk-bridge::border                        # line::border z14- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-=== 157
-
-highway-primary-bridge::border                      # line::border z11- (also has line z8-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-=== 156
-
-highway-secondary-bridge::border                    # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-=== 155
-
-highway-motorway_link-bridge::border                # line::border z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::border                   # line::border z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-=== 154
-
-highway-primary_link-bridge::border                 # line::border z15- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
 === 153

-highway-secondary_link-bridge::border               # line::border z15- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
-=== 152
-
-highway-motorway-tunnel::border                     # line::border z14- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-)
-highway-trunk-tunnel::border                        # line::border z14- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-)
-=== 151
-
-highway-primary-tunnel::border                      # line::border z11- (also has line z8-, line(casing) z14-, pathtext z10-, shield::shield z10-)
-=== 150
-
-highway-secondary-tunnel::border                    # line::border z11- (also has line z10-, line(casing) z16-, pathtext z10-, shield::shield z12-)
-=== 149
-
-highway-motorway_link-tunnel::border                # line::border z14- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-tunnel::border                   # line::border z14- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-)
-=== 148
-
-highway-primary_link-tunnel::border                 # line::border z15- (also has line z11-, line(casing) z14-, pathtext z11-, shield::shield z11-)
-=== 147
-
-highway-secondary_link-tunnel::border               # line::border z15- (also has line z13-, line(casing) z16-, pathtext z16-)
-=== 146
-
-highway-busway::border                              # line::border z15- (also has line z15-, pathtext z16-)
-highway-living_street::border                       # line::border z14- (also has line z12-, pathtext z14-)
-highway-residential::border                         # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-)
-highway-residential-area::border                    # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-)
-highway-road::border                                # line::border z14- (also has line z12-, pathtext z14-)
-highway-service::border                             # line::border z15- (also has line z15-, pathtext z16-)
-highway-service-area::border                        # line::border z15- (also has line z15-, pathtext z16-)
-highway-service-driveway::border                    # line::border z16- (also has line z16-, pathtext z16-)
-highway-service-parking_aisle::border               # line::border z15- (also has line z15-, pathtext z16-)
-highway-tertiary::border                            # line::border z11- (also has line z11-, pathtext z12-, shield::shield z13-)
-highway-tertiary-bridge::border                     # line::border z11- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link::border                       # line::border z14- (also has line z14-, pathtext z18-)
-highway-unclassified::border                        # line::border z13- (also has line z11-, pathtext z13-)
-highway-unclassified-area::border                   # line::border z13- (also has line z11-, pathtext z13-)
-=== 145
-
-highway-footway::border                             # line::border z15- (also has line z15-, pathtext z15-)
-highway-footway-area::border                        # line::border z15- (also has line z15-, area z14-, pathtext z15-)
-highway-footway-bicycle::border                     # line::border z15- (also has line z15-, line::cycleline z15-, pathtext z15-)
-highway-footway-crossing::border                    # line::border z16- (also has line z16-)
-highway-footway-sidewalk::border                    # line::border z16- (also has line z16-)
-highway-ford::border                                # line::border z14- (also has line z13-, icon z16-, pathtext z16-)
-highway-ladder::border                              # line::border z15- (also has line z15-, icon z17-, pathtext z17-)
-highway-pedestrian::border                          # line::border z14- (also has line z13-, pathtext z14-)
-highway-pedestrian-area::border                     # line::border z14- (also has line z13-, area z14-, pathtext z14-)
-highway-pedestrian-square::border                   # line::border z14- (also has line z13-, area z14-, pathtext z14-)
-highway-steps::border                               # line::border z15- (also has line z15-, pathtext z16-)
-=== 144
-
-highway-busway-bridge::border                       # line::border z15- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-living_street-bridge::border                # line::border z14- (also has line z12-, pathtext z14-)
-highway-residential-bridge::border                  # line::border z14- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::border                         # line::border z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
-highway-service-bridge::border                      # line::border z15- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-tertiary_link-bridge::border                # line::border z14- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
-highway-unclassified-bridge::border                 # line::border z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
-=== 143
-
-highway-footway-bridge::border                      # line::border z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-pedestrian-bridge::border                   # line::border z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
-highway-steps-bridge::border                        # line::border z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
-=== 142
-
-highway-busway-tunnel::border                       # line::border z15- (also has line z15-, line(casing) z15-, pathtext z16-)
-highway-living_street-tunnel::border                # line::border z14- (also has line z12-, line(casing) z16-, pathtext z14-)
-highway-residential-tunnel::border                  # line::border z14- (also has line z12-, line(casing) z16-, pathtext z13-, shield::shield z15-)
-highway-road-tunnel::border                         # line::border z14- (also has line z12-, pathtext z14-)
-highway-service-tunnel::border                      # line::border z15- (also has line z15-, line(casing) z15-, pathtext z16-)
-highway-tertiary-tunnel::border                     # line::border z11- (also has line z11-, line(casing) z16-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-tunnel::border                # line::border z14- (also has line z14-, line(casing) z16-, pathtext z18-)
-highway-unclassified-tunnel::border                 # line::border z13- (also has line z11-, line(casing) z16-, pathtext z13-)
-=== 141
-
-highway-footway-tunnel::border                      # line::border z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-highway-pedestrian-tunnel::border                   # line::border z14- (also has line z13-, line(casing) z16-, pathtext z14-)
-highway-steps-tunnel::border                        # line::border z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
-=== 140
-
 highway-bridleway-bridge::bridgewhite               # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-)
-highway-busway-bridge::bridgewhite                  # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z15-, pathtext z16-)
+highway-busway-bridge::bridgewhite                  # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
 highway-cycleway-bridge::bridgewhite                # line::bridgewhite z15- (also has line z13-, line::bridgeblack z17-, pathtext z15-)
-highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, pathtext z15-)
-highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::border z14-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::border z14-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
+highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
 highway-path-bridge::bridgewhite                    # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
-highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::border z14-, line::bridgeblack z14-, pathtext z14-)
-highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::border z15-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::border z14-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::border z14-, line::bridgeblack z16-, pathtext z14-)
-highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::border z15-, line::bridgeblack z14-, pathtext z16-)
-highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z15-, pathtext z16-)
-highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, pathtext z16-)
-highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::border z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::border z14-, line::bridgeblack z14-, pathtext z18-)
+highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-)
+highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-)
+highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-)
+highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
+highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-)
+highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-)
 highway-track-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
-highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::border z14-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::border z14-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z13-)
+highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
 railway-disused-bridge::bridgewhite                 # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
 railway-light_rail-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
 railway-miniature-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
@@ -485,30 +367,30 @@ railway-rail-spur-bridge::bridgewhite               # line::bridgewhite z15- (al
 railway-rail-tourism-bridge::bridgewhite            # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-, pathtext z14-)
 railway-rail-utility-bridge::bridgewhite            # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z17-)
 railway-subway-bridge::bridgewhite                  # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
-=== 135
+=== 150

 highway-bridleway-bridge::bridgeblack               # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-)
-highway-busway-bridge::bridgeblack                  # line::bridgeblack z15- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-)
+highway-busway-bridge::bridgeblack                  # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
 highway-cycleway-bridge::bridgeblack                # line::bridgeblack z17- (also has line z13-, line::bridgewhite z15-, pathtext z15-)
-highway-footway-bridge::bridgeblack                 # line::bridgeblack z17- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z15-)
-highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::border z14-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::border z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-footway-bridge::bridgeblack                 # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
+highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
 highway-path-bridge::bridgeblack                    # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
-highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::border z14-, line::bridgewhite z13-, pathtext z14-)
-highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::border z15-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::border z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::border z14-, line::bridgewhite z16-, pathtext z14-)
-highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::border z15-, line::bridgewhite z14-, pathtext z16-)
-highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-)
-highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-)
-highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::border z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::border z14-, line::bridgewhite z14-, pathtext z18-)
+highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-)
+highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-)
+highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-)
+highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
+highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
+highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-)
 highway-track-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
-highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::border z14-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::border z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z13-)
+highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
 railway-disused-bridge::bridgeblack                 # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
 railway-light_rail-bridge::bridgeblack              # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
 railway-miniature-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
@@ -522,14 +404,14 @@ railway-rail-spur-bridge::bridgeblack               # line::bridgeblack z16- (al
 railway-rail-tourism-bridge::bridgeblack            # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-, pathtext z14-)
 railway-rail-utility-bridge::bridgeblack            # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z17-)
 railway-subway-bridge::bridgeblack                  # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
-=== 130
+=== 140

 building                                            # area z14- (also has caption z17-)
 building-garage                                     # area z14- (also has caption z17-)
 building-guardhouse                                 # area z14- (also has icon z18-, caption(optional) z18-)
 building-has_parts                                  # area z14- (also has caption z17-)
 building-train_station                              # area z14- (also has icon z17-, caption(optional) z17-)
-=== 120
+=== 130

 piste:type-connection                               # line z15-
 piste:type-downhill                                 # line z14- (also has pathtext z15-)
@@ -543,30 +425,30 @@ piste:type-hike                                     # line z15- (also has pathte
 piste:type-nordic                                   # line z14- (also has pathtext z15-)
 piste:type-skitour                                  # line z14- (also has pathtext z15-)
 piste:type-sled                                     # line z14- (also has pathtext z15-)
-=== 110
+=== 120

 building:part                                       # area z16-
-=== 100
+=== 110

 barrier-retaining_wall                              # line z16-
 man_made-embankment                                 # line z16- (also has pathtext z18-)
 natural-cliff                                       # line z14- (also has pathtext z16-)
 natural-earth_bank                                  # line z14-
-=== 90
+=== 100

 boundary-administrative-2                           # line z2-
 boundary-administrative-3                           # line z4
 boundary-administrative-4                           # line z5-
-=== 80
+=== 90

 man_made-cutline                                    # line z14-
 route-ferry                                         # line z7- (also has pathtext z10-)
-=== 70
+=== 80

 aeroway-runway                                      # line z12-
 aeroway-taxiway                                     # line z14-
 barrier-ditch                                       # line z16-
-=== 60
+=== 70

 isoline-step_10                                     # line z15- (also has pathtext z17-)
 isoline-step_100                                    # line z12- (also has pathtext z14-)
@@ -574,7 +456,7 @@ isoline-step_1000                                   # line z11- (also has pathte
 isoline-step_50                                     # line z14- (also has pathtext z16-)
 isoline-step_500                                    # line z11- (also has pathtext z12-)
 isoline-zero                                        # line z15- (also has pathtext z17-)
-=== 50
+=== 60

 man_made-breakwater                                 # line z14- and area z12- (also has caption z17-)
 man_made-pier                                       # line z14- and area z12- (also has caption z17-)
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -78,20 +78,20 @@ amenity-ferry_terminal                              # icon z11- (also has captio
 railway-station                                     # icon z12- (also has caption(optional) z12-)
 === 6800

-highway-motorway                                    # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-)
-highway-motorway-bridge                             # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-motorway-tunnel                             # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line(casing) z12-)
-highway-trunk                                       # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-)
-highway-trunk-bridge                                # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-trunk-tunnel                                # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line(casing) z12-)
+highway-motorway                                    # pathtext z10- (also has shield::shield z10-, line z6-)
+highway-motorway-bridge                             # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-motorway-tunnel                             # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
+highway-trunk                                       # pathtext z10- (also has shield::shield z10-, line z6-)
+highway-trunk-bridge                                # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-trunk-tunnel                                # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
 === 6750

-highway-motorway::shield                            # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-)
-highway-motorway-bridge::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-motorway-tunnel::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line(casing) z12-)
-highway-trunk::shield                               # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-)
-highway-trunk-bridge::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line(casing) z12-)
+highway-motorway::shield                            # shield::shield z10- (also has pathtext z10-, line z6-)
+highway-motorway-bridge::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-motorway-tunnel::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
+highway-trunk::shield                               # shield::shield z10- (also has pathtext z10-, line z6-)
+highway-trunk-bridge::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
 === 6740

 boundary-aboriginal_lands                           # caption z10-16 (also has line z10-, area z10-16)
@@ -259,31 +259,31 @@ railway-station-subway-yerevan                      # icon z13- (also has captio
 railway-station-subway-yokohama                     # icon z13- (also has caption(optional) z14-)
 === 6250

-highway-primary                                     # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-)
-highway-primary-bridge                              # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary-tunnel                              # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-, line(casing) z14-)
+highway-primary                                     # pathtext z10- (also has shield::shield z10-, line z8-)
+highway-primary-bridge                              # pathtext z10- (also has shield::shield z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary-tunnel                              # pathtext z10- (also has shield::shield z10-, line z8-, line(casing) z14-)
 route-ferry                                         # pathtext z10- (also has line z7-)
 === 6200

-highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-)
-highway-motorway_link-bridge                        # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line(casing) z13-)
-highway-trunk_link                                  # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-)
-highway-trunk_link-bridge                           # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line(casing) z13-)
+highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-)
+highway-motorway_link-bridge                        # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
+highway-trunk_link                                  # pathtext z10- (also has shield::shield z10-, line z10-)
+highway-trunk_link-bridge                           # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
 === 6150

-highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-)
-highway-motorway_link-bridge::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line(casing) z13-)
-highway-trunk_link::shield                          # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-)
-highway-trunk_link-bridge::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line(casing) z13-)
+highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-)
+highway-motorway_link-bridge::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
+highway-trunk_link::shield                          # shield::shield z10- (also has pathtext z10-, line z10-)
+highway-trunk_link-bridge::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
 === 6140

-highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-)
-highway-primary_link-bridge                         # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-, line(casing) z14-)
+highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-)
+highway-primary_link-bridge                         # pathtext z11- (also has shield::shield z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
 === 6100

 barrier-border_control                              # icon z14- (also has caption(optional) z14-)
@@ -302,9 +302,9 @@ place-locality                                      # caption z13-
 place-neighbourhood                                 # caption z13-
 === 5700

-highway-secondary                                   # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-)
-highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-, line(casing) z16-)
+highway-secondary                                   # pathtext z10- (also has shield::shield z12-, line z10-)
+highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z16-)
 === 5600

 man_made-communications_tower                       # icon z14- (also has caption(optional) z15-)
@@ -591,14 +591,14 @@ shop-supermarket                                    # icon z16- (also has captio
 === 3200

 area:highway-pedestrian                             # caption z15- (also has area z14-)
-highway-pedestrian                                  # pathtext z14- (also has line z13-, line::border z14-)
-highway-pedestrian-area                             # pathtext z14- (also has line z13-, line::border z14-, area z14-)
-highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-)
-highway-pedestrian-square                           # pathtext z14- (also has line z13-, line::border z14-, area z14-)
-highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line::border z14-, line(casing) z16-)
-highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-)
-highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line(casing) z16-)
+highway-pedestrian                                  # pathtext z14- (also has line z13-)
+highway-pedestrian-area                             # pathtext z14- (also has line z13-, area z14-)
+highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-)
+highway-pedestrian-square                           # pathtext z14- (also has line z13-, area z14-)
+highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line(casing) z16-)
+highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-)
+highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z16-)
 natural-strait                                      # caption z13- (also has line z13-)
 natural-water                                       # caption z10- (also has area z1-)
 natural-water-pond                                  # caption z10- (also has area z1-)
@@ -610,10 +610,10 @@ waterway-dam                                        # pathtext z15- (also has li
 waterway-river                                      # pathtext z11- (also has line z10-)
 === 3150

-highway-unclassified                                # pathtext z13- (also has line z11-, line::border z13-)
-highway-unclassified-area                           # pathtext z13- (also has line z11-, line::border z13-)
-highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line::border z13-, line(casing) z16-)
+highway-unclassified                                # pathtext z13- (also has line z11-)
+highway-unclassified-area                           # pathtext z13- (also has line z11-)
+highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line(casing) z16-)
 === 3100

 amenity-water_point                                 # icon z17- (also has caption(optional) z18-)
@@ -645,46 +645,46 @@ aerialway-mixed_lift                                # pathtext z15- (also has li
 aerialway-platter                                   # pathtext z15- (also has line z13-, line::dash z13-)
 aerialway-rope_tow                                  # pathtext z15- (also has line z13-, line::dash z13-)
 aerialway-t-bar                                     # pathtext z15- (also has line z13-, line::dash z13-)
-highway-residential                                 # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
-highway-residential-area                            # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
-highway-residential-bridge                          # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-residential-tunnel                          # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line(casing) z16-)
-highway-road                                        # pathtext z14- (also has line z12-, line::border z14-)
-highway-road-bridge                                 # pathtext z14- (also has line z12-, line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-)
-highway-road-tunnel                                 # pathtext z14- (also has line z12-, line::border z14-)
-highway-secondary_link                              # pathtext z16- (also has line z13-, line::border z15-)
-highway-secondary_link-bridge                       # pathtext z16- (also has line z13-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary_link-tunnel                       # pathtext z16- (also has line z13-, line::border z15-, line(casing) z16-)
+highway-residential                                 # pathtext z13- (also has shield::shield z15-, line z12-)
+highway-residential-area                            # pathtext z13- (also has shield::shield z15-, line z12-)
+highway-residential-bridge                          # pathtext z13- (also has shield::shield z15-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel                          # pathtext z13- (also has shield::shield z15-, line z12-, line(casing) z16-)
+highway-road                                        # pathtext z14- (also has line z12-)
+highway-road-bridge                                 # pathtext z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-)
+highway-road-tunnel                                 # pathtext z14- (also has line z12-)
+highway-secondary_link                              # pathtext z16- (also has line z13-)
+highway-secondary_link-bridge                       # pathtext z16- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary_link-tunnel                       # pathtext z16- (also has line z13-, line(casing) z16-)
 === 3000

-highway-primary::shield                             # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-)
-highway-primary-bridge::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary-tunnel::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-, line(casing) z14-)
+highway-primary::shield                             # shield::shield z10- (also has pathtext z10-, line z8-)
+highway-primary-bridge::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary-tunnel::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line(casing) z14-)
 === 2975

-highway-primary_link::shield                        # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-)
-highway-primary_link-bridge::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary_link-tunnel::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-, line(casing) z14-)
+highway-primary_link::shield                        # shield::shield z11- (also has pathtext z11-, line z11-)
+highway-primary_link-bridge::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary_link-tunnel::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line(casing) z14-)
 === 2970

-highway-secondary::shield                           # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-)
-highway-secondary-bridge::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary-tunnel::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z16-)
+highway-secondary::shield                           # shield::shield z12- (also has pathtext z10-, line z10-)
+highway-secondary-bridge::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary-tunnel::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line(casing) z16-)
 === 2965

-highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-)
-highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line(casing) z16-)
+highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-)
+highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z16-)
 === 2960

 barrier-city_wall                                   # pathtext z16- (also has line z14-)
 historic-citywalls                                  # pathtext z16- (also has line z14-)
 === 2957

-highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
-highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
-highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line(casing) z16-)
+highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-)
+highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-)
+highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-)
 === 2955

 highway-cycleway                                    # pathtext z15- (also has line z13-)
@@ -693,14 +693,14 @@ highway-cycleway-tunnel                             # pathtext z15- (also has li
 === 2953

 area:highway-footway                                # caption z15- (also has area z14-)
-highway-footway                                     # pathtext z15- (also has line z15-, line::border z15-)
-highway-footway-area                                # pathtext z15- (also has line z15-, line::border z15-, area z14-)
-highway-footway-bicycle                             # pathtext z15- (also has line z15-, line::border z15-, line::cycleline z15-)
-highway-footway-bridge                              # pathtext z15- (also has line z15-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-footway-tunnel                              # pathtext z15- (also has line z15-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
-highway-tertiary_link                               # pathtext z18- (also has line z14-, line::border z14-)
-highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary_link-tunnel                        # pathtext z18- (also has line z14-, line::border z14-, line(casing) z16-)
+highway-footway                                     # pathtext z15- (also has line z15-)
+highway-footway-area                                # pathtext z15- (also has line z15-, area z14-)
+highway-footway-bicycle                             # pathtext z15- (also has line z15-, line::cycleline z15-)
+highway-footway-bridge                              # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-footway-tunnel                              # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-tertiary_link                               # pathtext z18- (also has line z14-)
+highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary_link-tunnel                        # pathtext z18- (also has line z14-, line(casing) z16-)
 === 2950

 natural-water-basin                                 # caption z10- (also has area z1-)
@@ -717,7 +717,7 @@ waterway-stream-intermittent                        # pathtext z13- (also has li
 waterway-weir                                       # pathtext z15- (also has line z14-)
 === 2900

-highway-ford                                        # icon z16- and pathtext z16- (also has line z13-, line::border z14-)
+highway-ford                                        # icon z16- and pathtext z16- (also has line z13-)
 natural-rock                                        # icon z17- (also has caption(optional) z17-)
 === 2850

@@ -733,9 +733,9 @@ highway-path-horse                                  # pathtext z15- (also has li
 highway-path-tunnel                                 # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2820

-highway-steps                                       # pathtext z16- (also has line z15-, line::border z15-)
-highway-steps-bridge                                # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-steps-tunnel                                # pathtext z16- (also has line z15-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-steps                                       # pathtext z16- (also has line z15-)
+highway-steps-bridge                                # pathtext z16- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-steps-tunnel                                # pathtext z16- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2810

 highway-track                                       # pathtext z15- (also has line z15-)
@@ -745,12 +745,12 @@ highway-track-no-access                             # pathtext z15- (also has li
 highway-track-tunnel                                # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2780

-highway-service                                     # pathtext z16- (also has line z15-, line::border z15-)
-highway-service-area                                # pathtext z16- (also has line z15-, line::border z15-)
-highway-service-bridge                              # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-service-driveway                            # pathtext z16- (also has line z16-, line::border z16-)
-highway-service-parking_aisle                       # pathtext z16- (also has line z15-, line::border z15-)
-highway-service-tunnel                              # pathtext z16- (also has line z15-, line::border z15-, line(casing) z15-)
+highway-service                                     # pathtext z16- (also has line z15-)
+highway-service-area                                # pathtext z16- (also has line z15-)
+highway-service-bridge                              # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-service-driveway                            # pathtext z16- (also has line z16-)
+highway-service-parking_aisle                       # pathtext z16- (also has line z15-)
+highway-service-tunnel                              # pathtext z16- (also has line(casing) z15-, line z15-)
 piste:type-downhill                                 # pathtext z15- (also has line z14-)
 piste:type-downhill-advanced                        # pathtext z15- (also has line z14-)
 piste:type-downhill-easy                            # pathtext z15- (also has line z14-)
@@ -833,9 +833,9 @@ attraction-historic                                 # icon z17- (also has captio
 attraction-maze                                     # icon z17- (also has caption(optional) z17-)
 attraction-roller_coaster                           # icon z17- (also has caption(optional) z17-)
 highway-construction                                # pathtext z15- (also has line z13-)
-highway-living_street                               # pathtext z14- (also has line z12-, line::border z14-)
-highway-living_street-bridge                        # pathtext z14- (also has line z12-, line::border z14-)
-highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line::border z14-, line(casing) z16-)
+highway-living_street                               # pathtext z14- (also has line z12-)
+highway-living_street-bridge                        # pathtext z14- (also has line z12-)
+highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line(casing) z16-)
 landuse-plant_nursery                               # icon z17- (also has caption(optional) z17-, area z12-)
 leisure-bowling_alley                               # icon z17- (also has caption(optional) z17-)
 leisure-garden                                      # icon z16- (also has caption(optional) z16-, area z12-)
@@ -902,9 +902,9 @@ barrier-yes                                         # icon z16- (also has captio
 leisure-dog_park                                    # icon z16- (also has caption(optional) z16-, area z15-)
 === 2300

-highway-busway                                      # pathtext z16- (also has line z15-, line::border z15-)
-highway-busway-bridge                               # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-busway-tunnel                               # pathtext z16- (also has line z15-, line::border z15-, line(casing) z15-)
+highway-busway                                      # pathtext z16- (also has line z15-)
+highway-busway-bridge                               # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-busway-tunnel                               # pathtext z16- (also has line(casing) z15-, line z15-)
 === 2250

 amenity-clinic                                      # icon z17- (also has caption(optional) z17-, area z13-)
@@ -1172,7 +1172,7 @@ amenity-nursing_home                                # icon z17- (also has captio
 amenity-prison                                      # icon z17- (also has caption(optional) z17-, area z12-)
 amenity-social_facility                             # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z18-, area z13-)
-highway-ladder                                      # icon z17- and pathtext z17- (also has line z15-, line::border z15-)
+highway-ladder                                      # icon z17- and pathtext z17- (also has line z15-)
 landuse-farmland                                    # caption z15- (also has area z10-)
 landuse-garages                                     # caption z15- (also has area z13-)
 landuse-orchard                                     # caption z15- (also has area z12-)
@@ -2443,8 +2443,9 @@ amenity-bench-backless                              # icon z18- (also has captio
 amenity-lounger                                     # icon z18- (also has caption(optional) z19-)
 amenity-waste_disposal                              # icon z18- (also has caption(optional) z18-)
 emergency-access_point                              # icon z18- (also has caption(optional) z18-)
-emergency-assembly_point                            # icon z18- (also has caption(optional) z18-)
+emergency-assembly_point                            # icon z19- (also has caption(optional) z19-)
 emergency-defibrillator                             # icon z18- (also has caption(optional) z18-)
+emergency-disaster_help_point                       # icon z18- (also has caption(optional) z18-)
 emergency-phone                                     # icon z17- (also has caption(optional) z19-)
 man_made-telescope                                  # icon z18- (also has caption(optional) z18-)
 === -9980
@@ -2481,8 +2482,9 @@ amenity-loading_dock                                # icon z19- (also has captio
 # amenity-waste_basket                              # caption(optional) z19- (also has icon z18-)
 # amenity-waste_disposal                            # caption(optional) z18- (also has icon z18-)
 # emergency-access_point                            # caption(optional) z18- (also has icon z18-)
-# emergency-assembly_point                          # caption(optional) z18- (also has icon z18-)
+# emergency-assembly_point                          # caption(optional) z19- (also has icon z19-)
 # emergency-defibrillator                           # caption(optional) z18- (also has icon z18-)
+# emergency-disaster_help_point                     # caption(optional) z18- (also has icon z18-)
 # emergency-fire_hydrant                            # caption(optional) z19- (also has icon z19-)
 # emergency-life_ring                               # caption(optional) z19- (also has icon z19-)
 # emergency-phone                                   # caption(optional) z19- (also has icon z17-)
--- a/data/styles/default/light/colors.mapcss
+++ b/data/styles/default/light/colors.mapcss
@@ -161,19 +161,11 @@
@path: #8E4E1D;
@path_expert: #3D2617;
@bridleway: #3D361E;
-@motorway1_border: #D87A00;
-@trunk1_border: #DA8F2B;
-@primary1_border: #E1A93A;
-@primary2_border: #E1AF4E;
-@secondary0_border: #E6BA51;
-@secondary1_border: #E6C068;
-@minor_road_border: #000000;

 /* 5.2 Bridges */

@bridge_background: #FCF1DE;
@bridge_casing: #E1D4BE;
-@bridge_minor_road_border: #E3D9C8;

 /* 5.3 Tunnels */

--- a/data/styles/default/light/symbols/defibrillator-m.svg
+++ b/data/styles/default/light/symbols/defibrillator-m.svg
@@ -1,11 +1 @@
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <title>defibrillator-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="defibrillator-m" fill-rule="nonzero">
-   <g id="defibrillator" transform="translate(5 5)" fill="#D85961">
-    <path id="Shape" d="m9.5476 0.89855c-0.93747 0-1.8267 0.3139-2.5476 0.89211-0.72089-0.57821-1.6101-0.89211-2.5476-0.89211-1.0901 0-2.1151 0.42456-2.886 1.1954-1.5913 1.5914-1.5913 4.1808 0 5.7721l5.0953 5.0952c0.093335 0.09346 0.21583 0.14019 0.33833 0.14019s0.24487-0.04673 0.33833-0.14019l5.0952-5.0952c1.5914-1.5914 1.5914-4.1808 0-5.7721-0.77086-0.77086-1.7957-1.1954-2.8859-1.1954zm2.2093 6.2907-4.7569 4.7569-4.7569-4.7569c-1.2182-1.2182-1.2182-3.2003 0-4.4185 0.59017-0.59017 1.3747-0.91516 2.2093-0.91516 0.83466 0 1.6192 0.32512 2.2093 0.91516 0.089722 0.089722 0.21147 0.14019 0.33833 0.14019s0.2486-0.050468 0.33833-0.14019c0.59017-0.59017 1.3747-0.91516 2.2093-0.91516 0.83454 0 1.6191 0.32512 2.2093 0.91516 1.2182 1.2181 1.2182 3.2003 0 4.4185z"/>
-    <path id="Shape" d="m9.3128 5.6781h-0.93959l0.77958-1.601c0.072151-0.14829 0.06293-0.32337-0.024549-0.46319-0.087479-0.13982-0.24075-0.2248-0.40574-0.2248h-2.2287c-0.20511 0-0.3873 0.13059-0.45322 0.32487l-1.1685 3.4454c-0.049845 0.14667-0.025546 0.30829 0.065173 0.4339 0.089971 0.12461 0.23427 0.19838 0.38792 0.19838h0.0033646l1.1499-0.0079753-0.45384 2.2543c-0.044612 0.22156 0.071902 0.444 0.27938 0.53372 0.061434 0.026418 0.12586 0.039129 0.18954 0.039129 0.15141 0 0.29857-0.071902 0.39054-0.20175l2.819-3.9757c0.10355-0.14592 0.11701-0.33745 0.034767-0.49646-0.08212-0.15888-0.24611-0.25882-0.42506-0.25882zm-1.9048 2.3377 0.12486-0.6202c0.028412-0.14119-0.0083491-0.28773-0.09994-0.39889-0.090968-0.11028-0.22642-0.17409-0.36923-0.17409h-0.00324l-1.0661 0.0073522 0.84239-2.4838h1.1206l-0.77958 1.601c-0.072151 0.14829-0.06293 0.32337 0.024549 0.46319 0.087479 0.13982 0.24075 0.2248 0.40574 0.2248h0.77883l-0.97896 1.3806z"/>
-   </g>
-  </g>
- </g>
-</svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m10.910745 4.4239125c.81765 0 1.58628.318405 2.164425.89655 1.19355 1.193475 1.19355 3.135525 0 4.329075l-3.8214 3.8214c-.070095.070095-.1618725.1051425-.2537475.1051425s-.18374625-.0350475-.2537475-.1051425l-3.821475-3.8214c-1.193475-1.193475-1.193475-3.135525 0-4.329075.578175-.57813 1.346925-.89655 2.1645-.89655.703125 0 1.3700325.235425 1.9107.6690825.4806-.38547333 1.0609511-.61431852 1.677796-.66041407zm0 .71778c-.62595 0-1.2143475.2437425-1.656975.68637-.0672975.0672915-.1586025.1051425-.2537475.1051425s-.186456-.037851-.2537475-.1051425c-.442575-.44253-1.03098-.68637-1.656975-.68637-.62595 0-1.2143475.2437425-1.656975.68637-.91365.91365-.91365 2.400225 0 3.313875l3.567675 3.567675 3.56772-3.567675c.91365-.91365.91365-2.4003 0-3.313875-.44265-.44253-1.03107-.68637-1.656975-.68637zm-.7272766 1.3583075c.1142317 0 .2203497.05883637.2809163.15564151.0605665.09680515.0669508.21802274.0169966.32069214l-.53974647 1.10846113.65050647.00000256c.123897 0 .2374364.06919401.2942926.17919544.0569414.11009145.0476223.2426983-.0240711.34372681l-1.95175011 2.75259771c-.06367593.089901-.16556297.1396827-.27039251.1396827-.0440892 0-.08869489-.0088005-.13122906-.0270912-.14364853-.0621181-.22431764-.2161257-.19343027-.3695239l.31421861-1.56077701-.79613957.00552174c-.10870992 0-.20861612-.05107506-.27090804-.13734948-.0628098-.08696677-.07963334-.19886526-.04512288-.30041304l.80901738-2.38544158c.04564007-.13451083.17178032-.22492553.31378935-.22492553z" fill="#d85961"/></svg>
--- a/data/styles/default/light/symbols/disaster_help_point-m.svg
+++ b/data/styles/default/light/symbols/disaster_help_point-m.svg
--- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
@@ -101,8 +101,8 @@ amenity-recycling-centre                            # area z15- (also has icon z
 amenity-social_facility                             # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
 emergency-mountain_rescue                           # area z13- (also has icon z12-, caption(optional) z12-)
-highway-pedestrian-area                             # area z14- (also has line z13-, line::border z14-, pathtext z14-)
-highway-pedestrian-square                           # area z14- (also has line z13-, line::border z14-, pathtext z14-)
+highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
+highway-pedestrian-square                           # area z14- (also has line z13-, pathtext z14-)
 highway-rest_area                                   # area z13- (also has icon z14-, caption(optional) z15-)
 highway-services                                    # area z13- (also has icon z14-, caption(optional) z14-)
 landuse-garages                                     # area z13- (also has caption z15-)
@@ -115,7 +115,7 @@ tourism-information-office                          # area z15- (also has icon z
 tourism-information-visitor_centre                  # area z13- (also has icon z13-, caption(optional) z14-)
 === 170

-highway-footway-area                                # area z14- (also has line z11-, line::border z15-, pathtext z13-)
+highway-footway-area                                # area z14- (also has line z11-, pathtext z13-)
 leisure-track-area                                  # area z15- (also has caption z16-)
 === 160

--- a/data/styles/outdoors/include/priorities_3_FG.prio.txt
+++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt
@@ -47,10 +47,10 @@ power-line::dash                                    # line::dash z13- (also has
 power-minor_line::dash                              # line::dash z15- (also has line z15-)
 === 340

-highway-ladder                                      # line z12- (also has line::border z15-, icon z16-, pathtext z17-)
-highway-steps                                       # line z12- (also has line::border z15-, pathtext z13-)
-highway-steps-bridge                                # line z12- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
-highway-steps-tunnel                                # line z12- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
+highway-ladder                                      # line z12- (also has icon z16-, pathtext z17-)
+highway-steps                                       # line z12- (also has pathtext z13-)
+highway-steps-bridge                                # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
+highway-steps-tunnel                                # line z12- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
 hwtag-oneway::arrows                                # line::arrows z15-
 waterway-weir                                       # line z14- (also has pathtext z15-)
 === 330
@@ -75,23 +75,23 @@ railway-tram-bridge                                 # line z13-
 railway-tram-tunnel                                 # line z13-
 === 320

-highway-motorway                                    # line z6- (also has line::border z14-, pathtext z10-, shield::shield z10-)
-highway-motorway-bridge                             # line z6- (also has line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway-tunnel                             # line z6- (also has line::border z14-, line(casing) z12-, pathtext z10-, shield::shield z10-)
-highway-trunk                                       # line z6- (also has line::border z14-, pathtext z10-, shield::shield z10-)
-highway-trunk-bridge                                # line z6- (also has line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk-tunnel                                # line z6- (also has line::border z14-, line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-motorway                                    # line z6- (also has pathtext z10-, shield::shield z10-)
+highway-motorway-bridge                             # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway-tunnel                             # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk                                       # line z6- (also has pathtext z10-, shield::shield z10-)
+highway-trunk-bridge                                # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk-tunnel                                # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
 highway-world_level                                 # line z4-9
 highway-world_towns_level                           # line z6-9
 === 310

-# highway-motorway-tunnel                           # line(casing) z12- (also has line z6-, line::border z14-, pathtext z10-, shield::shield z10-)
-# highway-trunk-tunnel                              # line(casing) z12- (also has line z6-, line::border z14-, pathtext z10-, shield::shield z10-)
+# highway-motorway-tunnel                           # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
+# highway-trunk-tunnel                              # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-)
 # === 309

-highway-primary                                     # line z8- (also has line::border z11-, pathtext z10-, shield::shield z10-)
-highway-primary-bridge                              # line z8- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary-tunnel                              # line z8- (also has line::border z11-, line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-primary                                     # line z8- (also has pathtext z10-, shield::shield z10-)
+highway-primary-bridge                              # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary-tunnel                              # line z8- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
 railway-rail-branch::dash                           # line::dash z15- (also has line z10-)
 railway-rail-branch-bridge::dash                    # line::dash z15- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
 railway-rail-branch-tunnel::dash                    # line::dash z15- (also has line z10-, line(casing) z14-)
@@ -106,7 +106,7 @@ railway-rail-tourism-bridge::dash                   # line::dash z15- (also has
 railway-rail-tourism-tunnel::dash                   # line::dash z15- (also has line z10-, line(casing) z14-, pathtext z14-)
 === 290

-# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, line::border z11-, pathtext z10-, shield::shield z10-)
+# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, pathtext z10-, shield::shield z10-)
 # === 289

 railway-rail-branch                                 # line z10- (also has line::dash z15-)
@@ -129,88 +129,88 @@ railway-rail-tourism-tunnel                         # line z10- (also has line::
 # railway-rail-tourism-tunnel                       # line(casing) z14- (also has line z10-, line::dash z15-, pathtext z14-)
 # === 279

-highway-secondary                                   # line z10- (also has line::border z11-, pathtext z10-, shield::shield z12-)
-highway-secondary-bridge                            # line z10- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary-tunnel                            # line z10- (also has line::border z11-, line(casing) z16-, pathtext z10-, shield::shield z12-)
+highway-secondary                                   # line z10- (also has pathtext z10-, shield::shield z12-)
+highway-secondary-bridge                            # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary-tunnel                            # line z10- (also has line(casing) z16-, pathtext z10-, shield::shield z12-)
 === 270

-# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, line::border z11-, pathtext z10-, shield::shield z12-)
+# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, pathtext z10-, shield::shield z12-)
 # === 269

-highway-tertiary                                    # line z11- (also has line::border z11-, pathtext z12-, shield::shield z13-)
-highway-tertiary-bridge                             # line z11- (also has line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary-tunnel                             # line z11- (also has line::border z11-, line(casing) z16-, pathtext z12-, shield::shield z13-)
-highway-unclassified                                # line z11- (also has line::border z13-, pathtext z13-)
-highway-unclassified-area                           # line z11- (also has line::border z13-, pathtext z13-)
-highway-unclassified-bridge                         # line z11- (also has line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
-highway-unclassified-tunnel                         # line z11- (also has line::border z13-, line(casing) z16-, pathtext z13-)
+highway-tertiary                                    # line z11- (also has pathtext z12-, shield::shield z13-)
+highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary-tunnel                             # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-)
+highway-unclassified                                # line z11- (also has pathtext z13-)
+highway-unclassified-area                           # line z11- (also has pathtext z13-)
+highway-unclassified-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
+highway-unclassified-tunnel                         # line z11- (also has line(casing) z16-, pathtext z13-)
 === 250

-# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, line::border z11-, pathtext z12-, shield::shield z13-)
-# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, line::border z13-, pathtext z13-)
+# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-)
+# highway-unclassified-tunnel                       # line(casing) z16- (also has line z11-, pathtext z13-)
 # === 249

-highway-living_street                               # line z12- (also has line::border z14-, pathtext z14-)
-highway-living_street-bridge                        # line z12- (also has line::border z14-, pathtext z14-)
-highway-living_street-tunnel                        # line z12- (also has line::border z14-, line(casing) z16-, pathtext z14-)
-highway-residential                                 # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
-highway-residential-area                            # line z12- (also has line::border z14-, pathtext z13-, shield::shield z15-)
-highway-residential-bridge                          # line z12- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-residential-tunnel                          # line z12- (also has line::border z14-, line(casing) z16-, pathtext z13-, shield::shield z15-)
-highway-road                                        # line z12- (also has line::border z14-, pathtext z14-)
-highway-road-bridge                                 # line z12- (also has line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
-highway-road-tunnel                                 # line z12- (also has line::border z14-, pathtext z14-)
+highway-living_street                               # line z12- (also has pathtext z14-)
+highway-living_street-bridge                        # line z12- (also has pathtext z14-)
+highway-living_street-tunnel                        # line z12- (also has line(casing) z16-, pathtext z14-)
+highway-residential                                 # line z12- (also has pathtext z13-, shield::shield z15-)
+highway-residential-area                            # line z12- (also has pathtext z13-, shield::shield z15-)
+highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-residential-tunnel                          # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-)
+highway-road                                        # line z12- (also has pathtext z14-)
+highway-road-bridge                                 # line z12- (also has line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
+highway-road-tunnel                                 # line z12- (also has pathtext z14-)
 === 230

-# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, line::border z14-, pathtext z14-)
-# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, line::border z14-, pathtext z13-, shield::shield z15-)
+# highway-living_street-tunnel                      # line(casing) z16- (also has line z12-, pathtext z14-)
+# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-)
 # === 229

-highway-motorway_link                               # line z10- (also has line::border z14-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge                        # line z10- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-tunnel                        # line z10- (also has line::border z14-, line(casing) z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link                                  # line z10- (also has line::border z14-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge                           # line z10- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-tunnel                           # line z10- (also has line::border z14-, line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link                               # line z10- (also has pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-tunnel                        # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link                                  # line z10- (also has pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-tunnel                           # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
 === 228

-# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, line::border z14-, pathtext z10-, shield::shield z10-)
-# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, line::border z14-, pathtext z10-, shield::shield z10-)
+# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
 # === 227

-highway-primary_link                                # line z11- (also has line::border z15-, pathtext z11-, shield::shield z11-)
-highway-primary_link-bridge                         # line z11- (also has line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-primary_link-tunnel                         # line z11- (also has line::border z15-, line(casing) z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link                                # line z11- (also has pathtext z11-, shield::shield z11-)
+highway-primary_link-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link-tunnel                         # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-)
 === 226

-# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, line::border z15-, pathtext z11-, shield::shield z11-)
+# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-)
 # === 225

-highway-secondary_link                              # line z13- (also has line::border z15-, pathtext z16-)
-highway-secondary_link-bridge                       # line z13- (also has line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
-highway-secondary_link-tunnel                       # line z13- (also has line::border z15-, line(casing) z16-, pathtext z16-)
+highway-secondary_link                              # line z13- (also has pathtext z16-)
+highway-secondary_link-bridge                       # line z13- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
+highway-secondary_link-tunnel                       # line z13- (also has line(casing) z16-, pathtext z16-)
 === 224

-# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, line::border z15-, pathtext z16-)
-highway-tertiary_link                               # line z14- (also has line::border z14-, pathtext z18-)
-highway-tertiary_link-bridge                        # line z14- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
-highway-tertiary_link-tunnel                        # line z14- (also has line::border z14-, line(casing) z16-, pathtext z18-)
+# highway-secondary_link-tunnel                     # line(casing) z16- (also has line z13-, pathtext z16-)
+highway-tertiary_link                               # line z14- (also has pathtext z18-)
+highway-tertiary_link-bridge                        # line z14- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
+highway-tertiary_link-tunnel                        # line z14- (also has line(casing) z16-, pathtext z18-)
 === 223

-highway-busway                                      # line z15- (also has line::border z15-, pathtext z16-)
-highway-busway-bridge                               # line z15- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-busway-tunnel                               # line z15- (also has line::border z15-, line(casing) z15-, pathtext z16-)
-highway-service                                     # line z13- (also has line::border z15-, pathtext z16-)
-highway-service-area                                # line z13- (also has line::border z15-, pathtext z16-)
-highway-service-bridge                              # line z13- (also has line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-service-driveway                            # line z16- (also has line::border z16-, pathtext z16-)
-highway-service-parking_aisle                       # line z15- (also has line::border z15-, pathtext z16-)
-highway-service-tunnel                              # line z13- (also has line::border z15-, line(casing) z15-, pathtext z16-)
-# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, line::border z14-, pathtext z18-)
+highway-busway                                      # line z15- (also has pathtext z16-)
+highway-busway-bridge                               # line z15- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-busway-tunnel                               # line z15- (also has line(casing) z15-, pathtext z16-)
+highway-service                                     # line z13- (also has pathtext z16-)
+highway-service-area                                # line z13- (also has pathtext z16-)
+highway-service-bridge                              # line z13- (also has line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
+highway-service-driveway                            # line z16- (also has pathtext z16-)
+highway-service-parking_aisle                       # line z15- (also has pathtext z16-)
+highway-service-tunnel                              # line z13- (also has line(casing) z15-, pathtext z16-)
+# highway-tertiary_link-tunnel                      # line(casing) z16- (also has line z14-, pathtext z18-)
 === 222

-# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, line::border z15-, pathtext z16-)
-# highway-service-tunnel                            # line(casing) z15- (also has line z13-, line::border z15-, pathtext z16-)
+# highway-busway-tunnel                             # line(casing) z15- (also has line z15-, pathtext z16-)
+# highway-service-tunnel                            # line(casing) z15- (also has line z13-, pathtext z16-)
 railway-light_rail::dash                            # line::dash z16- (also has line z13-)
 railway-light_rail-bridge::dash                     # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
 railway-rail::dash                                  # line::dash z15- (also has line z10-)
@@ -229,11 +229,11 @@ railway-subway::dash                                # line::dash z16- (also has
 railway-subway-bridge::dash                         # line::dash z16- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
 === 221

-highway-footway-bicycle                             # line z11- (also has line::border z15-, line::cycleline z13-, pathtext z13-)
+highway-footway-bicycle                             # line z11- (also has line::cycleline z13-, pathtext z13-)
 highway-path-bicycle                                # line z11- (also has line::cycleline z12-, pathtext z13-)
 === 220

-highway-footway-bicycle::cycleline                  # line::cycleline z13- (also has line z11-, line::border z15-, pathtext z13-)
+highway-footway-bicycle::cycleline                  # line::cycleline z13- (also has line z11-, pathtext z13-)
 highway-path-bicycle::cycleline                     # line::cycleline z12- (also has line z11-, pathtext z13-)
 === 219

@@ -266,23 +266,23 @@ railway-subway-bridge                               # line z13- (also has line::
 # railway-rail-utility-tunnel                       # line(casing) z14- (also has line z12-, line::dash z16-)
 # === 209

-highway-ford                                        # line z13- (also has line::border z14-, icon z14-, pathtext z16-)
-highway-pedestrian                                  # line z13- (also has line::border z14-, pathtext z14-)
-highway-pedestrian-area                             # line z13- and area z14- (also has line::border z14-, pathtext z14-)
-highway-pedestrian-bridge                           # line z13- (also has line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
-highway-pedestrian-square                           # line z13- and area z14- (also has line::border z14-, pathtext z14-)
-highway-pedestrian-tunnel                           # line z13- (also has line::border z14-, line(casing) z16-, pathtext z14-)
+highway-ford                                        # line z13- (also has icon z14-, pathtext z16-)
+highway-pedestrian                                  # line z13- (also has pathtext z14-)
+highway-pedestrian-area                             # line z13- and area z14- (also has pathtext z14-)
+highway-pedestrian-bridge                           # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
+highway-pedestrian-square                           # line z13- and area z14- (also has pathtext z14-)
+highway-pedestrian-tunnel                           # line z13- (also has line(casing) z16-, pathtext z14-)
 === 200

-# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, line::border z14-, pathtext z14-)
+# highway-pedestrian-tunnel                         # line(casing) z16- (also has line z13-, pathtext z14-)
 # === 199

 highway-bridleway                                   # line z11- (also has pathtext z13-)
 highway-bridleway-bridge                            # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
 highway-bridleway-tunnel                            # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
-highway-footway                                     # line z11- (also has line::border z15-, pathtext z13-)
-highway-footway-area                                # line z11- and area z14- (also has line::border z15-, pathtext z13-)
-highway-footway-crossing                            # line z16- (also has line::border z16-)
+highway-footway                                     # line z11- (also has pathtext z13-)
+highway-footway-area                                # line z11- and area z14- (also has pathtext z13-)
+highway-footway-crossing                            # line z16-
 highway-path                                        # line z11- (also has pathtext z13-)
 highway-path-difficult                              # line z11- (also has pathtext z13-)
 highway-path-expert                                 # line z11- (also has pathtext z13-)
@@ -292,7 +292,7 @@ highway-track-area                                  # line z11- (also has pathte
 highway-track-bridge                                # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
 highway-track-no-access                             # line z11- (also has pathtext z13-)
 highway-track-tunnel                                # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
-=== 190
+=== 180

 highway-construction                                # line z11- (also has pathtext z15-)
 leisure-track                                       # line z15- (also has caption z16-)
@@ -308,172 +308,54 @@ railway-preserved                                   # line z13-
 railway-preserved-bridge                            # line z13- (also has line::bridgeblack z16-, line::bridgewhite z15-)
 railway-preserved-tunnel                            # line z13-
 railway-turntable                                   # line z17-
-=== 180
+=== 160

-highway-footway-bridge                              # line z11- (also has line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
-highway-footway-sidewalk                            # line z13- (also has line::border z16-)
-highway-footway-tunnel                              # line z11- (also has line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
+highway-footway-bridge                              # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
+highway-footway-sidewalk                            # line z13-
+highway-footway-tunnel                              # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
 highway-path-bridge                                 # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
 highway-path-horse                                  # line z11- (also has pathtext z13-)
 highway-path-tunnel                                 # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
-=== 170
+=== 155

 highway-bridleway-tunnel::tunnelBackground          # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
 highway-cycleway-tunnel::tunnelBackground           # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
-highway-footway-tunnel::tunnelBackground            # line::tunnelBackground z17- (also has line z11-, line::border z15-, line::tunnelCasing z17-, pathtext z13-)
+highway-footway-tunnel::tunnelBackground            # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
 highway-path-tunnel::tunnelBackground               # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
-highway-steps-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z12-, line::border z15-, line::tunnelCasing z17-, pathtext z13-)
+highway-steps-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z12-, line::tunnelCasing z17-, pathtext z13-)
 highway-track-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-)
-=== 169
+=== 154

 highway-bridleway-tunnel::tunnelCasing              # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
 highway-cycleway-tunnel::tunnelCasing               # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
-highway-footway-tunnel::tunnelCasing                # line::tunnelCasing z17- (also has line z11-, line::border z15-, line::tunnelBackground z17-, pathtext z13-)
+highway-footway-tunnel::tunnelCasing                # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
 highway-path-tunnel::tunnelCasing                   # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
-highway-steps-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z12-, line::border z15-, line::tunnelBackground z17-, pathtext z13-)
+highway-steps-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z12-, line::tunnelBackground z17-, pathtext z13-)
 highway-track-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-)
-=== 168
-
-highway-motorway::border                            # line::border z14- (also has line z6-, pathtext z10-, shield::shield z10-)
-highway-trunk::border                               # line::border z14- (also has line z6-, pathtext z10-, shield::shield z10-)
-=== 163
-
-highway-primary::border                             # line::border z11- (also has line z8-, pathtext z10-, shield::shield z10-)
-=== 162
-
-highway-secondary::border                           # line::border z11- (also has line z10-, pathtext z10-, shield::shield z12-)
-=== 161
-
-highway-motorway_link::border                       # line::border z14- (also has line z10-, pathtext z10-, shield::shield z10-)
-highway-trunk_link::border                          # line::border z14- (also has line z10-, pathtext z10-, shield::shield z10-)
-=== 160
-
-highway-primary_link::border                        # line::border z15- (also has line z11-, pathtext z11-, shield::shield z11-)
-=== 159
-
-highway-secondary_link::border                      # line::border z15- (also has line z13-, pathtext z16-)
-=== 158
-
-highway-motorway-bridge::border                     # line::border z14- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk-bridge::border                        # line::border z14- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-=== 157
-
-highway-primary-bridge::border                      # line::border z11- (also has line z8-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-=== 156
-
-highway-secondary-bridge::border                    # line::border z11- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-=== 155
-
-highway-motorway_link-bridge::border                # line::border z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::border                   # line::border z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-=== 154
-
-highway-primary_link-bridge::border                 # line::border z15- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
 === 153

-highway-secondary_link-bridge::border               # line::border z15- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z16-)
-=== 152
-
-highway-motorway-tunnel::border                     # line::border z14- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-)
-highway-trunk-tunnel::border                        # line::border z14- (also has line z6-, line(casing) z12-, pathtext z10-, shield::shield z10-)
-=== 151
-
-highway-primary-tunnel::border                      # line::border z11- (also has line z8-, line(casing) z14-, pathtext z10-, shield::shield z10-)
-=== 150
-
-highway-secondary-tunnel::border                    # line::border z11- (also has line z10-, line(casing) z16-, pathtext z10-, shield::shield z12-)
-=== 149
-
-highway-motorway_link-tunnel::border                # line::border z14- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-tunnel::border                   # line::border z14- (also has line z10-, line(casing) z13-, pathtext z10-, shield::shield z10-)
-=== 148
-
-highway-primary_link-tunnel::border                 # line::border z15- (also has line z11-, line(casing) z14-, pathtext z11-, shield::shield z11-)
-=== 147
-
-highway-secondary_link-tunnel::border               # line::border z15- (also has line z13-, line(casing) z16-, pathtext z16-)
-=== 146
-
-highway-busway::border                              # line::border z15- (also has line z15-, pathtext z16-)
-highway-living_street::border                       # line::border z14- (also has line z12-, pathtext z14-)
-highway-residential::border                         # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-)
-highway-residential-area::border                    # line::border z14- (also has line z12-, pathtext z13-, shield::shield z15-)
-highway-road::border                                # line::border z14- (also has line z12-, pathtext z14-)
-highway-service::border                             # line::border z15- (also has line z13-, pathtext z16-)
-highway-service-area::border                        # line::border z15- (also has line z13-, pathtext z16-)
-highway-service-driveway::border                    # line::border z16- (also has line z16-, pathtext z16-)
-highway-service-parking_aisle::border               # line::border z15- (also has line z15-, pathtext z16-)
-highway-tertiary::border                            # line::border z11- (also has line z11-, pathtext z12-, shield::shield z13-)
-highway-tertiary-bridge::border                     # line::border z11- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link::border                       # line::border z14- (also has line z14-, pathtext z18-)
-highway-unclassified::border                        # line::border z13- (also has line z11-, pathtext z13-)
-highway-unclassified-area::border                   # line::border z13- (also has line z11-, pathtext z13-)
-=== 145
-
-highway-footway::border                             # line::border z15- (also has line z11-, pathtext z13-)
-highway-footway-area::border                        # line::border z15- (also has line z11-, area z14-, pathtext z13-)
-highway-footway-bicycle::border                     # line::border z15- (also has line z11-, line::cycleline z13-, pathtext z13-)
-highway-footway-crossing::border                    # line::border z16- (also has line z16-)
-highway-footway-sidewalk::border                    # line::border z16- (also has line z13-)
-highway-ford::border                                # line::border z14- (also has line z13-, icon z14-, pathtext z16-)
-highway-ladder::border                              # line::border z15- (also has line z12-, icon z16-, pathtext z17-)
-highway-pedestrian::border                          # line::border z14- (also has line z13-, pathtext z14-)
-highway-pedestrian-area::border                     # line::border z14- (also has line z13-, area z14-, pathtext z14-)
-highway-pedestrian-square::border                   # line::border z14- (also has line z13-, area z14-, pathtext z14-)
-highway-steps::border                               # line::border z15- (also has line z12-, pathtext z13-)
-=== 144
-
-highway-busway-bridge::border                       # line::border z15- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-living_street-bridge::border                # line::border z14- (also has line z12-, pathtext z14-)
-highway-residential-bridge::border                  # line::border z14- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::border                         # line::border z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-, pathtext z14-)
-highway-service-bridge::border                      # line::border z15- (also has line z13-, line::bridgeblack z15-, line::bridgewhite z15-, pathtext z16-)
-highway-tertiary_link-bridge::border                # line::border z14- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z18-)
-highway-unclassified-bridge::border                 # line::border z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-)
-=== 143
-
-highway-footway-bridge::border                      # line::border z15- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
-highway-pedestrian-bridge::border                   # line::border z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
-highway-steps-bridge::border                        # line::border z15- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
-=== 142
-
-highway-busway-tunnel::border                       # line::border z15- (also has line z15-, line(casing) z15-, pathtext z16-)
-highway-living_street-tunnel::border                # line::border z14- (also has line z12-, line(casing) z16-, pathtext z14-)
-highway-residential-tunnel::border                  # line::border z14- (also has line z12-, line(casing) z16-, pathtext z13-, shield::shield z15-)
-highway-road-tunnel::border                         # line::border z14- (also has line z12-, pathtext z14-)
-highway-service-tunnel::border                      # line::border z15- (also has line z13-, line(casing) z15-, pathtext z16-)
-highway-tertiary-tunnel::border                     # line::border z11- (also has line z11-, line(casing) z16-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-tunnel::border                # line::border z14- (also has line z14-, line(casing) z16-, pathtext z18-)
-highway-unclassified-tunnel::border                 # line::border z13- (also has line z11-, line(casing) z16-, pathtext z13-)
-=== 141
-
-highway-footway-tunnel::border                      # line::border z15- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
-highway-pedestrian-tunnel::border                   # line::border z14- (also has line z13-, line(casing) z16-, pathtext z14-)
-highway-steps-tunnel::border                        # line::border z15- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
-=== 140
-
 highway-bridleway-bridge::bridgewhite               # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
-highway-busway-bridge::bridgewhite                  # line::bridgewhite z15- (also has line z15-, line::border z15-, line::bridgeblack z15-, pathtext z16-)
+highway-busway-bridge::bridgewhite                  # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z16-)
 highway-cycleway-bridge::bridgewhite                # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
-highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z11-, line::border z15-, line::bridgeblack z17-, pathtext z13-)
-highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::border z14-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::border z14-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
+highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
 highway-path-bridge::bridgewhite                    # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
-highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::border z14-, line::bridgeblack z14-, pathtext z14-)
-highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::border z15-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::border z14-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::border z14-, line::bridgeblack z16-, pathtext z14-)
-highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::border z11-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::border z15-, line::bridgeblack z14-, pathtext z16-)
-highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z13-, line::border z15-, line::bridgeblack z15-, pathtext z16-)
-highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z12-, line::border z15-, line::bridgeblack z17-, pathtext z13-)
-highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::border z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::border z14-, line::bridgeblack z14-, pathtext z18-)
+highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-)
+highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-)
+highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, pathtext z16-)
+highway-service-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z13-, line::bridgeblack z15-, pathtext z16-)
+highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z12-, line::bridgeblack z17-, pathtext z13-)
+highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-)
 highway-track-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
-highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::border z14-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::border z14-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::border z13-, line::bridgeblack z14-, pathtext z13-)
+highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
 railway-disused-bridge::bridgewhite                 # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-)
 railway-light_rail-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
 railway-miniature-bridge::bridgewhite               # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-)
@@ -487,30 +369,30 @@ railway-rail-spur-bridge::bridgewhite               # line::bridgewhite z14- (al
 railway-rail-tourism-bridge::bridgewhite            # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-, pathtext z14-)
 railway-rail-utility-bridge::bridgewhite            # line::bridgewhite z13- (also has line z12-, line::bridgeblack z16-, line::dash z16-)
 railway-subway-bridge::bridgewhite                  # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
-=== 135
+=== 150

 highway-bridleway-bridge::bridgeblack               # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
-highway-busway-bridge::bridgeblack                  # line::bridgeblack z15- (also has line z15-, line::border z15-, line::bridgewhite z15-, pathtext z16-)
+highway-busway-bridge::bridgeblack                  # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
 highway-cycleway-bridge::bridgeblack                # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
-highway-footway-bridge::bridgeblack                 # line::bridgeblack z17- (also has line z11-, line::border z15-, line::bridgewhite z15-, pathtext z13-)
-highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::border z14-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::border z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-footway-bridge::bridgeblack                 # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
+highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
 highway-path-bridge::bridgeblack                    # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
-highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::border z14-, line::bridgewhite z13-, pathtext z14-)
-highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::border z15-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::border z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
-highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::border z14-, line::bridgewhite z16-, pathtext z14-)
-highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::border z11-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
-highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::border z15-, line::bridgewhite z14-, pathtext z16-)
-highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z13-, line::border z15-, line::bridgewhite z15-, pathtext z16-)
-highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z12-, line::border z15-, line::bridgewhite z15-, pathtext z13-)
-highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::border z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
-highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::border z14-, line::bridgewhite z14-, pathtext z18-)
+highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-)
+highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-)
+highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, pathtext z16-)
+highway-service-bridge::bridgeblack                 # line::bridgeblack z15- (also has line z13-, line::bridgewhite z15-, pathtext z16-)
+highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z12-, line::bridgewhite z15-, pathtext z13-)
+highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-)
 highway-track-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-)
-highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::border z14-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::border z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::border z13-, line::bridgewhite z14-, pathtext z13-)
+highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
 railway-disused-bridge::bridgeblack                 # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-)
 railway-light_rail-bridge::bridgeblack              # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
 railway-miniature-bridge::bridgeblack               # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-)
@@ -524,14 +406,14 @@ railway-rail-spur-bridge::bridgeblack               # line::bridgeblack z16- (al
 railway-rail-tourism-bridge::bridgeblack            # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-, pathtext z14-)
 railway-rail-utility-bridge::bridgeblack            # line::bridgeblack z16- (also has line z12-, line::bridgewhite z13-, line::dash z16-)
 railway-subway-bridge::bridgeblack                  # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
-=== 130
+=== 140

 building                                            # area z14- (also has caption z17-)
 building-garage                                     # area z14- (also has caption z17-)
 building-guardhouse                                 # area z14- (also has icon z16-, caption(optional) z18-)
 building-has_parts                                  # area z14- (also has caption z17-)
 building-train_station                              # area z14- (also has icon z17-, caption(optional) z17-)
-=== 120
+=== 130

 piste:type-connection                               # line z15-
 piste:type-downhill                                 # line z12- (also has pathtext z15-)
@@ -545,36 +427,38 @@ piste:type-hike                                     # line z12- (also has pathte
 piste:type-nordic                                   # line z12- (also has pathtext z13-)
 piste:type-skitour                                  # line z12- (also has pathtext z13-)
 piste:type-sled                                     # line z12- (also has pathtext z15-)
-=== 110
+=== 120

 building:part                                       # area z16-
-=== 100
+=== 110

 barrier-retaining_wall                              # line z16-
 man_made-embankment                                 # line z16- (also has pathtext z18-)
 natural-cliff                                       # line z12- (also has pathtext z14-)
 natural-earth_bank                                  # line z12-
-=== 90
+=== 100

 boundary-administrative-2                           # line z2-
 boundary-administrative-3                           # line z4
 boundary-administrative-4                           # line z5-
-=== 80
+=== 90

 man_made-cutline                                    # line z13-
 route-ferry                                         # line z7- (also has pathtext z10-)
-=== 70
+=== 80

 aeroway-runway                                      # line z12-
 aeroway-taxiway                                     # line z14-
 barrier-ditch                                       # line z15-
+=== 70
+
 isoline-step_10                                     # line z15- (also has pathtext z16-)
 isoline-step_100                                    # line z11- (also has pathtext z13-)
 isoline-step_1000                                   # line z10- (also has pathtext z10-)
 isoline-step_50                                     # line z13- (also has pathtext z15-)
 isoline-step_500                                    # line z10- (also has pathtext z11-)
 isoline-zero                                        # line z15- (also has pathtext z15-)
-=== 50
+=== 60

 man_made-breakwater                                 # line z14- and area z12- (also has caption z17-)
 man_made-pier                                       # line z14- and area z12- (also has caption z17-)
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -78,20 +78,20 @@ amenity-ferry_terminal                              # icon z11- (also has captio
 railway-station                                     # icon z12- (also has caption(optional) z12-)
 === 6800

-highway-motorway                                    # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-)
-highway-motorway-bridge                             # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-motorway-tunnel                             # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line(casing) z12-)
-highway-trunk                                       # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-)
-highway-trunk-bridge                                # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-trunk-tunnel                                # pathtext z10- (also has shield::shield z10-, line z6-, line::border z14-, line(casing) z12-)
+highway-motorway                                    # pathtext z10- (also has shield::shield z10-, line z6-)
+highway-motorway-bridge                             # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-motorway-tunnel                             # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
+highway-trunk                                       # pathtext z10- (also has shield::shield z10-, line z6-)
+highway-trunk-bridge                                # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-trunk-tunnel                                # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-)
 === 6750

-highway-motorway::shield                            # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-)
-highway-motorway-bridge::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-motorway-tunnel::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line(casing) z12-)
-highway-trunk::shield                               # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-)
-highway-trunk-bridge::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line::bridgeblack z13-, line::bridgewhite z13-)
-highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::border z14-, line(casing) z12-)
+highway-motorway::shield                            # shield::shield z10- (also has pathtext z10-, line z6-)
+highway-motorway-bridge::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-motorway-tunnel::shield                     # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
+highway-trunk::shield                               # shield::shield z10- (also has pathtext z10-, line z6-)
+highway-trunk-bridge::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-)
+highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-)
 === 6740

 boundary-aboriginal_lands                           # caption z10-16 (also has line z10-, area z10-16)
@@ -259,31 +259,31 @@ railway-station-subway-yerevan                      # icon z13- (also has captio
 railway-station-subway-yokohama                     # icon z13- (also has caption(optional) z14-)
 === 6250

-highway-primary                                     # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-)
-highway-primary-bridge                              # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary-tunnel                              # pathtext z10- (also has shield::shield z10-, line z8-, line::border z11-, line(casing) z14-)
+highway-primary                                     # pathtext z10- (also has shield::shield z10-, line z8-)
+highway-primary-bridge                              # pathtext z10- (also has shield::shield z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary-tunnel                              # pathtext z10- (also has shield::shield z10-, line z8-, line(casing) z14-)
 route-ferry                                         # pathtext z10- (also has line z7-)
 === 6200

-highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-)
-highway-motorway_link-bridge                        # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line(casing) z13-)
-highway-trunk_link                                  # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-)
-highway-trunk_link-bridge                           # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line::border z14-, line(casing) z13-)
+highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-)
+highway-motorway_link-bridge                        # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
+highway-trunk_link                                  # pathtext z10- (also has shield::shield z10-, line z10-)
+highway-trunk_link-bridge                           # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
 === 6150

-highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-)
-highway-motorway_link-bridge::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line(casing) z13-)
-highway-trunk_link::shield                          # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-)
-highway-trunk_link-bridge::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::border z14-, line(casing) z13-)
+highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-)
+highway-motorway_link-bridge::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
+highway-trunk_link::shield                          # shield::shield z10- (also has pathtext z10-, line z10-)
+highway-trunk_link-bridge::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
 === 6140

-highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-)
-highway-primary_link-bridge                         # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line::border z15-, line(casing) z14-)
+highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-)
+highway-primary_link-bridge                         # pathtext z11- (also has shield::shield z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
 === 6100

 barrier-border_control                              # icon z12- (also has caption(optional) z14-)
@@ -302,9 +302,9 @@ place-locality                                      # caption z13-
 place-neighbourhood                                 # caption z13-
 === 5700

-highway-secondary                                   # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-)
-highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line::border z11-, line(casing) z16-)
+highway-secondary                                   # pathtext z10- (also has shield::shield z12-, line z10-)
+highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z16-)
 === 5600

 man_made-communications_tower                       # icon z12- (also has caption(optional) z13-)
@@ -591,14 +591,14 @@ shop-supermarket                                    # icon z16- (also has captio
 === 3200

 area:highway-pedestrian                             # caption z15- (also has area z14-)
-highway-pedestrian                                  # pathtext z14- (also has line z13-, line::border z14-)
-highway-pedestrian-area                             # pathtext z14- (also has line z13-, line::border z14-, area z14-)
-highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z13-)
-highway-pedestrian-square                           # pathtext z14- (also has line z13-, line::border z14-, area z14-)
-highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line::border z14-, line(casing) z16-)
-highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-)
-highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line::border z11-, line(casing) z16-)
+highway-pedestrian                                  # pathtext z14- (also has line z13-)
+highway-pedestrian-area                             # pathtext z14- (also has line z13-, area z14-)
+highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-)
+highway-pedestrian-square                           # pathtext z14- (also has line z13-, area z14-)
+highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line(casing) z16-)
+highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-)
+highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z16-)
 natural-strait                                      # caption z13- (also has line z11-)
 natural-water                                       # caption z10- (also has area z1-)
 natural-water-pond                                  # caption z10- (also has area z1-)
@@ -610,10 +610,10 @@ waterway-dam                                        # pathtext z15- (also has li
 waterway-river                                      # pathtext z11- (also has line z10-)
 === 3150

-highway-unclassified                                # pathtext z13- (also has line z11-, line::border z13-)
-highway-unclassified-area                           # pathtext z13- (also has line z11-, line::border z13-)
-highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::border z13-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line::border z13-, line(casing) z16-)
+highway-unclassified                                # pathtext z13- (also has line z11-)
+highway-unclassified-area                           # pathtext z13- (also has line z11-)
+highway-unclassified-bridge                         # pathtext z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line(casing) z16-)
 === 3100

 amenity-water_point                                 # icon z12- (also has caption(optional) z14-)
@@ -645,46 +645,46 @@ aerialway-mixed_lift                                # pathtext z15- (also has li
 aerialway-platter                                   # pathtext z15- (also has line z13-, line::dash z13-)
 aerialway-rope_tow                                  # pathtext z15- (also has line z13-, line::dash z13-)
 aerialway-t-bar                                     # pathtext z15- (also has line z13-, line::dash z13-)
-highway-residential                                 # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
-highway-residential-area                            # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-)
-highway-residential-bridge                          # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-residential-tunnel                          # pathtext z13- (also has shield::shield z15-, line z12-, line::border z14-, line(casing) z16-)
-highway-road                                        # pathtext z14- (also has line z12-, line::border z14-)
-highway-road-bridge                                 # pathtext z14- (also has line z12-, line::border z14-, line::bridgeblack z16-, line::bridgewhite z16-)
-highway-road-tunnel                                 # pathtext z14- (also has line z12-, line::border z14-)
-highway-secondary_link                              # pathtext z16- (also has line z13-, line::border z15-)
-highway-secondary_link-bridge                       # pathtext z16- (also has line z13-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary_link-tunnel                       # pathtext z16- (also has line z13-, line::border z15-, line(casing) z16-)
+highway-residential                                 # pathtext z13- (also has shield::shield z15-, line z12-)
+highway-residential-area                            # pathtext z13- (also has shield::shield z15-, line z12-)
+highway-residential-bridge                          # pathtext z13- (also has shield::shield z15-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel                          # pathtext z13- (also has shield::shield z15-, line z12-, line(casing) z16-)
+highway-road                                        # pathtext z14- (also has line z12-)
+highway-road-bridge                                 # pathtext z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-)
+highway-road-tunnel                                 # pathtext z14- (also has line z12-)
+highway-secondary_link                              # pathtext z16- (also has line z13-)
+highway-secondary_link-bridge                       # pathtext z16- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary_link-tunnel                       # pathtext z16- (also has line z13-, line(casing) z16-)
 === 3000

-highway-primary::shield                             # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-)
-highway-primary-bridge::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary-tunnel::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::border z11-, line(casing) z14-)
+highway-primary::shield                             # shield::shield z10- (also has pathtext z10-, line z8-)
+highway-primary-bridge::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary-tunnel::shield                      # shield::shield z10- (also has pathtext z10-, line z8-, line(casing) z14-)
 === 2975

-highway-primary_link::shield                        # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-)
-highway-primary_link-bridge::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-primary_link-tunnel::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::border z15-, line(casing) z14-)
+highway-primary_link::shield                        # shield::shield z11- (also has pathtext z11-, line z11-)
+highway-primary_link-bridge::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-primary_link-tunnel::shield                 # shield::shield z11- (also has pathtext z11-, line z11-, line(casing) z14-)
 === 2970

-highway-secondary::shield                           # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-)
-highway-secondary-bridge::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-secondary-tunnel::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::border z11-, line(casing) z16-)
+highway-secondary::shield                           # shield::shield z12- (also has pathtext z10-, line z10-)
+highway-secondary-bridge::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-secondary-tunnel::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line(casing) z16-)
 === 2965

-highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-)
-highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::border z11-, line(casing) z16-)
+highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-)
+highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z16-)
 === 2960

 barrier-city_wall                                   # pathtext z16- (also has line z14-)
 historic-citywalls                                  # pathtext z16- (also has line z14-)
 === 2957

-highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
-highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-)
-highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::border z14-, line(casing) z16-)
+highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-)
+highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-)
+highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-)
 === 2955

 highway-cycleway                                    # pathtext z13- (also has line z11-)
@@ -693,14 +693,14 @@ highway-cycleway-tunnel                             # pathtext z13- (also has li
 === 2953

 area:highway-footway                                # caption z15- (also has area z14-)
-highway-footway                                     # pathtext z13- (also has line z11-, line::border z15-)
-highway-footway-area                                # pathtext z13- (also has line z11-, line::border z15-, area z14-)
-highway-footway-bicycle                             # pathtext z13- (also has line z11-, line::border z15-, line::cycleline z13-)
-highway-footway-bridge                              # pathtext z13- (also has line z11-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-footway-tunnel                              # pathtext z13- (also has line z11-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
-highway-tertiary_link                               # pathtext z18- (also has line z14-, line::border z14-)
-highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::border z14-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary_link-tunnel                        # pathtext z18- (also has line z14-, line::border z14-, line(casing) z16-)
+highway-footway                                     # pathtext z13- (also has line z11-)
+highway-footway-area                                # pathtext z13- (also has line z11-, area z14-)
+highway-footway-bicycle                             # pathtext z13- (also has line z11-, line::cycleline z13-)
+highway-footway-bridge                              # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-footway-tunnel                              # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-tertiary_link                               # pathtext z18- (also has line z14-)
+highway-tertiary_link-bridge                        # pathtext z18- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary_link-tunnel                        # pathtext z18- (also has line z14-, line(casing) z16-)
 === 2950

 natural-water-basin                                 # caption z10- (also has area z1-)
@@ -717,7 +717,7 @@ waterway-stream-intermittent                        # pathtext z13- (also has li
 waterway-weir                                       # pathtext z15- (also has line z14-)
 === 2900

-highway-ford                                        # icon z14- and pathtext z16- (also has line z13-, line::border z14-)
+highway-ford                                        # icon z14- and pathtext z16- (also has line z13-)
 natural-rock                                        # icon z14- (also has caption(optional) z17-)
 === 2850

@@ -733,9 +733,9 @@ highway-path-horse                                  # pathtext z13- (also has li
 highway-path-tunnel                                 # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2820

-highway-steps                                       # pathtext z13- (also has line z12-, line::border z15-)
-highway-steps-bridge                                # pathtext z13- (also has line z12-, line::border z15-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-steps-tunnel                                # pathtext z13- (also has line z12-, line::border z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-steps                                       # pathtext z13- (also has line z12-)
+highway-steps-bridge                                # pathtext z13- (also has line z12-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-steps-tunnel                                # pathtext z13- (also has line z12-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2810

 highway-track                                       # pathtext z13- (also has line z11-)
@@ -745,12 +745,12 @@ highway-track-no-access                             # pathtext z13- (also has li
 highway-track-tunnel                                # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2780

-highway-service                                     # pathtext z16- (also has line z13-, line::border z15-)
-highway-service-area                                # pathtext z16- (also has line z13-, line::border z15-)
-highway-service-bridge                              # pathtext z16- (also has line z13-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-service-driveway                            # pathtext z16- (also has line z16-, line::border z16-)
-highway-service-parking_aisle                       # pathtext z16- (also has line z15-, line::border z15-)
-highway-service-tunnel                              # pathtext z16- (also has line z13-, line::border z15-, line(casing) z15-)
+highway-service                                     # pathtext z16- (also has line z13-)
+highway-service-area                                # pathtext z16- (also has line z13-)
+highway-service-bridge                              # pathtext z16- (also has line z13-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-service-driveway                            # pathtext z16- (also has line z16-)
+highway-service-parking_aisle                       # pathtext z16- (also has line z15-)
+highway-service-tunnel                              # pathtext z16- (also has line z13-, line(casing) z15-)
 piste:type-downhill                                 # pathtext z15- (also has line z12-)
 piste:type-downhill-advanced                        # pathtext z15- (also has line z12-)
 piste:type-downhill-easy                            # pathtext z15- (also has line z12-)
@@ -833,9 +833,9 @@ attraction-historic                                 # icon z17- (also has captio
 attraction-maze                                     # icon z17- (also has caption(optional) z17-)
 attraction-roller_coaster                           # icon z17- (also has caption(optional) z17-)
 highway-construction                                # pathtext z15- (also has line z11-)
-highway-living_street                               # pathtext z14- (also has line z12-, line::border z14-)
-highway-living_street-bridge                        # pathtext z14- (also has line z12-, line::border z14-)
-highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line::border z14-, line(casing) z16-)
+highway-living_street                               # pathtext z14- (also has line z12-)
+highway-living_street-bridge                        # pathtext z14- (also has line z12-)
+highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line(casing) z16-)
 landuse-plant_nursery                               # icon z17- (also has caption(optional) z17-, area z12-)
 leisure-bowling_alley                               # icon z17- (also has caption(optional) z17-)
 leisure-garden                                      # icon z16- (also has caption(optional) z16-, area z12-)
@@ -902,9 +902,9 @@ barrier-yes                                         # icon z16- (also has captio
 leisure-dog_park                                    # icon z16- (also has caption(optional) z16-, area z15-)
 === 2300

-highway-busway                                      # pathtext z16- (also has line z15-, line::border z15-)
-highway-busway-bridge                               # pathtext z16- (also has line z15-, line::border z15-, line::bridgeblack z15-, line::bridgewhite z15-)
-highway-busway-tunnel                               # pathtext z16- (also has line z15-, line::border z15-, line(casing) z15-)
+highway-busway                                      # pathtext z16- (also has line z15-)
+highway-busway-bridge                               # pathtext z16- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-)
+highway-busway-tunnel                               # pathtext z16- (also has line(casing) z15-, line z15-)
 === 2250

 amenity-clinic                                      # icon z17- (also has caption(optional) z17-, area z13-)
@@ -1173,7 +1173,7 @@ amenity-nursing_home                                # icon z17- (also has captio
 amenity-prison                                      # icon z17- (also has caption(optional) z17-, area z12-)
 amenity-social_facility                             # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z18-, area z13-)
-highway-ladder                                      # icon z16- and pathtext z17- (also has line z12-, line::border z15-)
+highway-ladder                                      # icon z16- and pathtext z17- (also has line z12-)
 landuse-farmland                                    # caption z15- (also has area z10-)
 landuse-garages                                     # caption z15- (also has area z13-)
 landuse-orchard                                     # caption z15- (also has area z12-)
@@ -2449,8 +2449,9 @@ amenity-bench-backless                              # icon z18- (also has captio
 amenity-lounger                                     # icon z18- (also has caption(optional) z19-)
 amenity-waste_disposal                              # icon z18- (also has caption(optional) z18-)
 emergency-access_point                              # icon z18- (also has caption(optional) z18-)
-emergency-assembly_point                            # icon z18- (also has caption(optional) z18-)
+emergency-assembly_point                            # icon z19- (also has caption(optional) z19-)
 emergency-defibrillator                             # icon z18- (also has caption(optional) z18-)
+emergency-disaster_help_point                       # icon z18- (also has caption(optional) z18-)
 emergency-phone                                     # icon z17- (also has caption(optional) z19-)
 man_made-telescope                                  # icon z18- (also has caption(optional) z18-)
 === -9980
@@ -2487,8 +2488,9 @@ amenity-loading_dock                                # icon z19- (also has captio
 # amenity-waste_basket                              # caption(optional) z19- (also has icon z18-)
 # amenity-waste_disposal                            # caption(optional) z18- (also has icon z18-)
 # emergency-access_point                            # caption(optional) z18- (also has icon z18-)
-# emergency-assembly_point                          # caption(optional) z18- (also has icon z18-)
+# emergency-assembly_point                          # caption(optional) z19- (also has icon z19-)
 # emergency-defibrillator                           # caption(optional) z18- (also has icon z18-)
+# emergency-disaster_help_point                     # caption(optional) z18- (also has icon z18-)
 # emergency-fire_hydrant                            # caption(optional) z19- (also has icon z19-)
 # emergency-life_ring                               # caption(optional) z19- (also has icon z19-)
 # emergency-phone                                   # caption(optional) z19- (also has icon z17-)
--- a/docs/INSTALL_DESKTOP.md
+++ b/docs/INSTALL_DESKTOP.md
@@ -175,6 +175,11 @@ To build a desktop app:
 tools/unix/build_omim.sh -r desktop
 ```

+To build the "Designer" version of the desktop app, add the parameter `-t`:
+```bash
+tools/unix/build_omim.sh -r -t desktop
+```
+
 The output binary will go into `../omim-build-release`.

 Check `tools/unix/build_omim.sh -h` for more build options, e.g. to build a debug version.
@@ -205,6 +210,15 @@ _Linux:_
 ../omim-build-release/CoMaps
 ```

+For running the "Designer" version instead, use the following command and
+optionally add the path to the style file to be loaded. If no path is provided,
+the application will ask for it by opening a file dialog on startup.
+
+
+```bash
+../omim-build-release/CoMaps.Designer optional/path/to/style.mapcss
+```
+
 _macOS:_

 ```bash
--- a/docs/STYLES.md
+++ b/docs/STYLES.md
@@ -77,9 +77,10 @@ e strings

 ## Testing your changes

-The most convenient way is using [the desktop app](INSTALL.md#desktop-app).
-(there is a "Designer" version of it also, which facilitates development
-by rebuilding styles and symbols quickly, but it's broken as of now, please help fix it!)
+The most convenient way is using [the desktop app](INSTALL_DESKTOP.md#desktop-app).
+There is a "Designer" version of it also, which facilitates development
+by rebuilding styles and symbols quickly. See the guide referenced above to find
+details on how to build and execute it.

 To test on Android or iOS device either re-build the app or put
 the compiled style files (e.g. `drules_proto_default_light.bin`) into
--- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
@@ -362,6 +362,7 @@
 "type.emergency" = "Notfall";
 "type.emergency.access_point" = "Rettungspunkt";
 "type.emergency.assembly_point" = "Notfall-Sammelpunkt";
+"type.emergency.disaster_help_point" = "Notfall-Treffpunkt";
 "type.emergency.life_ring" = "Rettungsring";
 "type.emergency.defibrillator" = "Defibrillator";
 "type.emergency.fire_hydrant" = "Hydrant";
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
@@ -373,6 +373,7 @@
 "type.emergency" = "Emergency";
 "type.emergency.access_point" = "Emergency Rescue Point";
 "type.emergency.assembly_point" = "Emergency Assembly Point";
+"type.emergency.disaster_help_point" = "Emergency Disaster Help Point";
 "type.emergency.life_ring" = "Lifebuoy";
 "type.emergency.defibrillator" = "Defibrillator";
 "type.emergency.fire_hydrant" = "Fire Hydrant";
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -392,6 +392,7 @@
 "type.emergency" = "Emergency";
 "type.emergency.access_point" = "Emergency Rescue Point";
 "type.emergency.assembly_point" = "Emergency Assembly Point";
+"type.emergency.disaster_help_point" = "Emergency Disaster Help Point";
 "type.emergency.life_ring" = "Lifebuoy";
 "type.emergency.defibrillator" = "Defibrillator";
 "type.emergency.fire_hydrant" = "Fire Hydrant";
--- a/libs/drape_frontend/frontend_renderer.cpp
+++ b/libs/drape_frontend/frontend_renderer.cpp
@@ -24,6 +24,7 @@

 #include "indexer/drawing_rules.hpp"
 #include "indexer/scales.hpp"
+#include "indexer/classificator_loader.hpp"

 #include "geometry/any_rect2d.hpp"

--- a/libs/indexer/map_style_reader.cpp
+++ b/libs/indexer/map_style_reader.cpp
@@ -19,13 +19,13 @@ std::string const kSuffixOutdoorsDark = "_outdoors_dark";
 std::string const kStylesOverrideDir = "styles";

 #ifdef BUILD_DESIGNER
-std::string const kSuffixDesignTool = "_design";
+std::string const kSuffixDesignTool = "design";
 #endif  // BUILD_DESIGNER

 std::string GetStyleRulesSuffix(MapStyle mapStyle)
 {
 #ifdef BUILD_DESIGNER
-  return kSuffixDesignTool;
+  return "_" + kSuffixDesignTool;
 #else
  switch (mapStyle)
  {
--- a/libs/indexer/search_string_utils.cpp
+++ b/libs/indexer/search_string_utils.cpp
@@ -120,11 +120,13 @@ static std::pair<UniString, UniString> const kPreprocessReplacements[] = {
    {MakeUniString("ι.μ"), MakeUniString("ιερά μονή")},
    {MakeUniString("ι.ν"), MakeUniString("ιερός ναός")},
    {MakeUniString("κων/νου"), MakeUniString("κωνσταντίνου")},
+    {MakeUniString("б-р"), MakeUniString("бульвар")},
    {MakeUniString("д-р"), MakeUniString("доктор")},
    {MakeUniString("м-н"), MakeUniString("микрорайон")},
    {MakeUniString("наб-я"), MakeUniString("набережная")},
    {MakeUniString("пр-д"), MakeUniString("проезд")},
    {MakeUniString("пр-т"), MakeUniString("проспект")},
+    {MakeUniString("р-н"), MakeUniString("район")},
    {MakeUniString("আ/এ"), MakeUniString("আবাসিক এলাকা")},
 };

--- a/qt/build_style/build_common.cpp
+++ b/qt/build_style/build_common.cpp
@@ -3,6 +3,7 @@
 #include "platform/platform.hpp"

 #include "base/file_name_utils.hpp"
+#include "base/logging.hpp"

 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
@@ -17,11 +18,7 @@

 QString ExecProcess(QString const & program, std::initializer_list<QString> args, QProcessEnvironment const * env)
 {
-  // Quote all arguments.
  QStringList qargs(args);
-  for (auto i = qargs.begin(); i != qargs.end(); ++i)
-    *i = "\"" + *i + "\"";
-
  QProcess p;
  if (nullptr != env)
    p.setProcessEnvironment(*env);
@@ -43,8 +40,9 @@ QString ExecProcess(QString const & program, std::initializer_list<QString> args
  }
  if (!error.isEmpty())
  {
-    QString const msg = "STDERR with a zero exit code:\n" + program + " " + qargs.join(" ");
-    throw std::runtime_error(msg.toStdString());
+    QString msg = "STDERR with a zero exit code:\n" + program + " " + qargs.join(" ");
+    msg += "\nSTDERR:\n" + error;
+    LOG(LINFO, (msg.toStdString()));
  }
  return output;
 }
@@ -102,12 +100,13 @@ QString GetExternalPath(QString const & name, QString const & primaryPath, QStri
  // Special case for looking for in application folder.
  if (!QFileInfo::exists(path) && secondaryPath.isEmpty())
  {
-    std::string const appPath = QCoreApplication::applicationDirPath().toStdString();
+    QString appPath = QCoreApplication::applicationDirPath();

-    std::regex re("(/[^/]*\\.app)");
-    std::smatch m;
-    if (std::regex_search(appPath, m, re) && m.size() > 0)
-      path.fromStdString(base::JoinPath(m[0], name.toStdString()));
+#if defined(OMIM_OS_MAC)
+    path = JoinPathQt({appPath, "..", "..", "..", name});
+#elif defined(OMIM_OS_LINUX)
+    path = JoinPathQt({appPath, name});
+#endif
  }
  return path;
 }
--- a/qt/build_style/build_drules.cpp
+++ b/qt/build_style/build_drules.cpp
@@ -15,7 +15,7 @@

 namespace build_style
 {
-void BuildDrawingRulesImpl(QString const & mapcssFile, QString const & outputDir)
+void BuildDrawingRulesImpl(QString const & mapcssFile, QString const & outputDir, QString const & prioDir)
 {
  QString const outputTemplate = JoinPathQt({outputDir, "drules_proto_design"});
  QString const outputFile = outputTemplate + ".bin";
@@ -29,6 +29,21 @@ void BuildDrawingRulesImpl(QString const & mapcssFile, QString const & outputDir
  env.insert("PROTOBUF_EGG_PATH", GetProtobufEggPath());

  // Run the script
+#if defined(OMIM_OS_MAC)
+  (void)ExecProcess("python3",
+                    {
+                        GetExternalPath("libkomwm.py", "kothic/src", "../tools/kothic/src"),
+                        "-s",
+                        mapcssFile,
+                        "-o",
+                        outputTemplate,
+                        "-p",
+                        prioDir,
+                        "-x",
+                        "True",
+                    },
+                    &env);
+#else
  (void)ExecProcess("python",
                    {
                        GetExternalPath("libkomwm.py", "kothic/src", "../tools/kothic/src"),
@@ -36,21 +51,24 @@ void BuildDrawingRulesImpl(QString const & mapcssFile, QString const & outputDir
                        mapcssFile,
                        "-o",
                        outputTemplate,
+                        "-p",
+                        prioDir,
                        "-x",
                        "True",
                    },
                    &env);
+#endif

  // Ensure that generated file is not empty.
  if (QFile(outputFile).size() == 0)
    throw std::runtime_error("Drawing rules file has zero size");
 }

-void BuildDrawingRules(QString const & mapcssFile, QString const & outputDir)
+void BuildDrawingRules(QString const & mapcssFile, QString const & outputDir, QString const & prioDir)
 {
  CopyFromResources("mapcss-mapping.csv", outputDir);
  CopyFromResources("mapcss-dynamic.txt", outputDir);
-  BuildDrawingRulesImpl(mapcssFile, outputDir);
+  BuildDrawingRulesImpl(mapcssFile, outputDir, prioDir);
 }

 void ApplyDrawingRules(QString const & outputDir)
--- a/qt/build_style/build_drules.h
+++ b/qt/build_style/build_drules.h
@@ -4,6 +4,6 @@

 namespace build_style
 {
-void BuildDrawingRules(QString const & mapcssFile, QString const & outputDir);
+void BuildDrawingRules(QString const & mapcssFile, QString const & outputDir, QString const & prioDir);
 void ApplyDrawingRules(QString const & outputDir);
 }  // build_style
--- a/qt/build_style/build_phone_pack.cpp
+++ b/qt/build_style/build_phone_pack.cpp
@@ -21,7 +21,12 @@ QString RunBuildingPhonePack(QString const & stylesDir, QString const & targetDi
  if (!QDir(targetDir).exists())
    throw runtime_error("target directory does not exist" + targetDir.toStdString());

+#if defined(OMIM_OS_MAC)
+  return ExecProcess("python3",
+                     {GetExternalPath("generate_styles_override.py", "", "../tools/python"), stylesDir, targetDir});
+#else
  return ExecProcess("python",
                     {GetExternalPath("generate_styles_override.py", "", "../tools/python"), stylesDir, targetDir});
+#endif
 }
 }  // namespace build_style
--- a/qt/build_style/build_skins.cpp
+++ b/qt/build_style/build_skins.cpp
@@ -31,10 +31,10 @@ enum SkinType
  SkinCount
 };

-using SkinInfo = std::tuple<char const *, int, bool>;
+using SkinInfo = std::tuple<char const *, int>;
 SkinInfo const g_skinInfo[SkinCount] = {
-    std::make_tuple("mdpi", 18, false),  std::make_tuple("hdpi", 27, false),   std::make_tuple("xhdpi", 36, false),
-    std::make_tuple("6plus", 43, false), std::make_tuple("xxhdpi", 54, false), std::make_tuple("xxxhdpi", 64, false),
+    std::make_tuple("mdpi", 18),  std::make_tuple("hdpi", 27),   std::make_tuple("xhdpi", 36),
+    std::make_tuple("6plus", 43), std::make_tuple("xxhdpi", 54), std::make_tuple("xxxhdpi", 64),
 };

 std::array<SkinType, SkinCount> const g_skinTypes = {{
@@ -54,10 +54,6 @@ inline int SkinSize(SkinType s)
 {
  return std::get<1>(g_skinInfo[s]);
 }
-inline bool SkinCoorrectColor(SkinType s)
-{
-  return std::get<2>(g_skinInfo[s]);
-}

 QString GetSkinGeneratorPath()
 {
@@ -127,7 +123,7 @@ std::unordered_map<std::string, int> GetSkinSizes(QString const & file)
  return skinSizes;
 }

-void BuildSkinImpl(QString const & styleDir, QString const & suffix, int size, bool colorCorrection,
+void BuildSkinImpl(QString const & styleDir, QString const & suffix, int size,
                   QString const & outputDir)
 {
  QString const symbolsDir = JoinPathQt({styleDir, "symbols"});
@@ -141,7 +137,7 @@ void BuildSkinImpl(QString const & styleDir, QString const & suffix, int size, b
    throw std::runtime_error("Output directory is not clear");

  // Create output skin directory
-  if (!QDir().mkdir(outputDir))
+  if (!QDir().mkpath(outputDir))
    throw std::runtime_error("Cannot create output skin directory");

  // Create symbolic link for symbols/png
@@ -164,8 +160,6 @@ void BuildSkinImpl(QString const & styleDir, QString const & suffix, int size, b
                                                "--skinName",
                                                JoinPathQt({outputDir, "basic"}),
                                                "--skinSuffix=",
-                                                "--colorCorrection",
-                                                (colorCorrection ? "true" : "false"),
                                            });

  // Check if files were created.
@@ -187,9 +181,8 @@ void BuildSkins(QString const & styleDir, QString const & outputDir)
    QString const suffix = SkinSuffix(s);
    QString const outputSkinDir = JoinPathQt({outputDir, "symbols", suffix, "design"});
    int const size = resolution2size.at(suffix.toStdString());  // SkinSize(s);
-    bool const colorCorrection = SkinCoorrectColor(s);

-    BuildSkinImpl(styleDir, suffix, size, colorCorrection, outputSkinDir);
+    BuildSkinImpl(styleDir, suffix, size, outputSkinDir);
  }
 }

--- a/qt/build_style/build_statistics.cpp
+++ b/qt/build_style/build_statistics.cpp
@@ -27,6 +27,15 @@ QString GetStyleStatistics(QString const & mapcssMappingFile, QString const & dr
  env.insert("PROTOBUF_EGG_PATH", GetProtobufEggPath());

  // Run the script.
+#if defined(OMIM_OS_MAC)
+  return ExecProcess("python3",
+                     {
+                         GetExternalPath("drules_info.py", "kothic/src", "../tools/python/stylesheet"),
+                         mapcssMappingFile,
+                         drulesFile,
+                     },
+                     &env);
+#else
  return ExecProcess("python",
                     {
                         GetExternalPath("drules_info.py", "kothic/src", "../tools/python/stylesheet"),
@@ -34,6 +43,7 @@ QString GetStyleStatistics(QString const & mapcssMappingFile, QString const & dr
                         drulesFile,
                     },
                     &env);
+#endif
 }

 QString GetCurrentStyleStatistics()
--- a/qt/build_style/build_style.cpp
+++ b/qt/build_style/build_style.cpp
@@ -41,6 +41,7 @@ void BuildAndApply(QString const & mapcssFile)

  QDir const projectDir = QFileInfo(mapcssFile).absoluteDir();
  QString const styleDir = projectDir.absolutePath() + QDir::separator();
+  QString const prioDir = styleDir + ".." + QDir::separator() + "include";
  QString const outputDir = styleDir + "out" + QDir::separator();

  // Ensure output directory is clear
@@ -53,7 +54,7 @@ void BuildAndApply(QString const & mapcssFile)
  if (hasSymbols)
  {
    auto future = std::async(std::launch::async, BuildSkins, styleDir, outputDir);
-    BuildDrawingRules(mapcssFile, outputDir);
+    BuildDrawingRules(mapcssFile, outputDir, prioDir);
    future.get();  // may rethrow exception from the BuildSkin

    ApplyDrawingRules(outputDir);
@@ -61,7 +62,7 @@ void BuildAndApply(QString const & mapcssFile)
  }
  else
  {
-    BuildDrawingRules(mapcssFile, outputDir);
+    BuildDrawingRules(mapcssFile, outputDir, prioDir);
    ApplyDrawingRules(outputDir);
  }
 }
@@ -107,6 +108,16 @@ void RunRecalculationGeometryScript(QString const & mapcssFile)
  CopyFromResources("classificator.txt", geometryToolResourceDir);
  CopyFromResources("types.txt", geometryToolResourceDir);

+#if defined(OMIM_OS_MAC)
+  (void)ExecProcess("python3", {
+                                  GetRecalculateGeometryScriptPath(),
+                                  resourceDir,
+                                  writableDir,
+                                  generatorToolPath,
+                                  appPath,
+                                  mapcssFile,
+                              });
+#else
  (void)ExecProcess("python", {
                                  GetRecalculateGeometryScriptPath(),
                                  resourceDir,
@@ -115,6 +126,7 @@ void RunRecalculationGeometryScript(QString const & mapcssFile)
                                  appPath,
                                  mapcssFile,
                              });
+#endif
 }

 bool NeedRecalculate = false;
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -244,26 +244,26 @@ int main(int argc, char * argv[])
    );
    w.show();
    returnCode = QApplication::exec();
-  }

 #ifdef BUILD_DESIGNER
-  if (build_style::NeedRecalculate && !mapcssFilePath.isEmpty())
-  {
-    try
+    if (build_style::NeedRecalculate && !mapcssFilePath.isEmpty())
    {
-      build_style::RunRecalculationGeometryScript(mapcssFilePath);
+      try
+      {
+        build_style::RunRecalculationGeometryScript(mapcssFilePath);
+      }
+      catch (std::exception & e)
+      {
+        QMessageBox msgBox;
+        msgBox.setWindowTitle("Error");
+        msgBox.setText(e.what());
+        msgBox.setStandardButtons(QMessageBox::Ok);
+        msgBox.setDefaultButton(QMessageBox::Ok);
+        msgBox.exec();
+      }
    }
-    catch (std::exception & e)
-    {
-      QMessageBox msgBox;
-      msgBox.setWindowTitle("Error");
-      msgBox.setText(e.what());
-      msgBox.setStandardButtons(QMessageBox::Ok);
-      msgBox.setDefaultButton(QMessageBox::Ok);
-      msgBox.exec();
-    }
-  }
 #endif  // BUILD_DESIGNER
+  }

  LOG_SHORT(LINFO, ("Finished with code", returnCode));
  return returnCode;
--- a/qt/preferences_dialog.cpp
+++ b/qt/preferences_dialog.cpp
@@ -190,7 +190,7 @@ PreferencesDialog::PreferencesDialog(QWidget * parent, Framework & framework)
      settings::Set(kEnabledAutoRegenGeomIndex, false);
    indexRegenCheckBox->setChecked(enabled);
    connect(indexRegenCheckBox, &QCheckBox::stateChanged,
-            [](int i) { settings::Set(kEnabledAutoRegenGeomIndex, static_cast<bool>(i)) });
+            [](int i) { settings::Set(kEnabledAutoRegenGeomIndex, static_cast<bool>(i)); });
  }
 #endif

--- a/tools/python/recalculate_geom_index.py
+++ b/tools/python/recalculate_geom_index.py
@@ -8,7 +8,7 @@ Uses generator_tool for index calculation. After all it runs designer_tool if ha
 import os
 import subprocess
 import sys
-from Queue import Queue, Empty
+from queue import Queue, Empty
 from threading import Thread

 WORKERS = 8
@@ -27,7 +27,7 @@ def FindAllMwms(data_path):
    return result

 def ProcessMwm(generator_tool, task, error_queue):
-    print "Processing ", task[0]
+    print("Processing ", task[0])
    try:
        subprocess.call((generator_tool, '--data_path={0}'.format(task[1]), '--output={0}'.format(task[0][:-4]), "--generate_index=true", "--intermediate_data_path=/tmp/"))
    except subprocess.CalledProcessError as e:
@@ -38,7 +38,7 @@ def parallel_worker(tasks, generator_tool, error_queue):
        try:
            task = tasks.get_nowait()
        except Empty:
-            print "Process done!"
+            print("Process done!")
            return
        ProcessMwm(generator_tool, task, error_queue)
        tasks.task_done()
@@ -46,7 +46,7 @@ def parallel_worker(tasks, generator_tool, error_queue):
 if __name__ == "__main__":

    if len(sys.argv) < 3:
-        print "{0} <resources_dir> <writable_dir> <generator_tool> [<designer_tool> <designer_params>]".format(sys.argv[0])
+        print("{0} <resources_dir> <writable_dir> <generator_tool> [<designer_tool> <designer_params>]".format(sys.argv[0]))
        exit(1)

    mwms = FindAllMwms(sys.argv[1])
@@ -63,14 +63,14 @@ if __name__ == "__main__":
        t.start()

    tasks.join()
-    print "Processing done."
+    print("Processing done.")

    if len(sys.argv) > 4:
-        print "Starting app"
+        print("Starting app")
        subprocess.Popen(sys.argv[4:])

    if not error_queue.qsize() == 0:
        while error_queue.qsize():
            error = error_queue.get()
-            print error
+            print(error)
        exit(1)
--- a/tools/unix/build_omim.sh
+++ b/tools/unix/build_omim.sh
@@ -161,8 +161,20 @@ build()
      done
    fi
  else
-    "$CMAKE" "$CMAKE_GENERATOR" "$OMIM_PATH" -DCMAKE_BUILD_TYPE="$CONF" -DBUILD_DESIGNER:BOOL=ON ${CMAKE_CONFIG:-}
-    $MAKE_COMMAND package
+    "$CMAKE" "$CMAKE_GENERATOR" "$OMIM_PATH" \
+      -DCMAKE_BUILD_TYPE="$CONF" \
+      -DBUILD_DESIGNER:BOOL=ON \
+      -DBUILD_STANDALONE:BOOL=$([ "$OPT_STANDALONE" == 1 ] && echo "ON" || echo "OFF") \
+      ${CMAKE_CONFIG:-}
+    echo ""
+    "$CMAKE" --build "$DIRNAME" --target generator_tool
+    "$CMAKE" --build "$DIRNAME" --target skin_generator_tool
+    $MAKE_COMMAND $OPT_TARGET
+    if [ -n "$OPT_TARGET" ] && [ -n "$OPT_LAUNCH_BINARY" ]; then
+      for target in $OPT_TARGET; do
+        "$DIRNAME/$target"
+      done
+    fi
  fi
  if [ -n "$OPT_COMPILE_DATABASE" ]; then
    cp "$DIRNAME/compile_commands.json" "$OMIM_PATH"
--- a/tools/unix/generate_symbols.sh
+++ b/tools/unix/generate_symbols.sh
@@ -86,8 +86,6 @@ done

 rm -rf "$DATA_PATH"/symbols/*/design/

-# The styles designer is not used at the moment.
-# If enabled then remove design symbols from bundled android assets in android/sdk/src/main/assets/symbols
-# for i in ${symbols_name[*]}; do
-#   cp -r "$DATA_PATH"/symbols/"${i}"/light/ "$DATA_PATH"/symbols/"${i}"/design/
-# done
+for i in ${symbols_name[*]}; do
+  cp -r "$DATA_PATH"/symbols/"${i}"/light/ "$DATA_PATH"/symbols/"${i}"/design/
+done
Author	SHA1	Message	Date
Jean-Baptiste	1e61f7fb83	[android] Add setting to hide speed limit during navigation Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-13 18:28:07 +01:00
Yannik Bloscheck	d67803fc61	[styles] Show emergency assembly points one zoom level later Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-13 17:57:31 +01:00
Yannik Bloscheck	ad0f7176d0	[styles] Simplifying defibrillator icon Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-13 17:55:29 +01:00
Yannik Bloscheck	b28690701c	[types] Add emergency disaster help points Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-13 17:55:15 +01:00
Chris H. Meyer	d6c93f5206	[desktop] Fix designer Signed-off-by: Chris H. Meyer <christian.h.meyer@t-online.de> Co-authored-by: Yannik Bloscheck <git@yannikbloscheck.com> Co-authored-by: Chris H. Meyer <christian.h.meyer@t-online.de> Co-committed-by: Chris H. Meyer <christian.h.meyer@t-online.de>	2026-01-13 17:51:45 +01:00
x7z4w	239282ec48	[search] Add synonyms Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2026-01-13 17:50:49 +01:00
Yannik Bloscheck	2d2e6eeb69	[styles] Blue public transport label color for subways etc. without custom icon Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2026-01-13 17:39:44 +01:00
Jean-Baptiste	3880c3ec29	[android] Improve color of text in how to edit oph Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2026-01-13 17:38:39 +01:00