[generator] add country signing

Signed-off-by: zyphlar <zyphlar@gmail.com>
2026-01-21 18:53:51 +00:00 · 2026-01-20 18:54:19 -08:00
359 changed files with 6666 additions and 3065 deletions
--- a/.forgejo/workflows/map-generator.yml
+++ b/.forgejo/workflows/map-generator.yml
@@ -490,6 +490,7 @@ jobs:
      volumes:
        - /mnt/4tbexternal/:/mnt/4tbexternal/
        - /mnt/4tbexternal/osm-planet:/home/planet
+        - /root/keys:~/keys
      options: --ulimit nofile=262144:262144
    concurrency:
      group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
@@ -518,6 +519,18 @@ jobs:
        run: |
          cd ~/comaps
          bash ./tools/unix/maps/docker_maps_generator.sh
+      - name: Sign countries.txt and copy to latest
+        shell: bash
+        run: |
+          shopt -s nullglob
+          buildfolder=$(find /mnt/4tbexternal/osm-maps/ -mindepth 1 -maxdepth 1 -iname "2*" -type d | sort -n -r | head -1 | cut -d/ -f5)
+          builddate=$(find /mnt/4tbexternal/osm-maps/*/ -mindepth 1 -maxdepth 1 -iname "2*" -type d | sort -n -r | head -1 | cut -d/ -f6)
+          cd /mnt/4tbexternal/osm-maps/$buildfolder/$builddate
+          openssl pkeyutl -sign -inkey ~/keys/countries_ed25519_sk.pem -rawin -in countries.txt -out countries.txt.sig
+          openssl pkeyutl -verify -pubin -inkey ~/keys/countries_ed25519_pk.pem -rawin -in countries.txt -sigfile countries.txt.sig
+          cd ..
+          mkdir -p latest
+          cp /mnt/4tbexternal/osm-maps/$buildfolder/$builddate/countries* latest
      - name: Notify Zulip
        run: |
          curl -X POST https://comaps.zulipchat.com/api/v1/messages \
@@ -566,6 +579,9 @@ jobs:
            echo "<$(date +%T)> Found top level: $(ls -alt /mnt/4tbexternal/osm-maps/*)"
            echo "<$(date +%T)> Found second level: $(ls -alt /mnt/4tbexternal/osm-maps/$buildfolder/*)"
          fi
+
+          echo "<$(date +%T)> Uploading countries.txt/sig from $buildfolder/latest..."
+          ./upload_to_cdn.sh /mnt/4tbexternal/osm-maps/$buildfolder/latest
      - name: Notify Zulip
        run: |
          curl -X POST https://comaps.zulipchat.com/api/v1/messages \
--- 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
@@ -3,9 +3,8 @@
  android:width="74dp"
  android:height="57dp"
  android:viewportWidth="74"
-  android:viewportHeight="57"
-  android:tint="?iconTint">
+  android:viewportHeight="57">
  <path
-    android:fillColor="#FFFFFF"
-    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.425L25.208,36.215c-2.353,2.373 -2.331,6.197 0.046,8.544 2.379,2.345 6.209,2.326 8.562,-0.048L48.119,30.283c-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.042L65.323,13.832c2.091,-0.869 4.357,1.392 3.486,3.478L58.355,39.913c-1.219,2.607 -5.053,1.736 -5.053,-1.044V34.451c-0.506,-0.122 -1.006,-0.296 -1.494,-0.525L37.505,48.354C33.137,52.76 26.02,52.798 21.604,48.44 17.191,44.082 17.152,36.979 21.52,32.573L36.117,17.847c1.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.091C8.633,32.629 5,29.002 5,24.538c0,-4.466 3.633,-8.091 8.108,-8.091 1.424,0 2.764,0.367 3.928,1.012z" />
+    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" />
 </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
@@ -6,9 +6,9 @@
  android:viewportHeight="80">
    <path
      android:pathData="m4.858,10.076c0,-5.523 4.477,-10 10,-10h60c5.523,0 10,4.477 10,10v60c0,5.523 -4.477,10 -10,10h-60c-5.523,0 -10,-4.477 -10,-10z"
-      android:fillColor="@color/base_red"
+      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.333L31.879,49.485c-2.518,2.534 -2.495,6.616 0.049,9.122 2.546,2.504 6.646,2.483 9.164,-0.051L56.401,43.152c-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.383L74.814,25.588c2.238,-0.928 4.663,1.486 3.731,3.713L67.356,53.433c-1.305,2.783 -5.408,1.854 -5.408,-1.115V47.601c-0.542,-0.13 -1.077,-0.316 -1.599,-0.561L45.04,62.444C40.365,67.148 32.747,67.189 28.021,62.536 23.298,57.883 23.256,50.299 27.931,45.595L43.554,29.873c1.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: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"/>
 </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/layout/map_buttons_zoom.xml
+++ b/android/app/src/main/res/layout/map_buttons_zoom.xml
@@ -12,7 +12,7 @@
    android:tint="?iconTint"
    app:srcCompat="@drawable/ic_plus"
    app:shapeAppearanceOverlay="@style/ShapeAppearance.MapButton.Zoom.Minus"
-    android:layout_marginBottom="@dimen/margin_eighth_plus"
+    android:layout_marginBottom="@dimen/margin_eighth"
    android:contentDescription="@string/zoom_in"/>
  <com.google.android.material.floatingactionbutton.FloatingActionButton
    android:id="@+id/nav_zoom_out"
--- 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/dimens.xml
+++ b/android/app/src/main/res/values/dimens.xml
@@ -8,7 +8,6 @@

  <!-- margins -->
  <dimen name="margin_eighth">2dp</dimen>
-  <dimen name="margin_eighth_plus">3dp</dimen>
  <dimen name="margin_quarter">4dp</dimen>
  <dimen name="margin_quarter_plus">6dp</dimen>
  <dimen name="margin_half">8dp</dimen>
--- 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/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/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/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/transit_systems.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/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 +0,0 @@
-@import("../../default/include/priorities_1_BG-by-size.prio.txt")
--- a/data/styles/cycling/include/priorities_2_BG-top.prio.txt
+++ b/data/styles/cycling/include/priorities_2_BG-top.prio.txt
@@ -1 +0,0 @@
-@import("../../default/include/priorities_2_BG-top.prio.txt")
--- a/data/styles/cycling/include/priorities_3_FG.prio.txt
+++ b/data/styles/cycling/include/priorities_3_FG.prio.txt
@@ -1,10 +0,0 @@
-@import("../../default/include/priorities_3_FG.prio.txt")
-
-highway-tertiary
-highway-tertiary-bridge
-highway-tertiary-tunnel
-highway-unclassified
-highway-unclassified-area
-highway-unclassified-bridge
-highway-unclassified-tunnel
-=== 400
--- a/data/styles/cycling/include/priorities_4_overlays.prio.txt
+++ b/data/styles/cycling/include/priorities_4_overlays.prio.txt
@@ -1 +0,0 @@
-@import("../../default/include/priorities_4_overlays.prio.txt")
--- a/data/styles/cycling/include/transit_systems.mapcss
+++ b/data/styles/cycling/include/transit_systems.mapcss
@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/transit_systems.mapcss");
--- a/data/styles/cycling/include/ways.mapcss
+++ b/data/styles/cycling/include/ways.mapcss
@@ -1,52 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/ways.mapcss");
-
-line|z12-[highway=cycleway],
-line|z13-[highway=path][bicycle=designated]::cycleline,
-line|z14-[highway=footway][bicycle=designated]::cycleline,
-{color: @cycleway;}
-
-line|z12[highway=cycleway]
-{width: 1.9;}
-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|z13[highway=path][bicycle=designated]::cycleline,
-{width: 1.4;}
-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|z14[highway=footway][bicycle=designated]::cycleline,
-{width: 1.6;}
-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/transit_systems.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/transit_systems.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/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/Basemap_label.mapcss
+++ b/data/styles/default/include/Basemap_label.mapcss
--- 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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */

@@ -2373,16 +2374,16 @@ area|z14-[highway=services],
 area|z15-[highway=rest_area],
 {text-position: center;}

-node|z15-[amenity=fuel],
-node|z17-[amenity=charging_station][motorcar?][!capacity],
-node|z17-[amenity=charging_station][motorcar?][capacity=1],
-node|z17-[amenity=charging_station][motorcar?][capacity=2],
-node|z16-[amenity=charging_station][motorcar?][capacity?],
+node|z14-[amenity=fuel],
+node|z15-[amenity=charging_station][motorcar?][!capacity],
+node|z15-[amenity=charging_station][motorcar?][capacity=1],
+node|z15-[amenity=charging_station][motorcar?][capacity=2],
+node|z14-[amenity=charging_station][motorcar?][capacity?],
 area|z14-[highway=services],
 area|z15-[highway=rest_area],
 area|z15-[landuse=garages],
 node|z15-[amenity=sanitary_dump_station],
-node|z18-[amenity=charging_station],
+node|z16-[amenity=charging_station],
 node|z17-[amenity=bicycle_parking],
 node|z17-[amenity=motorcycle_parking],
 node|z17-[amenity=car_wash],
@@ -2395,30 +2396,46 @@ node|z18-[amenity=car_sharing],
 area|z18-[landuse=garages],
 {font-size: 11;}

-node|z15-[amenity=fuel],
-{icon-image: fuel-m.svg; text-offset: 1;}
+node|z14[amenity=fuel],
+{icon-image: fuel-s.svg; text-offset: 1; icon-min-distance: 20;}
+node|z15[amenity=fuel],
+{icon-image: fuel-m.svg; icon-min-distance: 20;}
+node|z16[amenity=fuel],
+{icon-image: fuel-m.svg; icon-min-distance: 10;}
+node|z17-[amenity=fuel],
+{icon-image: fuel-m.svg;}
+node|z18-[amenity=fuel],
+{font-size: 11;}

-node|z17-[amenity=charging_station][motorcar?],
-node|z18-[amenity=charging_station][motorcycle?],
-node|z18-[amenity=charging_station][bicycle?],
-node|z18-[amenity=charging_station][motorcar=not],
-node|z18-[amenity=charging_station],
+node|z15-[amenity=charging_station][motorcar?],
+node|z16-[amenity=charging_station][motorcycle?],
+node|z16-[amenity=charging_station][bicycle?],
+node|z16-[amenity=charging_station][motorcar=not],
+node|z16-[amenity=charging_station],
 {icon-image: charging_station-small-m.svg;}

-node|z16-[amenity=charging_station][motorcar?][capacity?],
+node|z14[amenity=charging_station][motorcar?][capacity?],
+{icon-image: charging_station-s.svg;}
+node|z15-[amenity=charging_station][motorcar?][capacity?],
 {icon-image: charging_station-m.svg;}

-node|z16[amenity=charging_station][motorcar?][!capacity],
-node|z16[amenity=charging_station][motorcar?][capacity=1],
-node|z16[amenity=charging_station][motorcar?][capacity=2],
+node|z14[amenity=charging_station][motorcar?][!capacity],
+node|z14[amenity=charging_station][motorcar?][capacity=1],
+node|z14[amenity=charging_station][motorcar?][capacity=2],
 {icon-image: none;}
-node|z17-[amenity=charging_station][motorcar?][!capacity],
-node|z17-[amenity=charging_station][motorcar?][capacity=1],
-node|z17-[amenity=charging_station][motorcar?][capacity=2],
+node|z15-[amenity=charging_station][motorcar?][!capacity],
+node|z15-[amenity=charging_station][motorcar?][capacity=1],
+node|z15-[amenity=charging_station][motorcar?][capacity=2],
 {icon-image: charging_station-small-m.svg;}

-node|z16[amenity=charging_station][motorcar?],
-{text-offset: 1;font-size: 10;}
+node|z14[amenity=charging_station][motorcar?],
+{text-offset: 1;font-size: 10;icon-min-distance: 20;}
+node|z15[amenity=charging_station][motorcar?],
+{icon-min-distance: 20;}
+node|z16[amenity=charging_station],
+{icon-min-distance: 10;}
+node|z18-[amenity=charging_station],
+{font-size: 11;}

 area|z14[highway=services],
 {icon-image: car-repair-s.svg; icon-min-distance: 20;}
@@ -2519,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/Icons_Label_Colors.mapcss
+++ b/data/styles/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/transit_systems.mapcss
+++ b/data/styles/default/include/transit_systems.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/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
@@ -85,15 +85,15 @@ landuse-cemetery-christian                          # area z10- (also has icon z
 === 180

 amenity-car_wash                                    # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-charging_station                            # area z16- (also has icon z18-, caption(optional) z18-)
-amenity-charging_station-bicycle                    # area z16- (also has icon z18-, caption(optional) z18-)
-amenity-charging_station-carless                    # area z16- (also has icon z18-, caption(optional) z18-)
-amenity-charging_station-motorcar                   # area z15- (also has icon z16-, caption(optional) z16-)
-amenity-charging_station-motorcycle                 # area z16- (also has icon z18-, caption(optional) z18-)
-amenity-charging_station-small                      # area z15- (also has icon z17-, caption(optional) z18-)
+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 z15-, caption(optional) z15-)
+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-)
@@ -192,12 +192,12 @@ 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-, caption 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-, caption z17-)
-leisure-park-no-access                              # area z10- (also has icon z14-, caption(optional) z14-, caption z17-)
-leisure-park-permissive                             # area z10- (also has icon z14-, caption(optional) z14-, caption z17-)
-leisure-park-private                                # area z10- (also has icon z14-, caption(optional) z14-, caption z17-)
+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-)
@@ -234,7 +234,7 @@ amenity-college                                     # area z13- (also has icon z
 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-, caption z14-)
