[android] Bump gradle to 9.2.1

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
2026-01-20 01:43:53 +00:00 · 2026-01-17 15:04:30 +01:00
197 changed files with 1259 additions and 12382 deletions
--- a/.forgejo/workflows/android-check.yaml
+++ b/.forgejo/workflows/android-check.yaml
@@ -34,63 +34,19 @@ on:
      - track_generator/**
      - xcode/**

-env:
-  SUBMODULE_CACHE_PATHS: |
-    .git/modules
-    3party/CMake-MetalShaderSupport
-    3party/Vulkan-Headers
-    3party/boost
-    3party/expat
-    3party/fast_double_parser
-    3party/fast_obj
-    3party/freetype/freetype
-    3party/gflags
-    3party/glaze
-    3party/glfw
-    3party/glm
-    3party/googletest
-    3party/harfbuzz/harfbuzz
-    3party/icu/icu
-    3party/imgui/imgui
-    3party/jansson/jansson
-    3party/just_gtfs
-    3party/protobuf/protobuf
-    3party/pugixml/pugixml
-    3party/utfcpp
-    tools/kothic
-    tools/osmctools
-
 jobs:
  lint:
    name: Android Lint
    runs-on: ubuntu-latest
-    container:
-      image: codeberg.org/comaps/docker-android-sdk:ubuntu-standalone-zy-docker
-      options: --user root
    steps:
      - name: Checkout sources
        uses: actions/checkout@v4
        with:
          fetch-depth: 1

-      - name: Cache world map
-        uses: actions/cache@v4
-        with:
-          path: data/world_mwm
-          key: world-mwm
-
-      - uses: actions/cache@v4
-        with:
-          path: ${{ env.SUBMODULE_CACHE_PATHS }}
-          key: submodules-${{ hashFiles('.gitmodules') }}
-          restore-keys: |
-            submodules-
-
-      - name: Sync and update submodules
+      - name: Parallel submodules checkout
        shell: bash
-        run: |
-          git submodule sync --recursive
-          git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
+        run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))

      - name: Lint
        shell: bash
@@ -100,9 +56,6 @@ jobs:
  android-check:
    name: Build Android Debug
    runs-on: ubuntu-latest
-    container:
-      image: codeberg.org/comaps/docker-android-sdk:ubuntu-standalone-zy-docker
-      options: --user root
    strategy:
      fail-fast: false
      matrix:
@@ -118,32 +71,23 @@ jobs:
      cancel-in-progress: true

    steps:
+      - name: Install build tools and dependencies
+        shell: bash
+        run: |
+          sudo apt-get update -y
+          sudo apt-get install -y ninja-build
+
      - name: Checkout sources
        uses: actions/checkout@v4
        with:
          fetch-depth: 200 # enough to get all commits for the current day

-      - name: Cache world map
-        uses: actions/cache@v4
-        with:
-          path: data/world_mwm
-          key: world-mwm
-
-      - uses: actions/cache@v4
-        with:
-          path: ${{ env.SUBMODULE_CACHE_PATHS }}
-          key: submodules-${{ hashFiles('.gitmodules') }}
-          restore-keys: |
-            submodules-
-
-      - name: Sync and update submodules
+      - name: Parallel submodules checkout
        shell: bash
-        run: |
-          git submodule sync --recursive
-          git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
+        run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))

      - name: Configure ccache
-        uses: https://github.com/hendrikmuhs/ccache-action@v1.2
+        uses: hendrikmuhs/ccache-action@v1.2
        with:
          key: ${{ github.workflow }}-${{ matrix.flavor }}

@@ -153,11 +97,14 @@ jobs:
        env:
          CMAKE_C_COMPILER_LAUNCHER: ccache
          CMAKE_CXX_COMPILER_LAUNCHER: ccache
-        run: ./gradlew -P${{ matrix.arch }} assemble${{ matrix.flavor }}
+        run: |
+          cmake --version
+          ninja --version
+          ./gradlew -P${{ matrix.arch }} assemble${{ matrix.flavor }}

      - name: Upload ${{ matrix.flavor }} apk
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: android-${{ matrix.flavor }}
-          path: android/app/build/outputs/apk/**/*.apk
+          path: android/app/build/outputs/apk/**/OrganicMaps-*.apk
          if-no-files-found: error
--- a/.github/workflows/android-check.yaml
+++ b/.github/workflows/android-check.yaml
@@ -1,6 +1,9 @@
 name: Android Check
 on:
  workflow_dispatch: # Manual trigger
+  push:
+    branches:
+      - main

 env:
  JAVA_HOME: /usr/lib/jvm/temurin-21-jdk-amd64  # Java 21 is required for Android Gradle 8 plugin
--- a/README.md
+++ b/README.md
@@ -22,8 +22,8 @@
    <a href="https://codeberg.org/comaps/comaps/src/branch/main/LICENSE">
      <img src="https://img.shields.io/github/license/comaps/comaps?style=for-the-badge&logo=opensourceinitiative&logoColor=white&color=588157" alt="License"/>
    </a>
-    <a href="https://codeberg.org/comaps/comaps/actions?workflow=android-check.yaml">
-      <img src="https://codeberg.org/comaps/comaps/badges/workflows/android-check.yaml/badge.svg?label=Android%20Build&logo=android&logoColor=white&style=for-the-badge" alt="Android Build Status"/>
+    <a href="https://github.com/comaps/comaps/actions/workflows/android-check.yaml">
+      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/android-check.yaml?label=Android%20Build&logo=android&logoColor=white&style=for-the-badge" alt="Android Build Status"/>
    </a>
    <a href="https://github.com/comaps/comaps/actions/workflows/ios-check.yaml">
      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/ios-check.yaml?label=iOS%20Build&logo=apple&logoColor=white&style=for-the-badge" alt="iOS Build Status"/>
--- a/android/app/src/main/res/drawable/ic_track_recording_off.xml
+++ b/android/app/src/main/res/drawable/ic_track_recording_off.xml
@@ -5,6 +5,45 @@
  android:viewportWidth="74"
  android:viewportHeight="57">
  <path
+    android:pathData="m67.3,21.772 l-28.103,11.757 11.772,5.095 5.463,11.606z"
+    android:strokeLineJoin="round"
+    android:strokeWidth="2"
    android:fillColor="#757575"
-    android:pathData="m26.278,8.137c3.695,-3.729 9.719,-3.761 13.453,-0.073 3.736,3.687 3.769,9.699 0.074,13.425l-14.597,14.726c-2.353,2.373 -2.331,6.197 0.046,8.544 2.379,2.345 6.209,2.326 8.562,-0.048l14.303,-14.428c-0.155,-0.32 -0.286,-0.647 -0.394,-0.978l-4.006,0.001c-2.787,0 -3.659,-3.825 -1.045,-5.042l7.813,-3.604c0.879,-0.652 1.87,-1.098 2.9,-1.333l11.936,-5.495c2.091,-0.869 4.357,1.392 3.486,3.478l-10.454,22.603c-1.219,2.607 -5.053,1.736 -5.053,-1.044v-4.418c-0.506,-0.122 -1.006,-0.296 -1.494,-0.525l-14.303,14.428c-4.368,4.406 -11.485,4.444 -15.901,0.086 -4.413,-4.358 -4.452,-11.461 -0.084,-15.867l14.597,-14.726c1.68,-1.693 1.665,-4.426 -0.033,-6.102 -1.7,-1.677 -4.437,-1.662 -6.117,0.033l-9.43,9.516c0.436,0.994 0.679,2.091 0.679,3.244 0,4.464 -3.634,8.091 -8.108,8.091 -4.475,0 -8.108,-3.627 -8.108,-8.091 0,-4.466 3.633,-8.091 8.108,-8.091 1.424,0 2.764,0.367 3.928,1.012z" />
+    android:strokeColor="#757575" />
+  <path
+    android:pathData="M45.042,44.7m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M37.942,51.6m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M27.842,52m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="m26.942,43.5c0,2.485 -2.015,4.5 -4.5,4.5 -2.485,0 -4.5,-2.015 -4.5,-4.5 0,-2.485 2.015,-4.5 4.5,-4.5 2.485,0 4.5,2.015 4.5,4.5z"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M26.642,34.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M34.042,27.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M40.842,20.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M41.842,10.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M32.842,4.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M23.842,9.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M16.842,16.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
+  <path
+    android:pathData="M9.842,23.5m-4.5,0a4.5,4.5 0,1 1,9 0a4.5,4.5 0,1 1,-9 0"
+    android:fillColor="#757575" />
 </vector>
--- a/android/app/src/main/res/drawable/ic_track_recording_on.xml
+++ b/android/app/src/main/res/drawable/ic_track_recording_on.xml
@@ -9,6 +9,45 @@
      android:fillColor="@color/active_track_recording"
      android:fillAlpha="0.78" />
    <path
-      android:pathData="m33.024,19.508c3.955,-3.981 10.402,-4.015 14.399,-0.078 3.999,3.937 4.034,10.355 0.079,14.333l-15.623,15.722c-2.518,2.534 -2.495,6.616 0.049,9.122 2.546,2.504 6.646,2.483 9.164,-0.051l15.309,-15.404c-0.166,-0.342 -0.306,-0.691 -0.422,-1.044l-4.288,0.001c-2.983,0 -3.916,-4.084 -1.118,-5.383l8.362,-3.848c0.941,-0.696 2.001,-1.172 3.104,-1.423l12.775,-5.867c2.238,-0.928 4.663,1.486 3.731,3.713l-11.189,24.132c-1.305,2.783 -5.408,1.854 -5.408,-1.115l-0,-4.717c-0.542,-0.13 -1.077,-0.316 -1.599,-0.561l-15.309,15.404c-4.675,4.704 -12.293,4.745 -17.019,0.092 -4.723,-4.653 -4.765,-12.237 -0.09,-16.941l15.623,-15.722c1.798,-1.808 1.782,-4.725 -0.035,-6.515 -1.819,-1.79 -4.749,-1.774 -6.547,0.035l-10.093,10.16c0.467,1.061 0.727,2.232 0.727,3.464 0,4.766 -3.89,8.638 -8.678,8.638 -4.79,0 -8.678,-3.872 -8.678,-8.638 0,-4.768 3.888,-8.638 8.678,-8.638 1.524,0 2.958,0.392 4.204,1.081z"
-      android:fillColor="#ffffff"/>
+      android:pathData="m78.907,32.87 l-31.833,13.318 13.335,5.772 6.188,13.147z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#ffffff"
+      android:strokeColor="#ffffff" />
+    <path
+      android:pathData="M49.731,57.709a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M41.688,65.525a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M30.247,65.978a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="m34.324,56.35c0,2.815 -2.282,5.097 -5.097,5.097 -2.815,0 -5.097,-2.282 -5.097,-5.097 0,-2.815 2.282,-5.097 5.097,-5.097 2.815,0 5.097,2.282 5.097,5.097z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M28.888,46.155a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M37.27,38.226a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M44.974,30.297a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M46.106,18.969a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M35.911,12.173a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M25.718,17.837a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M17.788,25.766a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
+    <path
+      android:pathData="M9.858,33.695a5.097,5.097 0,1 0,10.195 0a5.097,5.097 0,1 0,-10.195 0z"
+      android:fillColor="#ffffff" />
 </vector>
--- a/android/app/src/main/res/layout/fragment_editor.xml
+++ b/android/app/src/main/res/layout/fragment_editor.xml
@@ -6,7 +6,7 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:clipToPadding="false"
-    android:background="?colorSurfaceContainerLow"
+    android:background="@color/bg_editor"
    tools:context=".editor.EditorActivity">
  <LinearLayout
      android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/fragment_phone.xml
+++ b/android/app/src/main/res/layout/fragment_phone.xml
@@ -10,7 +10,7 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:id="@+id/frameLayout"
-        android:background="?colorSurfaceContainerLow"
+        android:background="@color/bg_editor"
        android:layout_marginBottom="@dimen/margin_quarter">

        <androidx.recyclerview.widget.RecyclerView
--- a/android/app/src/main/res/layout/fragment_timetable.xml
+++ b/android/app/src/main/res/layout/fragment_timetable.xml
@@ -9,7 +9,7 @@
    style="@style/MwmWidget.FrameLayout.Elevation"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?colorSurfaceContainerLow"
+    android:background="@color/bg_editor"
    android:layout_above="@+id/tv__mode_switch"
    android:layout_below="@id/toolbar"/>

@@ -19,7 +19,7 @@
    android:layout_height="wrap_content"
    android:layout_alignTop="@+id/tv__mode_switch"
    android:layout_alignParentBottom="true"
-    android:background="?colorSurfaceContainerLow"/>
+    android:background="@color/bg_editor"/>

  <com.google.android.material.textview.MaterialTextView
    android:id="@+id/tv__mode_switch"
--- a/android/app/src/main/res/layout/fragment_timetable_advanced.xml
+++ b/android/app/src/main/res/layout/fragment_timetable_advanced.xml
@@ -5,7 +5,7 @@
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
-  android:background="?colorSurfaceContainerLow">
+  android:background="@color/bg_editor">

  <LinearLayout
    android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/fragment_timetable_simple.xml
+++ b/android/app/src/main/res/layout/fragment_timetable_simple.xml
@@ -4,7 +4,7 @@
  android:id="@+id/recycler"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
-  android:background="?colorSurfaceContainerLow"
+  android:background="@color/bg_editor"
  android:paddingStart="@dimen/margin_half"
  android:paddingEnd="@dimen/margin_half"
  android:scrollbars="vertical"/>
--- a/android/app/src/main/res/layout/localized_name.xml
+++ b/android/app/src/main/res/layout/localized_name.xml
@@ -7,6 +7,7 @@
  android:orientation="vertical"
  android:paddingEnd="@dimen/margin_base"
  android:paddingStart="@dimen/margin_base"
+  android:background="@color/fg_editor"
  android:animateLayoutChanges="true">

  <com.google.android.material.textview.MaterialTextView
@@ -24,6 +25,7 @@
    android:id="@+id/recycler"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
+    android:background="@color/fg_editor"
    android:scrollbars="vertical"/>

  <com.google.android.material.button.MaterialButton
--- a/android/app/src/main/res/values-kw/strings.xml
+++ b/android/app/src/main/res/values-kw/strings.xml
@@ -129,7 +129,7 @@
    <string name="clear_search">Dilea Istori Hwilas</string>
    <string name="read_in_wikipedia">Wikipedya</string>
    <string name="wikimedia_commons">Wikimedia Commons</string>
-    <string name="p2p_your_location">Dha Tyller</string>
+    <string name="p2p_your_location">Agas Tyller</string>
    <string name="p2p_start">Dalleth</string>
    <string name="next_button">Nessa</string>
    <string name="editor_time_add">Addya Rol Vetyansow</string>
@@ -186,8 +186,8 @@
    <string name="error_enter_correct_zip_code">Ynworra unn kod post ewn</string>
    <string name="editor_other_info">Noten dhe bodhogyon OpenStreetMap (dre dhewis)</string>
    <string name="editor_more_about_osm">Moy a-dro OpenStreetMap</string>
-    <string name="editor_osm_history">Dha istori golegyans</string>
-    <string name="editor_osm_notes">Dha notennow mappow</string>
+    <string name="editor_osm_history">Agas istori golegyans</string>
+    <string name="editor_osm_notes">Agas notennow mappow</string>
    <string name="editor_operator">Oberador</string>
    <string name="operator">Oberador: %s</string>
    <string name="kilometers_per_hour">kdo</string>
@@ -266,9 +266,9 @@
    <string name="toll_road">Tollfordh</string>
    <string name="unpaved_road">Fordh dor</string>
    <string name="ferry_crossing">Kowbalhyns</string>
-    <string name="yes">Ea</string>
+    <string name="yes">Ya</string>
    <string name="no">Na</string>
-    <string name="yes_available">Ea</string>
+    <string name="yes_available">Ya</string>
    <string name="no_available">Na</string>
    <string name="capacity">Dalghuster: %s</string>
    <string name="network">Rosweyth: %s</string>
--- a/android/app/src/main/res/values-night/colors.xml
+++ b/android/app/src/main/res/values-night/colors.xml
@@ -16,6 +16,8 @@
  <color name="bg_panel">@color/bg_window</color>
  <color name="bg_primary_dark">#FF588157</color>
  <color name="bg_app">#10140F</color>
+  <color name="bg_editor">#161b14</color>
+  <color name="fg_editor">#282e25</color>

  <color name="bg_menu">#CC2D3237</color>

--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -151,7 +151,7 @@
    <!-- Kmz file successful loading -->
    <string name="load_kmz_successful">Os favoritos foram carregados com sucesso! Pode encontrá-los no mapa ou no ecrã de gestão dos favoritos.</string>
    <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Impossível carregar favoritos. O ficheiro pode estar corrompido ou com defeito.</string>
+    <string name="load_kmz_failed">Surgiu uma falha ao enviar os favoritos. O ficheiro pode estar corrompido ou com defeito.</string>
    <!-- Failed to recognize the format of a bookmarks or tracks file. -->
    <string name="unknown_file_type">O tipo de ficheiro não é reconhecido pela aplicação: \n%1$s</string>
    <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
@@ -549,7 +549,7 @@
    <string name="dialog_error_storage_message">O armazenamento externo não está disponível. Provavelmente porque o cartão SD foi removido, danificado ou o sistema de ficheiros é apenas para leitura. Verifique e contacte-nos através do email support@comaps.app</string>
    <string name="setting_emulate_bad_storage">Emular o armazenamento defeituoso</string>
    <string name="error_enter_correct_name">Introduza um nome correto</string>
-    <string name="bookmark_lists">Listas de Favoritos</string>
+    <string name="bookmark_lists">Listas</string>
    <!-- Do not display all bookmark lists on the map -->
    <string name="bookmark_lists_hide_all">Ocultar tudo</string>
    <string name="bookmark_lists_show_all">Mostrar tudo</string>
@@ -560,7 +560,7 @@
    </plurals>
    <string name="bookmarks_create_new_group">Criar nova lista</string>
    <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importar favoritos</string>
+    <string name="bookmarks_import">Importar favoritos e trajetos</string>
    <string name="bookmarks_error_message_share_general">Não foi possível partilhar devido a um erro da aplicação</string>
    <string name="bookmarks_error_title_share_empty">Erro ao partilhar</string>
    <string name="bookmarks_error_message_share_empty">Não é possível partilhar uma lista vazia</string>
@@ -748,7 +748,7 @@
    <string name="browser_not_available">O navegador de Internet não está disponível</string>
    <string name="volume">Volume</string>
    <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Exportar todos os Favoritos e Trajetos</string>
+    <string name="bookmarks_export">Exportar todos os favoritos e trajetos</string>
    <!-- button in (app) TTS settings, to open the system TTS settings. -->
    <string name="pref_tts_open_system_settings">Definições do sistema de síntese de voz</string>
    <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -780,7 +780,7 @@
    <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
    <string name="continue_recording">Continuar gravação</string>
    <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Guardar nos Favoritos?</string>
+    <string name="track_recording_alert_title">Guardar em Favoritos e Trajetos?</string>
    <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
    <string name="track_recording_toast_nothing_to_save">O trajeto está vazio - não há nada para guardar</string>
    <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
@@ -847,10 +847,10 @@
    <string name="backup_interval_every_day">Diariamente</string>
    <string name="backup_interval_every_week">Semanalmente</string>
    <string name="backup_interval_manual_only">Off (apenas manual)</string>
-    <string name="bookmark_color">Cor do Favorito</string>
+    <string name="bookmark_color">Cor do marcador</string>
    <string name="pref_backup_now_summary_ok">Backup completado com sucesso</string>
    <string name="pref_backup_location_summary_initial">Por favor selecione uma pasta primeiro e garanta permissão</string>