+amenity-university                                  # area z13- (also has icon z14-, caption(optional) z14-)
 === 40

 aeroway-aerodrome                                   # area z10- (also has icon z14-, caption(optional) z14-)
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -114,7 +114,7 @@ natural-water-reservoir                             # caption z10- (also has are
 barrier-toll_booth                                  # icon z16- (also has caption(optional) z16-)
 === 6600

-historic-ruins                                      # icon z17- and caption z17- (also has caption(optional) z17-)
+historic-ruins                                      # icon z17- (also has caption(optional) z17-)
 === 6551

 historic-castle                                     # icon z12- (also has caption(optional) z12-)
@@ -326,13 +326,13 @@ tourism-zoo                                         # icon z13- (also has captio
 === 5200

 amenity-hospital                                    # icon z14- (also has caption(optional) z15-, area z13-)
-amenity-university                                  # icon z14- and caption z14- (also has caption(optional) z14-, area z13-)
+amenity-university                                  # icon z14- (also has caption(optional) z14-, area z13-)
 leisure-stadium                                     # icon z13- (also has caption(optional) z13-, area z13-)
 === 5100

 leisure-marina                                      # icon z16- (also has caption(optional) z16-)
-leisure-park                                        # icon z14- and caption z17- (also has caption(optional) z14-, area z10-)
-leisure-park-permissive                             # icon z14- and caption z17- (also has caption(optional) z14-, area z10-)
+leisure-park                                        # icon z14- (also has caption(optional) z14-, area z10-)
+leisure-park-permissive                             # icon z14- (also has caption(optional) z14-, area z10-)
 mountain_pass                                       # icon z14- (also has caption(optional) z15-)
 place-square                                        # caption z16-
 === 5050
@@ -374,11 +374,11 @@ tourism-attraction                                  # icon z14- (also has captio
 tourism-gallery                                     # icon z15- (also has caption(optional) z15-)
 === 4300

-amenity-charging_station-small                      # icon z17- (also has caption(optional) z18-, area z15-)
+amenity-charging_station-small                      # icon z15- (also has caption(optional) z16-, area z15-)
 === 4280

-amenity-charging_station-motorcar                   # icon z16- (also has caption(optional) z16-, area z15-)
-amenity-fuel                                        # icon z15- (also has caption(optional) z15-, area z15-)
+amenity-charging_station-motorcar                   # icon z14- (also has caption(optional) z14-, area z15-)
+amenity-fuel                                        # icon z14- (also has caption(optional) z14-, area z15-)
 === 4270

 highway-services                                    # icon z14- (also has caption(optional) z14-, area z13-)
@@ -429,16 +429,16 @@ tourism-chalet                                      # icon z16- (also has captio
 shop-car_repair-tyres                               # icon z15- (also has caption(optional) z15-)
 === 3800

-amenity-charging_station-motorcycle                 # icon z18- (also has caption(optional) z18-, area z16-)
+amenity-charging_station-motorcycle                 # icon z16- (also has caption(optional) z16-, area z16-)
 === 3752