-    <string name="pref_backup_title">Backup dos Favoritos</string>
+    <string name="pref_backup_title">Backup dos marcadores e trajetos</string>
    <string name="dialog_report_error_missing_folder">A localização de backup selecionada não está disponível ou não permite escrita. Selecione outra localização, por favor.</string>
    <string name="dialog_report_error_with_logs">Por favor, envie-nos um reporte de erro:\n - \"Ativar o histórico\" nas definições\n - reproduza o problema\n - no ecrã de \"Acerca &amp; Ajuda\" pressione o botão para \"Reportar um problema\" e envie via email ou chat\n - desative o histórico</string>
    <string name="open_now">Aberto agora</string>
@@ -914,5 +914,4 @@
    <string name="download_resources_custom_url_message">Substitui o servidor de download de mapas normal. Deixe em branco para usar o servidor do CoMaps padrão.</string>
    <string name="download_resources_custom_url_summary_none">Indefinido</string>
    <string name="download_resources_custom_url_error_scheme">Por favor, insira um URL começando com http:// ou https://</string>
-    <string name="pref_maplanguage_local">Idioma Local</string>
 </resources>
--- a/android/app/src/main/res/values-sl/strings.xml
+++ b/android/app/src/main/res/values-sl/strings.xml
@@ -412,7 +412,7 @@
        <item quantity="few">%d datoteke najdene. Po pretvorbi si jih lahko ogledate.</item>
        <item quantity="other">%d datotek najdenih. Po pretvorbi si jih lahko ogledate.</item>
    </plurals>
-    <string name="restore">Povrni</string>
+    <string name="restore">Obnovi</string>
    <plurals name="tracks">
        <item quantity="one">%d pot</item>
        <item quantity="two">%d poti</item>
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -493,9 +493,9 @@
    <string name="editor_more_about_osm">关于 OpenStreetMap 的更多信息</string>
    <string name="editor_osm_history">您的编辑历史</string>
    <string name="editor_osm_notes">您的地图数据注记</string>
-    <string name="editor_operator">运营方</string>
+    <string name="editor_operator">操作员</string>
    <!-- To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... -->
-    <string name="operator">运营方：%s</string>
+    <string name="operator">操作员: %s</string>
    <string name="editor_category_unsuitable_title">找不到合适的类别？</string>
    <string name="editor_category_unsuitable_text">CoMaps 只允许添加简单的点类别，即无法添加城镇、道路、湖泊、建筑轮廓等类别。请直接向 <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> 添加此类类别。请查看我们的<a href="https://www.comaps.app/support/advanced-map-editing/">指南</a>，了解详细的步骤说明。</string>
    <string name="downloader_no_downloaded_maps_title">您尚未下载任何地图</string>
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -65,6 +65,8 @@
  <color name="bg_panel">@color/bg_window</color>
  <color name="bg_primary_dark">#37653F</color> <!-- secondary dark -->
  <color name="bg_app">@android:color/white</color>
+  <color name="bg_editor">#ebefe4</color>
+  <color name="fg_editor">#f9faf2</color>

  <color name="bg_dialog_translucent">#BB000000</color>
  <color name="bg_text_translucent">#99FFFFFF</color>
--- a/android/app/src/main/res/values/styles-editor.xml
+++ b/android/app/src/main/res/values/styles-editor.xml
@@ -89,7 +89,7 @@
    <item name="android:layout_width">match_parent</item>
    <item name="android:layout_height">wrap_content</item>
    <item name="android:layout_marginBottom">@dimen/margin_half</item>