-amenity-charging_station-bicycle                    # icon z18- (also has caption(optional) z18-, area z16-)
+amenity-charging_station-bicycle                    # icon z16- (also has caption(optional) z16-, area z16-)
 === 3751

-amenity-charging_station                            # icon z18- (also has caption(optional) z18-, area z16-)
+amenity-charging_station                            # icon z16- (also has caption(optional) z16-, area z16-)
 === 3750

-amenity-charging_station-carless                    # icon z18- (also has caption(optional) z18-, area z16-)
+amenity-charging_station-carless                    # icon z16- (also has caption(optional) z16-, area z16-)
 === 3749

 railway-subway_entrance                             # icon z16- (also has caption(optional) z17-)
@@ -838,7 +838,7 @@ highway-living_street-bridge                        # pathtext z14- (also has li
 highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line(casing) z16-)
 landuse-plant_nursery                               # icon z17- (also has caption(optional) z17-, area z12-)
 leisure-bowling_alley                               # icon z17- (also has caption(optional) z17-)
-leisure-garden                                      # icon z16- and caption z17- (also has caption(optional) z16-, area z12-)
+leisure-garden                                      # icon z16- (also has caption(optional) z16-, area z12-)
 leisure-swimming_pool                               # icon z17- (also has caption(optional) z17-, area z13-)
 office-diplomatic                                   # icon z17- (also has caption(optional) z17-, area z15-)
 tourism-zoo-petting                                 # icon z15- (also has caption(optional) z15-)
@@ -1396,8 +1396,8 @@ amenity-parking-private                             # icon z18- (also has captio
 amenity-parking-street_side-private                 # icon z18- (also has caption(optional) z18-, area z17-)
 amenity-parking-underground-private                 # icon z18- (also has caption(optional) z18-)
 amenity-parking_entrance-private                    # icon z19- (also has caption(optional) z19-)
-leisure-park-no-access                              # icon z14- and caption z17- (also has caption(optional) z14-, area z10-)
-leisure-park-private                                # icon z14- and caption z17- (also has caption(optional) z14-, area z10-)
+leisure-park-no-access                              # icon z14- (also has caption(optional) z14-, area z10-)
+leisure-park-private                                # icon z14- (also has caption(optional) z14-, area z10-)
 leisure-swimming_pool-private                       # icon z17- (also has caption(optional) z17-, area z13-)
 === 100

@@ -1434,7 +1434,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # barrier-toll_booth                                # caption(optional) z16- (also has icon z16-)
 # === -3400

-# historic-ruins                                    # caption(optional) z17- (also has icon z17-, caption z17-)
+# historic-ruins                                    # caption(optional) z17- (also has icon z17-)
 # === -3449

 # historic-castle                                   # caption(optional) z12- (also has icon z12-)
@@ -1604,13 +1604,13 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -4800

 # amenity-hospital                                  # caption(optional) z15- (also has icon z14-, area z13-)