-    <item name="cardBackgroundColor">?appBackground</item>
+    <item name="cardBackgroundColor">@color/fg_editor</item>
    <item name="android:padding">@dimen/margin_base</item>
    <item name="cardPreventCornerOverlap">false</item>
  </style>
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
+distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -153,7 +153,7 @@ project.afterEvaluate {

  final taskName = gradle.startParameter.taskNames

-  if (['assemble', 'bundle', 'compile', 'install', 'lint', 'publish', 'run'].any{taskName.any{task->task.startsWith(it)}}) {
+  if (['assemble', 'bundle', 'compile', 'install', 'run', 'publish'].any{taskName.any{task->task.startsWith(it)}}) {
    exec {
      workingDir '../..'

--- a/android/sdk/src/main/res/values-b+sr+Latn/types_strings.xml
+++ b/android/sdk/src/main/res/values-b+sr+Latn/types_strings.xml
@@ -149,6 +149,7 @@
    <string name="type.amenity.pub">Pab</string>
    <string name="type.amenity.public_bookcase">Razmena knjiga</string>
    <string name="type.amenity.recycling.centre">Centar za reciklažu</string>
+    <string name="type.amenity.recycling">Kontejner za reciklažu</string>
    <string name="type.amenity.recycling.container">Kontejner za reciklažu</string>
    <string name="type.recycling.batteries">Beterije</string>
    <string name="type.recycling.clothes">Stara odeća</string>
--- a/android/sdk/src/main/res/values-bg/types_strings.xml
+++ b/android/sdk/src/main/res/values-bg/types_strings.xml
@@ -587,6 +587,7 @@
    <string name="type.amenity.police">Полиция</string>
    <string name="type.amenity.pub">Кръчма</string>
    <string name="type.amenity.public_bookcase">Книжен обмен</string>
+    <string name="type.amenity.recycling">Кофи за преработваем отпадък</string>
    <string name="type.amenity.recycling.container">Кофи за преработваем отпадък</string>
    <string name="type.recycling.clothes">Дрехи</string>
    <string name="type.recycling.glass_bottles">Стъклени бутилки</string>
--- a/android/sdk/src/main/res/values-da/types_strings.xml
+++ b/android/sdk/src/main/res/values-da/types_strings.xml
@@ -957,7 +957,7 @@
    <string name="type.shop.coffee">Kaffehandel</string>
    <string name="type.shop.computer">Computerforretning</string>
    <string name="type.shop.confectionery">Slikbutik</string>
-    <string name="type.shop.convenience">Nærbutik</string>
+    <string name="type.shop.convenience">Døgnbutik</string>
    <string name="type.shop.copyshop">Kopieringsbutik</string>
    <string name="type.shop.cosmetics">Kosmetiker</string>
    <string name="type.shop.curtain">Gardinhandel</string>
--- a/android/sdk/src/main/res/values-es/types_strings.xml
+++ b/android/sdk/src/main/res/values-es/types_strings.xml
@@ -131,6 +131,7 @@
    <string name="type.amenity.public_bookcase">Intercambio de libros</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Centro de reciclaje</string>
+    <string name="type.amenity.recycling">Contenedor de reciclaje</string>
    <string name="type.amenity.recycling.container">Contenedor de reciclaje</string>
    <string name="type.recycling.batteries">Baterías</string>
    <string name="type.recycling.clothes">Ropa</string>
@@ -1397,7 +1398,7 @@
    <string name="type.building.guardhouse">Garita de seguridad</string>
    <string name="type.power.portal">Torre de alta tensión</string>
    <string name="type.shop.lighting">Tienda de iluminación</string>
-    <string name="type.amenity.bench.backless">Sin respaldo</string>
+    <string name="type.amenity.bench.backless">Banco sin respaldo</string>
    <string name="type.leisure.bandstand">Templete</string>
    <string name="type.leisure.sports_centre.sport.multi">Centro deportivo</string>
    <string name="type.leisure.sports_centre.sport.american_football">Centro deportivo</string>
@@ -1508,5 +1509,4 @@
    <string name="type.railway.turntable">Plataforma giratoria ferroviaria</string>
    <string name="type.tourism.information.tactile_map">Mapa táctil</string>
    <string name="type.emergency.disaster_help_point">Punto de ayuda para emergencias y desastres</string>
-    <string name="type.emergency.access_point.address">Dirección de Punto de Emergencia</string>
 </resources>
--- a/android/sdk/src/main/res/values-et/types_strings.xml
+++ b/android/sdk/src/main/res/values-et/types_strings.xml
@@ -1395,7 +1395,7 @@
    <string name="type.power.portal">Õhuliini värava-tüüpi mast</string>
    <string name="type.office.security">Turvafirma kontor</string>
    <string name="type.shop.lighting">Lambipood</string>
-    <string name="type.amenity.bench.backless">Ilma seljatoeta</string>
+    <string name="type.amenity.bench.backless">Ilma seljatoeta pink</string>
    <string name="type.leisure.bandstand">Väike vabaõhulava</string>
    <string name="type.leisure.sports_centre.sport.multi">Spordikeskus</string>
    <string name="type.leisure.fitness_centre.sport.yoga">Joogastuudio</string>
@@ -1507,5 +1507,4 @@
    <string name="type.amenity.charging_station.motorcycle">Mootorrattad</string>
    <string name="type.amenity.charging_station.small">Väike laadimisjaam</string>
    <string name="type.emergency.disaster_help_point">Katastroofiabi teenused</string>
-    <string name="type.emergency.access_point.address">Hädaolukorras asukohatuvastuspunkti aadress</string>
 </resources>
--- a/android/sdk/src/main/res/values-fr/types_strings.xml
+++ b/android/sdk/src/main/res/values-fr/types_strings.xml
@@ -124,6 +124,7 @@
    <string name="type.amenity.public_bookcase">Microbibliothèque</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Centre de recyclage</string>
+    <string name="type.amenity.recycling">Conteneur de recyclage</string>
    <string name="type.amenity.recycling.container">Conteneur de recyclage</string>
    <string name="type.recycling.batteries">Batteries</string>
    <string name="type.recycling.clothes">Vêtements usagés</string>
@@ -1396,7 +1397,7 @@
    <string name="type.building.guardhouse">Guérite de sécurité</string>
    <string name="type.power.portal">Portique haute tension</string>
    <string name="type.shop.lighting">Boutique de luminaires</string>
-    <string name="type.amenity.bench.backless">Sans dossier</string>
+    <string name="type.amenity.bench.backless">Banc sans dossier</string>
    <string name="type.leisure.bandstand">Kiosque à musique</string>
    <string name="type.leisure.sports_centre.sport.multi">Complexe sportif</string>
    <string name="type.leisure.sports_centre.sport.american_football">Complexe sportif</string>
--- a/android/sdk/src/main/res/values-hr/types_strings.xml
+++ b/android/sdk/src/main/res/values-hr/types_strings.xml
@@ -151,6 +151,7 @@
    <string name="type.amenity.pub">Pub</string>
    <string name="type.amenity.public_bookcase">Razmjena knjiga</string>
    <string name="type.amenity.recycling.centre">Centar za recikliranje</string>
+    <string name="type.amenity.recycling">Kontejner za recikliranje</string>
    <string name="type.amenity.recycling.container">Kontejner za recikliranje</string>
    <string name="type.recycling.batteries">Baterije</string>
    <string name="type.recycling.clothes">Odjeća</string>
--- a/android/sdk/src/main/res/values-it/types_strings.xml
+++ b/android/sdk/src/main/res/values-it/types_strings.xml
@@ -131,6 +131,7 @@
    <string name="type.amenity.public_bookcase">Biblioteca di strada</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Centro di riciclaggio</string>
+    <string name="type.amenity.recycling">Contenitore per materiali riciclabili</string>
    <string name="type.amenity.recycling.container">Contenitore per materiali riciclabili</string>
    <string name="type.recycling.batteries">Batterie</string>
    <string name="type.recycling.clothes">Vestiti usati</string>
--- a/android/sdk/src/main/res/values-ja/types_strings.xml
+++ b/android/sdk/src/main/res/values-ja/types_strings.xml
@@ -130,6 +130,7 @@
    <string name="type.amenity.public_bookcase">街角文庫</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">リサイクルセンター</string>
+    <string name="type.amenity.recycling">リサイクルボックス</string>
    <string name="type.amenity.recycling.container">リサイクルボックス</string>
    <string name="type.recycling.batteries">バッテリー</string>
    <string name="type.recycling.clothes">古着</string>
--- a/android/sdk/src/main/res/values-kw/types_strings.xml
+++ b/android/sdk/src/main/res/values-kw/types_strings.xml
@@ -97,6 +97,7 @@
    <string name="type.amenity.pub">Barr</string>
    <string name="type.amenity.public_bookcase">Keschanj Lyver</string>
    <string name="type.amenity.recycling.centre">Kresen Eylgylghyans</string>
+    <string name="type.amenity.recycling">Kofen Eylgylghyans</string>
    <string name="type.amenity.recycling.container">Kofen Eylgylghyans</string>
    <string name="type.recycling.batteries">Batriow</string>
    <string name="type.recycling.clothes">Dillas</string>
--- a/android/sdk/src/main/res/values-lt/types_strings.xml
+++ b/android/sdk/src/main/res/values-lt/types_strings.xml
@@ -110,7 +110,7 @@
    <string name="type.amenity.bank">Bankas</string>
    <string name="type.amenity.bar">Baras</string>
    <string name="type.amenity.bench">Suolas</string>
-    <string name="type.amenity.bench.backless">Be atramos</string>
+    <string name="type.amenity.bench.backless">Suolas be atramos</string>
    <string name="type.amenity.bicycle_parking">Dviračių stovėjimo aikštelė</string>
    <string name="type.amenity.bicycle_parking.covered">Dengta dviračių stovėjimo aikštelė</string>
    <string name="type.amenity.boat_rental">Valčių nuoma</string>
@@ -136,8 +136,8 @@
    <string name="type.leisure.adult_gaming_centre">Lošimo automatų salonas</string>
    <string name="type.leisure.amusement_arcade">Žaidimo automatų salonas</string>
    <string name="type.amenity.charging_station">Krovimo stotelė</string>
-    <string name="type.amenity.charging_station.bicycle">Elektriniams dviračiams</string>
-    <string name="type.amenity.charging_station.motorcar">Elektromobiliams</string>
+    <string name="type.amenity.charging_station.bicycle">Elektrinių dviračių krovimo stotelė</string>
+    <string name="type.amenity.charging_station.motorcar">Elektromobilių krovimo stotelė</string>
    <string name="type.amenity.childcare">Lopšelis</string>
    <string name="type.amenity.cinema">Kino teatras</string>
    <string name="type.leisure.bowling_alley">Boulingo klubas</string>
@@ -225,6 +225,7 @@
    <string name="type.amenity.pub">Aludė</string>
    <string name="type.amenity.public_bookcase">Knygų namelis</string>
    <string name="type.amenity.recycling.centre">Antrinių žaliavų surinkimo aikštelė</string>
+    <string name="type.amenity.recycling">Antrinių žaliavų konteineris</string>
    <string name="type.amenity.recycling.container">Antrinių žaliavų konteineris</string>
    <string name="type.recycling.batteries">Baterijos</string>
    <string name="type.recycling.clothes">Tekstilė</string>
@@ -1432,8 +1433,4 @@
    <string name="type.tourism.information.tactile_map">Taktilinis žemėlapis</string>
    <string name="type.railway.disused.bridge">Apleistas geležinkelio tiltas</string>
    <string name="type.railway.disused.tunnel">Apleistas geležinkelio tunelis</string>
-    <string name="type.amenity.charging_station.motorcycle">Motociklams</string>
-    <string name="type.amenity.charging_station.small">Ribota galia</string>
-    <string name="type.emergency.access_point.address">Evakuacijos adresas</string>
-    <string name="type.emergency.disaster_help_point">Pagalbos stichinių nelaimių atvejais punktas</string>
 </resources>
--- a/android/sdk/src/main/res/values-lv/types_strings.xml
+++ b/android/sdk/src/main/res/values-lv/types_strings.xml
@@ -123,7 +123,7 @@
    <string name="type.leisure.common">Valsts zemes īpašums</string>
    <string name="type.leisure.dog_park">Suņu parks</string>
    <string name="type.disusedbusiness">Brīva uzņēmējdarbība</string>
-    <string name="type.amenity.bench.backless">Bez atzveltnes</string>
+    <string name="type.amenity.bench.backless">Sols bez atzveltnes</string>
    <string name="type.shop.coffee">Kafijas mazumtirgotājs</string>
    <string name="type.shop.computer">Datorveikals</string>
    <string name="type.shop.confectionery">Saldumu veikals</string>
--- a/android/sdk/src/main/res/values-nb/types_strings.xml
+++ b/android/sdk/src/main/res/values-nb/types_strings.xml
@@ -120,6 +120,7 @@
    <string name="type.amenity.public_bookcase">Bokhylle</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Resirkuleringssenter</string>
+    <string name="type.amenity.recycling">Gjenvinningsbeholder</string>
    <string name="type.amenity.recycling.container">Gjenvinningsbeholder</string>
    <string name="type.recycling.batteries">Batterier</string>
    <string name="type.recycling.clothes">Gamle klær</string>
--- a/android/sdk/src/main/res/values-nl/types_strings.xml
+++ b/android/sdk/src/main/res/values-nl/types_strings.xml
@@ -1395,7 +1395,7 @@
    <string name="type.building.guardhouse">Beveiligingsloket</string>
    <string name="type.power.portal">Verdeelstation</string>
    <string name="type.shop.lighting">Verlichtingswinkel</string>
-    <string name="type.amenity.bench.backless">Zonder bankje</string>
+    <string name="type.amenity.bench.backless">Bankje</string>
    <string name="type.amenity.boat_rental">Bootverhuur</string>
    <string name="type.man_made.telescope">Telescoop</string>
    <string name="type.man_made.telescope.optical">Telescoop (optisch)</string>
--- a/android/sdk/src/main/res/values-pt/types_strings.xml
+++ b/android/sdk/src/main/res/values-pt/types_strings.xml
@@ -131,6 +131,7 @@
    <string name="type.amenity.public_bookcase">Biblioteca livre</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">Centro de reciclagem</string>
+    <string name="type.amenity.recycling">Contentor de reciclagem</string>
    <string name="type.amenity.recycling.container">Contentor de reciclagem</string>
    <string name="type.recycling.batteries">Baterias</string>
    <string name="type.recycling.clothes">Roupas velhas</string>
@@ -1396,7 +1397,7 @@
    <string name="type.building.guardhouse">Cabine de Segurança</string>
    <string name="type.power.portal">Portal de Energia</string>
    <string name="type.shop.lighting">Loja de Iluminação</string>
-    <string name="type.amenity.bench.backless">Sem Encosto</string>
+    <string name="type.amenity.bench.backless">Banco sem Encosto</string>
    <string name="type.leisure.bandstand">Coreto</string>
    <string name="type.leisure.sports_centre.sport.multi">Centro Desportivo</string>
    <string name="type.leisure.sports_centre.sport.american_football">Centro Desportivo</string>
@@ -1507,6 +1508,4 @@
    <string name="type.railway.miniature.tunnel">Túnel Ferroviário em Miniatura</string>
    <string name="type.railway.turntable">Plataforma Giratória Ferroviária</string>
    <string name="type.tourism.information.tactile_map">Mapa tátil</string>
-    <string name="type.emergency.access_point.address">Endereço de Resgate de Emergência</string>
-    <string name="type.emergency.disaster_help_point">Ponto de Ajuda de Emergências e Desastres</string>
 </resources>
--- a/android/sdk/src/main/res/values-sl/types_strings.xml
+++ b/android/sdk/src/main/res/values-sl/types_strings.xml
@@ -28,7 +28,7 @@
    <string name="type.amenity.bar">Lokal</string>
    <string name="type.amenity.bbq">Žar na prostem</string>
    <string name="type.amenity.bench">Klop</string>
-    <string name="type.amenity.bench.backless">Brez naslonjala</string>
+    <string name="type.amenity.bench.backless">Klop brez naslonjala</string>
    <string name="type.amenity.bicycle_parking">Parkirišče za kolesa</string>
    <string name="type.amenity.bicycle_parking.covered">Pokrito parkirišče za kolesa</string>
    <string name="type.amenity.bicycle_rental">Izposoja koles</string>
@@ -309,6 +309,7 @@
    <string name="type.amenity.prep_school">Inštrukcije</string>
    <string name="type.amenity.mobile_money_agent">Posrednik mobilnega denarja</string>
    <string name="type.amenity.recycling.centre">Zbirno mesto za ločene odpadke</string>
+    <string name="type.amenity.recycling">Zabojnik za ločene odpadke</string>
    <string name="type.amenity.recycling.container">Zabojnik za ločene odpadke</string>
    <string name="type.amenity.shelter.public_transport">Zavetje</string>
    <string name="type.amenity.vending_machine.public_transport_tickets">Avtomat za vozovnice javnega prometa</string>
@@ -1220,7 +1221,7 @@
    <string name="type.shop.coffee">Trgovina s kavo</string>
    <string name="type.shop.computer">Računalniška trgovina</string>
    <string name="type.shop.confectionery">Slaščičarna</string>
-    <string name="type.shop.convenience">Trgovina z osnovnimi potrebščinami</string>
+    <string name="type.shop.convenience">Trgovina z mešanim blagom</string>
    <string name="type.shop.copyshop">Kopirnica</string>
    <string name="type.shop.cosmetics">Kozmetična trgovina</string>
    <string name="type.shop.curtain">Trgovina z zavesami</string>
@@ -1320,7 +1321,7 @@
    <string name="type.shop.perfumery">Trgovina z dišavami</string>
    <string name="type.shop.sewing">Šiviljska trgovina</string>
    <string name="type.shop.storage_rental">Najem skladiščnih prostorov</string>
-    <string name="type.tourism.hostel">Hostel</string>
+    <string name="type.tourism.hostel">Gostišče</string>
    <string name="type.tourism.hotel">Hotel</string>
    <string name="type.tourism.information">Turistične informacije</string>
    <string name="type.tourism.information.board">Informacijska tabla</string>
@@ -1330,88 +1331,6 @@
    <string name="type.wheelchair.no">Nedostopno za invalidske vozičke</string>
    <string name="type.wheelchair.yes">Polna dostopnost za invalidske vozičke</string>
    <string name="type.aerialway.j.bar">Sidra</string>
-    <string name="type.aerialway.magic_carpet">Tekoči trak</string>
+    <string name="type.aerialway.magic_carpet">Preproge</string>
    <string name="type.aerialway.platter">Krožniki</string>
-    <string name="type.emergency.access_point.address">Naslov za reševanja v sili</string>
-    <string name="type.natural.water.lock">Zaporna komora</string>
-    <string name="type.shop.doityourself">Trgovina za dom in vrt</string>
-    <string name="type.shop.houseware">Gospodinjska trgovina</string>
-    <string name="type.shop.beauty.day_spa">Lepotni in sprostitveni center</string>
-    <string name="type.shop.outdoor">Trgovina z opremo za aktivnosti na prostem</string>
-    <string name="type.shop.outpost">Prevzemna točka</string>
-    <string name="type.shop.pasta">Trgovina s testeninami</string>
-    <string name="type.shop.pastry">Prodajalna peciva</string>
-    <string name="type.shop.pawnbroker">Zastavljalnica</string>
-    <string name="type.shop.pet">Trgovina s hišnimi ljubljenčki</string>
-    <string name="type.shop.pet_grooming">Negovalni salon za hišne ljubljenčke</string>
-    <string name="type.shop.photo">Fotografska trgovina</string>
-    <string name="type.shop.rental">Izposojevalnica</string>
-    <string name="type.shop.rental.bicycle">Izposojevalnica koles</string>
-    <string name="type.shop.variety_store">Trgovina z mešanim blagom</string>
-    <string name="type.shop.video">Videotrgovina</string>
-    <string name="type.shop.appliance">Trgovina z gospodinjskimi aparati</string>
-    <string name="type.shop.charity">Dobrodelna trgovina</string>
-    <string name="type.shop.tobacco">Trgovina s tobačnimi izdelki</string>
-    <string name="type.shop.trade">Specializirana trgovina</string>
-    <string name="type.shop.wholesale">Trgovina na debelo</string>
-    <string name="type.sport.curling">Curling</string>
-    <string name="type.sport.field_hockey">Hokej na travi</string>
-    <string name="type.sport.futsal">Dvoranski nogomet</string>
-    <string name="type.sport.padel">Padel</string>
-    <string name="type.sport.pelota">Basque Pelota</string>
-    <string name="type.shop.craft">Trgovina z materiali za ustvarjanje</string>
-    <string name="type.attraction.amusement_ride">Zabaviščna vožnja</string>
-    <string name="type.attraction.bumper_car">Vožnja z avtomobilčki</string>
-    <string name="type.attraction.big_wheel">Panoramsko kolo</string>
-    <string name="type.attraction.carousel">Vrtiljak</string>
-    <string name="type.attraction.historic">Zgodovinska znamenitost</string>
-    <string name="type.attraction.maze">Labirint</string>
-    <string name="type.attraction.roller_coaster">Bobkart</string>
-    <string name="type.tourism.attraction.specified">Znamenitost</string>
-    <string name="type.tourism.camp_site">Taborni prostor</string>
-    <string name="type.tourism.caravan_site">Kamp za počitniške prikolice</string>
-    <string name="type.tourism.chalet">Počitniška hišica</string>
-    <string name="type.tourism.gallery">Umetnostna galerija</string>
-    <string name="type.tourism.guest_house">Gostišče</string>
-    <string name="type.tourism.information.tactile_map">Zemljevid za slepe in slabovidne</string>
-    <string name="type.tourism.zoo.petting">Otroški živalski vrt</string>
-    <string name="type.waterway.lock_gate">Plovna zapornica</string>
-    <string name="type.aerialway.rope_tow">Vrvna vlečnica</string>
-    <string name="type.aerialway.t.bar">Vlečnica na T</string>
-    <string name="type.piste_type.downhill">Smučarska proga</string>
-    <string name="type.piste_type.downhill.area">Spustna proga za tek na smučeh</string>
-    <string name="type.piste_type.downhill.advanced">Zahtevna smučarska proga</string>
-    <string name="type.piste_type.downhill.advanced.area">Zahtevna spustna proga za tek na smučeh</string>
-    <string name="type.piste_type.downhill.easy">Enostavna spustna proga za tek na smučeh</string>
-    <string name="type.piste_type.downhill.easy.area">Enostavna smučarska proga</string>
-    <string name="type.piste_type.downhill.expert">Zelo zahtevna spustna proga za tek na smučeh</string>
-    <string name="type.piste_type.downhill.expert.area">Zelo zahtevna smučarska proga</string>
-    <string name="type.piste_type.downhill.freeride">Proga za tek na smučeh – prosti slog</string>
-    <string name="type.piste_type.downhill.intermediate">Srednje zahtevna proga za tek na smučeh</string>
-    <string name="type.piste_type.downhill.intermediate.area">Srednje zahtevna proga za tek na smučeh</string>
-    <string name="type.piste_type.downhill.novice">Začetniška spustna proga za tek na smučeh</string>
-    <string name="type.piste_type.downhill.novice.area">Začetniška smučarska proga</string>
-    <string name="type.piste_type.nordic">Proga za nordijsko smučanje</string>
-    <string name="type.piste_type.sled">Sankaška steza</string>
-    <string name="type.piste_type.sled.area">Sankaška steza</string>
-    <string name="type.piste_type.snow_park">Snežni park</string>
-    <string name="type.piste_type.hike">Zimska pohodniška pot</string>
-    <string name="type.piste_type.connection">Povezovalna proga</string>
-    <string name="type.piste_type.skitour">Proga za turno smučanje</string>
-    <string name="type.amenity.events_venue">Prireditveni prostor</string>
-    <string name="type.shop.auction">Dražba</string>
-    <string name="type.shop.collector">Trgovina s zbirateljskimi predmeti</string>
-    <string name="type.self_service.yes">Na voljo samopostrežba</string>
-    <string name="type.self_service.only">Samo samopostrežno</string>
-    <string name="type.self_service.partially">Delno samopostrežno</string>
-    <string name="type.self_service.no">Ni samopostrežno</string>
-    <string name="type.amenity.social_facility">Socialna ustanova</string>
-    <string name="type.social_facility.soup_kitchen">Kuhinja za brezdomce</string>
-    <string name="type.social_facility.food_bank">Brezplačna delilnica hrane</string>
-    <string name="type.amenity.food_sharing">Razdeljevalnica hrane</string>
-    <string name="type.amenity.give_box">Zaboj za darove</string>
-    <string name="type.emergency.emergency_ward_entrance">Vhod v urgentni oddelek</string>
-    <string name="type.amenity.dojo">Dojo (vadbeni prostor borilnih veščin)</string>
-    <string name="type.leisure.sports_hall">Športna dvorana</string>
-    <string name="type.xmas.tree">Božično drevo</string>
 </resources>
--- a/android/sdk/src/main/res/values-sr/types_strings.xml
+++ b/android/sdk/src/main/res/values-sr/types_strings.xml
@@ -6,8 +6,8 @@
    <string name="type.addr_interpolation.odd">Адреса/Блок</string>
    <string name="type.aerialway">Жичара</string>
    <string name="type.aerialway.cable_car">Жичара</string>
-    <string name="type.aerialway.chair_lift">Ски-лифт</string>
-    <string name="type.aerialway.drag_lift">Ски-лифт једносед</string>
+    <string name="type.aerialway.chair_lift">Седежница</string>
+    <string name="type.aerialway.drag_lift">Вучница</string>
    <string name="type.aerialway.gondola">Гондола</string>
    <string name="type.aerialway.mixed_lift">Комбинована жичара</string>
    <string name="type.aerialway.station">Станица жичаре</string>
--- a/android/sdk/src/main/res/values-zh-rHK/types_strings.xml
+++ b/android/sdk/src/main/res/values-zh-rHK/types_strings.xml
@@ -131,6 +131,7 @@
    <string name="type.amenity.public_bookcase">書架</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">回收中心</string>
+    <string name="type.amenity.recycling">回收箱</string>
    <string name="type.amenity.recycling.container">回收箱</string>
    <string name="type.recycling.batteries">電池</string>
    <string name="type.recycling.clothes">舊衣物</string>
--- a/android/sdk/src/main/res/values-zh-rTW/types_strings.xml
+++ b/android/sdk/src/main/res/values-zh-rTW/types_strings.xml
@@ -269,6 +269,7 @@
    <string name="type.amenity.pub">酒吧</string>
    <string name="type.amenity.public_bookcase">漂書站</string>
    <string name="type.amenity.recycling.centre">回收中心</string>
+    <string name="type.amenity.recycling">回收箱</string>
    <string name="type.amenity.recycling.container">回收箱</string>
    <string name="type.recycling.batteries">電池</string>
    <string name="type.recycling.clothes">衣服</string>
--- a/android/sdk/src/main/res/values-zh/types_strings.xml
+++ b/android/sdk/src/main/res/values-zh/types_strings.xml
@@ -131,6 +131,7 @@
    <string name="type.amenity.public_bookcase">公共书架</string>
    <!-- SECTION: Types: Recycling -->
    <string name="type.amenity.recycling.centre">资源回收设施</string>
+    <string name="type.amenity.recycling">回收容器</string>
    <string name="type.amenity.recycling.container">回收容器</string>
    <string name="type.recycling.batteries">电池</string>
    <string name="type.recycling.clothes">旧衣物</string>
@@ -354,7 +355,7 @@
    <string name="type.entrance">入口</string>
    <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
    <string name="type.entrance.main">主要入口</string>
-    <string name="type.entrance.exit">单向出口</string>
+    <string name="type.entrance.exit">出口</string>
    <string name="type.fee.yes">¥</string>
    <string name="type.fee.no">免费</string>
    <string name="type.healthcare.laboratory">医学实验室</string>
@@ -1392,36 +1393,8 @@
    <string name="type.post_office.post_partner">邮政合作点</string>
    <string name="type.barrier.wicket_gate">旁门</string>
    <string name="type.amenity.animal_shelter">动物收容所</string>
-    <string name="type.amenity.bench.backless">无靠背长凳</string>
+    <string name="type.amenity.bench.backless">长凳</string>
    <string name="type.office.security">保安室</string>
    <string name="type.building.guardhouse">保安亭</string>
    <string name="type.power.portal">能源站</string>
-    <string name="type.entrance.emergency">应急出口</string>
-    <string name="type.amenity.boat_rental">船只租赁</string>
-    <string name="type.man_made.telescope">望远镜</string>
-    <string name="type.man_made.telescope.optical">光学望远镜</string>
-    <string name="type.man_made.telescope.radio">射电望远镜</string>
-    <string name="type.man_made.telescope.gamma">伽玛射线望远镜</string>
-    <string name="type.man_made.observatory">观测台</string>
-    <string name="type.amenity.charging_station.motorcycle">摩托车</string>
-    <string name="type.amenity.car_pooling">拼车</string>
-    <string name="type.xmas.tree">圣诞树</string>
-    <string name="type.amenity.food_sharing">食物共享设施</string>
-    <string name="type.amenity.give_box">捐赠箱</string>
-    <string name="type.shop.beauty.nails">美甲店</string>
-    <string name="type.railway.turntable">铁路转车盘</string>
-    <string name="type.railway.disused.tunnel">废弃铁路隧道</string>
-    <string name="type.railway.miniature">小火车轨道</string>
-    <string name="type.railway.disused.bridge">废弃铁路桥</string>
-    <string name="type.natural.tree">树</string>
-    <string name="type.natural.sand">沙子</string>
-    <string name="type.leisure.sports_centre.sport.volleyball">运动中心</string>
-    <string name="type.leisure.sports_centre.sport.swimming">游泳中心</string>
-    <string name="type.cardinal.south">南</string>
-    <string name="type.cardinal.east">东</string>
-    <string name="type.cardinal.west">西</string>
-    <string name="type.cardinal.north">北</string>
-    <string name="type.entrance.garage">车库入口</string>
-    <string name="type.entrance.entry">单向入口</string>
-    <string name="type.emergency.access_point">紧急连络点</string>
 </resources>
--- a/data/countries-strings/de.json/localize.json
+++ b/data/countries-strings/de.json/localize.json
@@ -1553,21 +1553,21 @@
 "Croatia_West Description":"Opatija, Rijeka, Split",
 "Cuba Description":"Cienfuegos, Havanna, Santiago de Cuba",
 "Cyprus Description":"Nikosia, Limassol, Larnaca, Paphos",
-"Czech_Jihovychod_Jihomoravsky kraj Description":"Brno (ehem. Brünn), Znojmo, Břeclav",
-"Czech_Jihovychod_Kraj Vysocina Description":"Jihlava, Třebíč, Havlíčkův Brod",
-"Czech_Jihozapad_Jihocesky kraj Description":"České Budějovice (ehem. Budweis), Tábor, Písek",
+"Czech_Jihovychod_Jihomoravsky kraj Description":"Břeclav, Brno (ehem. Brünn), Znojmo",
+"Czech_Jihovychod_Kraj Vysocina Description":"Havlíčkův Brod, Jihlava, Třebíč",
+"Czech_Jihozapad_Jihocesky kraj Description":"České Budějovice (ehem. Budweis), Písek, Tábor",
 "Czech_Jihozapad_Plzensky kraj Description":"Plzeň (ehem. Pilsen), Klatovy, Rokycany",
-"Czech_Karlovasky kraj Description":"Karlovy Vary (ehem. Karlsbad), Cheb, Sokolov",
-"Czech_Moravskoslezsko Description":"Ostrava (ehem. Ostrau), Havířov, Opava",
-"Czech_Olomoucky kraj Description":"Olomouc (ehem. Olmütz), Prostějov, Přerov",
+"Czech_Karlovasky kraj Description":"Cheb, Karlovy Vary (ehem. Karlsbad), Sokolov",
+"Czech_Moravskoslezsko Description":"Havířov, Opava, Ostrava (ehem. Ostrau)",
+"Czech_Olomoucky kraj Description":"Olomouc (ehem. Olmütz), Přerov, Prostějov",
 "Czech_Praha Description":"Prag",
-"Czech_Severovychod_Kralovehradecky kraj Description":"Hradec Králové (ehem. Königgrätz), Trutnov, Náchod",
-"Czech_Severovychod_Liberecky kraj Description":"Liberec, Jablonec nad Nisou, Česká Lípa",
-"Czech_Severovychod_Pardubicky kraj Description":"Pardubice, Chrudim, Svitavy",
-"Czech_Stredni Cechy_East Description":"Kolín, Příbram, Kutná Hora",
-"Czech_Stredni Cechy_West Description":"Kladno, Mladá Boleslav, Beroun",
-"Czech_Ustecky kraj Description":"Ústí nad Labem, Most, Teplice",
-"Czech_Zlinsky Kraj Description":"Zlín, Kroměříž, Vsetín",
+"Czech_Severovychod_Kralovehradecky kraj Description":"Náchod, Hradec Králové (ehem. Königgrätz), Trutnov",
+"Czech_Severovychod_Liberecky kraj Description":"Česká Lípa, Jablonec nad Nisou, Liberec",
+"Czech_Severovychod_Pardubicky kraj Description":"Chrudim, Pardubice, Svitavy",
+"Czech_Stredni Cechy_East Description":"Kolín, Kutná Hora, Příbram",
+"Czech_Stredni Cechy_West Description":"Beroun, Kladno, Mladá Boleslav",
+"Czech_Ustecky kraj Description":"Most, Teplice, Ústí nad Labem",
+"Czech_Zlinsky Kraj Description":"Kroměříž, Vsetín, Zlín",
 "Denmark_Capital Region of Denmark Description":"Kopenhagen, Skovlunde, Virum",
 "Denmark_Central Denmark Region Description":"Aarhus, Brabrand, Juelsminde",
 "Denmark_North Denmark Region Description":"Aalborg, Hjörring, Frederikshavn",
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -475,7 +475,6 @@ amenity|parking|multi-storey;[amenity=parking][parking=multi-storey];;name;int_n
 # TODO: its being replaced by landuse-recreation_ground, merge in there.
 leisure|recreation_ground;360;
 deprecated:highway|footway|mountain_hiking:04.2024;[highway=footway][sac_scale=mountain_hiking];x;name;int_name;361;highway|path
-# Workaround for (mis)uses of emergency access points to provide kind of an additional emergency address to each house, which without this would completely clutter the map. See https://codeberg.org/comaps/comaps/pulls/3220.
 emergency|access_point|address;[emergency=access_point][operator=helpbidea];;name;;362;
 amenity|parking|multi-storey|fee;[amenity=parking][parking=multi-storey][fee];;name;int_name;363;
 sport|9pin;364;
--- a/data/sound-strings/de.json/localize.json
+++ b/data/sound-strings/de.json/localize.json
@@ -23,7 +23,7 @@
 "make_a_u_turn_street":"NULL",
 "make_a_u_turn_street_verb":"NULL",
 "go_straight":"Fahre geradeaus.",
-"exit":"Nimm die Ausfahrt.",
+"exit":"Beenden.",
 "onto":"auf",
 "take_exit_number":"Nehme die Ausfahrt auf",
 "take_exit_number_street_verb":"NULL",
--- a/data/sound-strings/zh-Hans.json/localize.json
+++ b/data/sound-strings/zh-Hans.json/localize.json
@@ -49,37 +49,37 @@
 "in_3_kilometers":"在三公里后",
 "then":"然后",
 "dist_direction_onto_street":"%1$s %2$s %3$s %4$s",
-"take_the_1_exit":"从第一个出口驶出环岛。",
+"take_the_1_exit":"从第一个出口驶出。",
 "take_the_1_exit_street":"NULL",
 "take_the_1_exit_street_verb":"NULL",
-"take_the_2_exit":"从第二个出口驶出环岛。",
+"take_the_2_exit":"从第二个出口驶出。",
 "take_the_2_exit_street":"NULL",
 "take_the_2_exit_street_verb":"NULL",
-"take_the_3_exit":"从第三个出口驶出环岛。",
+"take_the_3_exit":"从第三个出口驶出。",
 "take_the_3_exit_street":"NULL",
 "take_the_3_exit_street_verb":"NULL",
-"take_the_4_exit":"从第四个出口驶出环岛。",
+"take_the_4_exit":"从第四个出口驶出。",
 "take_the_4_exit_street":"NULL",
 "take_the_4_exit_street_verb":"NULL",
-"take_the_5_exit":"从第五个出口驶出环岛。",
+"take_the_5_exit":"从第五个出口驶出。",
 "take_the_5_exit_street":"NULL",
 "take_the_5_exit_street_verb":"NULL",
-"take_the_6_exit":"从第六个出口驶出环岛。",
+"take_the_6_exit":"从第六个出口驶出。",
 "take_the_6_exit_street":"NULL",
 "take_the_6_exit_street_verb":"NULL",
-"take_the_7_exit":"从第七个出口驶出环岛。",
+"take_the_7_exit":"从第七个出口驶出。",
 "take_the_7_exit_street":"NULL",
 "take_the_7_exit_street_verb":"NULL",
-"take_the_8_exit":"从第八个出口驶出环岛。",
+"take_the_8_exit":"从第八个出口驶出。",
 "take_the_8_exit_street":"NULL",
 "take_the_8_exit_street_verb":"NULL",
-"take_the_9_exit":"从第九个出口驶出环岛。",
+"take_the_9_exit":"从第九个出口驶出。",
 "take_the_9_exit_street":"NULL",
 "take_the_9_exit_street_verb":"NULL",
-"take_the_10_exit":"从第十个出口驶出环岛。",
+"take_the_10_exit":"从第十个出口驶出。",
 "take_the_10_exit_street":"NULL",
 "take_the_10_exit_street_verb":"NULL",
-"take_the_11_exit":"从第十一个出口驶出环岛。",
+"take_the_11_exit":"从第十一个出口驶出。",
 "take_the_11_exit_street":"NULL",
 "take_the_11_exit_street_verb":"NULL",
 "in_50_feet":"在五十英尺后",
--- a/data/styles/cycling/dark/colors.mapcss
+++ b/data/styles/cycling/dark/colors.mapcss
@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/dark/colors.mapcss");
--- a/data/styles/cycling/dark/style.mapcss
+++ b/data/styles/cycling/dark/style.mapcss
@@ -1,9 +0,0 @@
-@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/subways.mapcss");
-@import("../../default/dark/dynamic_colors.mapcss");
--- a/data/styles/cycling/include/Basemap.mapcss
+++ b/data/styles/cycling/include/Basemap.mapcss
@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap.mapcss");
--- a/data/styles/cycling/include/Basemap_label.mapcss
+++ b/data/styles/cycling/include/Basemap_label.mapcss
@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap_label.mapcss");
--- a/data/styles/cycling/include/Icons.mapcss
+++ b/data/styles/cycling/include/Icons.mapcss
@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/icons.mapcss");
--- a/data/styles/cycling/include/Subways.mapcss
+++ b/data/styles/cycling/include/Subways.mapcss
@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/subways.mapcss");
--- a/data/styles/cycling/include/icons_label_colors.mapcss
+++ b/data/styles/cycling/include/icons_label_colors.mapcss
@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/icons_label_colors.mapcss");
--- a/data/styles/cycling/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/cycling/include/priorities_1_BG-by-size.prio.txt
@@ -1,258 +0,0 @@
-# This file is automatically re-formatted and re-sorted in priorities descending order
-# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
-# are generated automatically for information only. Custom formatting and comments are not preserved.
-#
-# BG-by-size geometry: background areas rendered below BG-top and everything else.
-# Smaller areas are rendered above larger ones (area's size is estimated as the size of its' bounding box).
-# So effectively priority values of BG-by-size areas are not used at the moment.
-# But we might use them later for some special cases, e.g. to determine a main area type of a multi-type feature.
-# Keep them in a logical importance order please.
-#
-# Priorities ranges' rendering order overview:
-# - overlays (icons, captions...)
-# - FG: foreground areas and lines
-# - BG-top: water (linear and areal)
-# - BG-by-size: landcover areas sorted by their size
-
-leisure-stadium                                     # area z13- (also has icon z13-, caption(optional) z13-)
-=== 250
-
-amenity-place_of_worship                            # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-buddhist                   # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian                  # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian-jehovahs_witness  # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian-mormon           # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-hindu                      # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-jewish                     # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-muslim                     # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-shinto                     # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-taoist                     # area z13- (also has icon z14-, caption(optional) z14-)
-landuse-religious                                   # area z13-
-=== 240
-
-amenity-doctors                                     # area z15- (also has icon z17-, caption(optional) z17-)
-leisure-swimming_pool                               # area z13- (also has icon z17-, caption(optional) z17-)
-leisure-swimming_pool-private                       # area z13- (also has icon z17-, caption(optional) z17-)
-=== 230
-
-landuse-landfill                                    # area z13- (also has icon z15-, caption(optional) z15-)
-=== 220
-
-leisure-playground                                  # area z15- (also has icon z17-, caption(optional) z17-)
-=== 200
-
-amenity-fountain                                    # area z16- (also has icon z16-, caption(optional) z16-)
-leisure-fitness_centre-sport-yoga                   # area z16- (also has icon z16-, caption(optional) z17-)
-leisure-sports_centre                               # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-american_football       # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-archery                 # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-athletics               # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-australian_football     # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-badminton               # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-baseball                # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-basketball              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-beachvolleyball         # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-bowls                   # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-climbing                # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-cricket                 # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-curling                 # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-equestrian              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-field_hockey            # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-futsal                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-golf                    # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-gymnastics              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-handball                # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-ice_hockey              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-multi                   # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-padel                   # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-pelota                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-scuba_diving            # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-shooting                # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-skateboard              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-skiing                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-soccer                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-swimming                # area z13- (also has icon z15-, caption(optional) z15-)
-leisure-sports_centre-sport-table_tennis            # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-tennis                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-volleyball              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-yoga                    # area z13- (also has icon z16-, caption(optional) z16-)
-=== 190
-
-amenity-grave_yard                                  # area z10- (also has icon z17-, caption(optional) z17-)
-amenity-grave_yard-christian                        # area z10- (also has icon z17-, caption(optional) z17-)
-landuse-cemetery                                    # area z10- (also has icon z14-, caption(optional) z15-)
-landuse-cemetery-christian                          # area z10- (also has icon z14-, caption(optional) z15-)
-=== 180
-
-amenity-car_wash                                    # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-charging_station                            # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-bicycle                    # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-carless                    # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
-amenity-charging_station-motorcycle                 # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-small                      # area z15- (also has icon z15-, caption(optional) z16-)
-amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-fire_station                                # area z15- (also has icon z16-, caption(optional) z17-)
-amenity-fuel                                        # area z15- (also has icon z14-, caption(optional) z14-)
-amenity-marketplace                                 # area z15- (also has icon z16-, caption(optional) z16-)
-amenity-police                                      # area z15- (also has icon z16-, caption(optional) z17-)
-amenity-ranger_station                              # area z13- (also has icon z15-, caption(optional) z15-)
-amenity-recycling-centre                            # area z15- (also has icon z16-, caption(optional) z16-)
-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-, 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-)
-leisure-dog_park                                    # area z15- (also has icon z16-, caption(optional) z16-)
-leisure-resort                                      # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-water_park                                  # area z13- (also has icon z16-, caption(optional) z16-)
-office-diplomatic                                   # area z15- (also has icon z17-, caption(optional) z17-)
-tourism-camp_site                                   # area z13- (also has icon z16-, caption(optional) z16-)
-tourism-information-office                          # area z15- (also has icon z15-, caption(optional) z15-)
-tourism-information-visitor_centre                  # area z13- (also has icon z15-, caption(optional) z15-)
-=== 170
-
-highway-footway-area                                # area z14- (also has line z15-, pathtext z15-)
-leisure-track-area                                  # area z15- (also has caption z16-)
-=== 160
-
-aeroway-terminal                                    # area z14- (also has caption z15-)
-=== 150
-
-leisure-golf_course                                 # area z12- (also has icon z15-, caption(optional) z17-)
-leisure-miniature_golf                              # area z14- (also has icon z16-, caption(optional) z17-)
-=== 140
-
-landuse-flowerbed                                   # area z16-
-natural-scrub                                       # area z11-
-=== 130
-
-landuse-grass                                       # area z11-
-natural-grassland                                   # area z11-
-natural-heath                                       # area z11-
-=== 120
-
-area:highway-footway                                # area z14- (also has caption z15-)
-area:highway-living_street                          # area z14-
-area:highway-pedestrian                             # area z14- (also has caption z15-)
-public_transport-platform                           # area z16- (also has caption z17-)
-railway-platform                                    # area z16- (also has caption z16-)
-=== 110
-
-amenity-bicycle_parking                             # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-bicycle_parking-covered                     # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-car_pooling                                 # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-motorcycle_parking                          # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-parking                                     # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-fee                                 # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-lane                                # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-lane-fee                            # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-lane-private                        # area z17- (also has icon z19-, caption(optional) z19-)
-amenity-parking-multi-storey                        # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-multi-storey-fee                    # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-no-access                           # area z15- (also has icon z18-, caption(optional) z18-)
-amenity-parking-park_and_ride                       # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-permissive                          # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-private                             # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-street_side                         # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-street_side-fee                     # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-street_side-private                 # area z17- (also has icon z18-, caption(optional) z18-)
-=== 100
-
-natural-wetland                                     # area z11- (also has caption z16-)
-natural-wetland-bog                                 # area z11- (also has caption z16-)
-natural-wetland-fen                                 # area z11- (also has caption z16-)
-natural-wetland-mangrove                            # area z11- (also has caption z16-)
-natural-wetland-marsh                               # area z11- (also has caption z16-)
-natural-wetland-reedbed                             # area z11- (also has caption z16-)
-natural-wetland-saltmarsh                           # area z11- (also has caption z16-)
-natural-wetland-saltmarsh-tidal                     # area z11- (also has caption z16-)
-natural-wetland-swamp                               # area z11- (also has caption z16-)
-natural-wetland-tidalflat                           # area z11- (also has caption z16-)
-=== 90
-
-landuse-farmyard                                    # area z10- (also has caption z15-)
-=== 81
-
-landuse-allotments                                  # area z12- (also has caption z15-)
-landuse-farmland                                    # area z10- (also has caption z15-)
-landuse-meadow                                      # area z11-
-landuse-orchard                                     # area z12- (also has caption z15-)
-landuse-recreation_ground                           # area z12- (also has caption z15-)
-landuse-village_green                               # area z12-
-landuse-vineyard                                    # area z12- (also has caption z15-)
-leisure-fitness_station                             # area z15- (also has icon z17-, caption(optional) z17-)
-leisure-pitch                                       # area z15- (also has icon z17-, caption(optional) z17-)
-natural-bare_rock                                   # area z11- (also has caption z14-)
-natural-scree                                       # area z11-
-natural-shingle                                     # area z12-
-=== 80
-
-landuse-plant_nursery                               # area z12- (also has icon z17-, caption(optional) z17-)
-leisure-garden                                      # area z12- (also has icon z16-, caption(optional) z16-)
-leisure-garden-residential                          # area z12-
-leisure-park                                        # area z10- (also has icon z14-, caption(optional) z14-)
-leisure-park-no-access                              # area z10- (also has icon z14-, caption(optional) z14-)
-leisure-park-permissive                             # area z10- (also has icon z14-, caption(optional) z14-)
-leisure-park-private                                # area z10- (also has icon z14-, caption(optional) z14-)
-=== 70
-
-landuse-forest                                      # area z10- (also has icon z13-, caption(optional) z14-)
-landuse-forest-coniferous                           # area z10- (also has icon z13-, caption(optional) z14-)
-landuse-forest-deciduous                            # area z10- (also has icon z13-, caption(optional) z14-)
-landuse-forest-mixed                                # area z10- (also has icon z13-, caption(optional) z14-)
-=== 60
-
-amenity-waste_transfer_station                      # area z13- (also has icon z17-, caption(optional) z18-)
-landuse-construction                                # area z13- (also has caption z15-)
-landuse-industrial                                  # area z13- (also has caption z15-)
-landuse-industrial-mine                             # area z13- (also has icon z15-, caption(optional) z15-)
-landuse-quarry                                      # area z13- (also has icon z15-, caption(optional) z15-)
-landuse-railway                                     # area z13- (also has caption z15-)
-man_made-wastewater_plant                           # area z13- (also has caption z15-)
-man_made-works                                      # area z13- (also has icon z16-, caption(optional) z17-)
-power-generator                                     # area z13- (also has icon z17-)
-power-generator-gas                                 # area z13- (also has icon z17-)
-power-generator-hydro                               # area z13- (also has icon z17-)
-power-generator-solar                               # area z13-
-power-generator-wind                                # area z13- (also has icon z15-, caption(optional) z18-)
-power-plant                                         # area z13- (also has icon z17-)
-power-plant-coal                                    # area z13- (also has icon z17-)
-power-plant-gas                                     # area z13- (also has icon z17-)
-power-plant-hydro                                   # area z13- (also has icon z17-)
-power-plant-solar                                   # area z13- (also has icon z17-)
-power-plant-wind                                    # area z13- (also has icon z15-, caption(optional) z16-)
-power-substation                                    # area z13- (also has icon z17-, caption(optional) z18-)
-=== 50
-
-amenity-childcare                                   # area z13- (also has icon z17-, caption(optional) z17-)
-amenity-clinic                                      # area z13- (also has icon z17-, caption(optional) z17-)
-amenity-college                                     # area z13- (also has icon z16-, caption(optional) z16-)
-amenity-hospital                                    # area z13- (also has icon z14-, caption(optional) z15-)
-amenity-kindergarten                                # area z13- (also has icon z17-, caption(optional) z17-)
-amenity-school                                      # area z13- (also has icon z16-, caption(optional) z16-)
-amenity-university                                  # area z13- (also has icon z14-, caption(optional) z14-)
-=== 40
-
-aeroway-aerodrome                                   # area z10- (also has icon z14-, caption(optional) z14-)
-aeroway-aerodrome-international                     # area z10- (also has icon z7-, caption(optional) z10-)
-landuse-education                                   # area z13-
-landuse-retail                                      # area z13- (also has caption z16-)
-leisure-beach_resort                                # area z10- (also has icon z16-, caption(optional) z16-)
-natural-beach                                       # area z10- (also has caption z15-)
-natural-beach-gravel                                # area z10- (also has caption z15-)
-natural-beach-sand                                  # area z10- (also has caption z15-)
-natural-desert                                      # area z1- (also has caption z14-)
-natural-glacier                                     # area z1-
-natural-sand                                        # area z1- (also has caption z15-)
-=== 30
-
-natural-land                                        # area z1-
-place-islet                                         # area z10- (also has caption z14-)
-=== 20
-
-natural-coastline                                   # area z1-
-=== 10
--- a/data/styles/cycling/include/priorities_2_BG-top.prio.txt
+++ b/data/styles/cycling/include/priorities_2_BG-top.prio.txt
@@ -1,46 +0,0 @@
-# This file is automatically re-formatted and re-sorted in priorities descending order
-# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
-# are generated automatically for information only. Custom formatting and comments are not preserved.
-#
-# BG-top geometry: background lines and areas that should be always below foreground ones
-# (including e.g. layer=-10 underwater tunnels), but above background areas sorted by size (BG-by-size),
-# because ordering by size doesn't always work with e.g. water mapped over a forest,
-# so water should be on top of other landcover always, but linear waterways should be hidden beneath it.
-# Still, e.g. a layer=-1 BG-top feature will be rendered under a layer=0 BG-by-size feature
-# (so areal water tunnels are hidden beneath other landcover area) and a layer=1 landcover areas
-# are displayed above layer=0 BG-top.
-#
-# Priorities ranges' rendering order overview:
-# - overlays (icons, captions...)
-# - FG: foreground areas and lines
-# - BG-top: water (linear and areal)
-# - BG-by-size: landcover areas sorted by their size
-
-landuse-basin                                       # area z12-
-landuse-reservoir                                   # area z12- (also has caption z10-)
-landuse-salt_pond                                   # area z1-
-natural-water                                       # area z1- (also has caption z10-)
-natural-water-basin                                 # area z1- (also has caption z10-)
-natural-water-ditch                                 # area z13- (also has caption z17-)
-natural-water-drain                                 # area z13- (also has caption z17-)
-natural-water-lake                                  # area z1- (also has caption z10-)
-natural-water-lock                                  # area z1- (also has caption z10-)
-natural-water-moat                                  # area z1- (also has caption z17-)
-natural-water-pond                                  # area z1- (also has caption z10-)
-natural-water-reservoir                             # area z1- (also has caption z10-)
-natural-water-river                                 # area z1- (also has caption z10-)
-natural-water-tunnel                                # area z15-
-natural-water-wastewater                            # area z12- (also has caption z17-)
-waterway-dock                                       # area z1-
-=== 20
-
-natural-strait                                      # line z13- (also has caption z13-)
-waterway-canal                                      # line z13- (also has pathtext z13-)
-waterway-ditch                                      # line z13-
-waterway-drain                                      # line z13-
-waterway-fish_pass                                  # line z13- (also has pathtext z13-)
-waterway-river                                      # line z10- (also has pathtext z11-)
-waterway-stream                                     # line z13- (also has pathtext z13-)
-waterway-stream-ephemeral                           # line z13- (also has pathtext z13-)
-waterway-stream-intermittent                        # line z13- (also has pathtext z13-)
-=== 10
--- a/data/styles/cycling/include/priorities_3_FG.prio.txt
+++ b/data/styles/cycling/include/priorities_3_FG.prio.txt
@@ -1,481 +0,0 @@
-# This file is automatically re-formatted and re-sorted in priorities descending order
-# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
-# are generated automatically for information only. Custom formatting and comments are not preserved.
-#
-# FG geometry: foreground lines and areas (e.g. buildings) are rendered always below overlays
-# and always on top of background geometry (BG-top & BG-by-size) even if a foreground feature
-# is layer=-10 (as tunnels should be visibile over landcover and water).
-#
-# Priorities ranges' rendering order overview:
-# - overlays (icons, captions...)
-# - FG: foreground areas and lines
-# - BG-top: water (linear and areal)
-# - BG-by-size: landcover areas sorted by their size
-
-aerialway-cable_car::dash                           # line::dash z12- (also has line z12-, pathtext z15-)
-aerialway-chair_lift::dash                          # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-drag_lift::dash                           # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-gondola::dash                             # line::dash z12- (also has line z12-, pathtext z15-)
-aerialway-j-bar::dash                               # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-magic_carpet::dash                        # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-mixed_lift::dash                          # line::dash z12- (also has line z12-, pathtext z15-)
-aerialway-platter::dash                             # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-rope_tow::dash                            # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-t-bar::dash                               # line::dash z13- (also has line z13-, pathtext z15-)
-=== 380
-
-aerialway-cable_car                                 # line z12- (also has line::dash z12-, pathtext z15-)
-aerialway-chair_lift                                # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-drag_lift                                 # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-gondola                                   # line z12- (also has line::dash z12-, pathtext z15-)
-aerialway-j-bar                                     # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-magic_carpet                              # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-mixed_lift                                # line z12- (also has line::dash z12-, pathtext z15-)
-aerialway-platter                                   # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-rope_tow                                  # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-t-bar                                     # line z13- (also has line::dash z13-, pathtext z15-)
-=== 370
-
-historic-citywalls                                  # line z14- (also has pathtext z16-)
-=== 360
-
-power-line                                          # line z19- (also has line::dash z19-)
-=== 350
-
-power-line::dash                                    # line::dash z19- (also has line z19-)
-=== 340
-
-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
-
-barrier-city_wall                                   # line z14- (also has pathtext z16-)
-barrier-fence                                       # line z16-
-barrier-guard_rail                                  # line z17-
-barrier-hedge                                       # line z16-
-barrier-wall                                        # line z16-
-barrier-yes                                         # line z16- (also has icon z16-, caption(optional) z16-)
-railway-funicular                                   # line z12-
-railway-funicular-bridge                            # line z12-
-railway-funicular-tunnel                            # line z12-
-railway-monorail                                    # line z14-
-railway-monorail-bridge                             # line z14-
-railway-monorail-tunnel                             # line z14-
-railway-narrow_gauge                                # line z15-
-railway-narrow_gauge-bridge                         # line z15-
-railway-narrow_gauge-tunnel                         # line z15-
-railway-tram                                        # line z13-
-railway-tram-bridge                                 # line z13-
-railway-tram-tunnel                                 # line z13-
-=== 320
-
-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-, 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 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-)
-railway-rail-highspeed::dash                        # line::dash z16- (also has line z10-)
-railway-rail-highspeed-bridge::dash                 # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-highspeed-tunnel::dash                 # line::dash z16- (also has line z10-, line(casing) z14-)
-railway-rail-main::dash                             # line::dash z16- (also has line z10-)
-railway-rail-main-bridge::dash                      # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-main-tunnel::dash                      # line::dash z16- (also has line z10-, line(casing) z14-)
-railway-rail-tourism::dash                          # line::dash z16- (also has line z10-, pathtext z14-)
-railway-rail-tourism-bridge::dash                   # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, pathtext z14-)
-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-, pathtext z10-, shield::shield z10-)
-# === 289
-
-railway-rail-branch                                 # line z11- (also has line::dash z16-)
-railway-rail-branch-bridge                          # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-branch-tunnel                          # line z11- (also has line::dash z16-, line(casing) z14-)
-railway-rail-highspeed                              # line z10- (also has line::dash z16-)
-railway-rail-highspeed-bridge                       # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-highspeed-tunnel                       # line z10- (also has line::dash z16-, line(casing) z14-)
-railway-rail-main                                   # line z10- (also has line::dash z16-)
-railway-rail-main-bridge                            # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-main-tunnel                            # line z10- (also has line::dash z16-, line(casing) z14-)
-railway-rail-tourism                                # line z10- (also has line::dash z16-, pathtext z14-)
-railway-rail-tourism-bridge                         # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-, pathtext z14-)
-railway-rail-tourism-tunnel                         # line z10- (also has line::dash z16-, line(casing) z14-, pathtext z14-)
-=== 280
-
-# railway-rail-branch-tunnel                        # line(casing) z14- (also has line z11-, line::dash z16-)
-# railway-rail-highspeed-tunnel                     # line(casing) z14- (also has line z10-, line::dash z16-)
-# railway-rail-main-tunnel                          # line(casing) z14- (also has line z10-, line::dash z16-)
-# railway-rail-tourism-tunnel                       # line(casing) z14- (also has line z10-, line::dash z16-, pathtext z14-)
-# === 279
-
-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-, pathtext z10-, shield::shield z12-)
-# === 269
-
-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-, 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 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-, 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 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-, 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 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-, pathtext z11-, shield::shield z11-)
-# === 225
-
-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-, 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 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-, 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-)
-railway-rail-bridge::dash                           # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-service::dash                          # line::dash z17- (also has line z16-)
-railway-rail-service-bridge::dash                   # line::dash z17- (also has line z16-, line::bridgeblack z16-, line::bridgewhite z16-)
-railway-rail-service-tunnel::dash                   # line::dash z17- (also has line(casing) z16-, line z16-)
-railway-rail-spur::dash                             # line::dash z17- (also has line z15-)
-railway-rail-spur-bridge::dash                      # line::dash z17- (also has line z15-, line::bridgeblack z16-, line::bridgewhite z15-)
-railway-rail-spur-tunnel::dash                      # line::dash z17- (also has line(casing) z15-, line z15-)
-railway-rail-tunnel::dash                           # line::dash z16- (also has line z11-, line(casing) z14-)
-railway-rail-utility::dash                          # line::dash z17- (also has line z13-)
-railway-rail-utility-bridge::dash                   # line::dash z17- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-utility-tunnel::dash                   # line::dash z17- (also has line z13-, line(casing) z14-)
-railway-subway::dash                                # line::dash z16- (also has line z13-)
-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::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-, pathtext z15-)
-highway-path-bicycle::cycleline                     # line::cycleline z14- (also has line z15-, pathtext z15-)
-=== 219
-
-highway-cycleway                                    # line z13- (also has pathtext z15-)
-highway-cycleway-bridge                             # line z13- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-cycleway-tunnel                             # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-=== 218
-
-railway-light_rail                                  # line z13- (also has line::dash z16-)
-railway-light_rail-bridge                           # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail                                        # line z11- (also has line::dash z16-)
-railway-rail-bridge                                 # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-service                                # line z16- (also has line::dash z17-)
-railway-rail-service-bridge                         # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-, line::dash z17-)
-railway-rail-service-tunnel                         # line z16- (also has line(casing) z16-, line::dash z17-)
-railway-rail-spur                                   # line z15- (also has line::dash z17-)
-railway-rail-spur-bridge                            # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-, line::dash z17-)
-railway-rail-spur-tunnel                            # line z15- (also has line(casing) z15-, line::dash z17-)
-railway-rail-tunnel                                 # line z11- (also has line::dash z16-, line(casing) z14-)
-railway-rail-utility                                # line z13- (also has line::dash z17-)
-railway-rail-utility-bridge                         # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z17-)
-railway-rail-utility-tunnel                         # line z13- (also has line::dash z17-, line(casing) z14-)
-railway-subway                                      # line z13- (also has line::dash z16-)
-railway-subway-bridge                               # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-=== 210
-
-# railway-rail-service-tunnel                       # line(casing) z16- (also has line z16-, line::dash z17-)
-# railway-rail-spur-tunnel                          # line(casing) z15- (also has line z15-, line::dash z17-)
-# railway-rail-tunnel                               # line(casing) z14- (also has line z11-, line::dash z16-)
-# railway-rail-utility-tunnel                       # line(casing) z14- (also has line z13-, line::dash z17-)
-# === 209
-
-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-, 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 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-)
-highway-raceway                                     # line z14- (also has pathtext z16-)
-highway-track                                       # line z15- (also has pathtext z15-)
-highway-track-area                                  # line z15- (also has pathtext z15-)
-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-)
-=== 180
-
-highway-construction                                # line z13- (also has pathtext z15-)
-leisure-track                                       # line z15- (also has caption z16-)
-railway-abandoned                                   # line z16-
-railway-construction                                # line z15-
-railway-disused                                     # line z16-
-railway-disused-bridge                              # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
-railway-disused-tunnel                              # line z16-
-railway-miniature                                   # line z16-
-railway-miniature-bridge                            # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
-railway-miniature-tunnel                            # line z16-
-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-
-=== 160
-
-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-)
-=== 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::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::tunnelCasing z17-, pathtext z16-)
-highway-track-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
-=== 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::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::tunnelBackground z17-, pathtext z16-)
-highway-track-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
-=== 153
-
-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::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::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::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::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-)
-railway-preserved-bridge::bridgewhite               # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-)
-railway-rail-branch-bridge::bridgewhite             # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
-railway-rail-bridge::bridgewhite                    # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
-railway-rail-highspeed-bridge::bridgewhite          # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-)
-railway-rail-main-bridge::bridgewhite               # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-)
-railway-rail-service-bridge::bridgewhite            # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-, line::dash z17-)
-railway-rail-spur-bridge::bridgewhite               # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-, line::dash z17-)
-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-)
-=== 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::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::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::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::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-)
-railway-preserved-bridge::bridgeblack               # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-)
-railway-rail-branch-bridge::bridgeblack             # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-highspeed-bridge::bridgeblack          # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-main-bridge::bridgeblack               # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-service-bridge::bridgeblack            # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-, line::dash z17-)
-railway-rail-spur-bridge::bridgeblack               # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-, line::dash z17-)
-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-)
-=== 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-)
-=== 130
-
-piste:type-connection                               # line z15-
-piste:type-downhill                                 # line z14- (also has pathtext z15-)
-piste:type-downhill-advanced                        # line z14- (also has pathtext z15-)
-piste:type-downhill-easy                            # line z14- (also has pathtext z15-)
-piste:type-downhill-expert                          # line z14- (also has pathtext z15-)
-piste:type-downhill-freeride                        # line z14- (also has pathtext z15-)
-piste:type-downhill-intermediate                    # line z14- (also has pathtext z15-)
-piste:type-downhill-novice                          # line z14- (also has pathtext z15-)
-piste:type-hike                                     # line z15- (also has pathtext z15-)
-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-)
-=== 120
-
-building:part                                       # area z16-
-=== 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-
-=== 100
-
-boundary-administrative-2                           # line z2-
-boundary-administrative-3                           # line z4
-boundary-administrative-4                           # line z5-
-=== 90
-
-man_made-cutline                                    # line z14-
-route-ferry                                         # line z7- (also has pathtext z10-)
-=== 80
-
-aeroway-runway                                      # line z12-
-aeroway-taxiway                                     # line z14-
-barrier-ditch                                       # line z16-
-=== 70
-
-isoline-step_10                                     # line z15- (also has pathtext z17-)
-isoline-step_100                                    # line z12- (also has pathtext z14-)
-isoline-step_1000                                   # line z11- (also has pathtext z11-)
-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-)
-=== 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-)
-waterway-dam                                        # line z14- and area z14- (also has pathtext z15-)
-=== 30
-
-landuse-military                                    # area z12- (also has icon z16-, caption(optional) z17-)
-landuse-military-danger_area                        # area z10- (also has icon z16-, caption(optional) z17-)
-=== 25
-
-amenity-prison                                      # area z12- (also has icon z17-, caption(optional) z17-)
-boundary-aboriginal_lands                           # line z10- and area z10-16 (also has caption z10-16)
-boundary-national_park                              # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17)
-boundary-protected_area-1                           # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17)
-leisure-nature_reserve                              # area z10-17 (also has icon z11-17, caption(optional) z12-17, caption z18-)
-=== 20
-
-piste:type-snow_park                                # area z14- (also has caption z15-)
-=== 15
-
-man_made-bridge                                     # area z14-
-=== 10
--- a/data/styles/cycling/include/priorities_4_overlays.prio.txt
+++ b/data/styles/cycling/include/priorities_4_overlays.prio.txt
--- a/data/styles/cycling/include/ways.mapcss
+++ b/data/styles/cycling/include/ways.mapcss
@@ -1,42 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/ways.mapcss");
-
-
-line|z13[highway=cycleway]
-{width: 2.0;}
-line|z14[highway=cycleway],
-{width: 2.2;}
-line|z15[highway=cycleway],
-{width: 2.5;}
-line|z16[highway=cycleway],
-{width: 3;}
-line|z17[highway=cycleway],
-{width: 3.4;}
-line|z18[highway=cycleway],
-{width: 4.2;}
-line|z19-[highway=cycleway],
-{width: 5.2;}
-
-line|z14[highway=path][bicycle=designated]::cycleline,
-{width: 1.5;}
-line|z15[highway=path][bicycle=designated]::cycleline,
-{width: 1.6;}
-line|z16[highway=path][bicycle=designated]::cycleline,
-{width: 2.2;}
-line|z17[highway=path][bicycle=designated]::cycleline,
-{width: 2;}
-line|z18[highway=path][bicycle=designated]::cycleline,
-{width: 2.4;}
-line|z19-[highway=path][bicycle=designated]::cycleline,
-{width: 2.8;}
-
-line|z15[highway=footway][bicycle=designated]::cycleline,
-{width: 1.7;}
-line|z16[highway=footway][bicycle=designated]::cycleline,
-{width: 1.8;}
-line|z17[highway=footway][bicycle=designated]::cycleline,
-{width: 2.1;}
-line|z18[highway=footway][bicycle=designated]::cycleline,
-{width: 2.4;}
-line|z19-[highway=footway][bicycle=designated]::cycleline,
-{width: 3.0;}
--- a/data/styles/cycling/include/ways_label.mapcss
+++ b/data/styles/cycling/include/ways_label.mapcss
@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/ways_label.mapcss");
--- a/data/styles/cycling/light/colors.mapcss
+++ b/data/styles/cycling/light/colors.mapcss
@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/light/colors.mapcss");
--- a/data/styles/cycling/light/style.mapcss
+++ b/data/styles/cycling/light/style.mapcss
@@ -1,9 +0,0 @@
-@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/subways.mapcss");
-@import("../../default/light/dynamic_colors.mapcss");
--- a/data/styles/default/dark/style.mapcss
+++ b/data/styles/default/dark/style.mapcss
@@ -1,9 +1,134 @@
@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/subways.mapcss");
-@import("dynamic_colors.mapcss");
+@import("../include/defaults_new.mapcss");
+@import("../include/Basemap.mapcss");
+@import("../include/Basemap_label.mapcss");
+@import("../include/Roads.mapcss");
+@import("../include/Roads_label.mapcss");
+@import("../include/Icons.mapcss");
+@import("../include/Subways.mapcss");
+
+colors
+{
+  GuiText-color: #FFFFFF;
+  GuiText-opacity: 0.7;
+  MyPositionAccuracy-color: #FFFFFF;
+  MyPositionAccuracy-opacity: 0.06;
+  Selection-color: #FFFFFF;
+  Selection-opacity: 0.64;
+  Route-color: #0087FF;
+  RouteOutline-color: #055FCD;
+  RouteTrafficG0-color: #5E0F0D;
+  RouteTrafficG1-color: #7F1311;
+  RouteTrafficG2-color: #7F1311;
+  RouteTrafficG3-color: #9E8216;
+  RouteTrafficG3-opacity: 0.0;
+  RoutePedestrian-color: #FFB94B;
+  RoutePedestrian-opacity: 0.7;
+  RouteBicycle-color: #FF4B8C;
+  RouteBicycle-opacity: 0.7;
+  RouteRuler-color: #924ab5;
+  RouteRuler-opacity: 0.7;
+  RoutePreview-color: #FFFFFF;
+  RoutePreview-opacity: 0.3;
+  RouteMaskCar-color: #000000;
+  RouteMaskCar-opacity: 0.5;
+  RouteFirstSegmentArrowsMaskCar-color: #055FCD;
+  RouteFirstSegmentArrowsMaskCar-opacity: 0.0;
+  RouteArrowsMaskCar-color: #055FCD;
+  RouteArrowsMaskCar-opacity: 0.3;
+  RouteMaskBicycle-color: #000000;
+  RouteMaskBicycle-opacity: 0.5;
+  RouteFirstSegmentArrowsMaskBicycle-color: #FF4B8C;
+  RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0;
+  RouteArrowsMaskBicycle-color: #FF4B8C;
+  RouteArrowsMaskBicycle-opacity: 0.5;
+  RouteMaskPedestrian-color: #000000;
+  RouteMaskPedestrian-opacity: 0.5;
+  RouteFake-color: #A8A8A8;
+  RouteFakeOutline-color: #717171;
+  Arrow3D-color: #41C8FF;
+  Arrow3DObsolete-color: #82AAC8;
+  Arrow3DObsolete-opacity: 0.72;
+  Arrow3DShadow-color: #3C3C3C;
+  Arrow3DShadow-opacity: 0.24;
+  Arrow3DOutline-color: #FFFFFF;
+  TrackHumanSpeed-color: #FF9800;
+  TrackCarSpeed-color: #FFCA28;
+  TrackPlaneSpeed-color: #FFF5A0;
+  TrackUnknownDistance-color: #969696;
+  TrafficG0-color: #4C120F;
+  TrafficG1-color: #731816;
+  TrafficG2-color: #731816;
+  TrafficG3-color: #8C7012;
+  TrafficG3-opacity: 0.0;
+  TrafficG4-color: #376222;
+  TrafficG5-color: #376222;
+  TrafficTempBlock-color: #232323;
+  TrafficUnknown-color: #000000;
+  TrafficArrowLight-color: #C4C4C4;
+  TrafficArrowDark-color: #191919;
+  TrafficOutline-color: #383838;
+  RoadShieldBlackText-color: #212121;
+  RoadShieldWhiteText-color: #B7B6B6;
+  RoadShieldUKYellowText-color: #B49E0E;
+  RoadShieldWhiteBackground-color: #999999;
+  RoadShieldGreenBackground-color: #136C30;
+  RoadShieldBlueBackground-color: #294C88;
+  RoadShieldRedBackground-color: #9F1A17;
+  RoadShieldOrangeBackground-color: #B58E1B;
+  PoiHotelTextOutline-color: #000000;
+  PoiHotelTextOutline-opacity: 0.6;
+  PoiDeletedMask-color: #FFFFFF;
+  PoiDeletedMask-opacity: 0.3;
+  PoiVisitedMask-color: #FFFFFF;
+  PoiVisitedMask-opacity: 0.7;
+  DefaultTrackColor-color: #1E96F0;
+  RouteMarkPrimaryText-color: #888888;
+  RouteMarkPrimaryTextOutline-color: #000000;
+  RouteMarkSecondaryText-color: #888888;
+  RouteMarkSecondaryTextOutline-color: #000000;
+  TransitMarkPrimaryText-color: #888888;
+  TransitMarkPrimaryTextOutline-color: #000000;
+  TransitMarkSecondaryText-color: #888888;
+  TransitMarkSecondaryTextOutline-color: #000000;
+  TransitTransferOuterMarker-color: #000000;
+  TransitTransferInnerMarker-color: #888888;
+  TransitStopInnerMarker-color: #000000;
+  LocalAdsPrimaryText-color: #888888;
+  LocalAdsPrimaryTextOutline-color: #000000;
+  LocalAdsSecondaryText-color: #888888;
+  LocalAdsSecondaryTextOutline-color: #000000;
+  TransitBackground-color: #000000;
+  TransitBackground-opacity: 0.4;
+  BookmarkRed-color: #E51B23;
+  BookmarkPink-color: #FF4182;
+  BookmarkPurple-color: #9B24B2;
+  BookmarkDeepPurple-color: #6639BF;
+  BookmarkBlue-color: #0066CC;
+  BookmarkLightBlue-color: #249CF2;
+  BookmarkCyan-color: #14BECD;
+  BookmarkTeal-color: #00A58C;
+  BookmarkGreen-color: #3C8C3C;
+  BookmarkLime-color: #93BF39;
+  BookmarkYellow-color: #FFC800;
+  BookmarkOrange-color: #FF9600;
+  BookmarkDeepOrange-color: #F06432;
+  BookmarkBrown-color: #8C4E39;
+  BookmarkGray-color: #808080;
+  BookmarkBlueGray-color: #597380;
+  SearchmarkPreparing-color: #597380;
+  SearchmarkNotAvailable-color: #597380;
+  SearchmarkSelectedNotAvailable-color: #F06432;
+  RatingBad-color: #F06432;
+  RatingGood-color: #3C8C3C;
+  RatingNone-color: #249CF2;
+  SearchmarkDefault-color: #249CF2;
+  RatingText-color: #FFFFFF;
+  UGCRatingText-color: #B8B8B8;
+  SpeedCameraMarkText-color: #FFFFFF;
+  SpeedCameraMarkBg-color: #F51E30;
+  SpeedCameraMarkOutline-color: #FFFFFF;
+  GuideCityMarkText-color: #6639BF;
+  GuideOutdoorMarkText-color: #3C8C3C;
+  HotelPriceText-color: #000000;
+}
--- a/data/styles/default/dark/symbols/tram-m.svg
+++ b/data/styles/default/dark/symbols/tram-m.svg
@@ -1 +1 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m6.41350421 14.75c-.95 0-1.674375-.676875-1.7444375-1.6019375l-.0055625-.1480625v-.0833333l.25-6.1666667c0-.91666667.75-1.66666667 1.66666667-1.58333333h1.58333333v-.75c-.5 0-.91666667.16666666-1.08333333.16666666-.41666667.08333334-.83333334-.16666666-.91666667-.58333333s.08333333-.83333333.41666667-1l.11922451-.02060859c.27673179-.05556686.98917837-.2057297 1.91374923-.22689803l.38536266-.00204645-.00000307.26264718.00249272-.26264718.1683364-.00044693c1.24999997 0 2.16666667.25 2.24999997.25.3333334.16666667.5.58333333.4166667 1s-.5.66666667-.9166667.58333333c-.1666666 0-.5833333-.16666666-1.0833333-.16666666v.75h1.5833333c.8708334-.07916667 1.59125.59374999 1.6611146 1.44716666l.2555521 6.30283337v.0833333l-.0055625.1480625c-.0700625.9250625-.7944375 1.6019375-1.7444375 1.6019375zm.08333333-2.6666667c-.41666666 0-.75.3333334-.75.75 0 .4166667.33333334.75.75.75.41666667 0 .75-.4166666.75-.8333333s-.33333333-.6666667-.75-.6666667zm5.00582916 0c-.4166667 0-.75.25-.75.6666667s.3333333.8333333.75.8333333c.4166666 0 .75-.3333333.75-.75 0-.4166666-.3333334-.75-.75-.75zm-4.58916249-5.66666663c-.46428571 0-.85671769.3592687-.9104106.87764213l-.00625607.12235787-.08333333 2.41666666c0 .58333337.41666667.99999997.91666667.99999997h4.33916242c.5 0 .9166667-.4166666.9166667-.99999997l-.0833333-2.41666666-.0062561-.12235787c-.0536929-.51837343-.4461249-.87764213-.9104106-.87764213z" fill="#000"/></g></svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m12.9135042 6.75c-.0833333-1-.8333333-1.66666667-1.75-1.66666667h-1.49999999v-.75c.33333333 0 .74999999.08333334 1.16666669.16666667.3333333.08333333.6666667-.16666667.8333333-.58333333.0833334-.41666667-.1666666-.75-.5833333-.91666667-.75-.16666667-1.50000002-.25-2.16666669-.25h-.08333333c-1.25 0-2.16666667.25-2.25.25-.33333334.16666667-.5.58333333-.41666667 1s.5.66666667.91666667.58333333c.16666666 0 .58333333-.16666666 1.08333333-.16666666v.75h-1.58333333c-.91666667-.08333334-1.66666667.66666666-1.66666667 1.58333333l-.25 6.1666667v.0833333c0 1 .75 1.75 1.75 1.75h5.16666669.0833333c1-.0833333 1.75-.9166667 1.6666667-1.8333333zm-6.99999999 3.08333333.08333333-2.41666666c0-.58333334.41666667-1 .91666667-1h3.99999999c.5 0 .8333334.41666666.9166667 1l.0833333 2.41666666c0 .58333337-.3333333.99999997-.8333333.99999997h-.0833333-4.16666672c-.5 0-.91666667-.4166666-.91666667-.99999997zm.58333333 3.74999997c-.41666666 0-.75-.3333333-.75-.75 0-.4166666.33333334-.75.75-.75.41666667 0 .75.25.75.6666667s-.33333333.8333333-.75.8333333zm4.83333336 0c-.4166667 0-.75-.3333333-.75-.75 0-.4166666.3333333-.75.75-.75s.75.3333334.75.75c0 .3333334-.3333333.75-.75.75z" fill="#000"/></g></svg>
--- a/data/styles/default/dark/symbols/tram-s.svg
+++ b/data/styles/default/dark/symbols/tram-s.svg
@@ -1 +1 @@
-<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m5.99901368 2.00028841.27959242.00206521c.38744508.01070897.71530435.05601616.94321322.09555697l.34033345.06354774c.21527778.10763889.32291667.37673612.26909723.64583333-.04783951.23919754-.26577504.39334706-.50261012.38685034l-.14510611-.01607672-.26690051-.05931123c-.11014942-.02259475-.23865707-.04236516-.37704993-.04236516v.484375h1.02256944c.5525463-.05023148 1.01132716.3683642 1.07004218.90572943l.16780505 4.09947891v.05381944l-.00636265.12691821c-.05893828.58134568-.52106791 1.00329012-1.12384568 1.00329012h-3.34023687c-.60277777 0-1.0649074-.42194444-1.12384568-1.00329012l-.00636265-.12691821v-.05381944l.16145834-3.98263889c0-.59201389.484375-1.07638889 1.07638889-1.02256945h1.02256944v-.484375c-.27678572 0-.51403061.07908163-.64395044.10167639l-.05570234.0059625c-.26909722.05381945-.53819444-.10763889-.59201389-.37673612-.05381944-.26909721.05381945-.53819444.26909723-.64583333l.34033345-.06354774.25973069-.03996795c.19337167-.02593341.42518581-.04844971.68348253-.05558902zm-1.61563943 6.02748937c-.26909722 0-.484375.21527778-.484375.484375s.21527778.484375.484375.484375.484375-.26909722.484375-.53819445c0-.26909721-.21527778-.43055555-.484375-.43055555zm3.23259797 0c-.26909722 0-.484375.16145834-.484375.43055555 0 .26909723.21527778.53819445.484375.53819445s.484375-.21527778.484375-.484375-.21527778-.484375-.484375-.484375zm-.26909722-3.65972222h-2.69440353c-.29356061 0-.54264233.2223944-.58550379.54587716l-.00651009.09995617-.05381946 1.56076389c0 .37673611.26909723.64583334.59201389.64583334h2.80204243c.32291666 0 .59201389-.26909723.59201389-.64583334l-.05381946-1.56076389-.00651009-.09995617c-.04286146-.32348276-.29194318-.54587716-.58550379-.54587716z" fill="#000"/></g></svg>
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m8.52747147 4.58333334c-.05381944-.64583334-.53819445-1.07638889-1.13020833-1.07638889h-.96875v-.48437501c.21527777 0 .484375.05381945.75347222.10763889.21527778.05381945.43055555-.10763889.53819445-.37673611.05381944-.26909722-.1076389-.484375-.37673612-.59201389-.484375-.10763889-.96874999-.16145833-1.39930555-.16145833h-.05381945c-.80729166 0-1.39930555.16145833-1.45312499.16145833-.21527778.10763889-.32291667.37673612-.26909723.64583333.05381945.26909723.32291667.43055557.59201389.37673612.10763889 0 .37673611-.10763889.69965278-.10763889v.484375h-1.02256944c-.59201389-.05381944-1.07638889.43055556-1.07638889 1.02256945l-.16145834 3.98263889v.05381944c0 .64583333.484375 1.13020833 1.13020833 1.13020833h3.33680556.05381945c.64583333-.05381944 1.13020833-.59201389 1.07638889-1.18402777zm-4.52083334 1.99131944.05381946-1.56076389c0-.37673611.26909721-.64583333.59201388-.64583333h2.58333333c.32291667 0 .53819445.26909722.5920139.64583333l.05381944 1.56076389c0 .37673611-.21527778.64583334-.53819445.64583334h-.05381944-2.69097223c-.32291666 0-.59201389-.26909723-.59201389-.64583334zm.37673612 2.421875c-.26909722 0-.484375-.21527778-.484375-.48437499 0-.26909723.21527778-.48437501.484375-.48437501s.484375.16145834.484375.43055555c0 .26909723-.21527778.53819445-.484375.53819445zm3.12152778 0c-.26909723 0-.484375-.21527778-.484375-.48437499 0-.26909723.21527777-.48437501.484375-.48437501.26909722 0 .48437499.21527778.48437499.48437501 0 .21527777-.21527777.48437499-.48437499.48437499z" fill="#000"/></g></svg>
--- a/data/styles/default/include/Basemap.mapcss
+++ b/data/styles/default/include/Basemap.mapcss
@@ -1,6 +1,6 @@
 /* ~~~~ CONTENT OF BASEMAP ~~~~~

-1.BASICS
+1.Z-INDEX of BASEMAP
 2.LAND
 3.BOUNDARY
  3.1 Countries
@@ -28,35 +28,6 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */

-
-/* 1. BASICS */
-
-way|z1-12::*
-{
-  linejoin: bevel;
-}
-
-way|z13-::*
-{
-  linejoin: round;
-}
-
-way|z1-15::*
-{
-  linecap: butt;
-}
-
-way|z16-::*
-{
-  linecap: round;
-}
-
-*::int_name
-{
-  text-offset: 1;
-}
-
-
 /* 2.LAND */

 area|z0-[natural=coastline],
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -22,6 +22,7 @@
 6.1 Craft
 7.CAR
 7.1 Parking
+8. COLORED LABELS
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */

@@ -2535,4 +2536,8 @@ node|z17-[amenity=motorcycle_parking],
 {icon-image: motorcycle-parking-m.svg;}

 node|z18-[amenity=parking_space][parking_space=disabled],
-{icon-image: parking-disabled-m.svg;}
+{icon-image: parking-disabled-m.svg;}
+
+/* 8. Colored Labels */
+
+@import("../../default/include/Icons_Label_Colors.mapcss");
--- a/data/styles/default/include/Roads.mapcss
+++ b/data/styles/default/include/Roads.mapcss
--- a/data/styles/default/include/Roads_label.mapcss
+++ b/data/styles/default/include/Roads_label.mapcss
--- a/data/styles/default/include/defaults_new.mapcss
+++ b/data/styles/default/include/defaults_new.mapcss
@@ -0,0 +1,24 @@
+way|z1-12::*
+{
+  linejoin: bevel;
+}
+
+way|z13-::*
+{
+  linejoin: round;
+}
+
+way|z1-15::*
+{
+  linecap: butt;
+}
+
+way|z16-::*
+{
+  linecap: round;
+}
+
+*::int_name
+{
+  text-offset: 1;
+}
--- a/data/styles/default/light/style.mapcss
+++ b/data/styles/default/light/style.mapcss
@@ -1,9 +1,134 @@
@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/subways.mapcss");
-@import("dynamic_colors.mapcss");
+@import("../include/defaults_new.mapcss");
+@import("../include/Basemap.mapcss");
+@import("../include/Basemap_label.mapcss");
+@import("../include/Roads.mapcss");
+@import("../include/Roads_label.mapcss");
+@import("../include/Icons.mapcss");
+@import("../include/Subways.mapcss");
+
+colors
+{
+  GuiText-color: #4D4D4D;
+  GuiText-opacity: 0.86;
+  MyPositionAccuracy-color: #000000;
+  MyPositionAccuracy-opacity: 0.08;
+  Selection-color: #1E96F0;
+  Selection-opacity: 0.64;
+  Route-color: #0087FF;
+  RouteOutline-color: #055FCD;
+  RouteTrafficG0-color: #9B2300;
+  RouteTrafficG1-color: #E82705;
+  RouteTrafficG2-color: #E82705;
+  RouteTrafficG3-color: #FFE500;
+  RouteTrafficG3-opacity: 0.0;
+  RoutePedestrian-color: #1D339E;
+  RoutePedestrian-opacity: 0.8;
+  RouteBicycle-color: #9C27B0;
+  RouteBicycle-opacity: 0.8;
+  RouteRuler-color: #66347F;
+  RouteRuler-opacity: 0.9;
+  RoutePreview-color: #000000;
+  RoutePreview-opacity: 0.3;
+  RouteMaskCar-color: #000000;
+  RouteMaskCar-opacity: 0.3;
+  RouteFirstSegmentArrowsMaskCar-color: #033B80;
+  RouteFirstSegmentArrowsMaskCar-opacity: 0.0;
+  RouteArrowsMaskCar-color: #033B80;
+  RouteArrowsMaskCar-opacity: 0.2;
+  RouteMaskBicycle-color: #000000;
+  RouteMaskBicycle-opacity: 0.5;
+  RouteFirstSegmentArrowsMaskBicycle-color: #9C27B0;
+  RouteFirstSegmentArrowsMaskBicycle-opacity: 0.0;
+  RouteArrowsMaskBicycle-color: #9C27B0;
+  RouteArrowsMaskBicycle-opacity: 0.2;
+  RouteMaskPedestrian-color: #000000;
+  RouteMaskPedestrian-opacity: 0.5;
+  RouteFake-color: #A8A8A8;
+  RouteFakeOutline-color: #717171;
+  Arrow3D-color: #50AAFF;
+  Arrow3DObsolete-color: #82AAC8;
+  Arrow3DObsolete-opacity: 0.72;
+  Arrow3DShadow-color: #3C3C3C;
+  Arrow3DShadow-opacity: 0.24;
+  Arrow3DOutline-color: #FFFFFF;
+  TrackHumanSpeed-color: #1D339E;
+  TrackCarSpeed-color: #7C8EDE;
+  TrackPlaneSpeed-color: #A8B7ED;
+  TrackUnknownDistance-color: #616161;
+  TrafficG0-color: #7E1712;
+  TrafficG1-color: #E42300;
+  TrafficG2-color: #E42300;
+  TrafficG3-color: #FCDE00;
+  TrafficG3-opacity: 0.0;
+  TrafficG4-color: #39962E;
+  TrafficG5-color: #39962E;
+  TrafficTempBlock-color: #525252;
+  TrafficUnknown-color: #000000;
+  TrafficArrowLight-color: #FFFFFF;
+  TrafficArrowDark-color: #473635;
+  TrafficOutline-color: #E8E6DC;
+  RoadShieldBlackText-color: #000000;
+  RoadShieldWhiteText-color: #FFFFFF;
+  RoadShieldUKYellowText-color: #FFD400;
+  RoadShieldWhiteBackground-color: #FFFFFF;
+  RoadShieldGreenBackground-color: #309302;
+  RoadShieldBlueBackground-color: #1A5EC1;
+  RoadShieldRedBackground-color: #E63534;
+  RoadShieldOrangeBackground-color: #FFBE00;
+  PoiHotelTextOutline-color: #FFFFFF;
+  PoiHotelTextOutline-opacity: 0.6;
+  PoiDeletedMask-color: #FFFFFF;
+  PoiDeletedMask-opacity: 0.3;
+  PoiVisitedMask-color: #FFFFFF;
+  PoiVisitedMask-opacity: 0.7;
+  DefaultTrackColor-color: #1E96F0;
+  RouteMarkPrimaryText-color: #000000;
+  RouteMarkPrimaryTextOutline-color: #FFFFFF;
+  RouteMarkSecondaryText-color: #000000;
+  RouteMarkSecondaryTextOutline-color: #FFFFFF;
+  TransitMarkPrimaryText-color: #000000;
+  TransitMarkPrimaryTextOutline-color: #FFFFFF;
+  TransitMarkSecondaryText-color: #000000;
+  TransitMarkSecondaryTextOutline-color: #FFFFFF;
+  TransitTransferOuterMarker-color: #000000;
+  TransitTransferInnerMarker-color: #FFFFFF;
+  TransitStopInnerMarker-color: #FFFFFF;
+  LocalAdsPrimaryText-color: #000000;
+  LocalAdsPrimaryTextOutline-color: #FFFFFF;
+  LocalAdsSecondaryText-color: #000000;
+  LocalAdsSecondaryTextOutline-color: #FFFFFF;
+  TransitBackground-color: #FFFFFF;
+  TransitBackground-opacity: 0.4;
+  BookmarkRed-color: #E51B23;
+  BookmarkPink-color: #FF4182;
+  BookmarkPurple-color: #9B24B2;
+  BookmarkDeepPurple-color: #6639BF;
+  BookmarkBlue-color: #0066CC;
+  BookmarkLightBlue-color: #249CF2;
+  BookmarkCyan-color: #14BECD;
+  BookmarkTeal-color: #00A58C;
+  BookmarkGreen-color: #3C8C3C;
+  BookmarkLime-color: #93BF39;
+  BookmarkYellow-color: #FFC800;
+  BookmarkOrange-color: #FF9600;
+  BookmarkDeepOrange-color: #F06432;
+  BookmarkBrown-color: #804633;
+  BookmarkGray-color: #737373;
+  BookmarkBlueGray-color: #597380;
+  SearchmarkPreparing-color: #597380;
+  SearchmarkNotAvailable-color: #597380;
+  SearchmarkSelectedNotAvailable-color: #F06432;
+  RatingBad-color: #F06432;
+  RatingGood-color: #3C8C3C;
+  RatingNone-color: #249CF2;
+  SearchmarkDefault-color: #249CF2;
+  RatingText-color: #FFFFFF;
+  UGCRatingText-color: #000000;
+  SpeedCameraMarkText-color: #FFFFFF;
+  SpeedCameraMarkBg-color: #F51E30;
+  SpeedCameraMarkOutline-color: #FFFFFF;
+  GuideCityMarkText-color: #6639BF;
+  GuideOutdoorMarkText-color: #3C8C3C;
+  HotelPriceText-color: #000000;
+}
--- a/data/styles/default/light/symbols/tram-m.svg
+++ b/data/styles/default/light/symbols/tram-m.svg
@@ -1 +1 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m6.41350421 14.75c-.95 0-1.674375-.676875-1.7444375-1.6019375l-.0055625-.1480625v-.0833333l.25-6.1666667c0-.91666667.75-1.66666667 1.66666667-1.58333333h1.58333333v-.75c-.5 0-.91666667.16666666-1.08333333.16666666-.41666667.08333334-.83333334-.16666666-.91666667-.58333333s.08333333-.83333333.41666667-1l.11922451-.02060859c.27673179-.05556686.98917837-.2057297 1.91374923-.22689803l.38536266-.00204645-.00000307.26264718.00249272-.26264718.1683364-.00044693c1.24999997 0 2.16666667.25 2.24999997.25.3333334.16666667.5.58333333.4166667 1s-.5.66666667-.9166667.58333333c-.1666666 0-.5833333-.16666666-1.0833333-.16666666v.75h1.5833333c.8708334-.07916667 1.59125.59374999 1.6611146 1.44716666l.2555521 6.30283337v.0833333l-.0055625.1480625c-.0700625.9250625-.7944375 1.6019375-1.7444375 1.6019375zm.08333333-2.6666667c-.41666666 0-.75.3333334-.75.75 0 .4166667.33333334.75.75.75.41666667 0 .75-.4166666.75-.8333333s-.33333333-.6666667-.75-.6666667zm5.00582916 0c-.4166667 0-.75.25-.75.6666667s.3333333.8333333.75.8333333c.4166666 0 .75-.3333333.75-.75 0-.4166666-.3333334-.75-.75-.75zm-4.58916249-5.66666663c-.46428571 0-.85671769.3592687-.9104106.87764213l-.00625607.12235787-.08333333 2.41666666c0 .58333337.41666667.99999997.91666667.99999997h4.33916242c.5 0 .9166667-.4166666.9166667-.99999997l-.0833333-2.41666666-.0062561-.12235787c-.0536929-.51837343-.4461249-.87764213-.9104106-.87764213z" fill="#fff"/></g></svg>
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="18" opacity=".6" rx="1.875" width="18"/><rect fill="#2f6499" height="16.5" rx="1.5" width="16.5" x=".75" y=".75"/><path d="m12.9135042 6.75c-.0833333-1-.8333333-1.66666667-1.75-1.66666667h-1.49999999v-.75c.33333333 0 .74999999.08333334 1.16666669.16666667.3333333.08333333.6666667-.16666667.8333333-.58333333.0833334-.41666667-.1666666-.75-.5833333-.91666667-.75-.16666667-1.50000002-.25-2.16666669-.25h-.08333333c-1.25 0-2.16666667.25-2.25.25-.33333334.16666667-.5.58333333-.41666667 1s.5.66666667.91666667.58333333c.16666666 0 .58333333-.16666666 1.08333333-.16666666v.75h-1.58333333c-.91666667-.08333334-1.66666667.66666666-1.66666667 1.58333333l-.25 6.1666667v.0833333c0 1 .75 1.75 1.75 1.75h5.16666669.0833333c1-.0833333 1.75-.9166667 1.6666667-1.8333333zm-6.99999999 3.08333333.08333333-2.41666666c0-.58333334.41666667-1 .91666667-1h3.99999999c.5 0 .8333334.41666666.9166667 1l.0833333 2.41666666c0 .58333337-.3333333.99999997-.8333333.99999997h-.0833333-4.16666672c-.5 0-.91666667-.4166666-.91666667-.99999997zm.58333333 3.74999997c-.41666666 0-.75-.3333333-.75-.75 0-.4166666.33333334-.75.75-.75.41666667 0 .75.25.75.6666667s-.33333333.8333333-.75.8333333zm4.83333336 0c-.4166667 0-.75-.3333333-.75-.75 0-.4166666.3333333-.75.75-.75s.75.3333334.75.75c0 .3333334-.3333333.75-.75.75z" fill="#fff"/></g></svg>
--- a/data/styles/default/light/symbols/tram-s.svg
+++ b/data/styles/default/light/symbols/tram-s.svg
@@ -1 +1 @@
-<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m5.99901368 2.00028841.27959242.00206521c.38744508.01070897.71530435.05601616.94321322.09555697l.34033345.06354774c.21527778.10763889.32291667.37673612.26909723.64583333-.04783951.23919754-.26577504.39334706-.50261012.38685034l-.14510611-.01607672-.26690051-.05931123c-.11014942-.02259475-.23865707-.04236516-.37704993-.04236516v.484375h1.02256944c.5525463-.05023148 1.01132716.3683642 1.07004218.90572943l.16780505 4.09947891v.05381944l-.00636265.12691821c-.05893828.58134568-.52106791 1.00329012-1.12384568 1.00329012h-3.34023687c-.60277777 0-1.0649074-.42194444-1.12384568-1.00329012l-.00636265-.12691821v-.05381944l.16145834-3.98263889c0-.59201389.484375-1.07638889 1.07638889-1.02256945h1.02256944v-.484375c-.27678572 0-.51403061.07908163-.64395044.10167639l-.05570234.0059625c-.26909722.05381945-.53819444-.10763889-.59201389-.37673612-.05381944-.26909721.05381945-.53819444.26909723-.64583333l.34033345-.06354774.25973069-.03996795c.19337167-.02593341.42518581-.04844971.68348253-.05558902zm-1.61563943 6.02748937c-.26909722 0-.484375.21527778-.484375.484375s.21527778.484375.484375.484375.484375-.26909722.484375-.53819445c0-.26909721-.21527778-.43055555-.484375-.43055555zm3.23259797 0c-.26909722 0-.484375.16145834-.484375.43055555 0 .26909723.21527778.53819445.484375.53819445s.484375-.21527778.484375-.484375-.21527778-.484375-.484375-.484375zm-.26909722-3.65972222h-2.69440353c-.29356061 0-.54264233.2223944-.58550379.54587716l-.00651009.09995617-.05381946 1.56076389c0 .37673611.26909723.64583334.59201389.64583334h2.80204243c.32291666 0 .59201389-.26909723.59201389-.64583334l-.05381946-1.56076389-.00651009-.09995617c-.04286146-.32348276-.29194318-.54587716-.58550379-.54587716z" fill="#fff"/></g></svg>
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="12" opacity=".6" rx="1.875" width="12"/><rect fill="#2f6499" height="11.00025" rx="1.5" width="11.00025" x=".500003" y=".500003"/><path d="m8.52747147 4.58333334c-.05381944-.64583334-.53819445-1.07638889-1.13020833-1.07638889h-.96875v-.48437501c.21527777 0 .484375.05381945.75347222.10763889.21527778.05381945.43055555-.10763889.53819445-.37673611.05381944-.26909722-.1076389-.484375-.37673612-.59201389-.484375-.10763889-.96874999-.16145833-1.39930555-.16145833h-.05381945c-.80729166 0-1.39930555.16145833-1.45312499.16145833-.21527778.10763889-.32291667.37673612-.26909723.64583333.05381945.26909723.32291667.43055557.59201389.37673612.10763889 0 .37673611-.10763889.69965278-.10763889v.484375h-1.02256944c-.59201389-.05381944-1.07638889.43055556-1.07638889 1.02256945l-.16145834 3.98263889v.05381944c0 .64583333.484375 1.13020833 1.13020833 1.13020833h3.33680556.05381945c.64583333-.05381944 1.13020833-.59201389 1.07638889-1.18402777zm-4.52083334 1.99131944.05381946-1.56076389c0-.37673611.26909721-.64583333.59201388-.64583333h2.58333333c.32291667 0 .53819445.26909722.5920139.64583333l.05381944 1.56076389c0 .37673611-.21527778.64583334-.53819445.64583334h-.05381944-2.69097223c-.32291666 0-.59201389-.26909723-.59201389-.64583334zm.37673612 2.421875c-.26909722 0-.484375-.21527778-.484375-.48437499 0-.26909723.21527778-.48437501.484375-.48437501s.484375.16145834.484375.43055555c0 .26909723-.21527778.53819445-.484375.53819445zm3.12152778 0c-.26909723 0-.484375-.21527778-.484375-.48437499 0-.26909723.21527777-.48437501.484375-.48437501.26909722 0 .48437499.21527778.48437499.48437501 0 .21527777-.21527777.48437499-.48437499.48437499z" fill="#fff"/></g></svg>
--- a/data/styles/driving/dark/colors.mapcss
+++ b/data/styles/driving/dark/colors.mapcss
@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/dark/colors.mapcss");
--- a/data/styles/driving/dark/style.mapcss
+++ b/data/styles/driving/dark/style.mapcss
@@ -1,9 +0,0 @@
-@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/subways.mapcss");
-@import("../../default/dark/dynamic_colors.mapcss");
--- a/data/styles/driving/include/Basemap.mapcss
+++ b/data/styles/driving/include/Basemap.mapcss
@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap.mapcss");
--- a/data/styles/driving/include/Basemap_label.mapcss
+++ b/data/styles/driving/include/Basemap_label.mapcss
@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap_label.mapcss");
--- a/data/styles/driving/include/Icons.mapcss
+++ b/data/styles/driving/include/Icons.mapcss
@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/icons.mapcss");
--- a/data/styles/driving/include/icons_label_colors.mapcss
+++ b/data/styles/driving/include/icons_label_colors.mapcss
@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/icons_label_colors.mapcss");
--- a/data/styles/driving/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/driving/include/priorities_1_BG-by-size.prio.txt
@@ -1,258 +0,0 @@
-# This file is automatically re-formatted and re-sorted in priorities descending order
-# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
-# are generated automatically for information only. Custom formatting and comments are not preserved.
-#
-# BG-by-size geometry: background areas rendered below BG-top and everything else.
-# Smaller areas are rendered above larger ones (area's size is estimated as the size of its' bounding box).
-# So effectively priority values of BG-by-size areas are not used at the moment.
-# But we might use them later for some special cases, e.g. to determine a main area type of a multi-type feature.
-# Keep them in a logical importance order please.
-#
-# Priorities ranges' rendering order overview:
-# - overlays (icons, captions...)
-# - FG: foreground areas and lines
-# - BG-top: water (linear and areal)
-# - BG-by-size: landcover areas sorted by their size
-
-leisure-stadium                                     # area z13- (also has icon z13-, caption(optional) z13-)
-=== 250
-
-amenity-place_of_worship                            # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-buddhist                   # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian                  # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian-jehovahs_witness  # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian-mormon           # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-hindu                      # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-jewish                     # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-muslim                     # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-shinto                     # area z13- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-taoist                     # area z13- (also has icon z14-, caption(optional) z14-)
-landuse-religious                                   # area z13-
-=== 240
-
-amenity-doctors                                     # area z15- (also has icon z17-, caption(optional) z17-)
-leisure-swimming_pool                               # area z13- (also has icon z17-, caption(optional) z17-)
-leisure-swimming_pool-private                       # area z13- (also has icon z17-, caption(optional) z17-)
-=== 230
-
-landuse-landfill                                    # area z13- (also has icon z15-, caption(optional) z15-)
-=== 220
-
-leisure-playground                                  # area z15- (also has icon z17-, caption(optional) z17-)
-=== 200
-
-amenity-fountain                                    # area z16- (also has icon z16-, caption(optional) z16-)
-leisure-fitness_centre-sport-yoga                   # area z16- (also has icon z16-, caption(optional) z17-)
-leisure-sports_centre                               # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-american_football       # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-archery                 # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-athletics               # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-australian_football     # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-badminton               # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-baseball                # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-basketball              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-beachvolleyball         # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-bowls                   # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-climbing                # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-cricket                 # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-curling                 # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-equestrian              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-field_hockey            # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-futsal                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-golf                    # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-gymnastics              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-handball                # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-ice_hockey              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-multi                   # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-padel                   # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-pelota                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-scuba_diving            # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-shooting                # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-skateboard              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-skiing                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-soccer                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-swimming                # area z13- (also has icon z15-, caption(optional) z15-)
-leisure-sports_centre-sport-table_tennis            # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-tennis                  # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-volleyball              # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre-sport-yoga                    # area z13- (also has icon z16-, caption(optional) z16-)
-=== 190
-
-amenity-grave_yard                                  # area z10- (also has icon z17-, caption(optional) z17-)
-amenity-grave_yard-christian                        # area z10- (also has icon z17-, caption(optional) z17-)
-landuse-cemetery                                    # area z10- (also has icon z14-, caption(optional) z15-)
-landuse-cemetery-christian                          # area z10- (also has icon z14-, caption(optional) z15-)
-=== 180
-
-amenity-car_wash                                    # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-charging_station                            # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-bicycle                    # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-carless                    # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
-amenity-charging_station-motorcycle                 # area z16- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-small                      # area z15- (also has icon z15-, caption(optional) z16-)
-amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-fire_station                                # area z15- (also has icon z16-, caption(optional) z17-)
-amenity-fuel                                        # area z15- (also has icon z14-, caption(optional) z14-)
-amenity-marketplace                                 # area z15- (also has icon z16-, caption(optional) z16-)
-amenity-police                                      # area z15- (also has icon z16-, caption(optional) z17-)
-amenity-ranger_station                              # area z13- (also has icon z15-, caption(optional) z15-)
-amenity-recycling-centre                            # area z15- (also has icon z16-, caption(optional) z16-)
-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-, 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-)
-leisure-dog_park                                    # area z15- (also has icon z16-, caption(optional) z16-)
-leisure-resort                                      # area z13- (also has icon z16-, caption(optional) z16-)
-leisure-water_park                                  # area z13- (also has icon z16-, caption(optional) z16-)
-office-diplomatic                                   # area z15- (also has icon z17-, caption(optional) z17-)
-tourism-camp_site                                   # area z13- (also has icon z16-, caption(optional) z16-)
-tourism-information-office                          # area z15- (also has icon z15-, caption(optional) z15-)
-tourism-information-visitor_centre                  # area z13- (also has icon z15-, caption(optional) z15-)
-=== 170
-
-highway-footway-area                                # area z14- (also has line z15-, pathtext z15-)
-leisure-track-area                                  # area z15- (also has caption z16-)
-=== 160
-
-aeroway-terminal                                    # area z14- (also has caption z15-)
-=== 150
-
-leisure-golf_course                                 # area z12- (also has icon z15-, caption(optional) z17-)
-leisure-miniature_golf                              # area z14- (also has icon z16-, caption(optional) z17-)
-=== 140
-
-landuse-flowerbed                                   # area z16-
-natural-scrub                                       # area z11-
-=== 130
-
-landuse-grass                                       # area z11-
-natural-grassland                                   # area z11-
-natural-heath                                       # area z11-
-=== 120
-
-area:highway-footway                                # area z14- (also has caption z15-)
-area:highway-living_street                          # area z14-
-area:highway-pedestrian                             # area z14- (also has caption z15-)
-public_transport-platform                           # area z16- (also has caption z17-)
-railway-platform                                    # area z16- (also has caption z16-)
-=== 110
-
-amenity-bicycle_parking                             # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-bicycle_parking-covered                     # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-car_pooling                                 # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-motorcycle_parking                          # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-parking                                     # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-fee                                 # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-lane                                # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-lane-fee                            # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-lane-private                        # area z17- (also has icon z19-, caption(optional) z19-)
-amenity-parking-multi-storey                        # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-multi-storey-fee                    # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-no-access                           # area z15- (also has icon z18-, caption(optional) z18-)
-amenity-parking-park_and_ride                       # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-permissive                          # area z15- (also has icon z16-, caption(optional) z18-)
-amenity-parking-private                             # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-street_side                         # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-street_side-fee                     # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-parking-street_side-private                 # area z17- (also has icon z18-, caption(optional) z18-)
-=== 100
-
-natural-wetland                                     # area z11- (also has caption z16-)
-natural-wetland-bog                                 # area z11- (also has caption z16-)
-natural-wetland-fen                                 # area z11- (also has caption z16-)
-natural-wetland-mangrove                            # area z11- (also has caption z16-)
-natural-wetland-marsh                               # area z11- (also has caption z16-)
-natural-wetland-reedbed                             # area z11- (also has caption z16-)
-natural-wetland-saltmarsh                           # area z11- (also has caption z16-)
-natural-wetland-saltmarsh-tidal                     # area z11- (also has caption z16-)
-natural-wetland-swamp                               # area z11- (also has caption z16-)
-natural-wetland-tidalflat                           # area z11- (also has caption z16-)
-=== 90
-
-landuse-farmyard                                    # area z10- (also has caption z15-)
-=== 81
-
-landuse-allotments                                  # area z12- (also has caption z15-)
-landuse-farmland                                    # area z10- (also has caption z15-)
-landuse-meadow                                      # area z11-
-landuse-orchard                                     # area z12- (also has caption z15-)
-landuse-recreation_ground                           # area z12- (also has caption z15-)
-landuse-village_green                               # area z12-
-landuse-vineyard                                    # area z12- (also has caption z15-)
-leisure-fitness_station                             # area z15- (also has icon z17-, caption(optional) z17-)
-leisure-pitch                                       # area z15- (also has icon z17-, caption(optional) z17-)
-natural-bare_rock                                   # area z11- (also has caption z14-)
-natural-scree                                       # area z11-
-natural-shingle                                     # area z12-
-=== 80
-
-landuse-plant_nursery                               # area z12- (also has icon z17-, caption(optional) z17-)
-leisure-garden                                      # area z12- (also has icon z16-, caption(optional) z16-)
-leisure-garden-residential                          # area z12-
-leisure-park                                        # area z10- (also has icon z14-, caption(optional) z14-)
-leisure-park-no-access                              # area z10- (also has icon z14-, caption(optional) z14-)
-leisure-park-permissive                             # area z10- (also has icon z14-, caption(optional) z14-)
-leisure-park-private                                # area z10- (also has icon z14-, caption(optional) z14-)
-=== 70
-
-landuse-forest                                      # area z10- (also has icon z13-, caption(optional) z14-)
-landuse-forest-coniferous                           # area z10- (also has icon z13-, caption(optional) z14-)
-landuse-forest-deciduous                            # area z10- (also has icon z13-, caption(optional) z14-)
-landuse-forest-mixed                                # area z10- (also has icon z13-, caption(optional) z14-)
-=== 60
-
-amenity-waste_transfer_station                      # area z13- (also has icon z17-, caption(optional) z18-)
-landuse-construction                                # area z13- (also has caption z15-)
-landuse-industrial                                  # area z13- (also has caption z15-)
-landuse-industrial-mine                             # area z13- (also has icon z15-, caption(optional) z15-)
-landuse-quarry                                      # area z13- (also has icon z15-, caption(optional) z15-)
-landuse-railway                                     # area z13- (also has caption z15-)
-man_made-wastewater_plant                           # area z13- (also has caption z15-)
-man_made-works                                      # area z13- (also has icon z16-, caption(optional) z17-)
-power-generator                                     # area z13- (also has icon z17-)
-power-generator-gas                                 # area z13- (also has icon z17-)
-power-generator-hydro                               # area z13- (also has icon z17-)
-power-generator-solar                               # area z13-
-power-generator-wind                                # area z13- (also has icon z15-, caption(optional) z18-)
-power-plant                                         # area z13- (also has icon z17-)
-power-plant-coal                                    # area z13- (also has icon z17-)
-power-plant-gas                                     # area z13- (also has icon z17-)
-power-plant-hydro                                   # area z13- (also has icon z17-)
-power-plant-solar                                   # area z13- (also has icon z17-)
-power-plant-wind                                    # area z13- (also has icon z15-, caption(optional) z16-)
-power-substation                                    # area z13- (also has icon z17-, caption(optional) z18-)
-=== 50
-
-amenity-childcare                                   # area z13- (also has icon z17-, caption(optional) z17-)
-amenity-clinic                                      # area z13- (also has icon z17-, caption(optional) z17-)
-amenity-college                                     # area z13- (also has icon z16-, caption(optional) z16-)
-amenity-hospital                                    # area z13- (also has icon z14-, caption(optional) z15-)
-amenity-kindergarten                                # area z13- (also has icon z17-, caption(optional) z17-)
-amenity-school                                      # area z13- (also has icon z16-, caption(optional) z16-)
-amenity-university                                  # area z13- (also has icon z14-, caption(optional) z14-)
-=== 40
-
-aeroway-aerodrome                                   # area z10- (also has icon z14-, caption(optional) z14-)
-aeroway-aerodrome-international                     # area z10- (also has icon z7-, caption(optional) z10-)
-landuse-education                                   # area z13-
-landuse-retail                                      # area z13- (also has caption z16-)
-leisure-beach_resort                                # area z10- (also has icon z16-, caption(optional) z16-)
-natural-beach                                       # area z10- (also has caption z15-)
-natural-beach-gravel                                # area z10- (also has caption z15-)
-natural-beach-sand                                  # area z10- (also has caption z15-)
-natural-desert                                      # area z1- (also has caption z14-)
-natural-glacier                                     # area z1-
-natural-sand                                        # area z1- (also has caption z15-)
-=== 30
-
-natural-land                                        # area z1-
-place-islet                                         # area z10- (also has caption z14-)
-=== 20
-
-natural-coastline                                   # area z1-
-=== 10
--- a/data/styles/driving/include/priorities_2_BG-top.prio.txt
+++ b/data/styles/driving/include/priorities_2_BG-top.prio.txt
@@ -1,46 +0,0 @@
-# This file is automatically re-formatted and re-sorted in priorities descending order
-# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
-# are generated automatically for information only. Custom formatting and comments are not preserved.
-#
-# BG-top geometry: background lines and areas that should be always below foreground ones
-# (including e.g. layer=-10 underwater tunnels), but above background areas sorted by size (BG-by-size),
-# because ordering by size doesn't always work with e.g. water mapped over a forest,
-# so water should be on top of other landcover always, but linear waterways should be hidden beneath it.
-# Still, e.g. a layer=-1 BG-top feature will be rendered under a layer=0 BG-by-size feature
-# (so areal water tunnels are hidden beneath other landcover area) and a layer=1 landcover areas
-# are displayed above layer=0 BG-top.
-#
-# Priorities ranges' rendering order overview:
-# - overlays (icons, captions...)
-# - FG: foreground areas and lines
-# - BG-top: water (linear and areal)
-# - BG-by-size: landcover areas sorted by their size
-
-landuse-basin                                       # area z12-
-landuse-reservoir                                   # area z12- (also has caption z10-)
-landuse-salt_pond                                   # area z1-
-natural-water                                       # area z1- (also has caption z10-)
-natural-water-basin                                 # area z1- (also has caption z10-)
-natural-water-ditch                                 # area z13- (also has caption z17-)
-natural-water-drain                                 # area z13- (also has caption z17-)
-natural-water-lake                                  # area z1- (also has caption z10-)
-natural-water-lock                                  # area z1- (also has caption z10-)
-natural-water-moat                                  # area z1- (also has caption z17-)
-natural-water-pond                                  # area z1- (also has caption z10-)
-natural-water-reservoir                             # area z1- (also has caption z10-)
-natural-water-river                                 # area z1- (also has caption z10-)
-natural-water-tunnel                                # area z15-
-natural-water-wastewater                            # area z12- (also has caption z17-)
-waterway-dock                                       # area z1-
-=== 20
-
-natural-strait                                      # line z13- (also has caption z13-)
-waterway-canal                                      # line z13- (also has pathtext z13-)
-waterway-ditch                                      # line z13-
-waterway-drain                                      # line z13-
-waterway-fish_pass                                  # line z13- (also has pathtext z13-)
-waterway-river                                      # line z10- (also has pathtext z11-)
-waterway-stream                                     # line z13- (also has pathtext z13-)
-waterway-stream-ephemeral                           # line z13- (also has pathtext z13-)
-waterway-stream-intermittent                        # line z13- (also has pathtext z13-)
-=== 10
--- a/data/styles/driving/include/priorities_3_FG.prio.txt
+++ b/data/styles/driving/include/priorities_3_FG.prio.txt
@@ -1,481 +0,0 @@
-# This file is automatically re-formatted and re-sorted in priorities descending order
-# when generate_drules.sh is run. All comments (automatic priorities of e.g. optional captions, drule types visibilities, etc.)
-# are generated automatically for information only. Custom formatting and comments are not preserved.
-#
-# FG geometry: foreground lines and areas (e.g. buildings) are rendered always below overlays
-# and always on top of background geometry (BG-top & BG-by-size) even if a foreground feature
-# is layer=-10 (as tunnels should be visibile over landcover and water).
-#
-# Priorities ranges' rendering order overview:
-# - overlays (icons, captions...)
-# - FG: foreground areas and lines
-# - BG-top: water (linear and areal)
-# - BG-by-size: landcover areas sorted by their size
-
-aerialway-cable_car::dash                           # line::dash z12- (also has line z12-, pathtext z15-)
-aerialway-chair_lift::dash                          # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-drag_lift::dash                           # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-gondola::dash                             # line::dash z12- (also has line z12-, pathtext z15-)
-aerialway-j-bar::dash                               # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-magic_carpet::dash                        # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-mixed_lift::dash                          # line::dash z12- (also has line z12-, pathtext z15-)
-aerialway-platter::dash                             # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-rope_tow::dash                            # line::dash z13- (also has line z13-, pathtext z15-)
-aerialway-t-bar::dash                               # line::dash z13- (also has line z13-, pathtext z15-)
-=== 380
-
-aerialway-cable_car                                 # line z12- (also has line::dash z12-, pathtext z15-)
-aerialway-chair_lift                                # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-drag_lift                                 # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-gondola                                   # line z12- (also has line::dash z12-, pathtext z15-)
-aerialway-j-bar                                     # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-magic_carpet                              # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-mixed_lift                                # line z12- (also has line::dash z12-, pathtext z15-)
-aerialway-platter                                   # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-rope_tow                                  # line z13- (also has line::dash z13-, pathtext z15-)
-aerialway-t-bar                                     # line z13- (also has line::dash z13-, pathtext z15-)
-=== 370
-
-historic-citywalls                                  # line z14- (also has pathtext z16-)
-=== 360
-
-power-line                                          # line z19- (also has line::dash z19-)
-=== 350
-
-power-line::dash                                    # line::dash z19- (also has line z19-)
-=== 340
-
-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
-
-barrier-city_wall                                   # line z14- (also has pathtext z16-)
-barrier-fence                                       # line z16-
-barrier-guard_rail                                  # line z17-
-barrier-hedge                                       # line z16-
-barrier-wall                                        # line z16-
-barrier-yes                                         # line z16- (also has icon z16-, caption(optional) z16-)
-railway-funicular                                   # line z12-
-railway-funicular-bridge                            # line z12-
-railway-funicular-tunnel                            # line z12-
-railway-monorail                                    # line z14-
-railway-monorail-bridge                             # line z14-
-railway-monorail-tunnel                             # line z14-
-railway-narrow_gauge                                # line z15-
-railway-narrow_gauge-bridge                         # line z15-
-railway-narrow_gauge-tunnel                         # line z15-
-railway-tram                                        # line z13-
-railway-tram-bridge                                 # line z13-
-railway-tram-tunnel                                 # line z13-
-=== 320
-
-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-, 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 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-)
-railway-rail-highspeed::dash                        # line::dash z16- (also has line z10-)
-railway-rail-highspeed-bridge::dash                 # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-highspeed-tunnel::dash                 # line::dash z16- (also has line z10-, line(casing) z14-)
-railway-rail-main::dash                             # line::dash z16- (also has line z10-)
-railway-rail-main-bridge::dash                      # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-main-tunnel::dash                      # line::dash z16- (also has line z10-, line(casing) z14-)
-railway-rail-tourism::dash                          # line::dash z16- (also has line z10-, pathtext z14-)
-railway-rail-tourism-bridge::dash                   # line::dash z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, pathtext z14-)
-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-, pathtext z10-, shield::shield z10-)
-# === 289
-
-railway-rail-branch                                 # line z11- (also has line::dash z16-)
-railway-rail-branch-bridge                          # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-branch-tunnel                          # line z11- (also has line::dash z16-, line(casing) z14-)
-railway-rail-highspeed                              # line z10- (also has line::dash z16-)
-railway-rail-highspeed-bridge                       # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-highspeed-tunnel                       # line z10- (also has line::dash z16-, line(casing) z14-)
-railway-rail-main                                   # line z10- (also has line::dash z16-)
-railway-rail-main-bridge                            # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-main-tunnel                            # line z10- (also has line::dash z16-, line(casing) z14-)
-railway-rail-tourism                                # line z10- (also has line::dash z16-, pathtext z14-)
-railway-rail-tourism-bridge                         # line z10- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-, pathtext z14-)
-railway-rail-tourism-tunnel                         # line z10- (also has line::dash z16-, line(casing) z14-, pathtext z14-)
-=== 280
-
-# railway-rail-branch-tunnel                        # line(casing) z14- (also has line z11-, line::dash z16-)
-# railway-rail-highspeed-tunnel                     # line(casing) z14- (also has line z10-, line::dash z16-)
-# railway-rail-main-tunnel                          # line(casing) z14- (also has line z10-, line::dash z16-)
-# railway-rail-tourism-tunnel                       # line(casing) z14- (also has line z10-, line::dash z16-, pathtext z14-)
-# === 279
-
-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-, pathtext z10-, shield::shield z12-)
-# === 269
-
-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-, 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 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-, 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 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-, 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 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-, pathtext z11-, shield::shield z11-)
-# === 225
-
-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-, 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 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-, 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-)
-railway-rail-bridge::dash                           # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-service::dash                          # line::dash z17- (also has line z16-)
-railway-rail-service-bridge::dash                   # line::dash z17- (also has line z16-, line::bridgeblack z16-, line::bridgewhite z16-)
-railway-rail-service-tunnel::dash                   # line::dash z17- (also has line(casing) z16-, line z16-)
-railway-rail-spur::dash                             # line::dash z17- (also has line z15-)
-railway-rail-spur-bridge::dash                      # line::dash z17- (also has line z15-, line::bridgeblack z16-, line::bridgewhite z15-)
-railway-rail-spur-tunnel::dash                      # line::dash z17- (also has line(casing) z15-, line z15-)
-railway-rail-tunnel::dash                           # line::dash z16- (also has line z11-, line(casing) z14-)
-railway-rail-utility::dash                          # line::dash z17- (also has line z13-)
-railway-rail-utility-bridge::dash                   # line::dash z17- (also has line z13-, line::bridgeblack z16-, line::bridgewhite z13-)
-railway-rail-utility-tunnel::dash                   # line::dash z17- (also has line z13-, line(casing) z14-)
-railway-subway::dash                                # line::dash z16- (also has line z13-)
-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::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-, pathtext z15-)
-highway-path-bicycle::cycleline                     # line::cycleline z14- (also has line z15-, pathtext z15-)
-=== 219
-
-highway-cycleway                                    # line z13- (also has pathtext z15-)
-highway-cycleway-bridge                             # line z13- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-cycleway-tunnel                             # line z13- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-=== 218
-
-railway-light_rail                                  # line z13- (also has line::dash z16-)
-railway-light_rail-bridge                           # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail                                        # line z11- (also has line::dash z16-)
-railway-rail-bridge                                 # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-service                                # line z16- (also has line::dash z17-)
-railway-rail-service-bridge                         # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-, line::dash z17-)
-railway-rail-service-tunnel                         # line z16- (also has line(casing) z16-, line::dash z17-)
-railway-rail-spur                                   # line z15- (also has line::dash z17-)
-railway-rail-spur-bridge                            # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-, line::dash z17-)
-railway-rail-spur-tunnel                            # line z15- (also has line(casing) z15-, line::dash z17-)
-railway-rail-tunnel                                 # line z11- (also has line::dash z16-, line(casing) z14-)
-railway-rail-utility                                # line z13- (also has line::dash z17-)
-railway-rail-utility-bridge                         # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z17-)
-railway-rail-utility-tunnel                         # line z13- (also has line::dash z17-, line(casing) z14-)
-railway-subway                                      # line z13- (also has line::dash z16-)
-railway-subway-bridge                               # line z13- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
-=== 210
-
-# railway-rail-service-tunnel                       # line(casing) z16- (also has line z16-, line::dash z17-)
-# railway-rail-spur-tunnel                          # line(casing) z15- (also has line z15-, line::dash z17-)
-# railway-rail-tunnel                               # line(casing) z14- (also has line z11-, line::dash z16-)
-# railway-rail-utility-tunnel                       # line(casing) z14- (also has line z13-, line::dash z17-)
-# === 209
-
-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-, 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 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-)
-highway-raceway                                     # line z14- (also has pathtext z16-)
-highway-track                                       # line z15- (also has pathtext z15-)
-highway-track-area                                  # line z15- (also has pathtext z15-)
-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-)
-=== 180
-
-highway-construction                                # line z13- (also has pathtext z15-)
-leisure-track                                       # line z15- (also has caption z16-)
-railway-abandoned                                   # line z16-
-railway-construction                                # line z15-
-railway-disused                                     # line z16-
-railway-disused-bridge                              # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
-railway-disused-tunnel                              # line z16-
-railway-miniature                                   # line z16-
-railway-miniature-bridge                            # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
-railway-miniature-tunnel                            # line z16-
-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-
-=== 160
-
-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-)
-=== 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::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::tunnelCasing z17-, pathtext z16-)
-highway-track-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
-=== 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::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::tunnelBackground z17-, pathtext z16-)
-highway-track-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
-=== 153
-
-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::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::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::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::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-)
-railway-preserved-bridge::bridgewhite               # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-)
-railway-rail-branch-bridge::bridgewhite             # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
-railway-rail-bridge::bridgewhite                    # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
-railway-rail-highspeed-bridge::bridgewhite          # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-)
-railway-rail-main-bridge::bridgewhite               # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z16-)
-railway-rail-service-bridge::bridgewhite            # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-, line::dash z17-)
-railway-rail-spur-bridge::bridgewhite               # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-, line::dash z17-)
-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-)
-=== 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::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::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::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::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-)
-railway-preserved-bridge::bridgeblack               # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-)
-railway-rail-branch-bridge::bridgeblack             # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-highspeed-bridge::bridgeblack          # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-main-bridge::bridgeblack               # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z16-)
-railway-rail-service-bridge::bridgeblack            # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-, line::dash z17-)
-railway-rail-spur-bridge::bridgeblack               # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-, line::dash z17-)
-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-)
-=== 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-)
-=== 130
-
-piste:type-connection                               # line z15-
-piste:type-downhill                                 # line z14- (also has pathtext z15-)
-piste:type-downhill-advanced                        # line z14- (also has pathtext z15-)
-piste:type-downhill-easy                            # line z14- (also has pathtext z15-)
-piste:type-downhill-expert                          # line z14- (also has pathtext z15-)
-piste:type-downhill-freeride                        # line z14- (also has pathtext z15-)
-piste:type-downhill-intermediate                    # line z14- (also has pathtext z15-)
-piste:type-downhill-novice                          # line z14- (also has pathtext z15-)
-piste:type-hike                                     # line z15- (also has pathtext z15-)
-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-)
-=== 120
-
-building:part                                       # area z16-
-=== 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-
-=== 100
-
-boundary-administrative-2                           # line z2-
-boundary-administrative-3                           # line z4
-boundary-administrative-4                           # line z5-
-=== 90
-
-man_made-cutline                                    # line z14-
-route-ferry                                         # line z7- (also has pathtext z10-)
-=== 80
-
-aeroway-runway                                      # line z12-
-aeroway-taxiway                                     # line z14-
-barrier-ditch                                       # line z16-
-=== 70
-
-isoline-step_10                                     # line z15- (also has pathtext z17-)
-isoline-step_100                                    # line z12- (also has pathtext z14-)
-isoline-step_1000                                   # line z11- (also has pathtext z11-)
-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-)
-=== 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-)
-waterway-dam                                        # line z14- and area z14- (also has pathtext z15-)
-=== 30
-
-landuse-military                                    # area z12- (also has icon z16-, caption(optional) z17-)
-landuse-military-danger_area                        # area z10- (also has icon z16-, caption(optional) z17-)
-=== 25
-
-amenity-prison                                      # area z12- (also has icon z17-, caption(optional) z17-)
-boundary-aboriginal_lands                           # line z10- and area z10-16 (also has caption z10-16)
-boundary-national_park                              # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17)
-boundary-protected_area-1                           # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17)
-leisure-nature_reserve                              # area z10-17 (also has icon z11-17, caption(optional) z12-17, caption z18-)
-=== 20
-
-piste:type-snow_park                                # area z14- (also has caption z15-)
-=== 15
-
-man_made-bridge                                     # area z14-
-=== 10
--- a/data/styles/driving/include/priorities_4_overlays.prio.txt
+++ b/data/styles/driving/include/priorities_4_overlays.prio.txt
--- a/data/styles/driving/include/ways.mapcss
+++ b/data/styles/driving/include/ways.mapcss
@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/ways.mapcss");
--- a/data/styles/driving/include/ways_label.mapcss
+++ b/data/styles/driving/include/ways_label.mapcss
@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/ways_label.mapcss");
--- a/data/styles/driving/light/colors.mapcss
+++ b/data/styles/driving/light/colors.mapcss
@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/light/colors.mapcss");
--- a/data/styles/driving/light/style.mapcss
+++ b/data/styles/driving/light/style.mapcss
@@ -1,9 +0,0 @@
-@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/subways.mapcss");
-@import("../../default/light/dynamic_colors.mapcss");
--- a/data/styles/hiking/dark/style.mapcss
+++ b/data/styles/hiking/dark/style.mapcss
@@ -1,9 +0,0 @@
-@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/subways.mapcss");
-@import("../../default/dark/dynamic_colors.mapcss");
--- a/data/styles/hiking/include/Subways.mapcss
+++ b/data/styles/hiking/include/Subways.mapcss
@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/subways.mapcss");
--- a/data/styles/hiking/include/icons_label_colors.mapcss
+++ b/data/styles/hiking/include/icons_label_colors.mapcss
@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/icons_label_colors.mapcss");
--- a/data/styles/hiking/light/style.mapcss
+++ b/data/styles/hiking/light/style.mapcss
@@ -1,9 +0,0 @@
-@import("colors.mapcss");
-@import("../include/basemap.mapcss");
-@import("../include/basemap_label.mapcss");
-@import("../include/ways.mapcss");
-@import("../include/ways_label.mapcss");
-@import("../include/icons.mapcss");
-@import("../include/icons_label_colors.mapcss");
-@import("../include/subways.mapcss");
-@import("../../default/light/dynamic_colors.mapcss");
--- a/data/styles/outdoors/dark/colors.mapcss
+++ b/data/styles/outdoors/dark/colors.mapcss
--- a/data/styles/default/dark/dynamic_colors.mapcss
+++ b/data/styles/default/dark/dynamic_colors.mapcss
@@ -1,3 +1,12 @@
+@import("colors.mapcss");
+@import("../include/defaults_new.mapcss");
+@import("../include/Basemap.mapcss");
+@import("../include/Basemap_label.mapcss");
+@import("../include/Roads.mapcss");
+@import("../include/Roads_label.mapcss");
+@import("../include/Icons.mapcss");
+@import("../include/Subways.mapcss");
+
 colors
 {
  GuiText-color: #FFFFFF;
@@ -104,8 +113,8 @@ colors
  BookmarkYellow-color: #FFC800;
  BookmarkOrange-color: #FF9600;
  BookmarkDeepOrange-color: #F06432;
-  BookmarkBrown-color: #8C4E39;
-  BookmarkGray-color: #808080;
+  BookmarkBrown-color: #804633;
+  BookmarkGray-color: #737373;
  BookmarkBlueGray-color: #597380;
  SearchmarkPreparing-color: #597380;
  SearchmarkNotAvailable-color: #597380;
--- a/data/styles/outdoors/include/Basemap.mapcss
+++ b/data/styles/outdoors/include/Basemap.mapcss
@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap.mapcss");
+@import("../../default/include/Basemap.mapcss");


 /* 6.WATER */
--- a/data/styles/outdoors/include/Basemap_label.mapcss
+++ b/data/styles/outdoors/include/Basemap_label.mapcss
@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/basemap_label.mapcss");
+@import("../../default/include/Basemap_label.mapcss");

 /* Barriers, cliffs */

--- a/data/styles/outdoors/include/Icons.mapcss
+++ b/data/styles/outdoors/include/Icons.mapcss
@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/icons.mapcss");
+@import("../../default/include/Icons.mapcss");


 /* 2. NATURAL */
--- a/data/styles/outdoors/include/Roads.mapcss
+++ b/data/styles/outdoors/include/Roads.mapcss
@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/ways.mapcss");
+@import("../../default/include/Roads.mapcss");


 /* Make all roads more contrast */
--- a/data/styles/outdoors/include/Roads_label.mapcss
+++ b/data/styles/outdoors/include/Roads_label.mapcss
@@ -1,5 +1,5 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/ways_label.mapcss");
+@import("../../default/include/Roads_label.mapcss");


 line|z13-[highway=track],
--- a/data/styles/outdoors/include/Subways.mapcss
+++ b/data/styles/outdoors/include/Subways.mapcss
@@ -1,2 +1,2 @@
 /* Keep here changes of the base map style file only. */
-@import("../../default/include/subways.mapcss");
+@import("../../default/include/Subways.mapcss");
--- a/data/styles/outdoors/include/defaults_new.mapcss
+++ b/data/styles/outdoors/include/defaults_new.mapcss
@@ -0,0 +1,24 @@
+way|z1-12::*
+{
+  linejoin: bevel;
+}
+
+way|z13-::*
+{
+  linejoin: round;
+}
+
+way|z1-15::*
+{
+  linecap: butt;
+}
+
+way|z16-::*
+{
+  linecap: round;
+}
+
+*::int_name
+{
+  text-offset: 1;
+}
--- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
--- a/data/styles/outdoors/include/priorities_2_BG-top.prio.txt
+++ b/data/styles/outdoors/include/priorities_2_BG-top.prio.txt
--- a/data/styles/outdoors/include/priorities_3_FG.prio.txt
+++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt
--- a/Show More
+++ b/Show More