-# amenity-university                                # caption(optional) z14- (also has icon z14-, caption z14-, area z13-)
+# amenity-university                                # caption(optional) z14- (also has icon z14-, area z13-)
 # leisure-stadium                                   # caption(optional) z13- (also has icon z13-, area z13-)
 # === -4900

 # leisure-marina                                    # caption(optional) z16- (also has icon z16-)
-# leisure-park                                      # caption(optional) z14- (also has icon z14-, caption z17-, area z10-)
-# leisure-park-permissive                           # caption(optional) z14- (also has icon z14-, caption z17-, area z10-)
+# leisure-park                                      # caption(optional) z14- (also has icon z14-, area z10-)
+# leisure-park-permissive                           # caption(optional) z14- (also has icon z14-, area z10-)
 # mountain_pass                                     # caption(optional) z15- (also has icon z14-)
 # === -4950

@@ -1650,11 +1650,11 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-gallery                                   # caption(optional) z15- (also has icon z15-)
 # === -5700

-# amenity-charging_station-small                    # caption(optional) z18- (also has icon z17-, area z15-)
+# amenity-charging_station-small                    # caption(optional) z16- (also has icon z15-, area z15-)
 # === -5720

-# amenity-charging_station-motorcar                 # caption(optional) z16- (also has icon z16-, area z15-)
-# amenity-fuel                                      # caption(optional) z15- (also has icon z15-, area z15-)
+# amenity-charging_station-motorcar                 # caption(optional) z14- (also has icon z14-, area z15-)
+# amenity-fuel                                      # caption(optional) z14- (also has icon z14-, area z15-)
 # === -5730

 # highway-services                                  # caption(optional) z14- (also has icon z14-, area z13-)
@@ -1705,16 +1705,16 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-car_repair-tyres                             # caption(optional) z15- (also has icon z15-)
 # === -6200

-# amenity-charging_station-motorcycle               # caption(optional) z18- (also has icon z18-, area z16-)
+# amenity-charging_station-motorcycle               # caption(optional) z16- (also has icon z16-, area z16-)
 # === -6248

-# amenity-charging_station-bicycle                  # caption(optional) z18- (also has icon z18-, area z16-)
+# amenity-charging_station-bicycle                  # caption(optional) z16- (also has icon z16-, area z16-)
 # === -6249

-# amenity-charging_station                          # caption(optional) z18- (also has icon z18-, area z16-)
+# amenity-charging_station                          # caption(optional) z16- (also has icon z16-, area z16-)
 # === -6250

-# amenity-charging_station-carless                  # caption(optional) z18- (also has icon z18-, area z16-)
+# amenity-charging_station-carless                  # caption(optional) z16- (also has icon z16-, area z16-)
 # === -6251

 # railway-subway_entrance                           # caption(optional) z17- (also has icon z16-)
@@ -1934,7 +1934,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # attraction-roller_coaster                         # caption(optional) z17- (also has icon z17-)
 # landuse-plant_nursery                             # caption(optional) z17- (also has icon z17-, area z12-)
 # leisure-bowling_alley                             # caption(optional) z17- (also has icon z17-)
-# leisure-garden                                    # caption(optional) z16- (also has icon z16-, caption z17-, area z12-)
+# leisure-garden                                    # caption(optional) z16- (also has icon z16-, area z12-)
 # leisure-swimming_pool                             # caption(optional) z17- (also has icon z17-, area z13-)
 # office-diplomatic                                 # caption(optional) z17- (also has icon z17-, area z15-)
 # tourism-zoo-petting                               # caption(optional) z15- (also has icon z15-)
@@ -2394,8 +2394,8 @@ xmas-tree                                           # icon z18-
 # amenity-parking-street_side-private               # caption(optional) z18- (also has icon z18-, area z17-)
 # amenity-parking-underground-private               # caption(optional) z18- (also has icon z18-)
 # amenity-parking_entrance-private                  # caption(optional) z19- (also has icon z19-)
-# leisure-park-no-access                            # caption(optional) z14- (also has icon z14-, caption z17-, area z10-)
-# leisure-park-private                              # caption(optional) z14- (also has icon z14-, caption z17-, area z10-)
+# leisure-park-no-access                            # caption(optional) z14- (also has icon z14-, area z10-)
+# leisure-park-private                              # caption(optional) z14- (also has icon z14-, area z10-)
 # leisure-swimming_pool-private                     # caption(optional) z17- (also has icon z17-, area z13-)
 # === -9900

--- 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/transit_systems.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/subway-vienna-m.svg
+++ b/data/styles/default/light/symbols/subway-vienna-m.svg
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="18" height="18" version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/><circle cx="12" cy="12" r="11" fill="#1267CE"/><path d="m12 19.141c-2.6667 0-6-1.8076-6-6.141v-7.0295h4v6.9295c0 0.66086 0.66667 1.9 2 1.9 1.3333 0 2-1.0119 2-1.8v-7.0295h4v6.8295c0 4.5333-3.3333 6.341-6 6.341z" fill="#fff"/></svg>
+<svg width="18" height="18" version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/><circle cx="12" cy="12" r="11" fill="#3b87c9"/><path d="m12 19.141c-2.6667 0-6-1.8076-6-6.141v-7.0295h4v6.9295c0 0.66086 0.66667 1.9 2 1.9 1.3333 0 2-1.0119 2-1.8v-7.0295h4v6.8295c0 4.5333-3.3333 6.341-6 6.341z" fill="#fff"/></svg>
--- a/data/styles/default/light/symbols/subway-vienna-s.svg
+++ b/data/styles/default/light/symbols/subway-vienna-s.svg
@@ -2,7 +2,7 @@
 <svg width="14" height="14" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
 <g stroke-width=".75">
  <circle cx="9" cy="9" r="9" fill="#fff" opacity=".6"/>
-  <circle cx="9" cy="9" r="8.25" fill="#1267CE"/>
+  <circle cx="9" cy="9" r="8.25" fill="#3b87c9"/>
  <path d="m9 14.356c-2 0-4.5-1.3557-4.5-4.6057v-5.2722h3v5.1972c0 0.49565 0.5 1.425 1.5 1.425 1 0 1.5-0.75896 1.5-1.35v-5.2722h3v5.1222c0 3.4-2.5 4.7557-4.5 4.7557z" 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/transit_systems.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,53 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/icons.mapcss");
-
-/* 7. CAR */
-
-node|z14-[amenity=fuel],
-node|z15-[amenity=charging_station][motorcar?][!capacity],
-node|z15-[amenity=charging_station][motorcar?][capacity=1],
-node|z15-[amenity=charging_station][motorcar?][capacity=2],
-node|z14-[amenity=charging_station][motorcar?][capacity?],
-node|z16-[amenity=charging_station],
-{text: name;text-color: @poi_label;text-offset: 1;font-size: 10;}
-
-node|z14[amenity=fuel],
-{icon-image: fuel-s.svg; text-offset: 1; icon-min-distance: 20;}
-node|z15[amenity=fuel],
-{icon-image: fuel-m.svg; icon-min-distance: 20;}
-node|z16[amenity=fuel],
-{icon-image: fuel-m.svg; icon-min-distance: 10;}
-node|z17-[amenity=fuel],
-{icon-image: fuel-m.svg;}
-node|z18-[amenity=fuel],
-{font-size: 11;}
-
-node|z15-[amenity=charging_station][motorcar?],
-node|z16-[amenity=charging_station][motorcycle?],
-node|z16-[amenity=charging_station][bicycle?],
-node|z16-[amenity=charging_station][motorcar=not],
-node|z16-[amenity=charging_station],
-{icon-image: charging_station-small-m.svg;}
-
-node|z14[amenity=charging_station][motorcar?][capacity?],
-{icon-image: charging_station-s.svg;}
-node|z15-[amenity=charging_station][motorcar?][capacity?],
-{icon-image: charging_station-m.svg;}
-
-node|z14[amenity=charging_station][motorcar?][!capacity],
-node|z14[amenity=charging_station][motorcar?][capacity=1],
-node|z14[amenity=charging_station][motorcar?][capacity=2],
-{icon-image: none;}
-node|z15-[amenity=charging_station][motorcar?][!capacity],
-node|z15-[amenity=charging_station][motorcar?][capacity=1],
-node|z15-[amenity=charging_station][motorcar?][capacity=2],
-{icon-image: charging_station-small-m.svg;}
-
-node|z14[amenity=charging_station][motorcar?],
-{text-offset: 1;font-size: 10;icon-min-distance: 20;}
-node|z15[amenity=charging_station][motorcar?],
-{icon-min-distance: 20;}
-node|z16[amenity=charging_station],
-{icon-min-distance: 10;}
-node|z18-[amenity=charging_station],
-{font-size: 11;}
--- 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 +0,0 @@
-@import("../../default/include/priorities_1_BG-by-size.prio.txt")
--- a/data/styles/driving/include/priorities_2_BG-top.prio.txt
+++ b/data/styles/driving/include/priorities_2_BG-top.prio.txt
@@ -1 +0,0 @@
-@import("../../default/include/priorities_2_BG-top.prio.txt")
--- a/data/styles/driving/include/priorities_3_FG.prio.txt
+++ b/data/styles/driving/include/priorities_3_FG.prio.txt
@@ -1 +0,0 @@
-@import("../../default/include/priorities_3_FG.prio.txt")
--- a/data/styles/driving/include/priorities_4_overlays.prio.txt
+++ b/data/styles/driving/include/priorities_4_overlays.prio.txt
@@ -1 +0,0 @@
-@import("../../default/include/priorities_4_overlays.prio.txt")
--- a/data/styles/driving/include/transit_systems.mapcss
+++ b/data/styles/driving/include/transit_systems.mapcss
@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/transit_systems.mapcss");
--- 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/transit_systems.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/transit_systems.mapcss");
-@import("../../default/dark/dynamic_colors.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/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/hiking/include/priorities_1_BG-by-size.prio.txt
@@ -1,4 +0,0 @@
-@import("../../default/include/priorities_1_BG-by-size.prio.txt")
-
-amenity-courthouse
-=== 180
--- a/data/styles/hiking/include/priorities_2_BG-top.prio.txt
+++ b/data/styles/hiking/include/priorities_2_BG-top.prio.txt
@@ -1 +0,0 @@
-@import("../../default/include/priorities_2_BG-top.prio.txt")
--- a/data/styles/hiking/include/priorities_3_FG.prio.txt
+++ b/data/styles/hiking/include/priorities_3_FG.prio.txt
@@ -1,16 +0,0 @@
-@import("../../default/include/priorities_3_FG.prio.txt")
-
-power-minor_line
-=== 350
-
-power-minor_line::dash
-=== 340
-
-piste:type-downhill-advanced-area                   # area z13-
-piste:type-downhill-area                            # area z13-
-piste:type-downhill-easy-area                       # area z13-
-piste:type-downhill-expert-area                     # area z13-
-piste:type-downhill-intermediate-area               # area z13-
-piste:type-downhill-novice-area                     # area z13-
-piste:type-sled-area                                # area z13-
-=== 15
--- a/data/styles/hiking/include/priorities_4_overlays.prio.txt
+++ b/data/styles/hiking/include/priorities_4_overlays.prio.txt
@@ -1,8 +0,0 @@
-@import("../../default/include/priorities_4_overlays.prio.txt")
-
-power-line
-=== 1000
-
-man_made-utility_pole
-power-pole
-=== 230
--- a/data/styles/hiking/include/transit_systems.mapcss
+++ b/data/styles/hiking/include/transit_systems.mapcss
@@ -1,2 +0,0 @@
-/* Keep here changes of the base map style file only. */
-@import("../../default/include/transit_systems.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/transit_systems.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/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`@import("../../default/include/priorities_1_BG-by-size.prio.txt")`