diff --git a/.github/workflows/android-monkey.yaml b/.github/workflows/android-monkey.yaml
index c0da2212b1..a8a34d4e87 100644
--- a/.github/workflows/android-monkey.yaml
+++ b/.github/workflows/android-monkey.yaml
@@ -91,5 +91,5 @@ jobs:
             --device model=a10,version=29,orientation=landscape \
             --device model=cactus,version=27 \
             --device model=sailfish,version=25 \
-            --device model=harpia,version=23 \
+            --device model=hammerhead,version=23 \
             --timeout 15m
diff --git a/android/app/src/main/cpp/app/organicmaps/editor/Editor.cpp b/android/app/src/main/cpp/app/organicmaps/editor/Editor.cpp
index 3c4461ee5a..50cff911bf 100644
--- a/android/app/src/main/cpp/app/organicmaps/editor/Editor.cpp
+++ b/android/app/src/main/cpp/app/organicmaps/editor/Editor.cpp
@@ -236,9 +236,9 @@ Java_app_organicmaps_editor_Editor_nativeIsBuilding(JNIEnv * env, jclass clazz)
 }
 
 JNIEXPORT jobject JNICALL
-Java_app_organicmaps_editor_Editor_nativeGetNamesDataSource(JNIEnv * env, jclass, jboolean needFakes)
+Java_app_organicmaps_editor_Editor_nativeGetNamesDataSource(JNIEnv * env, jclass)
 {
-  auto const namesDataSource = g_editableMapObject.GetNamesDataSource(needFakes);
+  auto const namesDataSource = g_editableMapObject.GetNamesDataSource();
 
   jobjectArray names = jni::ToJavaArray(env, g_localNameClazz, namesDataSource.names, ToJavaName);
   jsize const mandatoryNamesCount = static_cast<jsize>(namesDataSource.mandatoryNamesCount);
@@ -246,18 +246,6 @@ Java_app_organicmaps_editor_Editor_nativeGetNamesDataSource(JNIEnv * env, jclass
   return env->NewObject(g_namesDataSourceClassID, g_namesDataSourceConstructorID, names, mandatoryNamesCount);
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_editor_Editor_nativeGetDefaultName(JNIEnv * env, jclass)
-{
-  return jni::ToJavaString(env, g_editableMapObject.GetDefaultName());
-}
-
-JNIEXPORT void JNICALL
-Java_app_organicmaps_editor_Editor_nativeEnableNamesAdvancedMode(JNIEnv *, jclass)
-{
-  g_editableMapObject.EnableNamesAdvancedMode();
-}
-
 JNIEXPORT void JNICALL
 Java_app_organicmaps_editor_Editor_nativeSetNames(JNIEnv * env, jclass, jobjectArray names)
 {
diff --git a/android/app/src/main/java/app/organicmaps/editor/Editor.java b/android/app/src/main/java/app/organicmaps/editor/Editor.java
index 2f68e11502..5faa0720e9 100644
--- a/android/app/src/main/java/app/organicmaps/editor/Editor.java
+++ b/android/app/src/main/java/app/organicmaps/editor/Editor.java
@@ -92,9 +92,7 @@ public final class Editor
   public static native boolean nativeIsPointType();
   public static native boolean nativeIsBuilding();
 
-  public static native NamesDataSource nativeGetNamesDataSource(boolean needFakes);
-  public static native String nativeGetDefaultName();
-  public static native void nativeEnableNamesAdvancedMode();
+  public static native NamesDataSource nativeGetNamesDataSource();
   public static native void nativeSetNames(@NonNull LocalizedName[] names);
   public static native LocalizedName nativeMakeLocalizedName(String langCode, String name);
   public static native Language[] nativeGetSupportedLanguages();
diff --git a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
index 62dfdb0c0a..3b7aba405a 100644
--- a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
@@ -103,9 +103,9 @@ public class EditorHostFragment extends BaseMwmToolbarFragment implements View.O
     mMandatoryNamesCount = mandatoryNamesCount;
   }
 
-  private void fillNames(boolean needFakes)
+  private void fillNames()
   {
-    NamesDataSource namesDataSource = Editor.nativeGetNamesDataSource(needFakes);
+    NamesDataSource namesDataSource = Editor.nativeGetNamesDataSource();
     setNames(namesDataSource.getNames());
     setMandatoryNamesCount(namesDataSource.getMandatoryNamesCount());
     editMapObject();
@@ -135,7 +135,7 @@ public class EditorHostFragment extends BaseMwmToolbarFragment implements View.O
       mIsNewObject = getArguments().getBoolean(EditorActivity.EXTRA_NEW_OBJECT, false);
     getToolbarController().setTitle(getTitle());
 
-    fillNames(true /* addFakes */);
+    fillNames();
   }
 
   @StringRes
@@ -403,13 +403,6 @@ public class EditorHostFragment extends BaseMwmToolbarFragment implements View.O
   public void onLanguageSelected(Language lang)
   {
     String name = "";
-    if (lang.code.equals(Language.DEFAULT_LANG_CODE))
-    {
-      fillNames(false /* addFakes */);
-      name = Editor.nativeGetDefaultName();
-      Editor.nativeEnableNamesAdvancedMode();
-    }
-
     addName(Editor.nativeMakeLocalizedName(lang.code, name));
     editMapObject(true /* focusToLastName */);
   }
diff --git a/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java b/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java
index ff9c315e2d..7717780da7 100644
--- a/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java
@@ -38,15 +38,7 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
         languages.add(lang);
     }
 
-    Collections.sort(languages, (lhs, rhs) -> {
-      // Default name can be changed, but it should be last in list of names.
-      if (lhs.isDefaultLang() && !rhs.isDefaultLang())
-        return 1;
-      if (!lhs.isDefaultLang() && rhs.isDefaultLang())
-        return -1;
-
-      return lhs.name.compareTo(rhs.name);
-    });
+    Collections.sort(languages, Comparator.comparing(lhs -> lhs.name));
 
     return new LanguagesAdapter(this, languages.toArray(new Language[languages.size()]));
   }
diff --git a/android/app/src/main/java/app/organicmaps/editor/MultilanguageAdapter.java b/android/app/src/main/java/app/organicmaps/editor/MultilanguageAdapter.java
index e4c2753da9..1d781f56b8 100644
--- a/android/app/src/main/java/app/organicmaps/editor/MultilanguageAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/MultilanguageAdapter.java
@@ -10,6 +10,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.textfield.TextInputLayout;
 import com.google.android.material.textfield.TextInputEditText;
 import app.organicmaps.R;
+import app.organicmaps.editor.data.Language;
 import app.organicmaps.editor.data.LocalizedName;
 import app.organicmaps.util.StringUtils;
 import app.organicmaps.util.UiUtils;
@@ -43,7 +44,10 @@ public class MultilanguageAdapter extends RecyclerView.Adapter<MultilanguageAdap
   {
     LocalizedName name = mNames.get(position);
     holder.input.setText(name.name);
-    holder.inputLayout.setHint(name.langName);
+    if (name.lang.equals(Language.DEFAULT_LANG_CODE))
+      holder.inputLayout.setHint(holder.itemView.getContext().getString(R.string.editor_default_language_hint));
+    else
+      holder.inputLayout.setHint(name.langName);
   }
 
   @Override
diff --git a/android/app/src/main/java/app/organicmaps/editor/data/Language.java b/android/app/src/main/java/app/organicmaps/editor/data/Language.java
index fa2a598ad9..c3a42004e2 100644
--- a/android/app/src/main/java/app/organicmaps/editor/data/Language.java
+++ b/android/app/src/main/java/app/organicmaps/editor/data/Language.java
@@ -20,9 +20,4 @@ public class Language
     this.code = code;
     this.name = name;
   }
-
-  public boolean isDefaultLang()
-  {
-    return code.equals(DEFAULT_LANG_CODE);
-  }
 }
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingController.java
index 0468a02e5a..66fbc6a91d 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingController.java
@@ -351,7 +351,7 @@ public class RoutingController
   private void initLastRouteType(@Nullable MapObject startPoint, @Nullable MapObject endPoint,
                                  boolean fromApi)
   {
-    if (shouldForceTransitRoute(fromApi))
+    if (isSubwayEnabled() && !fromApi)
     {
       mLastRouterType = Framework.ROUTER_TYPE_TRANSIT;
       return;
@@ -367,11 +367,6 @@ public class RoutingController
     return mContainer != null && mContainer.isSubwayEnabled();
   }
 
-  private boolean shouldForceTransitRoute(boolean fromApi)
-  {
-    return mState == State.NONE && isSubwayEnabled() && !fromApi;
-  }
-
   public void prepare(final @Nullable MapObject startPoint, final @Nullable MapObject endPoint,
                       @Framework.RouterType int routerType)
   {
diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml
index 1422ac5d51..c83999ef15 100644
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -490,6 +490,8 @@
 	<string name="editor_edit_place_title">يتم التعديل</string>
 	<string name="editor_add_place_title">يتم الإضافة</string>
 	<string name="editor_edit_place_name_hint">اسم المكان</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">كما هو مكتوب باللغة المحلية</string>
 	<string name="editor_edit_place_category_title">الفئة</string>
 	<string name="detailed_problem_description">وصف مفصّل للمشكلة</string>
 	<string name="editor_report_problem_other_title">مشكلة أخرى</string>
@@ -1207,9 +1209,15 @@
 	<string name="type.highway.footway">مسار للمشاة</string>
 	<string name="type.highway.footway.sidewalk">رصيف</string>
 	<string name="type.highway.footway.crossing">عبور المشاة</string>
+	<string name="type.highway.footway.alpine_hiking">مسار</string>
 	<string name="type.highway.footway.area">منطقة مشاة</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">جسر للمشاة</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">مسار</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">مسار</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">مسار</string>
+	<string name="type.highway.footway.hiking">مسار</string>
+	<string name="type.highway.footway.mountain_hiking">مسار</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">نفق للمشاة</string>
 	<string name="type.highway.ford">مخاضة</string>
@@ -1230,15 +1238,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">نفق</string>
 	<string name="type.highway.path">مسار</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">مسار</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">مسار</string>
+	<string name="type.highway.path.alpine_hiking">مسار</string>
 	<string name="type.highway.path.bicycle">مسار للمشاة والدراجات معاً</string>
-	<string name="type.highway.footway.bicycle">مسار للمشاة والدراجات معاً</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">جسر</string>
+	<string name="type.highway.path.demanding_alpine_hiking">مسار</string>
+	<string name="type.highway.path.demanding_mountain_hiking">مسار</string>
+	<string name="type.highway.path.difficult_alpine_hiking">مسار</string>
+	<string name="type.highway.path.hiking">مسار</string>
 	<string name="type.highway.path.horse">مسار</string>
+	<string name="type.highway.path.mountain_hiking">مسار</string>
+	<string name="type.highway.path.permissive">مسار</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">نفق</string>
 	<string name="type.highway.pedestrian">شارع للمشاة</string>
@@ -1312,7 +1322,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">جسر</string>
 	<string name="type.highway.track.grade1">شارع</string>
+	<string name="type.highway.track.grade2">شارع</string>
+	<string name="type.highway.track.grade3">شارع</string>
+	<string name="type.highway.track.grade4">شارع</string>
+	<string name="type.highway.track.grade5">شارع</string>
 	<string name="type.highway.track.no.access">شارع</string>
+	<string name="type.highway.track.permissive">شارع</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">نفق</string>
 	<string name="type.highway.traffic_signals">إشارات مرورية</string>
diff --git a/android/app/src/main/res/values-az/strings.xml b/android/app/src/main/res/values-az/strings.xml
index 31d29639ef..7faac84394 100644
--- a/android/app/src/main/res/values-az/strings.xml
+++ b/android/app/src/main/res/values-az/strings.xml
@@ -477,6 +477,8 @@
 	<string name="editor_edit_place_title">Redaktə</string>
 	<string name="editor_add_place_title">Əlavə</string>
 	<string name="editor_edit_place_name_hint">Yerin adı</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Yerli dildə yazıldığı kimi</string>
 	<string name="editor_edit_place_category_title">Kateqoriya</string>
 	<string name="detailed_problem_description">Problemin ətraflı təsviri</string>
 	<string name="editor_report_problem_other_title">Fərqli problem</string>
@@ -1166,9 +1168,15 @@
 	<string name="type.highway.footway">Səki</string>
 	<string name="type.highway.footway.sidewalk">Səki</string>
 	<string name="type.highway.footway.crossing">Piyada keçidi</string>
+	<string name="type.highway.footway.alpine_hiking">Yol</string>
 	<string name="type.highway.footway.area">Piyada ərazisi</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Körpü</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Yol</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Yol</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Yol</string>
+	<string name="type.highway.footway.hiking">Yol</string>
+	<string name="type.highway.footway.mountain_hiking">Yol</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Tunel</string>
 	<string name="type.highway.ford">Keçid</string>
@@ -1189,15 +1197,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Tunel</string>
 	<string name="type.highway.path">Yol</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Yol</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Yol</string>
+	<string name="type.highway.path.alpine_hiking">Yol</string>
 	<string name="type.highway.path.bicycle">Velosiped və Gəzinti Yolu</string>
-	<string name="type.highway.footway.bicycle">Velosiped və Gəzinti Yolu</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Körpü</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Yol</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Yol</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Yol</string>
+	<string name="type.highway.path.hiking">Yol</string>
 	<string name="type.highway.path.horse">Atlı yolu</string>
+	<string name="type.highway.path.mountain_hiking">Yol</string>
+	<string name="type.highway.path.permissive">Yol</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Tunel</string>
 	<string name="type.highway.pedestrian">Piyadalar üçün küçə</string>
@@ -1271,7 +1281,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Körpü</string>
 	<string name="type.highway.track.grade1">Uçuş zolağı</string>
+	<string name="type.highway.track.grade2">Uçuş zolağı</string>
+	<string name="type.highway.track.grade3">Uçuş zolağı</string>
+	<string name="type.highway.track.grade4">Uçuş zolağı</string>
+	<string name="type.highway.track.grade5">Uçuş zolağı</string>
 	<string name="type.highway.track.no.access">Uçuş zolağı</string>
+	<string name="type.highway.track.permissive">Uçuş zolağı</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Tunel</string>
 	<string name="type.highway.traffic_signals">İşıqfor</string>
diff --git a/android/app/src/main/res/values-be/strings.xml b/android/app/src/main/res/values-be/strings.xml
index fbd96bf780..161ca10cbd 100644
--- a/android/app/src/main/res/values-be/strings.xml
+++ b/android/app/src/main/res/values-be/strings.xml
@@ -475,6 +475,8 @@
 	<string name="editor_edit_place_title">Рэдагаванне</string>
 	<string name="editor_add_place_title">Даданне</string>
 	<string name="editor_edit_place_name_hint">Назва месца</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">На мясцовай мове</string>
 	<string name="editor_edit_place_category_title">Катэгорыя</string>
 	<string name="detailed_problem_description">Падрабязнае апісанне праблемы</string>
 	<string name="editor_report_problem_other_title">Іншая праблема</string>
@@ -1342,7 +1344,6 @@
 	<string name="type.tourism.aquarium">Акварыум</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Горны прытулак з абслугоўваннем</string>
-	<string name="type.tourism.apartment">Кватэра для адпачынку</string>
 	<string name="type.attraction.animal">Вальера для жывёл</string>
 	<string name="type.tourism.caravan_site">Кемпінг для аўтадамоў</string>
 	<!-- A rentable countryside vacation house. -->
diff --git a/android/app/src/main/res/values-bg/strings.xml b/android/app/src/main/res/values-bg/strings.xml
index 1aab7803c4..b678192023 100644
--- a/android/app/src/main/res/values-bg/strings.xml
+++ b/android/app/src/main/res/values-bg/strings.xml
@@ -443,6 +443,8 @@
 	<string name="editor_edit_place_title">Редактиране</string>
 	<string name="editor_add_place_title">Добавяне</string>
 	<string name="editor_edit_place_name_hint">Име на мястото</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Както е написано на местния език</string>
 	<string name="editor_edit_place_category_title">Категория</string>
 	<string name="detailed_problem_description">Подробно описание на проблема</string>
 	<string name="editor_report_problem_other_title">Друг проблем</string>
@@ -1184,7 +1186,6 @@
 	<string name="type.tourism.aquarium">Аквариум</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Планинска хижа</string>
-	<string name="type.tourism.apartment">Ваканционен апартамент</string>
 	<string name="type.attraction.animal">Заграждение за животни</string>
 	<!-- A rentable countryside vacation house. -->
 	<string name="type.tourism.chalet">Ваканционна вила</string>
diff --git a/android/app/src/main/res/values-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml
index a5a2454e0c..44b49e4add 100644
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -470,6 +470,8 @@
 	<string name="editor_edit_place_title">Edició</string>
 	<string name="editor_add_place_title">Addició</string>
 	<string name="editor_edit_place_name_hint">Nom del lloc</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Com està escrit en la llengua local</string>
 	<string name="editor_edit_place_category_title">Categoria</string>
 	<string name="detailed_problem_description">Descripció detallada del problema</string>
 	<string name="editor_report_problem_other_title">Un altre problema</string>
@@ -939,7 +941,6 @@
 	<string name="type.tourism.aquarium">Aquari</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Lodge de muntanya</string>
-	<string name="type.tourism.apartment">Apartament de vacances</string>
 	<string name="type.attraction.animal">Recinte d\'animals</string>
 	<!-- A rentable countryside vacation house. -->
 	<string name="type.tourism.chalet">Casa rural de vacances</string>
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index f5769cb40b..7fc0179d65 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -457,6 +457,8 @@
 	<string name="editor_edit_place_title">Probíhají úpravy</string>
 	<string name="editor_add_place_title">Probíhá přidávání</string>
 	<string name="editor_edit_place_name_hint">Název místa</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Jak je napsáno v místním jazyce</string>
 	<string name="editor_edit_place_category_title">Kategorie</string>
 	<string name="detailed_problem_description">Detailní popis problému</string>
 	<string name="editor_report_problem_other_title">Jiný problém</string>
@@ -1105,9 +1107,15 @@
 	<string name="type.highway.footway">Cesta</string>
 	<string name="type.highway.footway.sidewalk">Chodník</string>
 	<string name="type.highway.footway.crossing">Přechod pro chodce</string>
+	<string name="type.highway.footway.alpine_hiking">Cesta</string>
 	<string name="type.highway.footway.area">Cesta</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Most</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Cesta</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Cesta</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Cesta</string>
+	<string name="type.highway.footway.hiking">Cesta</string>
+	<string name="type.highway.footway.mountain_hiking">Cesta</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Tunel</string>
 	<string name="type.highway.ford">Brod</string>
@@ -1128,15 +1136,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Tunel</string>
 	<string name="type.highway.path">Cesta</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Cesta</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Cesta</string>
+	<string name="type.highway.path.alpine_hiking">Cesta</string>
 	<string name="type.highway.path.bicycle">Cesta</string>
-	<string name="type.highway.footway.bicycle">Cesta</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Most</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Cesta</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Cesta</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Cesta</string>
+	<string name="type.highway.path.hiking">Cesta</string>
 	<string name="type.highway.path.horse">Cesta</string>
+	<string name="type.highway.path.mountain_hiking">Cesta</string>
+	<string name="type.highway.path.permissive">Cesta</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Tunel</string>
 	<string name="type.highway.pedestrian">Ulice</string>
@@ -1209,7 +1219,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Most</string>
 	<string name="type.highway.track.grade1">Ulice</string>
+	<string name="type.highway.track.grade2">Ulice</string>
+	<string name="type.highway.track.grade3">Ulice</string>
+	<string name="type.highway.track.grade4">Ulice</string>
+	<string name="type.highway.track.grade5">Ulice</string>
 	<string name="type.highway.track.no.access">Ulice</string>
+	<string name="type.highway.track.permissive">Ulice</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Tunel</string>
 	<string name="type.highway.traffic_signals">Semafor</string>
@@ -1844,7 +1859,7 @@
 	<string name="type.tourism.aquarium">Akvárium</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Horská chata</string>
-	<string name="type.tourism.apartment">Prázdninový apartmán</string>
+	<string name="type.tourism.apartment">Byty</string>
 	<string name="type.tourism.artwork">Umělecké dílo</string>
 	<string name="type.tourism.artwork.architecture">Umělecké dílo</string>
 	<string name="type.tourism.artwork.painting">Umělecké dílo</string>
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index a40900dac2..850d30e251 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -453,6 +453,8 @@
 	<string name="editor_edit_place_title">Redigerer</string>
 	<string name="editor_add_place_title">Tilføjer</string>
 	<string name="editor_edit_place_name_hint">Stedets navn</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Som det står skrevet på det lokale sprog</string>
 	<string name="editor_edit_place_category_title">Kategori</string>
 	<string name="detailed_problem_description">Detaljeret beskrivelse af problemet</string>
 	<string name="editor_report_problem_other_title">Et anderledes problem</string>
@@ -1085,9 +1087,15 @@
 	<string name="type.highway.footway">Sti</string>
 	<string name="type.highway.footway.sidewalk">Fortov</string>
 	<string name="type.highway.footway.crossing">Fodgængerovergang</string>
+	<string name="type.highway.footway.alpine_hiking">Sti</string>
 	<string name="type.highway.footway.area">Sti</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Bro</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Sti</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Sti</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Sti</string>
+	<string name="type.highway.footway.hiking">Sti</string>
+	<string name="type.highway.footway.mountain_hiking">Sti</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Tunnel</string>
 	<string name="type.highway.ford">Vadested</string>
@@ -1108,15 +1116,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Tunnel</string>
 	<string name="type.highway.path">Sti</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Sti</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Sti</string>
+	<string name="type.highway.path.alpine_hiking">Sti</string>
 	<string name="type.highway.path.bicycle">Sti</string>
-	<string name="type.highway.footway.bicycle">Sti</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Bro</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Sti</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Sti</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Sti</string>
+	<string name="type.highway.path.hiking">Sti</string>
 	<string name="type.highway.path.horse">Sti</string>
+	<string name="type.highway.path.mountain_hiking">Sti</string>
+	<string name="type.highway.path.permissive">Sti</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Tunnel</string>
 	<string name="type.highway.pedestrian">Gade</string>
@@ -1189,7 +1199,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Bro</string>
 	<string name="type.highway.track.grade1">Gade</string>
+	<string name="type.highway.track.grade2">Gade</string>
+	<string name="type.highway.track.grade3">Gade</string>
+	<string name="type.highway.track.grade4">Gade</string>
+	<string name="type.highway.track.grade5">Gade</string>
 	<string name="type.highway.track.no.access">Gade</string>
+	<string name="type.highway.track.permissive">Gade</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Tunnel</string>
 	<string name="type.highway.traffic_signals">Trafiklys</string>
@@ -1821,7 +1836,7 @@
 	<string name="type.tourism.aquarium">Akvarium</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Bjerghytte</string>
-	<string name="type.tourism.apartment">Ferielejlighed</string>
+	<string name="type.tourism.apartment">Lejligheder</string>
 	<string name="type.tourism.artwork">Kunstværk</string>
 	<string name="type.tourism.artwork.architecture">Kunstværk</string>
 	<string name="type.tourism.artwork.painting">Kunstværk</string>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index a113241e90..c4ebf87515 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -473,6 +473,8 @@
 	<string name="editor_edit_place_title">Wird bearbeitet</string>
 	<string name="editor_add_place_title">Wird hinzugefügt</string>
 	<string name="editor_edit_place_name_hint">Name des Ortes</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Wie in der lokalen Sprache geschrieben</string>
 	<string name="editor_edit_place_category_title">Kategorie</string>
 	<string name="detailed_problem_description">Detaillierte Beschreibung eines Problems</string>
 	<string name="editor_report_problem_other_title">Ein anderes Problem</string>
@@ -1184,9 +1186,15 @@
 	<string name="type.highway.footway">Fußweg</string>
 	<string name="type.highway.footway.sidewalk">Bürgersteig</string>
 	<string name="type.highway.footway.crossing">Fußgängerübergang</string>
+	<string name="type.highway.footway.alpine_hiking">Alpinwanderweg</string>
 	<string name="type.highway.footway.area">Fußweg</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Brücke</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Anspruchsvoller Alpinwanderweg</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Anspruchsvoller Bergwanderweg</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Schwieriger Alpinwanderweg</string>
+	<string name="type.highway.footway.hiking">Wanderweg</string>
+	<string name="type.highway.footway.mountain_hiking">Bergwanderweg</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Fußgängertunnel</string>
 	<string name="type.highway.ford">Furt</string>
@@ -1207,15 +1215,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Tunnel</string>
 	<string name="type.highway.path">Weg</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Weg</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Weg</string>
+	<string name="type.highway.path.alpine_hiking">Alpinwanderweg</string>
 	<string name="type.highway.path.bicycle">Radweg</string>
-	<string name="type.highway.footway.bicycle">Radweg</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Brücke</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Anspruchsvoller Alpinwanderweg</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Anspruchsvoller Bergwanderweg</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Schwieriger Alpinwanderweg</string>
+	<string name="type.highway.path.hiking">Wanderweg</string>
 	<string name="type.highway.path.horse">Reitweg</string>
+	<string name="type.highway.path.mountain_hiking">Bergwanderweg</string>
+	<string name="type.highway.path.permissive">Weg</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Tunnel</string>
 	<string name="type.highway.pedestrian">Fußgängerzone</string>
@@ -1289,7 +1299,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Brücke</string>
 	<string name="type.highway.track.grade1">Forst-/Feldweg</string>
+	<string name="type.highway.track.grade2">Forst-/Feldweg</string>
+	<string name="type.highway.track.grade3">Forst-/Feldweg</string>
+	<string name="type.highway.track.grade4">Forst-/Feldweg</string>
+	<string name="type.highway.track.grade5">Forst-/Feldweg</string>
 	<string name="type.highway.track.no.access">Forst-/Feldweg</string>
+	<string name="type.highway.track.permissive">Forst-/Feldweg</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Straßentunnel</string>
 	<string name="type.highway.traffic_signals">Ampel</string>
diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml
index f951aa1188..fbc1a84002 100644
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -478,6 +478,8 @@
 	<string name="editor_edit_place_title">Επεξεργασία</string>
 	<string name="editor_add_place_title">Προσθήκη</string>
 	<string name="editor_edit_place_name_hint">Όνομα τοποθεσίας</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Όπως είναι γραμμένο στην τοπική γλώσσα</string>
 	<string name="editor_edit_place_category_title">Κατηγορία</string>
 	<string name="detailed_problem_description">Λεπτομερής περιγραφή του θέματος</string>
 	<string name="editor_report_problem_other_title">Διαφορετικό πρόβλημα</string>
@@ -1146,9 +1148,15 @@
 	<string name="type.highway.footway">Διαδρομή</string>
 	<string name="type.highway.footway.sidewalk">Πεζοδρόμιο</string>
 	<string name="type.highway.footway.crossing">Διάβαση πεζών</string>
+	<string name="type.highway.footway.alpine_hiking">Διαδρομή</string>
 	<string name="type.highway.footway.area">Διαδρομή</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Γέφυρα</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Διαδρομή</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Διαδρομή</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Διαδρομή</string>
+	<string name="type.highway.footway.hiking">Διαδρομή</string>
+	<string name="type.highway.footway.mountain_hiking">Διαδρομή</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Σήραγγα</string>
 	<string name="type.highway.ford">Πέρασμα</string>
@@ -1169,15 +1177,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Σήραγγα</string>
 	<string name="type.highway.path">Διαδρομή</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Διαδρομή</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Διαδρομή</string>
+	<string name="type.highway.path.alpine_hiking">Διαδρομή</string>
 	<string name="type.highway.path.bicycle">Διαδρομή</string>
-	<string name="type.highway.footway.bicycle">Διαδρομή</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Γέφυρα</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Διαδρομή</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Διαδρομή</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Διαδρομή</string>
+	<string name="type.highway.path.hiking">Διαδρομή</string>
 	<string name="type.highway.path.horse">Διαδρομή</string>
+	<string name="type.highway.path.mountain_hiking">Διαδρομή</string>
+	<string name="type.highway.path.permissive">Διαδρομή</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Σήραγγα</string>
 	<string name="type.highway.pedestrian">Οδός</string>
@@ -1250,7 +1260,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Γέφυρα</string>
 	<string name="type.highway.track.grade1">Οδός</string>
+	<string name="type.highway.track.grade2">Οδός</string>
+	<string name="type.highway.track.grade3">Οδός</string>
+	<string name="type.highway.track.grade4">Οδός</string>
+	<string name="type.highway.track.grade5">Οδός</string>
 	<string name="type.highway.track.no.access">Οδός</string>
+	<string name="type.highway.track.permissive">Οδός</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Σήραγγα</string>
 	<string name="type.highway.traffic_signals">Φανάρια κυκλοφορίας</string>
@@ -1889,7 +1904,7 @@
 	<string name="type.tourism.aquarium">Ενυδρείο</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Ορεινό καταφύγιο</string>
-	<string name="type.tourism.apartment">Διαμέρισμα διακοπών</string>
+	<string name="type.tourism.apartment">Διαμερίσματα</string>
 	<string name="type.tourism.artwork">Έργα τέχνης</string>
 	<string name="type.tourism.artwork.architecture">Έργα τέχνης</string>
 	<string name="type.tourism.artwork.painting">Έργα τέχνης</string>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index d137e51461..82f8682864 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -477,6 +477,8 @@
 	<string name="editor_edit_place_title">Editar</string>
 	<string name="editor_add_place_title">Añadir</string>
 	<string name="editor_edit_place_name_hint">Nombre del lugar</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Como está escrito en la lengua local</string>
 	<string name="editor_edit_place_category_title">Categoría</string>
 	<string name="detailed_problem_description">Descripción detallada del problema</string>
 	<string name="editor_report_problem_other_title">Un problema diferente</string>
@@ -1202,9 +1204,15 @@
 	<string name="type.highway.footway">Camino</string>
 	<string name="type.highway.footway.sidewalk">Acera</string>
 	<string name="type.highway.footway.crossing">Paso de peatones</string>
+	<string name="type.highway.footway.alpine_hiking">Camino de senderismo alpino</string>
 	<string name="type.highway.footway.area">Zona peatonal</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Puente peatonal</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Camino</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Camino</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Camino</string>
+	<string name="type.highway.footway.hiking">Sendero</string>
+	<string name="type.highway.footway.mountain_hiking">Sendero de montaña</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Túnel peatonal</string>
 	<string name="type.highway.ford">Vado</string>
@@ -1225,15 +1233,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Túnel</string>
 	<string name="type.highway.path">Camino</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Camino</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Camino</string>
+	<string name="type.highway.path.alpine_hiking">Camino de senderismo alpino</string>
 	<string name="type.highway.path.bicycle">Camino para bicicletas</string>
-	<string name="type.highway.footway.bicycle">Camino para bicicletas</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Puente</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Camino de senderismo alpino exigente</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Camino de senderismo de montaña exigente</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Camino</string>
+	<string name="type.highway.path.hiking">Sendero</string>
 	<string name="type.highway.path.horse">Sendero de herradura</string>
+	<string name="type.highway.path.mountain_hiking">Sendero de montaña</string>
+	<string name="type.highway.path.permissive">Camino</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Túnel</string>
 	<string name="type.highway.pedestrian">Calle peatonal</string>
@@ -1307,7 +1317,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Puente</string>
 	<string name="type.highway.track.grade1">Pista</string>
+	<string name="type.highway.track.grade2">Pista</string>
+	<string name="type.highway.track.grade3">Pista</string>
+	<string name="type.highway.track.grade4">Pista</string>
+	<string name="type.highway.track.grade5">Pista</string>
 	<string name="type.highway.track.no.access">Pista</string>
+	<string name="type.highway.track.permissive">Pista</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Túnel</string>
 	<string name="type.highway.traffic_signals">Semáforos</string>
@@ -2030,7 +2045,7 @@
 	<string name="type.tourism.aquarium">Acuario</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Albergue de montaña</string>
-	<string name="type.tourism.apartment">Apartamento de vacaciones</string>
+	<string name="type.tourism.apartment">Apartamentos</string>
 	<string name="type.tourism.artwork">Obras de arte</string>
 	<string name="type.tourism.artwork.architecture">Obras de arte</string>
 	<string name="type.tourism.artwork.painting">Obras de arte</string>
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index db71dcd3a9..47da81c26f 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -469,6 +469,8 @@
 	<string name="editor_edit_place_title">Muutmine</string>
 	<string name="editor_add_place_title">Lisamine</string>
 	<string name="editor_edit_place_name_hint">Koha nimi</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Nagu on kirjutatud kohalikus keeles</string>
 	<string name="editor_edit_place_category_title">Kategooria</string>
 	<string name="detailed_problem_description">Probleemi üksikasjalik kirjeldus</string>
 	<string name="editor_report_problem_other_title">Erinev probleem</string>
@@ -1189,9 +1191,15 @@
 	<string name="type.highway.footway">Jalgrada</string>
 	<string name="type.highway.footway.sidewalk">Kõnnitee</string>
 	<string name="type.highway.footway.crossing">Jalakäijate ülekäigurada</string>
+	<string name="type.highway.footway.alpine_hiking">Alpi matkarada</string>
 	<string name="type.highway.footway.area">Jalakäijate ala</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Jalakäijate sild</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Nõudlik alpi matkarada</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Rada</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Nõudlik mägimatkarada</string>
+	<string name="type.highway.footway.hiking">Rada</string>
+	<string name="type.highway.footway.mountain_hiking">Mägirada</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Jalakäijate tunnel</string>
 	<string name="type.highway.ford">Koolmekoht</string>
@@ -1212,15 +1220,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Tunnel</string>
 	<string name="type.highway.path">Rada</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Rada</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Rada</string>
+	<string name="type.highway.path.alpine_hiking">Alpi matkarada</string>
 	<string name="type.highway.path.bicycle">Jalgratta- ja jalgtee</string>
-	<string name="type.highway.footway.bicycle">Jalgratta- ja jalgtee</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Sild</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Nõudlik alpi matkarada</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Nõudlik mägimatkarada</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Raske alpi matkarada</string>
+	<string name="type.highway.path.hiking">Rada</string>
 	<string name="type.highway.path.horse">Valjarada</string>
+	<string name="type.highway.path.mountain_hiking">Mägitee</string>
+	<string name="type.highway.path.permissive">Rada</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Tunnel</string>
 	<string name="type.highway.pedestrian">Jalakäijate tänav</string>
@@ -1294,7 +1304,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Sild</string>
 	<string name="type.highway.track.grade1">Rada</string>
+	<string name="type.highway.track.grade2">Rada</string>
+	<string name="type.highway.track.grade3">Rada</string>
+	<string name="type.highway.track.grade4">Rada</string>
+	<string name="type.highway.track.grade5">Rada</string>
 	<string name="type.highway.track.no.access">Rada</string>
+	<string name="type.highway.track.permissive">Rada</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Tunnel</string>
 	<string name="type.highway.traffic_signals">Valgusfoor</string>
@@ -2030,7 +2045,7 @@
 	<string name="type.tourism.aquarium">Akvaarium</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Mägimajake</string>
-	<string name="type.tourism.apartment">Puhkuse korter</string>
+	<string name="type.tourism.apartment">Korterid</string>
 	<string name="type.tourism.artwork">Kunstiteos</string>
 	<string name="type.tourism.artwork.architecture">Kunstiteos - arhitektuur</string>
 	<string name="type.tourism.artwork.painting">Kunstiteos - maal</string>
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index 99cfb5a617..5689ad914c 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -475,6 +475,8 @@
 	<string name="editor_edit_place_title">Editatzen</string>
 	<string name="editor_add_place_title">Gehitzen</string>
 	<string name="editor_edit_place_name_hint">Tokiaren izena</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Bertako hizkuntzan idatzita dagoenez</string>
 	<string name="editor_edit_place_category_title">Kategoria</string>
 	<string name="detailed_problem_description">Arazoaren deskribapen zehatza</string>
 	<string name="editor_report_problem_other_title">Beste arazo bat</string>
@@ -1189,9 +1191,15 @@
 	<string name="type.highway.footway">Bidea</string>
 	<string name="type.highway.footway.sidewalk">Espaloia</string>
 	<string name="type.highway.footway.crossing">Oinezkoen pasabidea</string>
+	<string name="type.highway.footway.alpine_hiking">Bidea</string>
 	<string name="type.highway.footway.area">Bidea</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Zubia</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Bidea</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Bidea</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Bidea</string>
+	<string name="type.highway.footway.hiking">Bidea</string>
+	<string name="type.highway.footway.mountain_hiking">Bidea</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Tunel</string>
 	<string name="type.highway.ford">Ford (lekukoa)</string>
@@ -1212,15 +1220,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Tunel</string>
 	<string name="type.highway.path">Bidea</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Bidea</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Bidea</string>
+	<string name="type.highway.path.alpine_hiking">Bidea</string>
 	<string name="type.highway.path.bicycle">Bidea</string>
-	<string name="type.highway.footway.bicycle">Bidea</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Zubia</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Bidea</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Bidea</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Bidea</string>
+	<string name="type.highway.path.hiking">Bidea</string>
 	<string name="type.highway.path.horse">Bidea</string>
+	<string name="type.highway.path.mountain_hiking">Bidea</string>
+	<string name="type.highway.path.permissive">Bidea</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Tunel</string>
 	<string name="type.highway.pedestrian">Kalea</string>
@@ -1293,7 +1303,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Zubia</string>
 	<string name="type.highway.track.grade1">Kalea</string>
+	<string name="type.highway.track.grade2">Kalea</string>
+	<string name="type.highway.track.grade3">Kalea</string>
+	<string name="type.highway.track.grade4">Kalea</string>
+	<string name="type.highway.track.grade5">Kalea</string>
 	<string name="type.highway.track.no.access">Kalea</string>
+	<string name="type.highway.track.permissive">Kalea</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Tunel</string>
 	<string name="type.highway.traffic_signals">Semaforoak</string>
@@ -1938,7 +1953,7 @@
 	<string name="type.tourism.aquarium">Aquariuma</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Mendiko ostatua</string>
-	<string name="type.tourism.apartment">Oporretako apartamentua</string>
+	<string name="type.tourism.apartment">Apartamentuak</string>
 	<string name="type.tourism.artwork">Artelanak</string>
 	<string name="type.tourism.artwork.architecture">Artelanak</string>
 	<string name="type.tourism.artwork.painting">Artelanak</string>
diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml
index b4388fcf72..f2b8fdafaf 100644
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -448,6 +448,8 @@
 	<string name="editor_edit_place_title">درحال ویرایش</string>
 	<string name="editor_add_place_title">درحال افزودن</string>
 	<string name="editor_edit_place_name_hint">نام مکان</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">همانطور که به زبان محلی نوشته شده است</string>
 	<string name="editor_edit_place_category_title">دسته بندی</string>
 	<string name="detailed_problem_description">توضیح مفصل در مورد مشکل</string>
 	<string name="editor_report_problem_other_title">مشکلی دیگر</string>
@@ -1011,9 +1013,15 @@
 	<string name="type.highway.footway">مسیر</string>
 	<string name="type.highway.footway.sidewalk">پیاده رو</string>
 	<string name="type.highway.footway.crossing">محل عبور عابر پیاده</string>
+	<string name="type.highway.footway.alpine_hiking">مسیر</string>
 	<string name="type.highway.footway.area">مسیر</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">پل</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">مسیر</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">مسیر</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">مسیر</string>
+	<string name="type.highway.footway.hiking">مسیر</string>
+	<string name="type.highway.footway.mountain_hiking">مسیر</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">تونل</string>
 	<string name="type.highway.ford">گدار</string>
@@ -1034,15 +1042,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">تونل</string>
 	<string name="type.highway.path">مسیر</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">مسیر</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">مسیر</string>
+	<string name="type.highway.path.alpine_hiking">مسیر</string>
 	<string name="type.highway.path.bicycle">مسیر</string>
-	<string name="type.highway.footway.bicycle">مسیر</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">پل</string>
+	<string name="type.highway.path.demanding_alpine_hiking">مسیر</string>
+	<string name="type.highway.path.demanding_mountain_hiking">مسیر</string>
+	<string name="type.highway.path.difficult_alpine_hiking">مسیر</string>
+	<string name="type.highway.path.hiking">مسیر</string>
 	<string name="type.highway.path.horse">مسیر</string>
+	<string name="type.highway.path.mountain_hiking">مسیر</string>
+	<string name="type.highway.path.permissive">مسیر</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">تونل</string>
 	<string name="type.highway.pedestrian">جاده</string>
@@ -1114,7 +1124,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">پل</string>
 	<string name="type.highway.track.grade1">جاده</string>
+	<string name="type.highway.track.grade2">جاده</string>
+	<string name="type.highway.track.grade3">جاده</string>
+	<string name="type.highway.track.grade4">جاده</string>
+	<string name="type.highway.track.grade5">جاده</string>
 	<string name="type.highway.track.no.access">جاده</string>
+	<string name="type.highway.track.permissive">جاده</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">تونل</string>
 	<string name="type.highway.traffic_signals">چراغ راهنما</string>
@@ -1752,7 +1767,7 @@
 	<string name="type.tourism.aquarium">آکواریوم</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">اقامتگاه کوهستانی</string>
-	<string name="type.tourism.apartment">آپارتمان تعطیلات</string>
+	<string name="type.tourism.apartment">اپارتمان</string>
 	<string name="type.tourism.artwork">گردشگری</string>
 	<string name="type.tourism.artwork.architecture">گردشگری</string>
 	<string name="type.tourism.artwork.painting">گردشگری</string>
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index eec59837fb..0be425bb7e 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -479,6 +479,8 @@
 	<string name="editor_edit_place_title">Muokkaus</string>
 	<string name="editor_add_place_title">Lisääminen</string>
 	<string name="editor_edit_place_name_hint">Paikan nimi</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Paikallisella kielellä kirjoitettuna</string>
 	<string name="editor_edit_place_category_title">Kategoria</string>
 	<string name="detailed_problem_description">Ongelman tarkka kuvaus</string>
 	<string name="editor_report_problem_other_title">Eri ongelma</string>
@@ -1189,9 +1191,15 @@
 	<string name="type.highway.elevator">Hissi</string>
 	<string name="type.highway.footway">Polku</string>
 	<string name="type.highway.footway.crossing">Jalankulkijoiden ylitys</string>
+	<string name="type.highway.footway.alpine_hiking">Polku</string>
 	<string name="type.highway.footway.area">Jalankulkualue</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Jalankulkusilta</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Vaativa alppivaellus</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Vaativa vuoristovaellus</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Vaikea alppivaellus</string>
+	<string name="type.highway.footway.hiking">Vaellus</string>
+	<string name="type.highway.footway.mountain_hiking">Vuoristovaellus</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Jalankulkutunneli</string>
 	<string name="type.highway.ford">Kahluupaikka</string>
@@ -1212,15 +1220,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Tunneli</string>
 	<string name="type.highway.path">Polku</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Polku</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Polku</string>
+	<string name="type.highway.path.alpine_hiking">Alppivaellus</string>
 	<string name="type.highway.path.bicycle">Pyörä- ja jalkatie</string>
-	<string name="type.highway.footway.bicycle">Pyörä- ja jalkatie</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Silta</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Vaativa alppivaellus</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Vaativa vuoristovaellus</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Vaikea alppivaellus</string>
+	<string name="type.highway.path.hiking">Vaellus</string>
 	<string name="type.highway.path.horse">Ratsastuspolku</string>
+	<string name="type.highway.path.mountain_hiking">Vuoristovaellus</string>
+	<string name="type.highway.path.permissive">Polku</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Tunneli</string>
 	<string name="type.highway.pedestrian">Jalankulkutie</string>
@@ -1294,7 +1304,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Silta</string>
 	<string name="type.highway.track.grade1">Katu</string>
+	<string name="type.highway.track.grade2">Katu</string>
+	<string name="type.highway.track.grade3">Katu</string>
+	<string name="type.highway.track.grade4">Katu</string>
+	<string name="type.highway.track.grade5">Katu</string>
 	<string name="type.highway.track.no.access">Katu</string>
+	<string name="type.highway.track.permissive">Katu</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Tunneli</string>
 	<string name="type.highway.traffic_signals">Liikennevalot</string>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index d61957d914..d7648dab0d 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -479,6 +479,8 @@
 	<string name="editor_edit_place_title">Modification</string>
 	<string name="editor_add_place_title">Ajout</string>
 	<string name="editor_edit_place_name_hint">Nom du lieu</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Comme c\'est écrit dans la langue locale</string>
 	<string name="editor_edit_place_category_title">Catégorie</string>
 	<string name="detailed_problem_description">Description détaillée du problème</string>
 	<string name="editor_report_problem_other_title">Autre problème</string>
@@ -1189,9 +1191,15 @@
 	<string name="type.highway.footway">Chemin</string>
 	<string name="type.highway.footway.sidewalk">Trottoir</string>
 	<string name="type.highway.footway.crossing">Passage pour piétons</string>
+	<string name="type.highway.footway.alpine_hiking">Chemin</string>
 	<string name="type.highway.footway.area">Chemin</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Pont</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Chemin</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Chemin</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Chemin</string>
+	<string name="type.highway.footway.hiking">Chemin</string>
+	<string name="type.highway.footway.mountain_hiking">Chemin</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Tunnel</string>
 	<string name="type.highway.ford">Gué</string>
@@ -1212,15 +1220,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Tunnel</string>
 	<string name="type.highway.path">Chemin</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Chemin</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Chemin</string>
+	<string name="type.highway.path.alpine_hiking">Chemin</string>
 	<string name="type.highway.path.bicycle">Chemin</string>
-	<string name="type.highway.footway.bicycle">Chemin</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Pont</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Chemin</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Chemin</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Chemin</string>
+	<string name="type.highway.path.hiking">Chemin</string>
 	<string name="type.highway.path.horse">Chemin</string>
+	<string name="type.highway.path.mountain_hiking">Chemin</string>
+	<string name="type.highway.path.permissive">Chemin</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Tunnel</string>
 	<string name="type.highway.pedestrian">Rue piétonne</string>
@@ -1294,7 +1304,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Pont</string>
 	<string name="type.highway.track.grade1">Piste</string>
+	<string name="type.highway.track.grade2">Piste</string>
+	<string name="type.highway.track.grade3">Piste</string>
+	<string name="type.highway.track.grade4">Piste</string>
+	<string name="type.highway.track.grade5">Piste</string>
 	<string name="type.highway.track.no.access">Piste</string>
+	<string name="type.highway.track.permissive">Piste</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Tunnel</string>
 	<string name="type.highway.traffic_signals">Feux de circulation</string>
diff --git a/android/app/src/main/res/values-hi/strings.xml b/android/app/src/main/res/values-hi/strings.xml
index 88360e94df..7e628d892f 100644
--- a/android/app/src/main/res/values-hi/strings.xml
+++ b/android/app/src/main/res/values-hi/strings.xml
@@ -363,6 +363,8 @@
 	<string name="editor_focus_map_on_location">ऑब्जेक्ट का सही स्थान चुनने के लिए मानचित्र को खींचें।</string>
 	<string name="editor_add_place_title">जोड़ना</string>
 	<string name="editor_edit_place_name_hint">स्थान का नाम</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">जैसा कि स्थानीय भाषा में लिखा गया है</string>
 	<string name="editor_edit_place_category_title">वर्ग</string>
 	<string name="placepage_add_business_button">व्यवसाय जोड़ें</string>
 	<!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
@@ -815,18 +817,26 @@
 	<string name="type.highway.footway">पैदलपथ</string>
 	<string name="type.highway.footway.sidewalk">फ़ुटपाथ</string>
 	<string name="type.highway.footway.crossing">पैदल पार पथ</string>
+	<string name="type.highway.footway.alpine_hiking">पथ</string>
 	<string name="type.highway.footway.area">पैदलपथ</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">पथ</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">पथ</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">पथ</string>
+	<string name="type.highway.footway.hiking">पथ</string>
+	<string name="type.highway.footway.mountain_hiking">पथ</string>
 	<string name="type.highway.motorway">राजमार्ग</string>
 	<string name="type.highway.motorway_junction">राजमार्ग निकास</string>
 	<string name="type.highway.motorway_link">फ्रीवे प्रवेश</string>
 	<string name="type.highway.path">पथ</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">पथ</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">पथ</string>
+	<string name="type.highway.path.alpine_hiking">पथ</string>
 	<string name="type.highway.path.bicycle">पथ</string>
-	<string name="type.highway.footway.bicycle">पथ</string>
+	<string name="type.highway.path.demanding_alpine_hiking">पथ</string>
+	<string name="type.highway.path.demanding_mountain_hiking">पथ</string>
+	<string name="type.highway.path.difficult_alpine_hiking">पथ</string>
+	<string name="type.highway.path.hiking">पथ</string>
 	<string name="type.highway.path.horse">पथ</string>
+	<string name="type.highway.path.mountain_hiking">पथ</string>
+	<string name="type.highway.path.permissive">पथ</string>
 	<string name="type.highway.pedestrian">पैदल यात्रीयों की सड़क</string>
 	<string name="type.highway.pedestrian.area">पैदल यात्रीयों की सड़क</string>
 	<string name="type.highway.primary">प्राथमिक सड़क</string>
@@ -846,7 +856,12 @@
 	<string name="type.highway.track">सड़क</string>
 	<string name="type.highway.track.area">सड़क</string>
 	<string name="type.highway.track.grade1">सड़क</string>
+	<string name="type.highway.track.grade2">सड़क</string>
+	<string name="type.highway.track.grade3">सड़क</string>
+	<string name="type.highway.track.grade4">सड़क</string>
+	<string name="type.highway.track.grade5">सड़क</string>
 	<string name="type.highway.track.no.access">सड़क</string>
+	<string name="type.highway.track.permissive">सड़क</string>
 	<string name="type.highway.traffic_signals">ट्रैफिक लाइट</string>
 	<string name="type.highway.trunk">प्रधान मार्ग</string>
 	<string name="type.highway.trunk_link">प्रधान मार्ग</string>
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index e579054e0f..44b54c5bb2 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -465,6 +465,8 @@
 	<string name="editor_edit_place_title">Szerkesztés</string>
 	<string name="editor_add_place_title">Hozzáadás</string>
 	<string name="editor_edit_place_name_hint">Hely neve</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Ahogy a helyi nyelven írva van</string>
 	<string name="editor_edit_place_category_title">Kategória</string>
 	<string name="detailed_problem_description">A probléma részletes leírása</string>
 	<string name="editor_report_problem_other_title">Különböző problémaDifferent problem</string>
@@ -1115,9 +1117,15 @@
 	<string name="type.highway.footway">Ösvény</string>
 	<string name="type.highway.footway.sidewalk">Járda</string>
 	<string name="type.highway.footway.crossing">Gyalogátkelőhely</string>
+	<string name="type.highway.footway.alpine_hiking">Ösvény</string>
 	<string name="type.highway.footway.area">Ösvény</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Híd</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Ösvény</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Ösvény</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Ösvény</string>
+	<string name="type.highway.footway.hiking">Ösvény</string>
+	<string name="type.highway.footway.mountain_hiking">Ösvény</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Alagút</string>
 	<string name="type.highway.ford">Gázló</string>
@@ -1138,15 +1146,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Alagút</string>
 	<string name="type.highway.path">Ösvény</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Ösvény</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Ösvény</string>
+	<string name="type.highway.path.alpine_hiking">Ösvény</string>
 	<string name="type.highway.path.bicycle">Ösvény</string>
-	<string name="type.highway.footway.bicycle">Ösvény</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Híd</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Ösvény</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Ösvény</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Ösvény</string>
+	<string name="type.highway.path.hiking">Ösvény</string>
 	<string name="type.highway.path.horse">Ösvény</string>
+	<string name="type.highway.path.mountain_hiking">Ösvény</string>
+	<string name="type.highway.path.permissive">Ösvény</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Alagút</string>
 	<string name="type.highway.pedestrian">Sétálóutca</string>
@@ -1219,7 +1229,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Híd</string>
 	<string name="type.highway.track.grade1">Utca</string>
+	<string name="type.highway.track.grade2">Utca</string>
+	<string name="type.highway.track.grade3">Utca</string>
+	<string name="type.highway.track.grade4">Utca</string>
+	<string name="type.highway.track.grade5">Utca</string>
 	<string name="type.highway.track.no.access">Utca</string>
+	<string name="type.highway.track.permissive">Utca</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Alagút</string>
 	<string name="type.highway.traffic_signals">Közlekedési lámpa</string>
@@ -1856,7 +1871,7 @@
 	<string name="type.tourism.aquarium">Akvárium</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Hegyi kunyhó</string>
-	<string name="type.tourism.apartment">Nyaraló apartman</string>
+	<string name="type.tourism.apartment">Apartmanok</string>
 	<string name="type.tourism.artwork">Szobor</string>
 	<string name="type.tourism.artwork.architecture">Műalkotás</string>
 	<string name="type.tourism.artwork.painting">Műalkotás</string>
diff --git a/android/app/src/main/res/values-in/strings.xml b/android/app/src/main/res/values-in/strings.xml
index 1a0c7ae109..1e6d75e431 100644
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -453,6 +453,8 @@
 	<string name="editor_edit_place_title">Mengedit</string>
 	<string name="editor_add_place_title">Menambahkan</string>
 	<string name="editor_edit_place_name_hint">Nama tempat</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Seperti yang tertulis dalam bahasa lokal</string>
 	<string name="editor_edit_place_category_title">Kategori</string>
 	<string name="detailed_problem_description">Gambaran terperinci tentang masalah</string>
 	<string name="editor_report_problem_other_title">Masalah yang berbeda</string>
@@ -1091,9 +1093,15 @@
 	<string name="type.highway.footway">Jalur</string>
 	<string name="type.highway.footway.sidewalk">Trotoar</string>
 	<string name="type.highway.footway.crossing">Penyeberangan Pejalan Kaki</string>
+	<string name="type.highway.footway.alpine_hiking">Jalur</string>
 	<string name="type.highway.footway.area">Jalur</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Menjembatani</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Jalur</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Jalur</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Jalur</string>
+	<string name="type.highway.footway.hiking">Jalur</string>
+	<string name="type.highway.footway.mountain_hiking">Jalur</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Terowongan</string>
 	<string name="type.highway.ford">Menyeberang</string>
@@ -1114,15 +1122,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Terowongan</string>
 	<string name="type.highway.path">Jalur</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Jalur</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Jalur</string>
+	<string name="type.highway.path.alpine_hiking">Jalur</string>
 	<string name="type.highway.path.bicycle">Jalur</string>
-	<string name="type.highway.footway.bicycle">Jalur</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Menjembatani</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Jalur</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Jalur</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Jalur</string>
+	<string name="type.highway.path.hiking">Jalur</string>
 	<string name="type.highway.path.horse">Jalur</string>
+	<string name="type.highway.path.mountain_hiking">Jalur</string>
+	<string name="type.highway.path.permissive">Jalur</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Terowongan</string>
 	<string name="type.highway.pedestrian">Jalan</string>
@@ -1195,7 +1205,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Menjembatani</string>
 	<string name="type.highway.track.grade1">Jalan</string>
+	<string name="type.highway.track.grade2">Jalan</string>
+	<string name="type.highway.track.grade3">Jalan</string>
+	<string name="type.highway.track.grade4">Jalan</string>
+	<string name="type.highway.track.grade5">Jalan</string>
 	<string name="type.highway.track.no.access">Jalan</string>
+	<string name="type.highway.track.permissive">Jalan</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Terowongan</string>
 	<string name="type.highway.traffic_signals">Lampu lalu lintas</string>
@@ -1829,7 +1844,7 @@
 	<string name="type.tourism.aquarium">Akuarium</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Penginapan gunung</string>
-	<string name="type.tourism.apartment">Apartemen Liburan</string>
+	<string name="type.tourism.apartment">Apartemen</string>
 	<string name="type.tourism.artwork">Pariwisata</string>
 	<string name="type.tourism.artwork.architecture">Pariwisata</string>
 	<string name="type.tourism.artwork.painting">Pariwisata</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index 2794b1cb71..02b32e4a1a 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -463,6 +463,8 @@
 	<string name="editor_edit_place_title">Modifica</string>
 	<string name="editor_add_place_title">Aggiungi</string>
 	<string name="editor_edit_place_name_hint">Nome del luogo</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Come è scritto nella lingua locale</string>
 	<string name="editor_edit_place_category_title">Categoria</string>
 	<string name="detailed_problem_description">Descrizione dettagliata del problema</string>
 	<string name="editor_report_problem_other_title">Un problema diverso</string>
@@ -1181,9 +1183,15 @@
 	<string name="type.highway.footway">Sentiero</string>
 	<string name="type.highway.footway.sidewalk">Marciapiede</string>
 	<string name="type.highway.footway.crossing">Attraversamento pedonale</string>
+	<string name="type.highway.footway.alpine_hiking">Sentiero</string>
 	<string name="type.highway.footway.area">Sentiero</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Ponte</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Sentiero</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Sentiero</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Sentiero</string>
+	<string name="type.highway.footway.hiking">Sentiero</string>
+	<string name="type.highway.footway.mountain_hiking">Sentiero</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Tunnel</string>
 	<string name="type.highway.ford">Guado</string>
@@ -1203,15 +1211,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Tunnel</string>
 	<string name="type.highway.path">Sentiero</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Sentiero</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Sentiero</string>
+	<string name="type.highway.path.alpine_hiking">Sentiero</string>
 	<string name="type.highway.path.bicycle">Sentiero</string>
-	<string name="type.highway.footway.bicycle">Sentiero</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Ponte</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Sentiero</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Sentiero</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Sentiero</string>
+	<string name="type.highway.path.hiking">Sentiero</string>
 	<string name="type.highway.path.horse">Sentiero</string>
+	<string name="type.highway.path.mountain_hiking">Sentiero</string>
+	<string name="type.highway.path.permissive">Sentiero</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Tunnel</string>
 	<string name="type.highway.pedestrian">Strada pedonale</string>
@@ -1284,7 +1294,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Ponte</string>
 	<string name="type.highway.track.grade1">Via</string>
+	<string name="type.highway.track.grade2">Via</string>
+	<string name="type.highway.track.grade3">Via</string>
+	<string name="type.highway.track.grade4">Via</string>
+	<string name="type.highway.track.grade5">Via</string>
 	<string name="type.highway.track.no.access">Via</string>
+	<string name="type.highway.track.permissive">Via</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Tunnel</string>
 	<string name="type.highway.traffic_signals">Semaforo</string>
@@ -1983,7 +1998,7 @@
 	<string name="type.tourism.aquarium">Acquario</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Rifugio di montagna</string>
-	<string name="type.tourism.apartment">Appartamento vacanze</string>
+	<string name="type.tourism.apartment">Appartamento</string>
 	<string name="type.tourism.artwork">Opera d\'arte</string>
 	<string name="type.tourism.artwork.architecture">Opera d\'arte</string>
 	<string name="type.tourism.artwork.painting">Dipinto</string>
diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml
index 8a0fc16cfe..6722a2eee3 100644
--- a/android/app/src/main/res/values-iw/strings.xml
+++ b/android/app/src/main/res/values-iw/strings.xml
@@ -469,6 +469,8 @@
 	<string name="editor_edit_place_title">עריכת מקום</string>
 	<string name="editor_add_place_title">הוספת מקום</string>
 	<string name="editor_edit_place_name_hint">שם המקום</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">כפי שנכתב בשפה המקומית</string>
 	<string name="editor_edit_place_category_title">קטגוריה</string>
 	<string name="detailed_problem_description">תאור מפורט של הבעיה</string>
 	<string name="editor_report_problem_other_title">בעיה אחרת</string>
@@ -1339,7 +1341,6 @@
 	<string name="type.tourism.aquarium">אַקוַרִיוּם</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">בקתת הרים</string>
-	<string name="type.tourism.apartment">דירת נופש</string>
 	<string name="type.attraction.animal">מתחם בעלי חיים</string>
 	<!-- A rentable countryside vacation house. -->
 	<string name="type.tourism.chalet">בית נופש</string>
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index 1eaf783577..7d6c3e82d0 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -479,6 +479,8 @@
 	<string name="editor_edit_place_title">編集中</string>
 	<string name="editor_add_place_title">追加中</string>
 	<string name="editor_edit_place_name_hint">場所の名前</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">現地の言葉でこう書かれている。</string>
 	<string name="editor_edit_place_category_title">カテゴリ</string>
 	<string name="detailed_problem_description">問題の詳細な説明</string>
 	<string name="editor_report_problem_other_title">異なる問題</string>
@@ -1171,9 +1173,15 @@
 	<string name="type.highway.footway">歩道</string>
 	<string name="type.highway.footway.sidewalk">歩道</string>
 	<string name="type.highway.footway.crossing">横断歩道</string>
+	<string name="type.highway.footway.alpine_hiking">歩道</string>
 	<string name="type.highway.footway.area">歩道</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">橋</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">歩道</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">歩道</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">歩道</string>
+	<string name="type.highway.footway.hiking">歩道</string>
+	<string name="type.highway.footway.mountain_hiking">歩道</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">トンネル</string>
 	<string name="type.highway.ford">浅瀬</string>
@@ -1194,15 +1202,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">トンネル</string>
 	<string name="type.highway.path">歩道</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">歩道</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">歩道</string>
+	<string name="type.highway.path.alpine_hiking">歩道</string>
 	<string name="type.highway.path.bicycle">歩道</string>
-	<string name="type.highway.footway.bicycle">歩道</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">橋</string>
+	<string name="type.highway.path.demanding_alpine_hiking">歩道</string>
+	<string name="type.highway.path.demanding_mountain_hiking">歩道</string>
+	<string name="type.highway.path.difficult_alpine_hiking">歩道</string>
+	<string name="type.highway.path.hiking">歩道</string>
 	<string name="type.highway.path.horse">歩道</string>
+	<string name="type.highway.path.mountain_hiking">歩道</string>
+	<string name="type.highway.path.permissive">歩道</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">トンネル</string>
 	<string name="type.highway.pedestrian">ストリート</string>
@@ -1276,7 +1286,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">橋</string>
 	<string name="type.highway.track.grade1">ストリート</string>
+	<string name="type.highway.track.grade2">ストリート</string>
+	<string name="type.highway.track.grade3">ストリート</string>
+	<string name="type.highway.track.grade4">ストリート</string>
+	<string name="type.highway.track.grade5">ストリート</string>
 	<string name="type.highway.track.no.access">ストリート</string>
+	<string name="type.highway.track.permissive">ストリート</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">トンネル</string>
 	<string name="type.highway.traffic_signals">交通信号</string>
@@ -1997,7 +2012,7 @@
 	<string name="type.tourism.aquarium">水族館</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">山小屋</string>
-	<string name="type.tourism.apartment">ホリデー・アパート</string>
+	<string name="type.tourism.apartment">アパート</string>
 	<string name="type.tourism.artwork">芸術</string>
 	<string name="type.tourism.artwork.architecture">建築</string>
 	<string name="type.tourism.artwork.painting">絵画</string>
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index c0e87df4a6..6bbc7b996d 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -451,6 +451,8 @@
 	<string name="editor_edit_place_title">편집 중</string>
 	<string name="editor_add_place_title">첨가 중</string>
 	<string name="editor_edit_place_name_hint">장소 이름</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">현지 언어로 작성되었으므로</string>
 	<string name="editor_edit_place_category_title">범주</string>
 	<string name="detailed_problem_description">문제에 대한 자세한 설명</string>
 	<string name="editor_report_problem_other_title">다른 문제</string>
@@ -1095,9 +1097,15 @@
 	<string name="type.highway.footway">길</string>
 	<string name="type.highway.footway.sidewalk">보도</string>
 	<string name="type.highway.footway.crossing">횡단보도</string>
+	<string name="type.highway.footway.alpine_hiking">길</string>
 	<string name="type.highway.footway.area">길</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">다리</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">길</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">길</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">길</string>
+	<string name="type.highway.footway.hiking">길</string>
+	<string name="type.highway.footway.mountain_hiking">길</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">터널</string>
 	<string name="type.highway.ford">여울</string>
@@ -1117,15 +1125,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">터널</string>
 	<string name="type.highway.path">길</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">길</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">길</string>
+	<string name="type.highway.path.alpine_hiking">길</string>
 	<string name="type.highway.path.bicycle">길</string>
-	<string name="type.highway.footway.bicycle">길</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">다리</string>
+	<string name="type.highway.path.demanding_alpine_hiking">길</string>
+	<string name="type.highway.path.demanding_mountain_hiking">길</string>
+	<string name="type.highway.path.difficult_alpine_hiking">길</string>
+	<string name="type.highway.path.hiking">길</string>
 	<string name="type.highway.path.horse">길</string>
+	<string name="type.highway.path.mountain_hiking">길</string>
+	<string name="type.highway.path.permissive">길</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">터널</string>
 	<string name="type.highway.pedestrian">거리</string>
@@ -1198,7 +1208,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">다리</string>
 	<string name="type.highway.track.grade1">거리</string>
+	<string name="type.highway.track.grade2">거리</string>
+	<string name="type.highway.track.grade3">거리</string>
+	<string name="type.highway.track.grade4">거리</string>
+	<string name="type.highway.track.grade5">거리</string>
 	<string name="type.highway.track.no.access">거리</string>
+	<string name="type.highway.track.permissive">거리</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">터널</string>
 	<string name="type.highway.traffic_signals">신호등</string>
@@ -1839,7 +1854,7 @@
 	<string name="type.tourism.aquarium">수족관</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">마운틴 롯지</string>
-	<string name="type.tourism.apartment">홀리데이 아파트</string>
+	<string name="type.tourism.apartment">아파트</string>
 	<string name="type.tourism.artwork">작품</string>
 	<string name="type.tourism.artwork.architecture">작품</string>
 	<string name="type.tourism.artwork.painting">작품</string>
diff --git a/android/app/src/main/res/values-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml
index 8d4ac06fc5..b39b95f096 100644
--- a/android/app/src/main/res/values-mr/strings.xml
+++ b/android/app/src/main/res/values-mr/strings.xml
@@ -448,6 +448,8 @@
 	<string name="editor_edit_place_title">संपादन</string>
 	<string name="editor_add_place_title">जोडणे</string>
 	<string name="editor_edit_place_name_hint">ठिकाणाचे नाव</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">स्थानिक भाषेत लिहिल्याप्रमाणे</string>
 	<string name="editor_edit_place_category_title">प्रवर्ग</string>
 	<string name="detailed_problem_description">समस्येचे तपशिलात वर्णन</string>
 	<string name="editor_report_problem_other_title">वेगळी समस्या</string>
@@ -1073,9 +1075,15 @@
 	<string name="type.highway.footway">पादचारी मार्ग</string>
 	<string name="type.highway.footway.sidewalk">फुटपाथ</string>
 	<string name="type.highway.footway.crossing">पादचारी ओलांडणे</string>
+	<string name="type.highway.footway.alpine_hiking">पथ</string>
 	<string name="type.highway.footway.area">पादचारी झोन</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">पादचारी पूल</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">पथ</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">पथ</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">पथ</string>
+	<string name="type.highway.footway.hiking">पथ</string>
+	<string name="type.highway.footway.mountain_hiking">पथ</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">पादचारी बोगदा</string>
 	<string name="type.highway.living_street">वस्ती मार्ग</string>
@@ -1095,15 +1103,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">बोगदा</string>
 	<string name="type.highway.path">पथ</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">पथ</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">पथ</string>
+	<string name="type.highway.path.alpine_hiking">पथ</string>
 	<string name="type.highway.path.bicycle">सायकल आणि पाऊलवाट</string>
-	<string name="type.highway.footway.bicycle">सायकल आणि पाऊलवाट</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">पूल</string>
+	<string name="type.highway.path.demanding_alpine_hiking">पथ</string>
+	<string name="type.highway.path.demanding_mountain_hiking">पथ</string>
+	<string name="type.highway.path.difficult_alpine_hiking">पथ</string>
+	<string name="type.highway.path.hiking">पथ</string>
 	<string name="type.highway.path.horse">पथ</string>
+	<string name="type.highway.path.mountain_hiking">पथ</string>
+	<string name="type.highway.path.permissive">पथ</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">बोगदा</string>
 	<string name="type.highway.pedestrian">पादचारी मार्ग</string>
@@ -1177,7 +1187,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">पूल</string>
 	<string name="type.highway.track.grade1">ट्रॅक</string>
+	<string name="type.highway.track.grade2">ट्रॅक</string>
+	<string name="type.highway.track.grade3">ट्रॅक</string>
+	<string name="type.highway.track.grade4">ट्रॅक</string>
+	<string name="type.highway.track.grade5">ट्रॅक</string>
 	<string name="type.highway.track.no.access">ट्रॅक</string>
+	<string name="type.highway.track.permissive">ट्रॅक</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">बोगदा</string>
 	<string name="type.highway.traffic_signals">वाहतूक दिवे</string>
@@ -1848,7 +1863,7 @@
 	<string name="type.tourism.aquarium">मत्स्यालय</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">माउंटन लॉज</string>
-	<string name="type.tourism.apartment">हॉलिडे अपार्टमेंट</string>
+	<string name="type.tourism.apartment">सदनिका</string>
 	<string name="type.tourism.artwork">कलाकृती</string>
 	<string name="type.tourism.artwork.architecture">कलाकृती</string>
 	<string name="type.tourism.artwork.painting">कलाकृती</string>
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index 0396657b2d..73bc0cc93d 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -477,6 +477,8 @@
 	<string name="editor_edit_place_title">Redigerer</string>
 	<string name="editor_add_place_title">Legger til</string>
 	<string name="editor_edit_place_name_hint">Navn på stedet</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Som det står skrevet på det lokale språket</string>
 	<string name="editor_edit_place_category_title">Kategori</string>
 	<string name="detailed_problem_description">Detaljert beskrivelse av problemet</string>
 	<string name="editor_report_problem_other_title">Et annet problem</string>
@@ -1148,9 +1150,15 @@
 	<string name="type.highway.footway">Gangvei</string>
 	<string name="type.highway.footway.sidewalk">Fortau</string>
 	<string name="type.highway.footway.crossing">Fotgjengerovergang</string>
+	<string name="type.highway.footway.alpine_hiking">Sti</string>
 	<string name="type.highway.footway.area">Gangvei</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Bru</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Sti</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Sti</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Sti</string>
+	<string name="type.highway.footway.hiking">Sti</string>
+	<string name="type.highway.footway.mountain_hiking">Sti</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Tunnel</string>
 	<string name="type.highway.ford">Vadested</string>
@@ -1171,15 +1179,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Tunnel</string>
 	<string name="type.highway.path">Sti</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Sti</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Sti</string>
+	<string name="type.highway.path.alpine_hiking">Sti</string>
 	<string name="type.highway.path.bicycle">Sti</string>
-	<string name="type.highway.footway.bicycle">Sti</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Bru</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Sti</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Sti</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Sti</string>
+	<string name="type.highway.path.hiking">Sti</string>
 	<string name="type.highway.path.horse">Sti</string>
+	<string name="type.highway.path.mountain_hiking">Sti</string>
+	<string name="type.highway.path.permissive">Sti</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Tunnel</string>
 	<string name="type.highway.pedestrian">Gågate</string>
@@ -1252,7 +1262,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Bru</string>
 	<string name="type.highway.track.grade1">Traktor/Skogsbilvei</string>
+	<string name="type.highway.track.grade2">Traktor/Skogsbilvei</string>
+	<string name="type.highway.track.grade3">Traktor/Skogsbilvei</string>
+	<string name="type.highway.track.grade4">Traktor/Skogsbilvei</string>
+	<string name="type.highway.track.grade5">Traktor/Skogsbilvei</string>
 	<string name="type.highway.track.no.access">Traktor/Skogsbilvei</string>
+	<string name="type.highway.track.permissive">Traktor/Skogsbilvei</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Tunnel</string>
 	<string name="type.highway.traffic_signals">Trafikklys</string>
@@ -1894,7 +1909,7 @@
 	<string name="type.tourism.aquarium">Akvarium</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Fjellstue</string>
-	<string name="type.tourism.apartment">Ferieleilighet</string>
+	<string name="type.tourism.apartment">Leiligheter</string>
 	<string name="type.tourism.artwork">Kunstverk</string>
 	<string name="type.tourism.artwork.architecture">Kunstverk</string>
 	<string name="type.tourism.artwork.painting">Kunstverk</string>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index f0b344fd14..004569acc5 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -473,6 +473,8 @@
 	<string name="editor_edit_place_title">Aan het aanpassen</string>
 	<string name="editor_add_place_title">Aan het toevoegen</string>
 	<string name="editor_edit_place_name_hint">Naam van de plaats</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Zoals het in de plaatselijke taal geschreven staat</string>
 	<string name="editor_edit_place_category_title">Categorie</string>
 	<string name="detailed_problem_description">Gedetailleerde probleemomschrijving</string>
 	<string name="editor_report_problem_other_title">Een ander probleem</string>
@@ -1192,9 +1194,15 @@
 	<string name="type.highway.footway">Voetpad</string>
 	<string name="type.highway.footway.sidewalk">Stoep</string>
 	<string name="type.highway.footway.crossing">Voetgangersoversteekplaats</string>
+	<string name="type.highway.footway.alpine_hiking">Alpine wandelpad</string>
 	<string name="type.highway.footway.area">Voetgangerszone</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Voetgangersbrug</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Uitdagend alpine bergklimpad</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Uitdagend bergwandelpad</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Moeilijk alpine bergklimpad</string>
+	<string name="type.highway.footway.hiking">Wandelpad</string>
+	<string name="type.highway.footway.mountain_hiking">Bergpad</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Voetgangerstunnel</string>
 	<string name="type.highway.ford">Voorde</string>
@@ -1215,15 +1223,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Tunnel</string>
 	<string name="type.highway.path">Pad</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Pad</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Pad</string>
+	<string name="type.highway.path.alpine_hiking">Alpine wandelpad</string>
 	<string name="type.highway.path.bicycle">Fietspad</string>
-	<string name="type.highway.footway.bicycle">Fietspad</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Brug</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Pad</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Pad</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Pad</string>
+	<string name="type.highway.path.hiking">Wandelpad</string>
 	<string name="type.highway.path.horse">Ruiterpad</string>
+	<string name="type.highway.path.mountain_hiking">Bergpad</string>
+	<string name="type.highway.path.permissive">Pad</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Tunnel</string>
 	<string name="type.highway.pedestrian">Voetgangersgebied</string>
@@ -1297,7 +1307,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Brug</string>
 	<string name="type.highway.track.grade1">Straat</string>
+	<string name="type.highway.track.grade2">Straat</string>
+	<string name="type.highway.track.grade3">Straat</string>
+	<string name="type.highway.track.grade4">Straat</string>
+	<string name="type.highway.track.grade5">Straat</string>
 	<string name="type.highway.track.no.access">Straat</string>
+	<string name="type.highway.track.permissive">Straat</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Tunnel</string>
 	<string name="type.highway.traffic_signals">Verkeerslichten</string>
@@ -2033,7 +2048,7 @@
 	<string name="type.tourism.aquarium">Aquarium</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Berghut</string>
-	<string name="type.tourism.apartment">Appartement</string>
+	<string name="type.tourism.apartment">Appartementen</string>
 	<string name="type.tourism.artwork">Kunstwerk</string>
 	<string name="type.tourism.artwork.architecture">Kunstwerk</string>
 	<string name="type.tourism.artwork.painting">Schilderij</string>
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index e96177bdbd..40820a75c2 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -477,6 +477,8 @@
 	<string name="editor_edit_place_title">Edycja</string>
 	<string name="editor_add_place_title">Dodawanie</string>
 	<string name="editor_edit_place_name_hint">Nazwa miejsca</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Jak napisano w lokalnym języku</string>
 	<string name="editor_edit_place_category_title">Kategoria</string>
 	<string name="detailed_problem_description">Szczegółowy opis problemu</string>
 	<string name="editor_report_problem_other_title">Inny problem</string>
@@ -1198,9 +1200,15 @@
 	<string name="type.highway.footway">Chodnik</string>
 	<string name="type.highway.footway.sidewalk">Chodnik</string>
 	<string name="type.highway.footway.crossing">Przejście dla pieszych</string>
+	<string name="type.highway.footway.alpine_hiking">Ścieżka wspinaczkowa</string>
 	<string name="type.highway.footway.area">Obszar chodnika</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Most dla pieszych</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Ścieżka</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Ścieżka</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Ścieżka</string>
+	<string name="type.highway.footway.hiking">Ścieżka</string>
+	<string name="type.highway.footway.mountain_hiking">Ścieżka</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Tunel dla pieszych</string>
 	<string name="type.highway.ford">Bród</string>
@@ -1221,15 +1229,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Tunel</string>
 	<string name="type.highway.path">Ścieżka</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Ścieżka</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Ścieżka</string>
+	<string name="type.highway.path.alpine_hiking">Ścieżka wspinaczkowa</string>
 	<string name="type.highway.path.bicycle">Ścieżka dla rowerów</string>
-	<string name="type.highway.footway.bicycle">Ścieżka dla rowerów</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Most</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Ścieżka</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Ścieżka</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Ścieżka</string>
+	<string name="type.highway.path.hiking">Ścieżka</string>
 	<string name="type.highway.path.horse">Ścieżka</string>
+	<string name="type.highway.path.mountain_hiking">Ścieżka</string>
+	<string name="type.highway.path.permissive">Ścieżka</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Tunel</string>
 	<string name="type.highway.pedestrian">Deptak</string>
@@ -1303,7 +1313,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Most</string>
 	<string name="type.highway.track.grade1">Droga na pola lub do lasu</string>
+	<string name="type.highway.track.grade2">Droga na pola lub do lasu</string>
+	<string name="type.highway.track.grade3">Droga na pola lub do lasu</string>
+	<string name="type.highway.track.grade4">Droga na pola lub do lasu</string>
+	<string name="type.highway.track.grade5">Droga na pola lub do lasu</string>
 	<string name="type.highway.track.no.access">Droga na pola lub do lasu</string>
+	<string name="type.highway.track.permissive">Droga na pola lub do lasu</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Tunel drogowy</string>
 	<string name="type.highway.traffic_signals">Sygnalizacja świetlna</string>
@@ -2006,7 +2021,7 @@
 	<string name="type.tourism.aquarium">Akwarium</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Domek górski</string>
-	<string name="type.tourism.apartment">Apartament wakacyjny</string>
+	<string name="type.tourism.apartment">Apartamenty</string>
 	<string name="type.tourism.artwork">Dzieło sztuki</string>
 	<string name="type.tourism.artwork.architecture">Architektura</string>
 	<string name="type.tourism.artwork.painting">Malarstwo</string>
diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml
index 92b52bc628..06cb47d65d 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -1103,9 +1103,15 @@
 	<string name="type.highway.footway">Caminho pedonal</string>
 	<string name="type.highway.footway.sidewalk">Calçada</string>
 	<string name="type.highway.footway.crossing">Travessia de pedestres</string>
+	<string name="type.highway.footway.alpine_hiking">Caminho pedonal</string>
 	<string name="type.highway.footway.area">Área de pedestres</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Ponte para pedestres</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Caminho pedonal difícil</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Caminho pedonal difícil</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Caminho pedonal difícil</string>
+	<string name="type.highway.footway.hiking">Caminho pedonal</string>
+	<string name="type.highway.footway.mountain_hiking">Caminho pedonal</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Túnel para pedestres</string>
 	<string name="type.highway.ford">Rio raso</string>
@@ -1126,15 +1132,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Túnel</string>
 	<string name="type.highway.path">Caminho</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Caminho</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Caminho</string>
+	<string name="type.highway.path.alpine_hiking">Caminho pedonal</string>
 	<string name="type.highway.path.bicycle">Caminho para ciclistas</string>
-	<string name="type.highway.footway.bicycle">Caminho para ciclistas</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Ponte</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Caminho pedonal difícil</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Caminho pedonal difícil</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Caminho pedonal difícil</string>
+	<string name="type.highway.path.hiking">Caminho pedonal</string>
 	<string name="type.highway.path.horse">Caminho para cavaleiros</string>
+	<string name="type.highway.path.mountain_hiking">Caminho pedonal</string>
+	<string name="type.highway.path.permissive">Caminho</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Túnel</string>
 	<string name="type.highway.pedestrian">Rua pedonal</string>
@@ -1208,7 +1216,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Ponte</string>
 	<string name="type.highway.track.grade1">Estrada rústica</string>
+	<string name="type.highway.track.grade2">Estrada rústica</string>
+	<string name="type.highway.track.grade3">Estrada rústica</string>
+	<string name="type.highway.track.grade4">Estrada rústica</string>
+	<string name="type.highway.track.grade5">Estrada rústica</string>
 	<string name="type.highway.track.no.access">Estrada rústica</string>
+	<string name="type.highway.track.permissive">Estrada rústica</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Túnel rodoviário</string>
 	<string name="type.highway.traffic_signals">Semáforo</string>
@@ -1788,6 +1801,7 @@
 	<string name="type.tourism">Turismo</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Alojamento na montanha</string>
+	<string name="type.tourism.apartment">Apartamentos</string>
 	<string name="type.tourism.artwork">Obra de arte</string>
 	<string name="type.tourism.artwork.architecture">Obra de arte de arquitetura</string>
 	<string name="type.tourism.artwork.painting">Pintura</string>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 56daf16f31..bd14ef4891 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -458,6 +458,8 @@
 	<string name="editor_edit_place_title">Edição</string>
 	<string name="editor_add_place_title">A adicionar</string>
 	<string name="editor_edit_place_name_hint">Nome do lugar</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Como escrito na língua local</string>
 	<string name="editor_edit_place_category_title">Categoria</string>
 	<string name="detailed_problem_description">Descrição detalhada do problema</string>
 	<string name="editor_report_problem_other_title">Um problema diferente</string>
@@ -1149,9 +1151,15 @@
 	<string name="type.highway.footway">Caminho pedonal</string>
 	<string name="type.highway.footway.sidewalk">Passeio</string>
 	<string name="type.highway.footway.crossing">Passagem de peões</string>
+	<string name="type.highway.footway.alpine_hiking">Caminho pedonal</string>
 	<string name="type.highway.footway.area">Caminho pedonal</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Ponte</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Caminho pedonal</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Caminho pedonal</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Caminho pedonal</string>
+	<string name="type.highway.footway.hiking">Caminho pedonal</string>
+	<string name="type.highway.footway.mountain_hiking">Caminho pedonal</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Túnel</string>
 	<string name="type.highway.ford">Vau</string>
@@ -1172,15 +1180,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Túnel</string>
 	<string name="type.highway.path">Caminho</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Caminho</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Caminho</string>
+	<string name="type.highway.path.alpine_hiking">Caminho</string>
 	<string name="type.highway.path.bicycle">Caminho</string>
-	<string name="type.highway.footway.bicycle">Caminho</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Ponte</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Caminho</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Caminho</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Caminho</string>
+	<string name="type.highway.path.hiking">Caminho</string>
 	<string name="type.highway.path.horse">Caminho</string>
+	<string name="type.highway.path.mountain_hiking">Caminho</string>
+	<string name="type.highway.path.permissive">Caminho</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Túnel</string>
 	<string name="type.highway.pedestrian">Rua pedonal</string>
@@ -1254,7 +1264,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Ponte</string>
 	<string name="type.highway.track.grade1">Carreiro florestal ou agrícola</string>
+	<string name="type.highway.track.grade2">Carreiro florestal ou agrícola</string>
+	<string name="type.highway.track.grade3">Carreiro florestal ou agrícola</string>
+	<string name="type.highway.track.grade4">Carreiro florestal ou agrícola</string>
+	<string name="type.highway.track.grade5">Carreiro florestal ou agrícola</string>
 	<string name="type.highway.track.no.access">Carreiro florestal ou agrícola</string>
+	<string name="type.highway.track.permissive">Carreiro florestal ou agrícola</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Túnel</string>
 	<string name="type.highway.traffic_signals">Semáforo</string>
@@ -1980,7 +1995,7 @@
 	<string name="type.tourism.aquarium">Aquário</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Alojamento de montanha</string>
-	<string name="type.tourism.apartment">Apartamento de férias</string>
+	<string name="type.tourism.apartment">Apartamentos</string>
 	<string name="type.tourism.artwork">Obra de arte</string>
 	<string name="type.tourism.artwork.architecture">Obra de arte de arquitetura</string>
 	<string name="type.tourism.artwork.painting">Pintura</string>
diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml
index 4e25d62a56..887ef9a360 100644
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -463,6 +463,8 @@
 	<string name="editor_edit_place_title">Modifică</string>
 	<string name="editor_add_place_title">Adaugă</string>
 	<string name="editor_edit_place_name_hint">Numele locului</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Așa cum este scris în limba locală</string>
 	<string name="editor_edit_place_category_title">Categorie</string>
 	<string name="detailed_problem_description">Descriere detaliată a problemei</string>
 	<string name="editor_report_problem_other_title">Altă problemă</string>
@@ -1115,9 +1117,15 @@
 	<string name="type.highway.footway">Cale</string>
 	<string name="type.highway.footway.sidewalk">Trotuar</string>
 	<string name="type.highway.footway.crossing">Trecere de pietoni</string>
+	<string name="type.highway.footway.alpine_hiking">Cale</string>
 	<string name="type.highway.footway.area">Cale</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Pod</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Cale</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Cale</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Cale</string>
+	<string name="type.highway.footway.hiking">Cale</string>
+	<string name="type.highway.footway.mountain_hiking">Cale</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Tunel</string>
 	<string name="type.highway.ford">Superficial</string>
@@ -1138,15 +1146,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Tunel</string>
 	<string name="type.highway.path">Cale</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Cale</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Cale</string>
+	<string name="type.highway.path.alpine_hiking">Cale</string>
 	<string name="type.highway.path.bicycle">Cale</string>
-	<string name="type.highway.footway.bicycle">Cale</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Pod</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Cale</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Cale</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Cale</string>
+	<string name="type.highway.path.hiking">Cale</string>
 	<string name="type.highway.path.horse">Cale</string>
+	<string name="type.highway.path.mountain_hiking">Cale</string>
+	<string name="type.highway.path.permissive">Cale</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Tunel</string>
 	<string name="type.highway.pedestrian">Stradă</string>
@@ -1219,7 +1229,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Pod</string>
 	<string name="type.highway.track.grade1">Stradă</string>
+	<string name="type.highway.track.grade2">Stradă</string>
+	<string name="type.highway.track.grade3">Stradă</string>
+	<string name="type.highway.track.grade4">Stradă</string>
+	<string name="type.highway.track.grade5">Stradă</string>
 	<string name="type.highway.track.no.access">Stradă</string>
+	<string name="type.highway.track.permissive">Stradă</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Tunel</string>
 	<string name="type.highway.traffic_signals">Semafoare</string>
@@ -1854,7 +1869,7 @@
 	<string name="type.tourism.aquarium">Acvariu</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Cabana de munte</string>
-	<string name="type.tourism.apartment">Apartament de vacanță</string>
+	<string name="type.tourism.apartment">Apartamente</string>
 	<string name="type.tourism.artwork">Turism</string>
 	<string name="type.tourism.artwork.architecture">Turism</string>
 	<string name="type.tourism.artwork.painting">Turism</string>
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index a5c3ecbf49..8048a0ae42 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -480,6 +480,8 @@
 	<string name="editor_edit_place_title">Редактирование</string>
 	<string name="editor_add_place_title">Добавление</string>
 	<string name="editor_edit_place_name_hint">Название места</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">На местном языке</string>
 	<string name="editor_edit_place_category_title">Категория</string>
 	<string name="detailed_problem_description">Подробное описание проблемы</string>
 	<string name="editor_report_problem_other_title">Другая проблема</string>
@@ -1213,9 +1215,15 @@
 	<string name="type.highway.footway">Пешеходная дорожка</string>
 	<string name="type.highway.footway.sidewalk">Тротуар</string>
 	<string name="type.highway.footway.crossing">Пешеходный переход</string>
+	<string name="type.highway.footway.alpine_hiking">Тропа</string>
 	<string name="type.highway.footway.area">Пешеходная зона</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Пешеходный мост</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Тропа</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Тропа</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Тропа</string>
+	<string name="type.highway.footway.hiking">Тропа</string>
+	<string name="type.highway.footway.mountain_hiking">Тропа</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Пешеходный тоннель</string>
 	<string name="type.highway.ford">Брод</string>
@@ -1236,15 +1244,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Тоннель</string>
 	<string name="type.highway.path">Тропа</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Сложная или плохо видимая тропа</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Очень сложная или неразличимая тропа</string>
+	<string name="type.highway.path.alpine_hiking">Тропа</string>
 	<string name="type.highway.path.bicycle">Велопешеходная дорожка</string>
-	<string name="type.highway.footway.bicycle">Велопешеходная дорожка</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Мост</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Тропа</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Тропа</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Тропа</string>
+	<string name="type.highway.path.hiking">Тропа</string>
 	<string name="type.highway.path.horse">Конная тропа</string>
+	<string name="type.highway.path.mountain_hiking">Тропа</string>
+	<string name="type.highway.path.permissive">Тропа</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Тоннель</string>
 	<string name="type.highway.pedestrian">Пешеходная улица</string>
@@ -1318,7 +1328,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Мост</string>
 	<string name="type.highway.track.grade1">Грунтовка</string>
+	<string name="type.highway.track.grade2">Грунтовка</string>
+	<string name="type.highway.track.grade3">Грунтовка</string>
+	<string name="type.highway.track.grade4">Грунтовка</string>
+	<string name="type.highway.track.grade5">Грунтовка</string>
 	<string name="type.highway.track.no.access">Грунтовка</string>
+	<string name="type.highway.track.permissive">Грунтовка</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Тоннель</string>
 	<string name="type.highway.traffic_signals">Светофор</string>
@@ -2059,7 +2074,7 @@
 	<string name="type.tourism.aquarium">Аквариум</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Горный приют с обслуживанием</string>
-	<string name="type.tourism.apartment">Квартира для отдыха</string>
+	<string name="type.tourism.apartment">Апартаменты</string>
 	<string name="type.tourism.artwork">Произведение искусства</string>
 	<string name="type.tourism.artwork.architecture">Произведение искусства</string>
 	<string name="type.tourism.artwork.painting">Произведение искусства</string>
diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml
index 4886311d33..727af1e0b6 100644
--- a/android/app/src/main/res/values-sk/strings.xml
+++ b/android/app/src/main/res/values-sk/strings.xml
@@ -475,6 +475,8 @@
 	<string name="editor_edit_place_title">Úprava</string>
 	<string name="editor_add_place_title">Nové</string>
 	<string name="editor_edit_place_name_hint">Názov miesta</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Tak, ako sa píše v miestnom jazyku</string>
 	<string name="editor_edit_place_category_title">Kategória</string>
 	<string name="detailed_problem_description">Podrobný popis problému</string>
 	<string name="editor_report_problem_other_title">Iný problém</string>
@@ -1184,9 +1186,15 @@
 	<string name="type.highway.footway">Cesta pre chodcov</string>
 	<string name="type.highway.footway.sidewalk">Chodník</string>
 	<string name="type.highway.footway.crossing">Priechod pre chodcov</string>
+	<string name="type.highway.footway.alpine_hiking">Turistický chodník</string>
 	<string name="type.highway.footway.area">Pešia zóna</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Most pre chodcov</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Cesta</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Náročný horský chodník</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Náročný turistický chodník</string>
+	<string name="type.highway.footway.hiking">Turistický chodník</string>
+	<string name="type.highway.footway.mountain_hiking">Horský turistický chodník</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Tunel pre chodcov</string>
 	<string name="type.highway.ford">Brod</string>
@@ -1207,15 +1215,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Tunel</string>
 	<string name="type.highway.path">Cesta</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Cesta</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Cesta</string>
+	<string name="type.highway.path.alpine_hiking">Turistický chodník</string>
 	<string name="type.highway.path.bicycle">Cesta pre cyklistov a chodcov</string>
-	<string name="type.highway.footway.bicycle">Cesta pre cyklistov a chodcov</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Most</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Náročný turistický chodník</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Náročný horský chodník</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Obtiažny turistický chodník</string>
+	<string name="type.highway.path.hiking">Turistický chodník</string>
 	<string name="type.highway.path.horse">Cesta pre jazdca na zvierati</string>
+	<string name="type.highway.path.mountain_hiking">Horský turistický chodník</string>
+	<string name="type.highway.path.permissive">Cesta</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Tunel</string>
 	<string name="type.highway.pedestrian">Ulica</string>
@@ -1289,7 +1299,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Most</string>
 	<string name="type.highway.track.grade1">Poľná cesta</string>
+	<string name="type.highway.track.grade2">Poľná cesta</string>
+	<string name="type.highway.track.grade3">Poľná cesta</string>
+	<string name="type.highway.track.grade4">Poľná cesta</string>
+	<string name="type.highway.track.grade5">Poľná cesta</string>
 	<string name="type.highway.track.no.access">Poľná cesta</string>
+	<string name="type.highway.track.permissive">Poľná cesta</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Tunel</string>
 	<string name="type.highway.traffic_signals">Semafor</string>
@@ -1994,7 +2009,7 @@
 	<string name="type.tourism.aquarium">Akvárium</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Horská chata</string>
-	<string name="type.tourism.apartment">Prázdninový apartmán</string>
+	<string name="type.tourism.apartment">Apartmány</string>
 	<string name="type.tourism.artwork">Umelecké dielo</string>
 	<string name="type.tourism.artwork.architecture">Architektonické dielo</string>
 	<string name="type.tourism.artwork.painting">Maľba</string>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index c289a168a1..833404e9b7 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -449,6 +449,8 @@
 	<string name="editor_edit_place_title">Redigerar</string>
 	<string name="editor_add_place_title">Lägger till</string>
 	<string name="editor_edit_place_name_hint">Namn på platsen</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Som det står skrivet på det lokala språket</string>
 	<string name="editor_edit_place_category_title">Kategori</string>
 	<string name="detailed_problem_description">Detaljerad beskrivning av ett problem</string>
 	<string name="editor_report_problem_other_title">Ett annat problem</string>
@@ -1091,9 +1093,15 @@
 	<string name="type.highway.footway">Gångväg</string>
 	<string name="type.highway.footway.sidewalk">Trottoar</string>
 	<string name="type.highway.footway.crossing">Övergångsställe för fotgängare</string>
+	<string name="type.highway.footway.alpine_hiking">Gångväg</string>
 	<string name="type.highway.footway.area">Gångväg</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Bro</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Gångväg</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Gångväg</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Gångväg</string>
+	<string name="type.highway.footway.hiking">Gångväg</string>
+	<string name="type.highway.footway.mountain_hiking">Gångväg</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Tunnel</string>
 	<string name="type.highway.ford">Vadställe</string>
@@ -1114,15 +1122,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Tunnel</string>
 	<string name="type.highway.path">Gångväg</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Gångväg</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Gångväg</string>
+	<string name="type.highway.path.alpine_hiking">Gångväg</string>
 	<string name="type.highway.path.bicycle">Gångväg</string>
-	<string name="type.highway.footway.bicycle">Gångväg</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Bro</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Gångväg</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Gångväg</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Gångväg</string>
+	<string name="type.highway.path.hiking">Gångväg</string>
 	<string name="type.highway.path.horse">Gångväg</string>
+	<string name="type.highway.path.mountain_hiking">Gångväg</string>
+	<string name="type.highway.path.permissive">Gångväg</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Tunnel</string>
 	<string name="type.highway.pedestrian">Gata</string>
@@ -1195,7 +1205,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Bro</string>
 	<string name="type.highway.track.grade1">Gata</string>
+	<string name="type.highway.track.grade2">Gata</string>
+	<string name="type.highway.track.grade3">Gata</string>
+	<string name="type.highway.track.grade4">Gata</string>
+	<string name="type.highway.track.grade5">Gata</string>
 	<string name="type.highway.track.no.access">Gata</string>
+	<string name="type.highway.track.permissive">Gata</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Tunnel</string>
 	<string name="type.highway.traffic_signals">Trafikljus</string>
@@ -1828,7 +1843,7 @@
 	<string name="type.tourism.aquarium">Akvarium</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Fjällstuga</string>
-	<string name="type.tourism.apartment">Semesterlägenhet</string>
+	<string name="type.tourism.apartment">Lägenheter</string>
 	<string name="type.tourism.artwork">Konstverk</string>
 	<string name="type.tourism.artwork.architecture">Konstverk</string>
 	<string name="type.tourism.artwork.painting">Konstverk</string>
diff --git a/android/app/src/main/res/values-sw/strings.xml b/android/app/src/main/res/values-sw/strings.xml
index 5ef6502995..f710be1de7 100644
--- a/android/app/src/main/res/values-sw/strings.xml
+++ b/android/app/src/main/res/values-sw/strings.xml
@@ -92,6 +92,8 @@
 	<!-- SECTION: Strings for downloading map from search -->
 	<string name="login_osm">Ingia kwa OpenStreetMap</string>
 	<string name="level">Ghorofa</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Kama ilivyoandikwa katika lugha ya kienyeji</string>
 	<!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
 	<string name="osm_presentation">Data ya OpenStreetMap iliyoundwa na jumuiya kufikia %s. Pata maelezo zaidi kuhusu jinsi ya kuhariri na kusasisha ramani katika OpenStreetMap.org</string>
 	<string name="editor_other_info">Tuma ujumbe kwenye vihariri vya OSM</string>
@@ -912,7 +914,6 @@
 	<string name="type.tourism.aquarium">Aquarium</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Mlima lodge</string>
-	<string name="type.tourism.apartment">Ghorofa ya Likizo</string>
 	<string name="type.attraction.animal">Hifadhi ya Wanyama</string>
 	<!-- A rentable countryside vacation house. -->
 	<string name="type.tourism.chalet">Nyumba ndogo ya Likizo</string>
diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index cccb44fc4f..70daee440f 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -453,6 +453,8 @@
 	<string name="editor_edit_place_title">กำลังแก้ไข</string>
 	<string name="editor_add_place_title">กำลังเพิ่ม</string>
 	<string name="editor_edit_place_name_hint">ชื่อสถานที่</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">ตามที่เขียนเป็นภาษาท้องถิ่น</string>
 	<string name="editor_edit_place_category_title">หมวดหมู่</string>
 	<string name="detailed_problem_description">คำอธิบายปัญหาอย่างละเอียด</string>
 	<string name="editor_report_problem_other_title">ปัญหาอีกอย่างหนึ่ง</string>
@@ -1096,9 +1098,15 @@
 	<string name="type.highway.footway">เส้นทาง</string>
 	<string name="type.highway.footway.sidewalk">ทางเท้า</string>
 	<string name="type.highway.footway.crossing">ทางม้าลาย</string>
+	<string name="type.highway.footway.alpine_hiking">เส้นทาง</string>
 	<string name="type.highway.footway.area">เส้นทาง</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">สะพาน</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">เส้นทาง</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">เส้นทาง</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">เส้นทาง</string>
+	<string name="type.highway.footway.hiking">เส้นทาง</string>
+	<string name="type.highway.footway.mountain_hiking">เส้นทาง</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">อุโมงค์</string>
 	<string name="type.highway.ford">ที่ตื้นของทางน้ำ</string>
@@ -1119,15 +1127,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">อุโมงค์</string>
 	<string name="type.highway.path">เส้นทาง</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">เส้นทาง</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">เส้นทาง</string>
+	<string name="type.highway.path.alpine_hiking">เส้นทาง</string>
 	<string name="type.highway.path.bicycle">เส้นทาง</string>
-	<string name="type.highway.footway.bicycle">เส้นทาง</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">สะพาน</string>
+	<string name="type.highway.path.demanding_alpine_hiking">เส้นทาง</string>
+	<string name="type.highway.path.demanding_mountain_hiking">เส้นทาง</string>
+	<string name="type.highway.path.difficult_alpine_hiking">เส้นทาง</string>
+	<string name="type.highway.path.hiking">เส้นทาง</string>
 	<string name="type.highway.path.horse">เส้นทาง</string>
+	<string name="type.highway.path.mountain_hiking">เส้นทาง</string>
+	<string name="type.highway.path.permissive">เส้นทาง</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">อุโมงค์</string>
 	<string name="type.highway.pedestrian">ถนน</string>
@@ -1200,7 +1210,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">สะพาน</string>
 	<string name="type.highway.track.grade1">ถนน</string>
+	<string name="type.highway.track.grade2">ถนน</string>
+	<string name="type.highway.track.grade3">ถนน</string>
+	<string name="type.highway.track.grade4">ถนน</string>
+	<string name="type.highway.track.grade5">ถนน</string>
 	<string name="type.highway.track.no.access">ถนน</string>
+	<string name="type.highway.track.permissive">ถนน</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">อุโมงค์</string>
 	<string name="type.highway.traffic_signals">สัญญาณไฟจราจร</string>
@@ -1837,7 +1852,7 @@
 	<string name="type.tourism.aquarium">พิพิธภัณฑ์สัตว์น้ำ</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">บ้านพักบนภูเขา</string>
-	<string name="type.tourism.apartment">ฮอลิเดย์ อพาร์ตเมนต์</string>
+	<string name="type.tourism.apartment">อพาร์ตเมนต์</string>
 	<string name="type.tourism.artwork">งานศิลปะ</string>
 	<string name="type.tourism.artwork.architecture">งานศิลปะ</string>
 	<string name="type.tourism.artwork.painting">งานศิลปะ</string>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index 4ac63c8d01..7e59722c96 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -477,6 +477,8 @@
 	<string name="editor_edit_place_title">Düzenleme</string>
 	<string name="editor_add_place_title">Ekleme</string>
 	<string name="editor_edit_place_name_hint">Yerin adı</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Yerel dilde yazıldığı gibi</string>
 	<string name="editor_edit_place_category_title">Kategori</string>
 	<string name="detailed_problem_description">Sorunun ayrıntılı açıklaması</string>
 	<string name="editor_report_problem_other_title">Farklı bir sorun</string>
@@ -1196,9 +1198,15 @@
 	<string name="type.highway.footway">Yaya Yolu</string>
 	<string name="type.highway.footway.sidewalk">Kaldırım</string>
 	<string name="type.highway.footway.crossing">Yaya Geçidi</string>
+	<string name="type.highway.footway.alpine_hiking">Yol</string>
 	<string name="type.highway.footway.area">Yaya Alanı</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Köprü</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Yol</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Yol</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Yol</string>
+	<string name="type.highway.footway.hiking">Yol</string>
+	<string name="type.highway.footway.mountain_hiking">Yol</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Tünel</string>
 	<string name="type.highway.ford">Geçit</string>
@@ -1219,15 +1227,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Tünel</string>
 	<string name="type.highway.path">Yol</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Yol</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Yol</string>
+	<string name="type.highway.path.alpine_hiking">Yol</string>
 	<string name="type.highway.path.bicycle">Bisiklet ve Yürüyüş Yolu</string>
-	<string name="type.highway.footway.bicycle">Bisiklet ve Yürüyüş Yolu</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Köprü</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Yol</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Yol</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Yol</string>
+	<string name="type.highway.path.hiking">Yol</string>
 	<string name="type.highway.path.horse">Atlı Yolu</string>
+	<string name="type.highway.path.mountain_hiking">Yol</string>
+	<string name="type.highway.path.permissive">Yol</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Tünel</string>
 	<string name="type.highway.pedestrian">Yayalar için Cadde</string>
@@ -1301,7 +1311,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Köprü</string>
 	<string name="type.highway.track.grade1">Pist</string>
+	<string name="type.highway.track.grade2">Pist</string>
+	<string name="type.highway.track.grade3">Pist</string>
+	<string name="type.highway.track.grade4">Pist</string>
+	<string name="type.highway.track.grade5">Pist</string>
 	<string name="type.highway.track.no.access">Pist</string>
+	<string name="type.highway.track.permissive">Pist</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Tünel</string>
 	<string name="type.highway.traffic_signals">Trafik Işıkları</string>
@@ -2031,7 +2046,7 @@
 	<string name="type.tourism.aquarium">Akvaryum</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Dağ Köşkü</string>
-	<string name="type.tourism.apartment">Tatil Apartmanı</string>
+	<string name="type.tourism.apartment">Apart Otel</string>
 	<string name="type.tourism.artwork">Sanat</string>
 	<string name="type.tourism.artwork.architecture">Sanatsal Mimari</string>
 	<string name="type.tourism.artwork.painting">Sanat Eserleri</string>
diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml
index 27512fbc47..a223bc86ac 100644
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -479,6 +479,8 @@
 	<string name="editor_edit_place_title">Редагування</string>
 	<string name="editor_add_place_title">Додавання</string>
 	<string name="editor_edit_place_name_hint">Назва місця</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Місцевою мовою</string>
 	<string name="editor_edit_place_category_title">Категорія</string>
 	<string name="detailed_problem_description">Детальний опис проблеми</string>
 	<string name="editor_report_problem_other_title">Інші проблема</string>
@@ -1201,9 +1203,15 @@
 	<string name="type.highway.footway">Пішохідна доріжка</string>
 	<string name="type.highway.footway.sidewalk">Тротуар</string>
 	<string name="type.highway.footway.crossing">Пішохідний перехід</string>
+	<string name="type.highway.footway.alpine_hiking">Стежка</string>
 	<string name="type.highway.footway.area">Пішохідна зона</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Міст</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Стежка</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Стежка</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Стежка</string>
+	<string name="type.highway.footway.hiking">Стежка</string>
+	<string name="type.highway.footway.mountain_hiking">Стежка</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Тунель</string>
 	<string name="type.highway.ford">Брід</string>
@@ -1224,15 +1232,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Тунель</string>
 	<string name="type.highway.path">Стежка</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Стежка</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Стежка</string>
+	<string name="type.highway.path.alpine_hiking">Стежка</string>
 	<string name="type.highway.path.bicycle">Велопішохідна доріжка</string>
-	<string name="type.highway.footway.bicycle">Велопішохідна доріжка</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Міст</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Стежка</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Стежка</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Стежка</string>
+	<string name="type.highway.path.hiking">Стежка</string>
 	<string name="type.highway.path.horse">Кінна стежка</string>
+	<string name="type.highway.path.mountain_hiking">Стежка</string>
+	<string name="type.highway.path.permissive">Стежка</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Тунель</string>
 	<string name="type.highway.pedestrian">Пішохідна вулиця</string>
@@ -1306,7 +1316,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Міст</string>
 	<string name="type.highway.track.grade1">Ґрунтівка</string>
+	<string name="type.highway.track.grade2">Ґрунтівка</string>
+	<string name="type.highway.track.grade3">Ґрунтівка</string>
+	<string name="type.highway.track.grade4">Ґрунтівка</string>
+	<string name="type.highway.track.grade5">Ґрунтівка</string>
 	<string name="type.highway.track.no.access">Ґрунтівка</string>
+	<string name="type.highway.track.permissive">Ґрунтівка</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Тунель</string>
 	<string name="type.highway.traffic_signals">Світлофор</string>
@@ -2038,7 +2053,7 @@
 	<string name="type.tourism.aquarium">Акваріум</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Гірський притулок з обслуговуванням</string>
-	<string name="type.tourism.apartment">Апартаменти для відпочинку</string>
+	<string name="type.tourism.apartment">Апартаменти</string>
 	<string name="type.tourism.artwork">Витвір мистецтва</string>
 	<string name="type.tourism.artwork.architecture">Витвір мистецтва</string>
 	<string name="type.tourism.artwork.painting">Витвір мистецтва</string>
diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml
index 436ced2992..091fe038a7 100644
--- a/android/app/src/main/res/values-vi/strings.xml
+++ b/android/app/src/main/res/values-vi/strings.xml
@@ -451,6 +451,8 @@
 	<string name="editor_edit_place_title">Chỉnh sửa</string>
 	<string name="editor_add_place_title">Nhập</string>
 	<string name="editor_edit_place_name_hint">Tên địa điểm</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">Vì nó được viết bằng ngôn ngữ địa phương</string>
 	<string name="editor_edit_place_category_title">Thể loại</string>
 	<string name="detailed_problem_description">Mô tả chi tiết của vấn đề</string>
 	<string name="editor_report_problem_other_title">Một vấn đề khác</string>
@@ -1093,9 +1095,15 @@
 	<string name="type.highway.footway">Đường</string>
 	<string name="type.highway.footway.sidewalk">Đường đi bộ</string>
 	<string name="type.highway.footway.crossing">Vạch qua đường</string>
+	<string name="type.highway.footway.alpine_hiking">Đường</string>
 	<string name="type.highway.footway.area">Đường</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Cầu</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Đường</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Đường</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Đường</string>
+	<string name="type.highway.footway.hiking">Đường</string>
+	<string name="type.highway.footway.mountain_hiking">Đường</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Đường hầm</string>
 	<string name="type.highway.ford">Đập tràn</string>
@@ -1116,15 +1124,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Đường hầm</string>
 	<string name="type.highway.path">Đường</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Đường</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Đường</string>
+	<string name="type.highway.path.alpine_hiking">Đường</string>
 	<string name="type.highway.path.bicycle">Đường</string>
-	<string name="type.highway.footway.bicycle">Đường</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Cầu</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Đường</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Đường</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Đường</string>
+	<string name="type.highway.path.hiking">Đường</string>
 	<string name="type.highway.path.horse">Đường</string>
+	<string name="type.highway.path.mountain_hiking">Đường</string>
+	<string name="type.highway.path.permissive">Đường</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Đường hầm</string>
 	<string name="type.highway.pedestrian">Phố</string>
@@ -1197,7 +1207,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Cầu</string>
 	<string name="type.highway.track.grade1">Phố</string>
+	<string name="type.highway.track.grade2">Phố</string>
+	<string name="type.highway.track.grade3">Phố</string>
+	<string name="type.highway.track.grade4">Phố</string>
+	<string name="type.highway.track.grade5">Phố</string>
 	<string name="type.highway.track.no.access">Phố</string>
+	<string name="type.highway.track.permissive">Phố</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Đường hầm</string>
 	<string name="type.highway.traffic_signals">Đèn Giao Thông</string>
@@ -1833,7 +1848,7 @@
 	<string name="type.tourism.aquarium">Bể nuôi cá</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">Nhà nghỉ trên núi</string>
-	<string name="type.tourism.apartment">Căn hộ nghỉ dưỡng</string>
+	<string name="type.tourism.apartment">Căn hộ</string>
 	<string name="type.tourism.artwork">Du lịch</string>
 	<string name="type.tourism.artwork.architecture">Du lịch</string>
 	<string name="type.tourism.artwork.painting">Du lịch</string>
diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml
index b5798ebd15..335b8b29dd 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -465,6 +465,8 @@
 	<string name="editor_edit_place_title">編輯中</string>
 	<string name="editor_add_place_title">新增中</string>
 	<string name="editor_edit_place_name_hint">該地點的名稱</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">因為它是用當地語言寫的</string>
 	<string name="editor_edit_place_category_title">類別</string>
 	<string name="detailed_problem_description">問題的詳細描述</string>
 	<string name="editor_report_problem_other_title">不同的問題</string>
@@ -1135,9 +1137,15 @@
 	<string name="type.highway.footway">人行步道</string>
 	<string name="type.highway.footway.sidewalk">人行道</string>
 	<string name="type.highway.footway.crossing">行人穿越道</string>
+	<string name="type.highway.footway.alpine_hiking">人行步道</string>
 	<string name="type.highway.footway.area">人行步道</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">橋</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">人行步道</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">人行步道</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">人行步道</string>
+	<string name="type.highway.footway.hiking">人行步道</string>
+	<string name="type.highway.footway.mountain_hiking">人行步道</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">隧道</string>
 	<string name="type.highway.ford">淺灘</string>
@@ -1158,15 +1166,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">隧道</string>
 	<string name="type.highway.path">人行步道</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">人行步道</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">人行步道</string>
+	<string name="type.highway.path.alpine_hiking">人行步道</string>
 	<string name="type.highway.path.bicycle">人行步道</string>
-	<string name="type.highway.footway.bicycle">人行步道</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">橋</string>
+	<string name="type.highway.path.demanding_alpine_hiking">人行步道</string>
+	<string name="type.highway.path.demanding_mountain_hiking">人行步道</string>
+	<string name="type.highway.path.difficult_alpine_hiking">人行步道</string>
+	<string name="type.highway.path.hiking">人行步道</string>
 	<string name="type.highway.path.horse">人行步道</string>
+	<string name="type.highway.path.mountain_hiking">人行步道</string>
+	<string name="type.highway.path.permissive">人行步道</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">隧道</string>
 	<string name="type.highway.pedestrian">路</string>
@@ -1240,7 +1250,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">橋</string>
 	<string name="type.highway.track.grade1">土路</string>
+	<string name="type.highway.track.grade2">土路</string>
+	<string name="type.highway.track.grade3">土路</string>
+	<string name="type.highway.track.grade4">土路</string>
+	<string name="type.highway.track.grade5">土路</string>
 	<string name="type.highway.track.no.access">土路</string>
+	<string name="type.highway.track.permissive">土路</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">隧道</string>
 	<string name="type.highway.traffic_signals">紅綠燈</string>
@@ -1887,7 +1902,7 @@
 	<string name="type.tourism.aquarium">水族館</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">山間小屋</string>
-	<string name="type.tourism.apartment">假日公寓</string>
+	<string name="type.tourism.apartment">公寓</string>
 	<string name="type.tourism.artwork">藝術品</string>
 	<string name="type.tourism.artwork.architecture">藝術品</string>
 	<string name="type.tourism.artwork.painting">藝術品</string>
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index 379d95b0ca..12848f9618 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -462,6 +462,8 @@
 	<string name="editor_edit_place_title">编辑中</string>
 	<string name="editor_add_place_title">添加中</string>
 	<string name="editor_edit_place_name_hint">该地点的名称</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">当地语言写道</string>
 	<string name="editor_edit_place_category_title">类别</string>
 	<string name="detailed_problem_description">问题的详细描述</string>
 	<string name="editor_report_problem_other_title">一个不同的问题</string>
@@ -1149,9 +1151,15 @@
 	<string name="type.highway.footway">步行道路</string>
 	<string name="type.highway.footway.sidewalk">人行道</string>
 	<string name="type.highway.footway.crossing">行人过街天桥</string>
+	<string name="type.highway.footway.alpine_hiking">步行道路</string>
 	<string name="type.highway.footway.area">步行道路</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">桥</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">步行道路</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">步行道路</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">步行道路</string>
+	<string name="type.highway.footway.hiking">步行道路</string>
+	<string name="type.highway.footway.mountain_hiking">步行道路</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">隧道</string>
 	<string name="type.highway.ford">浅滩</string>
@@ -1172,15 +1180,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">隧道</string>
 	<string name="type.highway.path">小道</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">小道</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">小道</string>
+	<string name="type.highway.path.alpine_hiking">小道</string>
 	<string name="type.highway.path.bicycle">小道</string>
-	<string name="type.highway.footway.bicycle">小道</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">桥</string>
+	<string name="type.highway.path.demanding_alpine_hiking">小道</string>
+	<string name="type.highway.path.demanding_mountain_hiking">小道</string>
+	<string name="type.highway.path.difficult_alpine_hiking">小道</string>
+	<string name="type.highway.path.hiking">小道</string>
 	<string name="type.highway.path.horse">小道</string>
+	<string name="type.highway.path.mountain_hiking">小道</string>
+	<string name="type.highway.path.permissive">小道</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">隧道</string>
 	<string name="type.highway.pedestrian">步行街</string>
@@ -1254,7 +1264,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">桥</string>
 	<string name="type.highway.track.grade1">土路</string>
+	<string name="type.highway.track.grade2">土路</string>
+	<string name="type.highway.track.grade3">土路</string>
+	<string name="type.highway.track.grade4">土路</string>
+	<string name="type.highway.track.grade5">土路</string>
 	<string name="type.highway.track.no.access">土路</string>
+	<string name="type.highway.track.permissive">土路</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">隧道</string>
 	<string name="type.highway.traffic_signals">交通信号灯</string>
@@ -1966,7 +1981,7 @@
 	<string name="type.tourism.aquarium">水族馆</string>
 	<!-- Typically serviced, staff is present and food is available (compared to wilderness_hut). -->
 	<string name="type.tourism.alpine_hut">山间小屋</string>
-	<string name="type.tourism.apartment">度假公寓</string>
+	<string name="type.tourism.apartment">公寓</string>
 	<string name="type.tourism.artwork">艺术品</string>
 	<string name="type.tourism.artwork.architecture">艺术品</string>
 	<string name="type.tourism.artwork.painting">油画</string>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index b0817dcd2c..7cfd957153 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -502,6 +502,8 @@
 	<string name="editor_edit_place_title">Editing</string>
 	<string name="editor_add_place_title">Adding</string>
 	<string name="editor_edit_place_name_hint">Name of the place</string>
+	<!-- The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name -->
+	<string name="editor_default_language_hint">As it is written in the local language</string>
 	<string name="editor_edit_place_category_title">Category</string>
 	<string name="detailed_problem_description">Detailed description of the issue</string>
 	<string name="editor_report_problem_other_title">Different problem</string>
@@ -1236,9 +1238,15 @@
 	<string name="type.highway.footway">Foot Path</string>
 	<string name="type.highway.footway.sidewalk">Sidewalk</string>
 	<string name="type.highway.footway.crossing">Pedestrian Crossing</string>
+	<string name="type.highway.footway.alpine_hiking">Path</string>
 	<string name="type.highway.footway.area">Pedestrian Area</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.footway.bridge">Pedestrian Bridge</string>
+	<string name="type.highway.footway.demanding_alpine_hiking">Path</string>
+	<string name="type.highway.footway.demanding_mountain_hiking">Path</string>
+	<string name="type.highway.footway.difficult_alpine_hiking">Path</string>
+	<string name="type.highway.footway.hiking">Path</string>
+	<string name="type.highway.footway.mountain_hiking">Path</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.footway.tunnel">Pedestrian Tunnel</string>
 	<string name="type.highway.ford">Ford</string>
@@ -1259,15 +1267,17 @@
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.motorway_link.tunnel">Tunnel</string>
 	<string name="type.highway.path">Path</string>
-	<!-- Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. -->
-	<string name="type.highway.path.difficult">Difficult or Indistinct Trail</string>
-	<!-- Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. -->
-	<string name="type.highway.path.expert">Expert or Indiscernible Trail</string>
+	<string name="type.highway.path.alpine_hiking">Path</string>
 	<string name="type.highway.path.bicycle">Cycle &amp; Foot Path</string>
-	<string name="type.highway.footway.bicycle">Cycle &amp; Foot Path</string>
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.path.bridge">Bridge</string>
+	<string name="type.highway.path.demanding_alpine_hiking">Path</string>
+	<string name="type.highway.path.demanding_mountain_hiking">Path</string>
+	<string name="type.highway.path.difficult_alpine_hiking">Path</string>
+	<string name="type.highway.path.hiking">Path</string>
 	<string name="type.highway.path.horse">Bridle Path</string>
+	<string name="type.highway.path.mountain_hiking">Path</string>
+	<string name="type.highway.path.permissive">Path</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.path.tunnel">Tunnel</string>
 	<string name="type.highway.pedestrian">Pedestrian Street</string>
@@ -1341,7 +1351,12 @@
 	<!-- These translations are used for all type.highway.*.bridge. -->
 	<string name="type.highway.track.bridge">Bridge</string>
 	<string name="type.highway.track.grade1">Track</string>
+	<string name="type.highway.track.grade2">Track</string>
+	<string name="type.highway.track.grade3">Track</string>
+	<string name="type.highway.track.grade4">Track</string>
+	<string name="type.highway.track.grade5">Track</string>
 	<string name="type.highway.track.no.access">Track</string>
+	<string name="type.highway.track.permissive">Track</string>
 	<!-- These translations are used for all type.highway.*.tunnel. -->
 	<string name="type.highway.track.tunnel">Tunnel</string>
 	<string name="type.highway.traffic_signals">Traffic Lights</string>
diff --git a/data/classificator.txt b/data/classificator.txt
index ae2eae1738..da88039126 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -414,10 +414,15 @@ world  +
             {}
         elevator  -
         footway  +
+            alpine_hiking  -
             area  -
-            bicycle  -
             bridge  -
             crossing  -
+            demanding_alpine_hiking  -
+            demanding_mountain_hiking  -
+            difficult_alpine_hiking  -
+            hiking  -
+            mountain_hiking  -
             sidewalk  -
             tunnel  -
             {}
@@ -436,11 +441,15 @@ world  +
             tunnel  -
             {}
         path  +
+            alpine_hiking  -
             bicycle  -
             bridge  -
-            difficult  -
-            expert  -
+            demanding_alpine_hiking  -
+            demanding_mountain_hiking  -
+            difficult_alpine_hiking  -
+            hiking  -
             horse  -
+            mountain_hiking  -
             tunnel  -
             {}
         pedestrian  +
@@ -499,6 +508,11 @@ world  +
         track  +
             area  -
             bridge  -
+            grade1  -
+            grade2  -
+            grade3  -
+            grade4  -
+            grade5  -
             no-access  -
             tunnel  -
             {}
diff --git a/data/colors.txt b/data/colors.txt
index c13c7d2039..552a00367d 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -96,7 +96,6 @@
 3881273
 3881787
 3968060
-4007447
 4016230
 4065802
 4073251
@@ -128,9 +127,7 @@
 5196359
 5286655
 5378955
-5389875
 5395026
-5459435
 5592405
 5666134
 5717555
@@ -294,6 +291,7 @@
 16742950
 16746278
 16746306
+16746413
 16747109
 16748864
 16749632
@@ -316,8 +314,10 @@
 441199131
 441925171
 442905727
+443432263
 451800027
 452764770
+452954029
 452968274
 452984831
 609045837
@@ -347,13 +347,9 @@
 859315988
 859519289
 859519803
-859645463
 860111940
 860571203
 860629531
-861027891
-861097451
-861295871
 861355571
 861690961
 861690972
@@ -361,7 +357,6 @@
 862076287
 862148400
 862348902
-862862663
 863203947
 863664762
 863850275
@@ -410,7 +405,6 @@
 1295527997
 1295658816
 1295727419
-1295853079
 1295855912
 1296187970
 1296316234
@@ -425,8 +419,6 @@
 1296977469
 1297041991
 1297109072
-1297235507
-1297305067
 1297438037
 1297563187
 1297691427
@@ -475,6 +467,7 @@
 1308586790
 1308588582
 1308591910
+1308592045
 1308594496
 1308595264
 1308601687
@@ -496,14 +489,11 @@
 1714860223
 1715089216
 1715157819
-1715283479
 1715287582
 1715749956
 1715771835
 1716276300
-1716665907
 1716868437
-1716933887
 1717328977
 1717523245
 1717714303
@@ -522,6 +512,7 @@
 1724368575
 1724500155
 1724896680
+1728022445
 1728053247
 1931024665
 1943327690
@@ -547,12 +538,10 @@
 2152483916
 2152615485
 2153076053
-2153141503
 2153536593
 2153769774
 2153921919
 2153997148
-2154708295
 2154984050
 2155510394
 2155695907
@@ -634,6 +623,7 @@
 3427361097
 3428218198
 3428990335
+3430108454
 3431500856
 3432785840
 3435428607
@@ -650,7 +640,6 @@
 3653532415
 3657174555
 3942645760
-4000533798
 4043309055
 4278401920
 4278542285
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 595ddeed0c..32eef36d79 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 4e99b5d0c0..a7cb172129 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -16379,7 +16379,7 @@ cont {
   element {
     scale: 10
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -16394,7 +16394,7 @@ cont {
   element {
     scale: 11
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -16409,7 +16409,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -16424,7 +16424,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -16439,7 +16439,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -16454,7 +16454,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -16469,7 +16469,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -16481,6 +16481,66 @@ cont {
       priority: 6700
     }
   }
+  element {
+    scale: 17
+    area {
+      color: 3430108454
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6967599
+        stroke_color: 872415231
+      }
+      priority: 6700
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 3430108454
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6967599
+        stroke_color: 872415231
+      }
+      priority: 6700
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 3430108454
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6967599
+        stroke_color: 872415231
+      }
+      priority: 6700
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 3430108454
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6967599
+        stroke_color: 872415231
+      }
+      priority: 6700
+    }
+  }
 }
 cont {
   name: "boundary-administrative-2"
@@ -22594,8 +22654,8 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
-      color: 2153141503
+      width: 1.0
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -22603,8 +22663,8 @@ cont {
   element {
     scale: 12
     lines {
-      width: 0.9
-      color: 2153141503
+      width: 1.0
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -22612,8 +22672,8 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.9
-      color: 2153141503
+      width: 1.0
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -22621,8 +22681,8 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
-      color: 2153141503
+      width: 1.2
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -22630,8 +22690,8 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.2
-      color: 2153141503
+      width: 1.4
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -22647,8 +22707,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.3
-      color: 1716933887
+      width: 1.6
+      color: 1308592045
       priority: 330
     }
     path_text {
@@ -22663,8 +22723,8 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.4
-      color: 1716933887
+      width: 1.8
+      color: 1308592045
       priority: 330
     }
     path_text {
@@ -22679,8 +22739,8 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.6
-      color: 861295871
+      width: 2.0
+      color: 452954029
       priority: 330
     }
     path_text {
@@ -22695,8 +22755,8 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.8
-      color: 861295871
+      width: 2.2
+      color: 452954029
       priority: 330
     }
     path_text {
@@ -22711,8 +22771,8 @@ cont {
   element {
     scale: 20
     lines {
-      width: 1.8
-      color: 861295871
+      width: 2.2
+      color: 452954029
       priority: 330
     }
     path_text {
@@ -22730,8 +22790,8 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
-      color: 2153141503
+      width: 1.0
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -22739,8 +22799,8 @@ cont {
   element {
     scale: 12
     lines {
-      width: 0.9
-      color: 2153141503
+      width: 1.0
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -22748,8 +22808,8 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.9
-      color: 2153141503
+      width: 1.0
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -22757,8 +22817,8 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
-      color: 2153141503
+      width: 1.2
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -22766,14 +22826,14 @@ cont {
   element {
     scale: 15
     lines {
-      width: 3.4
+      width: 3.8
       color: 871230427
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.2
-      color: 2153141503
+      width: 1.4
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -22789,14 +22849,14 @@ cont {
   element {
     scale: 16
     lines {
-      width: 3.6
+      width: 4.2
       color: 871230427
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.3
-      color: 1716933887
+      width: 1.6
+      color: 1308592045
       priority: 330
     }
     path_text {
@@ -22811,20 +22871,20 @@ cont {
   element {
     scale: 17
     lines {
-      width: 5.8
+      width: 6.6
       color: 1300267136
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 4.8
+      width: 5.6
       color: 871230427
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.4
-      color: 1716933887
+      width: 1.8
+      color: 1308592045
       priority: 330
     }
     path_text {
@@ -22839,20 +22899,20 @@ cont {
   element {
     scale: 18
     lines {
-      width: 8.2
+      width: 9.0
       color: 1300267136
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 7.2
+      width: 8.0
       color: 871230427
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.6
-      color: 861295871
+      width: 2.0
+      color: 452954029
       priority: 330
     }
     path_text {
@@ -22867,20 +22927,20 @@ cont {
   element {
     scale: 19
     lines {
-      width: 9.6
+      width: 10.4
       color: 1300267136
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
+      width: 9.4
       color: 871230427
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.8
-      color: 861295871
+      width: 2.2
+      color: 452954029
       priority: 330
     }
     path_text {
@@ -22895,20 +22955,20 @@ cont {
   element {
     scale: 20
     lines {
-      width: 9.6
+      width: 10.4
       color: 1300267136
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
+      width: 9.4
       color: 871230427
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.8
-      color: 861295871
+      width: 2.2
+      color: 452954029
       priority: 330
     }
     path_text {
@@ -22926,8 +22986,8 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
-      color: 2153141503
+      width: 1.0
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -22935,8 +22995,8 @@ cont {
   element {
     scale: 12
     lines {
-      width: 0.9
-      color: 2153141503
+      width: 1.0
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -22944,8 +23004,8 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.9
-      color: 2153141503
+      width: 1.0
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -22953,8 +23013,8 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
-      color: 2153141503
+      width: 1.2
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -22962,8 +23022,8 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.2
-      color: 2153141503
+      width: 1.4
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -22979,8 +23039,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.3
-      color: 1716933887
+      width: 1.6
+      color: 1308592045
       priority: 330
     }
     path_text {
@@ -22995,18 +23055,18 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.4
-      color: 1716933887
+      width: 1.8
+      color: 1308592045
       priority: 330
     }
     lines {
-      width: 4.8
+      width: 5.6
       color: 1307438043
       priority: 50
       cap: BUTTCAP
     }
     lines {
-      width: 5.8
+      width: 6.6
       color: 1300267136
       dashdot {
         dd: 2.0
@@ -23027,18 +23087,18 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.6
-      color: 861295871
+      width: 2.0
+      color: 452954029
       priority: 330
     }
     lines {
-      width: 7.2
+      width: 8.0
       color: 1307438043
       priority: 50
       cap: BUTTCAP
     }
     lines {
-      width: 8.2
+      width: 9.0
       color: 1300267136
       dashdot {
         dd: 2.0
@@ -23059,18 +23119,18 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.8
-      color: 861295871
+      width: 2.2
+      color: 452954029
       priority: 330
     }
     lines {
-      width: 8.6
+      width: 9.4
       color: 1307438043
       priority: 50
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
+      width: 10.4
       color: 1300267136
       dashdot {
         dd: 2.0
@@ -23091,18 +23151,18 @@ cont {
   element {
     scale: 20
     lines {
-      width: 1.8
-      color: 861295871
+      width: 2.2
+      color: 452954029
       priority: 330
     }
     lines {
-      width: 8.6
+      width: 9.4
       color: 1307438043
       priority: 50
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
+      width: 10.4
       color: 1300267136
       dashdot {
         dd: 2.0
@@ -23360,6 +23420,182 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-footway-alpine_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1721782290
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
 cont {
   name: "highway-footway-area"
   element {
@@ -23536,237 +23772,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-footway-bicycle"
-  element {
-    scale: 11
-    lines {
-      width: 1.1
-      color: 2153141503
-      priority: 170
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.1
-      color: 1308162296
-      dashdot {
-        dd: 4.0
-        dd: 3.2
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.1
-      color: 2153141503
-      priority: 170
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.1
-      color: 1308162296
-      dashdot {
-        dd: 4.0
-        dd: 3.2
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.1
-      color: 2153141503
-      priority: 170
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.1
-      color: 1308162296
-      dashdot {
-        dd: 4.0
-        dd: 3.2
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.1
-      color: 2153141503
-      priority: 170
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.1
-      color: 1308162296
-      dashdot {
-        dd: 4.0
-        dd: 3.2
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.2
-      color: 2153141503
-      priority: 170
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.5
-      color: 670628088
-      dashdot {
-        dd: 5.0
-        dd: 3.5
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 8
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.3
-      color: 1716933887
-      priority: 170
-    }
-    lines {
-      width: 2.0
-      color: 670628088
-      dashdot {
-        dd: 5.0
-        dd: 3.5
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.4
-      color: 1716933887
-      priority: 170
-    }
-    lines {
-      width: 2.4
-      color: 16316664
-      dashdot {
-        dd: 6.0
-        dd: 4.2
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.6
-      color: 861295871
-      priority: 170
-    }
-    lines {
-      width: 3.2
-      color: 16316664
-      dashdot {
-        dd: 8.0
-        dd: 5.5
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.8
-      color: 861295871
-      priority: 170
-    }
-    lines {
-      width: 4.2
-      color: 16316664
-      dashdot {
-        dd: 10.0
-        dd: 6.7
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.8
-      color: 861295871
-      priority: 170
-    }
-    lines {
-      width: 4.2
-      color: 16316664
-      dashdot {
-        dd: 10.0
-        dd: 6.7
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2950
-    }
-  }
-}
 cont {
   name: "highway-footway-bridge"
   element {
@@ -23784,7 +23789,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -23811,7 +23816,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -23838,7 +23843,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -23865,7 +23870,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -23892,7 +23897,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -23919,7 +23924,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -23951,7 +23956,7 @@ cont {
         dd: 6.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -23983,7 +23988,7 @@ cont {
         dd: 8.0
         dd: 3.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -24015,7 +24020,7 @@ cont {
         dd: 10.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -24047,7 +24052,7 @@ cont {
         dd: 10.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -24122,6 +24127,886 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-footway-demanding_alpine_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1721782290
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-footway-demanding_mountain_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1721782290
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-footway-difficult_alpine_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1721782290
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-footway-hiking"
+  element {
+    scale: 11
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1721782290
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-footway-mountain_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1721782290
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
 cont {
   name: "highway-footway-sidewalk"
   element {
@@ -24133,7 +25018,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
     }
   }
   element {
@@ -24145,7 +25030,7 @@ cont {
         dd: 6.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
   }
   element {
@@ -24157,7 +25042,7 @@ cont {
         dd: 8.0
         dd: 3.0
       }
-      priority: 155
+      priority: 180
     }
   }
   element {
@@ -24169,7 +25054,7 @@ cont {
         dd: 10.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
   }
   element {
@@ -24181,7 +25066,7 @@ cont {
         dd: 10.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
   }
 }
@@ -24196,7 +25081,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -24217,7 +25102,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -24238,7 +25123,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -24259,7 +25144,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -24280,7 +25165,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -24301,7 +25186,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -24321,7 +25206,7 @@ cont {
         dd: 6.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 5.8
@@ -24357,7 +25242,7 @@ cont {
         dd: 8.0
         dd: 3.0
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 7.4
@@ -24393,7 +25278,7 @@ cont {
         dd: 10.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 9.4
@@ -24429,7 +25314,7 @@ cont {
         dd: 10.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 9.4
@@ -27281,21 +28166,15 @@ cont {
   }
 }
 cont {
-  name: "highway-path-bicycle"
+  name: "highway-path-alpine_hiking"
   element {
     scale: 11
-    lines {
-      width: 1.1
-      color: 2153141503
-      priority: 170
-      cap: BUTTCAP
-    }
     lines {
       width: 0.9
       color: 1721782290
       dashdot {
         dd: 3.5
-        dd: 2.7
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
@@ -27303,18 +28182,12 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 1.1
-      color: 2153141503
-      priority: 170
-      cap: BUTTCAP
-    }
     lines {
       width: 0.9
       color: 1721782290
       dashdot {
         dd: 3.5
-        dd: 2.7
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
@@ -27322,18 +28195,12 @@ cont {
   }
   element {
     scale: 13
-    lines {
-      width: 1.1
-      color: 2153141503
-      priority: 170
-      cap: BUTTCAP
-    }
     lines {
       width: 0.9
       color: 1721782290
       dashdot {
         dd: 3.5
-        dd: 2.7
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
@@ -27341,18 +28208,12 @@ cont {
   }
   element {
     scale: 14
-    lines {
-      width: 1.1
-      color: 2153141503
-      priority: 170
-      cap: BUTTCAP
-    }
     lines {
       width: 0.9
       color: 1721782290
       dashdot {
         dd: 3.5
-        dd: 2.7
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
@@ -27360,18 +28221,12 @@ cont {
   }
   element {
     scale: 15
-    lines {
-      width: 1.2
-      color: 2153141503
-      priority: 170
-      cap: BUTTCAP
-    }
     lines {
       width: 1.1
       color: 1721782290
       dashdot {
         dd: 3.5
-        dd: 2.7
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
@@ -27387,17 +28242,12 @@ cont {
   }
   element {
     scale: 16
-    lines {
-      width: 1.3
-      color: 1716933887
-      priority: 170
-    }
     lines {
       width: 1.5
       color: 1721782290
       dashdot {
         dd: 4.0
-        dd: 3.2
+        dd: 2.5
       }
       priority: 180
     }
@@ -27412,17 +28262,12 @@ cont {
   }
   element {
     scale: 17
-    lines {
-      width: 1.4
-      color: 1716933887
-      priority: 170
-    }
     lines {
       width: 2.0
       color: 1721782290
       dashdot {
         dd: 4.0
-        dd: 3.2
+        dd: 2.5
       }
       priority: 180
     }
@@ -27437,17 +28282,12 @@ cont {
   }
   element {
     scale: 18
-    lines {
-      width: 1.6
-      color: 861295871
-      priority: 170
-    }
     lines {
       width: 2.8
       color: 866144274
       dashdot {
         dd: 6.0
-        dd: 4.7
+        dd: 3.5
       }
       priority: 180
     }
@@ -27462,17 +28302,12 @@ cont {
   }
   element {
     scale: 19
-    lines {
-      width: 1.8
-      color: 861295871
-      priority: 170
-    }
     lines {
       width: 3.7
       color: 866144274
       dashdot {
         dd: 8.0
-        dd: 6.2
+        dd: 4.5
       }
       priority: 180
     }
@@ -27488,16 +28323,187 @@ cont {
   element {
     scale: 20
     lines {
-      width: 1.8
-      color: 861295871
-      priority: 170
+      width: 3.7
+      color: 866144274
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
     }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-bicycle"
+  element {
+    scale: 11
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.1
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 2.8
+      color: 866144274
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
     lines {
       width: 3.7
       color: 866144274
       dashdot {
         dd: 8.0
-        dd: 6.2
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 3.7
+      color: 866144274
+      dashdot {
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27522,7 +28528,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -27535,7 +28541,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -27548,7 +28554,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -27561,7 +28567,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -27580,7 +28586,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27607,7 +28613,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27639,7 +28645,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27671,7 +28677,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27703,7 +28709,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27735,7 +28741,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27748,14 +28754,14 @@ cont {
   }
 }
 cont {
-  name: "highway-path-difficult"
+  name: "highway-path-demanding_alpine_hiking"
   element {
     scale: 11
     lines {
       width: 0.9
       color: 1721782290
       dashdot {
-        dd: 1.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 180
@@ -27768,7 +28774,7 @@ cont {
       width: 0.9
       color: 1721782290
       dashdot {
-        dd: 1.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 180
@@ -27781,7 +28787,7 @@ cont {
       width: 0.9
       color: 1721782290
       dashdot {
-        dd: 1.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 180
@@ -27794,7 +28800,7 @@ cont {
       width: 0.9
       color: 1721782290
       dashdot {
-        dd: 1.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 180
@@ -27807,7 +28813,7 @@ cont {
       width: 1.1
       color: 1721782290
       dashdot {
-        dd: 1.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 180
@@ -27828,7 +28834,7 @@ cont {
       width: 1.5
       color: 1721782290
       dashdot {
-        dd: 1.8
+        dd: 4.0
         dd: 2.5
       }
       priority: 180
@@ -27848,7 +28854,7 @@ cont {
       width: 2.0
       color: 1721782290
       dashdot {
-        dd: 1.8
+        dd: 4.0
         dd: 2.5
       }
       priority: 180
@@ -27868,7 +28874,7 @@ cont {
       width: 2.8
       color: 866144274
       dashdot {
-        dd: 2.8
+        dd: 6.0
         dd: 3.5
       }
       priority: 180
@@ -27885,11 +28891,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.8
+      width: 3.7
       color: 866144274
       dashdot {
-        dd: 2.8
-        dd: 3.5
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27905,11 +28911,11 @@ cont {
   element {
     scale: 20
     lines {
-      width: 2.8
+      width: 3.7
       color: 866144274
       dashdot {
-        dd: 2.8
-        dd: 3.5
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27924,15 +28930,15 @@ cont {
   }
 }
 cont {
-  name: "highway-path-expert"
+  name: "highway-path-demanding_mountain_hiking"
   element {
     scale: 11
     lines {
       width: 0.9
-      color: 1715283479
+      color: 1721782290
       dashdot {
-        dd: 1.0
-        dd: 4.0
+        dd: 3.5
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
@@ -27942,10 +28948,10 @@ cont {
     scale: 12
     lines {
       width: 0.9
-      color: 1715283479
+      color: 1721782290
       dashdot {
-        dd: 1.0
-        dd: 4.0
+        dd: 3.5
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
@@ -27955,10 +28961,10 @@ cont {
     scale: 13
     lines {
       width: 0.9
-      color: 1715283479
+      color: 1721782290
       dashdot {
-        dd: 1.0
-        dd: 4.0
+        dd: 3.5
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
@@ -27968,10 +28974,10 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 1715283479
+      color: 1721782290
       dashdot {
-        dd: 1.0
-        dd: 4.0
+        dd: 3.5
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
@@ -27981,10 +28987,10 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 1715283479
+      color: 1721782290
       dashdot {
-        dd: 1.0
-        dd: 4.0
+        dd: 3.5
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
@@ -28002,10 +29008,10 @@ cont {
     scale: 16
     lines {
       width: 1.5
-      color: 1715283479
+      color: 1721782290
       dashdot {
-        dd: 1.6
-        dd: 6.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 180
     }
@@ -28022,10 +29028,10 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 1715283479
+      color: 1721782290
       dashdot {
-        dd: 1.6
-        dd: 6.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 180
     }
@@ -28042,10 +29048,10 @@ cont {
     scale: 18
     lines {
       width: 2.8
-      color: 859645463
+      color: 866144274
       dashdot {
-        dd: 2.8
-        dd: 8.0
+        dd: 6.0
+        dd: 3.5
       }
       priority: 180
     }
@@ -28061,11 +29067,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.8
-      color: 859645463
+      width: 3.7
+      color: 866144274
       dashdot {
-        dd: 2.8
         dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -28081,11 +29087,363 @@ cont {
   element {
     scale: 20
     lines {
-      width: 2.8
-      color: 859645463
+      width: 3.7
+      color: 866144274
       dashdot {
-        dd: 2.8
         dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-difficult_alpine_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.1
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 2.8
+      color: 866144274
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.7
+      color: 866144274
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 3.7
+      color: 866144274
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-hiking"
+  element {
+    scale: 11
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.1
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 2.8
+      color: 866144274
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.7
+      color: 866144274
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 3.7
+      color: 866144274
+      dashdot {
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -28110,7 +29468,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -28123,7 +29481,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -28136,7 +29494,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -28149,7 +29507,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -28162,7 +29520,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -28183,7 +29541,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28203,7 +29561,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28223,7 +29581,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28243,7 +29601,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28263,7 +29621,183 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-mountain_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.1
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 2.8
+      color: 866144274
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.7
+      color: 866144274
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 3.7
+      color: 866144274
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
     }
     path_text {
       primary {
@@ -28286,7 +29820,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -28299,7 +29833,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -28312,7 +29846,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -28325,7 +29859,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -28338,7 +29872,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -28359,7 +29893,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28379,7 +29913,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 5.0
@@ -28415,7 +29949,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 6.6
@@ -28451,7 +29985,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 8.4
@@ -28487,7 +30021,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 8.4
@@ -37250,6 +38784,886 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-track-grade1"
+  element {
+    scale: 11
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.4
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.9
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 862148400
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.3
+      color: 862148400
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 862148400
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 862148400
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+}
+cont {
+  name: "highway-track-grade2"
+  element {
+    scale: 11
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.4
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.9
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.3
+      color: 862148400
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 862148400
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 862148400
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+}
+cont {
+  name: "highway-track-grade3"
+  element {
+    scale: 11
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.4
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.9
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.3
+      color: 862148400
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 862148400
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 862148400
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+}
+cont {
+  name: "highway-track-grade4"
+  element {
+    scale: 11
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.4
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.9
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.3
+      color: 862148400
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 862148400
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 862148400
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+}
+cont {
+  name: "highway-track-grade5"
+  element {
+    scale: 11
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.4
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.9
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.3
+      color: 862148400
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 862148400
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 862148400
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+}
 cont {
   name: "highway-track-no-access"
   element {
@@ -51295,35 +53709,65 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 3431500856
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
     caption {
       primary {
-        height: 10
-        color: 4473924
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
         offset_y: 1
+        is_optional: true
       }
-      priority: 6700
+      priority: -3300
     }
   }
   element {
     scale: 19
+    area {
+      color: 3431500856
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
     caption {
       primary {
-        height: 10
-        color: 4473924
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
         offset_y: 1
+        is_optional: true
       }
-      priority: 6700
+      priority: -3300
     }
   }
   element {
     scale: 20
+    area {
+      color: 3431500856
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
     caption {
       primary {
-        height: 10
-        color: 4473924
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
         offset_y: 1
+        is_optional: true
       }
-      priority: 6700
+      priority: -3300
     }
   }
 }
@@ -53549,7 +55993,7 @@ cont {
     lines {
       width: 1.5
       color: 1305595303
-      priority: 160
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -53558,7 +56002,7 @@ cont {
     lines {
       width: 1.8
       color: 1305595303
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
@@ -53574,7 +56018,7 @@ cont {
     lines {
       width: 3.0
       color: 869387687
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
@@ -53591,7 +56035,7 @@ cont {
     lines {
       width: 3.0
       color: 869387687
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
@@ -53608,7 +56052,7 @@ cont {
     lines {
       width: 4.0
       color: 869387687
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
@@ -53625,7 +56069,7 @@ cont {
     lines {
       width: 4.0
       color: 869387687
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index cd1a6d4db5..499543fd70 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 98e565df37..036fe8f48e 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -15765,7 +15765,7 @@ cont {
   element {
     scale: 10
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -15780,7 +15780,7 @@ cont {
   element {
     scale: 11
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -15795,7 +15795,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -15810,7 +15810,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -15825,7 +15825,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -15840,7 +15840,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -15855,7 +15855,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -15867,6 +15867,66 @@ cont {
       priority: 6700
     }
   }
+  element {
+    scale: 17
+    area {
+      color: 3430108454
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6967599
+        stroke_color: 872415231
+      }
+      priority: 6700
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 3430108454
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6967599
+        stroke_color: 872415231
+      }
+      priority: 6700
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 3430108454
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6967599
+        stroke_color: 872415231
+      }
+      priority: 6700
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 3430108454
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6967599
+        stroke_color: 872415231
+      }
+      priority: 6700
+    }
+  }
 }
 cont {
   name: "boundary-administrative-2"
@@ -16429,6 +16489,69 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    area {
+      color: 3431500856
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 3431500856
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 3431500856
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area"
@@ -16545,6 +16668,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-1"
@@ -16696,6 +16870,69 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    area {
+      color: 3431500856
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 3431500856
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 3431500856
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-2"
@@ -16812,6 +17049,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-3"
@@ -16928,6 +17216,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-4"
@@ -17044,6 +17383,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-5"
@@ -17160,6 +17550,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-6"
@@ -17276,6 +17717,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "building"
@@ -21357,8 +21849,8 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.9
-      color: 2153141503
+      width: 1.0
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -21366,8 +21858,8 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
-      color: 2153141503
+      width: 1.2
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -21375,8 +21867,8 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.2
-      color: 2153141503
+      width: 1.4
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -21392,8 +21884,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.3
-      color: 1716933887
+      width: 1.6
+      color: 1308592045
       priority: 330
     }
     path_text {
@@ -21408,8 +21900,8 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.4
-      color: 1716933887
+      width: 1.8
+      color: 1308592045
       priority: 330
     }
     path_text {
@@ -21424,8 +21916,8 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.6
-      color: 861295871
+      width: 2.0
+      color: 452954029
       priority: 330
     }
     path_text {
@@ -21440,8 +21932,8 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.8
-      color: 861295871
+      width: 2.2
+      color: 452954029
       priority: 330
     }
     path_text {
@@ -21456,8 +21948,8 @@ cont {
   element {
     scale: 20
     lines {
-      width: 1.8
-      color: 861295871
+      width: 2.2
+      color: 452954029
       priority: 330
     }
     path_text {
@@ -21475,8 +21967,8 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.9
-      color: 2153141503
+      width: 1.0
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -21484,8 +21976,8 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
-      color: 2153141503
+      width: 1.2
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -21493,14 +21985,14 @@ cont {
   element {
     scale: 15
     lines {
-      width: 3.4
+      width: 3.8
       color: 871230427
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.2
-      color: 2153141503
+      width: 1.4
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -21516,14 +22008,14 @@ cont {
   element {
     scale: 16
     lines {
-      width: 3.6
+      width: 4.2
       color: 871230427
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.3
-      color: 1716933887
+      width: 1.6
+      color: 1308592045
       priority: 330
     }
     path_text {
@@ -21538,20 +22030,20 @@ cont {
   element {
     scale: 17
     lines {
-      width: 5.8
+      width: 6.6
       color: 1300267136
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 4.8
+      width: 5.6
       color: 871230427
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.4
-      color: 1716933887
+      width: 1.8
+      color: 1308592045
       priority: 330
     }
     path_text {
@@ -21566,20 +22058,20 @@ cont {
   element {
     scale: 18
     lines {
-      width: 8.2
+      width: 9.0
       color: 1300267136
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 7.2
+      width: 8.0
       color: 871230427
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.6
-      color: 861295871
+      width: 2.0
+      color: 452954029
       priority: 330
     }
     path_text {
@@ -21594,20 +22086,20 @@ cont {
   element {
     scale: 19
     lines {
-      width: 9.6
+      width: 10.4
       color: 1300267136
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
+      width: 9.4
       color: 871230427
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.8
-      color: 861295871
+      width: 2.2
+      color: 452954029
       priority: 330
     }
     path_text {
@@ -21622,20 +22114,20 @@ cont {
   element {
     scale: 20
     lines {
-      width: 9.6
+      width: 10.4
       color: 1300267136
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
+      width: 9.4
       color: 871230427
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.8
-      color: 861295871
+      width: 2.2
+      color: 452954029
       priority: 330
     }
     path_text {
@@ -21653,8 +22145,8 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.9
-      color: 2153141503
+      width: 1.0
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -21662,8 +22154,8 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
-      color: 2153141503
+      width: 1.2
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -21671,8 +22163,8 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.2
-      color: 2153141503
+      width: 1.4
+      color: 1308592045
       priority: 330
       cap: BUTTCAP
     }
@@ -21688,8 +22180,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.3
-      color: 1716933887
+      width: 1.6
+      color: 1308592045
       priority: 330
     }
     path_text {
@@ -21704,18 +22196,18 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.4
-      color: 1716933887
+      width: 1.8
+      color: 1308592045
       priority: 330
     }
     lines {
-      width: 4.8
+      width: 5.6
       color: 1307438043
       priority: 50
       cap: BUTTCAP
     }
     lines {
-      width: 5.8
+      width: 6.6
       color: 1300267136
       dashdot {
         dd: 2.0
@@ -21736,18 +22228,18 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.6
-      color: 861295871
+      width: 2.0
+      color: 452954029
       priority: 330
     }
     lines {
-      width: 7.2
+      width: 8.0
       color: 1307438043
       priority: 50
       cap: BUTTCAP
     }
     lines {
-      width: 8.2
+      width: 9.0
       color: 1300267136
       dashdot {
         dd: 2.0
@@ -21768,18 +22260,18 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.8
-      color: 861295871
+      width: 2.2
+      color: 452954029
       priority: 330
     }
     lines {
-      width: 8.6
+      width: 9.4
       color: 1307438043
       priority: 50
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
+      width: 10.4
       color: 1300267136
       dashdot {
         dd: 2.0
@@ -21800,18 +22292,18 @@ cont {
   element {
     scale: 20
     lines {
-      width: 1.8
-      color: 861295871
+      width: 2.2
+      color: 452954029
       priority: 330
     }
     lines {
-      width: 8.6
+      width: 9.4
       color: 1307438043
       priority: 50
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
+      width: 10.4
       color: 1300267136
       dashdot {
         dd: 2.0
@@ -21985,6 +22477,143 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-footway-alpine_hiking"
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1721782290
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
 cont {
   name: "highway-footway-area"
   element {
@@ -22140,180 +22769,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-footway-bicycle"
-  element {
-    scale: 14
-    lines {
-      width: 1.1
-      color: 2153141503
-      priority: 170
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.1
-      color: 1308162296
-      dashdot {
-        dd: 4.0
-        dd: 3.2
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.2
-      color: 2153141503
-      priority: 170
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.5
-      color: 670628088
-      dashdot {
-        dd: 5.0
-        dd: 3.5
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 8
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.3
-      color: 1716933887
-      priority: 170
-    }
-    lines {
-      width: 2.0
-      color: 670628088
-      dashdot {
-        dd: 5.0
-        dd: 3.5
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.4
-      color: 1716933887
-      priority: 170
-    }
-    lines {
-      width: 2.4
-      color: 16316664
-      dashdot {
-        dd: 6.0
-        dd: 4.2
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.6
-      color: 861295871
-      priority: 170
-    }
-    lines {
-      width: 3.2
-      color: 16316664
-      dashdot {
-        dd: 8.0
-        dd: 5.5
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.8
-      color: 861295871
-      priority: 170
-    }
-    lines {
-      width: 4.2
-      color: 16316664
-      dashdot {
-        dd: 10.0
-        dd: 6.7
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.8
-      color: 861295871
-      priority: 170
-    }
-    lines {
-      width: 4.2
-      color: 16316664
-      dashdot {
-        dd: 10.0
-        dd: 6.7
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2950
-    }
-  }
-}
 cont {
   name: "highway-footway-bridge"
   element {
@@ -22331,7 +22786,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -22358,7 +22813,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -22390,7 +22845,7 @@ cont {
         dd: 6.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -22422,7 +22877,7 @@ cont {
         dd: 8.0
         dd: 3.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -22454,7 +22909,7 @@ cont {
         dd: 10.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -22486,7 +22941,7 @@ cont {
         dd: 10.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -22561,6 +23016,691 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-footway-demanding_alpine_hiking"
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1721782290
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-footway-demanding_mountain_hiking"
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1721782290
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-footway-difficult_alpine_hiking"
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1721782290
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-footway-hiking"
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1721782290
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-footway-mountain_hiking"
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1721782290
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1721782290
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 10506258
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
 cont {
   name: "highway-footway-sidewalk"
   element {
@@ -22572,7 +23712,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
     }
   }
   element {
@@ -22584,7 +23724,7 @@ cont {
         dd: 6.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
   }
   element {
@@ -22596,7 +23736,7 @@ cont {
         dd: 8.0
         dd: 3.0
       }
-      priority: 155
+      priority: 180
     }
   }
   element {
@@ -22608,7 +23748,7 @@ cont {
         dd: 10.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
   }
   element {
@@ -22620,7 +23760,7 @@ cont {
         dd: 10.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
   }
 }
@@ -22635,7 +23775,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -22656,7 +23796,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -22676,7 +23816,7 @@ cont {
         dd: 6.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 5.8
@@ -22712,7 +23852,7 @@ cont {
         dd: 8.0
         dd: 3.0
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 7.4
@@ -22748,7 +23888,7 @@ cont {
         dd: 10.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 9.4
@@ -22784,7 +23924,7 @@ cont {
         dd: 10.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 9.4
@@ -25597,21 +26737,15 @@ cont {
   }
 }
 cont {
-  name: "highway-path-bicycle"
+  name: "highway-path-alpine_hiking"
   element {
     scale: 14
-    lines {
-      width: 1.1
-      color: 2153141503
-      priority: 170
-      cap: BUTTCAP
-    }
     lines {
       width: 0.9
       color: 1721782290
       dashdot {
         dd: 3.5
-        dd: 2.7
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
@@ -25619,18 +26753,12 @@ cont {
   }
   element {
     scale: 15
-    lines {
-      width: 1.2
-      color: 2153141503
-      priority: 170
-      cap: BUTTCAP
-    }
     lines {
       width: 1.1
       color: 1721782290
       dashdot {
         dd: 3.5
-        dd: 2.7
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
@@ -25646,17 +26774,12 @@ cont {
   }
   element {
     scale: 16
-    lines {
-      width: 1.3
-      color: 1716933887
-      priority: 170
-    }
     lines {
       width: 1.5
       color: 1721782290
       dashdot {
         dd: 4.0
-        dd: 3.2
+        dd: 2.5
       }
       priority: 180
     }
@@ -25671,17 +26794,12 @@ cont {
   }
   element {
     scale: 17
-    lines {
-      width: 1.4
-      color: 1716933887
-      priority: 170
-    }
     lines {
       width: 2.0
       color: 1721782290
       dashdot {
         dd: 4.0
-        dd: 3.2
+        dd: 2.5
       }
       priority: 180
     }
@@ -25696,17 +26814,12 @@ cont {
   }
   element {
     scale: 18
-    lines {
-      width: 1.6
-      color: 861295871
-      priority: 170
-    }
     lines {
       width: 2.8
       color: 866144274
       dashdot {
         dd: 6.0
-        dd: 4.7
+        dd: 3.5
       }
       priority: 180
     }
@@ -25721,17 +26834,12 @@ cont {
   }
   element {
     scale: 19
-    lines {
-      width: 1.8
-      color: 861295871
-      priority: 170
-    }
     lines {
       width: 3.7
       color: 866144274
       dashdot {
         dd: 8.0
-        dd: 6.2
+        dd: 4.5
       }
       priority: 180
     }
@@ -25747,16 +26855,148 @@ cont {
   element {
     scale: 20
     lines {
-      width: 1.8
-      color: 861295871
-      priority: 170
+      width: 3.7
+      color: 866144274
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
     }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-bicycle"
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.1
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 2.8
+      color: 866144274
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
     lines {
       width: 3.7
       color: 866144274
       dashdot {
         dd: 8.0
-        dd: 6.2
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 3.7
+      color: 866144274
+      dashdot {
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -25781,7 +27021,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -25800,7 +27040,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -25827,7 +27067,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -25859,7 +27099,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -25891,7 +27131,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -25923,7 +27163,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -25955,7 +27195,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -25968,14 +27208,14 @@ cont {
   }
 }
 cont {
-  name: "highway-path-difficult"
+  name: "highway-path-demanding_alpine_hiking"
   element {
     scale: 14
     lines {
       width: 0.9
       color: 1721782290
       dashdot {
-        dd: 1.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 180
@@ -25988,7 +27228,7 @@ cont {
       width: 1.1
       color: 1721782290
       dashdot {
-        dd: 1.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 180
@@ -26009,7 +27249,7 @@ cont {
       width: 1.5
       color: 1721782290
       dashdot {
-        dd: 1.8
+        dd: 4.0
         dd: 2.5
       }
       priority: 180
@@ -26029,7 +27269,7 @@ cont {
       width: 2.0
       color: 1721782290
       dashdot {
-        dd: 1.8
+        dd: 4.0
         dd: 2.5
       }
       priority: 180
@@ -26049,7 +27289,7 @@ cont {
       width: 2.8
       color: 866144274
       dashdot {
-        dd: 2.8
+        dd: 6.0
         dd: 3.5
       }
       priority: 180
@@ -26066,11 +27306,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.8
+      width: 3.7
       color: 866144274
       dashdot {
-        dd: 2.8
-        dd: 3.5
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -26086,11 +27326,11 @@ cont {
   element {
     scale: 20
     lines {
-      width: 2.8
+      width: 3.7
       color: 866144274
       dashdot {
-        dd: 2.8
-        dd: 3.5
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -26105,15 +27345,15 @@ cont {
   }
 }
 cont {
-  name: "highway-path-expert"
+  name: "highway-path-demanding_mountain_hiking"
   element {
     scale: 14
     lines {
       width: 0.9
-      color: 1715283479
+      color: 1721782290
       dashdot {
-        dd: 1.0
-        dd: 4.0
+        dd: 3.5
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
@@ -26123,10 +27363,10 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 1715283479
+      color: 1721782290
       dashdot {
-        dd: 1.0
-        dd: 4.0
+        dd: 3.5
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
@@ -26144,10 +27384,10 @@ cont {
     scale: 16
     lines {
       width: 1.5
-      color: 1715283479
+      color: 1721782290
       dashdot {
-        dd: 1.6
-        dd: 6.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 180
     }
@@ -26164,10 +27404,10 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 1715283479
+      color: 1721782290
       dashdot {
-        dd: 1.6
-        dd: 6.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 180
     }
@@ -26184,10 +27424,10 @@ cont {
     scale: 18
     lines {
       width: 2.8
-      color: 859645463
+      color: 866144274
       dashdot {
-        dd: 2.8
-        dd: 8.0
+        dd: 6.0
+        dd: 3.5
       }
       priority: 180
     }
@@ -26203,11 +27443,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.8
-      color: 859645463
+      width: 3.7
+      color: 866144274
       dashdot {
-        dd: 2.8
         dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -26223,11 +27463,285 @@ cont {
   element {
     scale: 20
     lines {
-      width: 2.8
-      color: 859645463
+      width: 3.7
+      color: 866144274
       dashdot {
-        dd: 2.8
         dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-difficult_alpine_hiking"
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.1
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 2.8
+      color: 866144274
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.7
+      color: 866144274
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 3.7
+      color: 866144274
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-hiking"
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.1
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 2.8
+      color: 866144274
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.7
+      color: 866144274
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 3.7
+      color: 866144274
+      dashdot {
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -26252,7 +27766,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -26265,7 +27779,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -26286,7 +27800,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26306,7 +27820,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26326,7 +27840,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26346,7 +27860,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26366,7 +27880,144 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-mountain_hiking"
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.1
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 2.8
+      color: 866144274
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.7
+      color: 866144274
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 3.7
+      color: 866144274
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
     }
     path_text {
       primary {
@@ -26389,7 +28040,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -26402,7 +28053,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -26423,7 +28074,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26443,7 +28094,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 5.0
@@ -26479,7 +28130,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 6.6
@@ -26515,7 +28166,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 8.4
@@ -26551,7 +28202,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 8.4
@@ -34862,6 +36513,691 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-track-grade1"
+  element {
+    scale: 14
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.4
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.9
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 862148400
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.3
+      color: 862148400
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 862148400
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 862148400
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+}
+cont {
+  name: "highway-track-grade2"
+  element {
+    scale: 14
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.4
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.9
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.3
+      color: 862148400
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 862148400
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 862148400
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+}
+cont {
+  name: "highway-track-grade3"
+  element {
+    scale: 14
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.4
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.9
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.3
+      color: 862148400
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 862148400
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 862148400
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+}
+cont {
+  name: "highway-track-grade4"
+  element {
+    scale: 14
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.4
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.9
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.3
+      color: 862148400
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 862148400
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 862148400
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+}
+cont {
+  name: "highway-track-grade5"
+  element {
+    scale: 14
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.4
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.9
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.3
+      color: 862148400
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 862148400
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 862148400
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+}
 cont {
   name: "highway-track-no-access"
   element {
@@ -48783,35 +51119,65 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 3431500856
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
     caption {
       primary {
-        height: 10
-        color: 4473924
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
         offset_y: 1
+        is_optional: true
       }
-      priority: 6700
+      priority: -3300
     }
   }
   element {
     scale: 19
+    area {
+      color: 3431500856
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
     caption {
       primary {
-        height: 10
-        color: 4473924
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
         offset_y: 1
+        is_optional: true
       }
-      priority: 6700
+      priority: -3300
     }
   }
   element {
     scale: 20
+    area {
+      color: 3431500856
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
     caption {
       primary {
-        height: 10
-        color: 4473924
+        height: 11
+        color: 3832097
+        stroke_color: 452984831
         offset_y: 1
+        is_optional: true
       }
-      priority: 6700
+      priority: -3300
     }
   }
 }
@@ -51005,7 +53371,7 @@ cont {
     lines {
       width: 1.5
       color: 1305595303
-      priority: 160
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -51014,7 +53380,7 @@ cont {
     lines {
       width: 1.8
       color: 1305595303
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
@@ -51030,7 +53396,7 @@ cont {
     lines {
       width: 3.0
       color: 869387687
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
@@ -51047,7 +53413,7 @@ cont {
     lines {
       width: 3.0
       color: 869387687
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
@@ -51064,7 +53430,7 @@ cont {
     lines {
       width: 4.0
       color: 869387687
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
@@ -51081,7 +53447,7 @@ cont {
     lines {
       width: 4.0
       color: 869387687
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index d71b6a130d..037f158a43 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 60c550962b..760e4e4553 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -15765,7 +15765,7 @@ cont {
   element {
     scale: 10
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -15780,7 +15780,7 @@ cont {
   element {
     scale: 11
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -15795,7 +15795,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -15810,7 +15810,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -15825,7 +15825,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -15840,7 +15840,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -15855,7 +15855,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -15867,6 +15867,66 @@ cont {
       priority: 6700
     }
   }
+  element {
+    scale: 17
+    area {
+      color: 3430108454
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6967599
+        stroke_color: 856032768
+      }
+      priority: 6700
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 3430108454
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6967599
+        stroke_color: 856032768
+      }
+      priority: 6700
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 3430108454
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6967599
+        stroke_color: 856032768
+      }
+      priority: 6700
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 3430108454
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6967599
+        stroke_color: 856032768
+      }
+      priority: 6700
+    }
+  }
 }
 cont {
   name: "boundary-administrative-2"
@@ -16429,6 +16489,69 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    area {
+      color: 3425648640
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 3425648640
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 3425648640
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area"
@@ -16545,6 +16668,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-1"
@@ -16696,6 +16870,69 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    area {
+      color: 3425648640
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 3425648640
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 3425648640
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-2"
@@ -16812,6 +17049,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-3"
@@ -16928,6 +17216,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-4"
@@ -17044,6 +17383,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-5"
@@ -17160,6 +17550,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-6"
@@ -17276,6 +17717,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "building"
@@ -21357,8 +21849,8 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.9
-      color: 2154708295
+      width: 1.0
+      color: 1299070279
       priority: 330
       cap: BUTTCAP
     }
@@ -21366,8 +21858,8 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
-      color: 2154708295
+      width: 1.2
+      color: 1299070279
       priority: 330
       cap: BUTTCAP
     }
@@ -21375,8 +21867,8 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.2
-      color: 2154708295
+      width: 1.4
+      color: 1299070279
       priority: 330
       cap: BUTTCAP
     }
@@ -21392,8 +21884,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.3
-      color: 1718500679
+      width: 1.6
+      color: 1299070279
       priority: 330
     }
     path_text {
@@ -21408,8 +21900,8 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.4
-      color: 1718500679
+      width: 1.8
+      color: 1299070279
       priority: 330
     }
     path_text {
@@ -21424,8 +21916,8 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.6
-      color: 862862663
+      width: 2.0
+      color: 443432263
       priority: 330
     }
     path_text {
@@ -21440,8 +21932,8 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.8
-      color: 862862663
+      width: 2.2
+      color: 443432263
       priority: 330
     }
     path_text {
@@ -21456,8 +21948,8 @@ cont {
   element {
     scale: 20
     lines {
-      width: 1.8
-      color: 862862663
+      width: 2.2
+      color: 443432263
       priority: 330
     }
     path_text {
@@ -21475,8 +21967,8 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.9
-      color: 2154708295
+      width: 1.0
+      color: 1299070279
       priority: 330
       cap: BUTTCAP
     }
@@ -21484,8 +21976,8 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
-      color: 2154708295
+      width: 1.2
+      color: 1299070279
       priority: 330
       cap: BUTTCAP
     }
@@ -21493,14 +21985,14 @@ cont {
   element {
     scale: 15
     lines {
-      width: 3.4
+      width: 3.8
       color: 858532890
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.2
-      color: 2154708295
+      width: 1.4
+      color: 1299070279
       priority: 330
       cap: BUTTCAP
     }
@@ -21516,14 +22008,14 @@ cont {
   element {
     scale: 16
     lines {
-      width: 3.6
+      width: 4.2
       color: 858532890
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.3
-      color: 1718500679
+      width: 1.6
+      color: 1299070279
       priority: 330
     }
     path_text {
@@ -21538,20 +22030,20 @@ cont {
   element {
     scale: 17
     lines {
-      width: 5.8
+      width: 6.6
       color: 1297109072
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 4.8
+      width: 5.6
       color: 858532890
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.4
-      color: 1718500679
+      width: 1.8
+      color: 1299070279
       priority: 330
     }
     path_text {
@@ -21566,20 +22058,20 @@ cont {
   element {
     scale: 18
     lines {
-      width: 8.2
+      width: 9.0
       color: 1297109072
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 7.2
+      width: 8.0
       color: 858532890
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.6
-      color: 862862663
+      width: 2.0
+      color: 443432263
       priority: 330
     }
     path_text {
@@ -21594,20 +22086,20 @@ cont {
   element {
     scale: 19
     lines {
-      width: 9.6
+      width: 10.4
       color: 1297109072
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
+      width: 9.4
       color: 858532890
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.8
-      color: 862862663
+      width: 2.2
+      color: 443432263
       priority: 330
     }
     path_text {
@@ -21622,20 +22114,20 @@ cont {
   element {
     scale: 20
     lines {
-      width: 9.6
+      width: 10.4
       color: 1297109072
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 8.6
+      width: 9.4
       color: 858532890
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.8
-      color: 862862663
+      width: 2.2
+      color: 443432263
       priority: 330
     }
     path_text {
@@ -21653,8 +22145,8 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.9
-      color: 2154708295
+      width: 1.0
+      color: 1299070279
       priority: 330
       cap: BUTTCAP
     }
@@ -21662,8 +22154,8 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
-      color: 2154708295
+      width: 1.2
+      color: 1299070279
       priority: 330
       cap: BUTTCAP
     }
@@ -21671,8 +22163,8 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.2
-      color: 2154708295
+      width: 1.4
+      color: 1299070279
       priority: 330
       cap: BUTTCAP
     }
@@ -21688,8 +22180,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.3
-      color: 1718500679
+      width: 1.6
+      color: 1299070279
       priority: 330
     }
     path_text {
@@ -21704,18 +22196,18 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.4
-      color: 1718500679
+      width: 1.8
+      color: 1299070279
       priority: 330
     }
     lines {
-      width: 4.8
+      width: 5.6
       color: 1294740506
       priority: 50
       cap: BUTTCAP
     }
     lines {
-      width: 5.8
+      width: 6.6
       color: 1297109072
       dashdot {
         dd: 2.0
@@ -21736,18 +22228,18 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.6
-      color: 862862663
+      width: 2.0
+      color: 443432263
       priority: 330
     }
     lines {
-      width: 7.2
+      width: 8.0
       color: 1294740506
       priority: 50
       cap: BUTTCAP
     }
     lines {
-      width: 8.2
+      width: 9.0
       color: 1297109072
       dashdot {
         dd: 2.0
@@ -21768,18 +22260,18 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.8
-      color: 862862663
+      width: 2.2
+      color: 443432263
       priority: 330
     }
     lines {
-      width: 8.6
+      width: 9.4
       color: 1294740506
       priority: 50
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
+      width: 10.4
       color: 1297109072
       dashdot {
         dd: 2.0
@@ -21800,18 +22292,18 @@ cont {
   element {
     scale: 20
     lines {
-      width: 1.8
-      color: 862862663
+      width: 2.2
+      color: 443432263
       priority: 330
     }
     lines {
-      width: 8.6
+      width: 9.4
       color: 1294740506
       priority: 50
       cap: BUTTCAP
     }
     lines {
-      width: 9.6
+      width: 10.4
       color: 1297109072
       dashdot {
         dd: 2.0
@@ -21985,6 +22477,143 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-footway-alpine_hiking"
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1720994322
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1720994322
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 9718290
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 9718290
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+}
 cont {
   name: "highway-footway-area"
   element {
@@ -22140,180 +22769,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-footway-bicycle"
-  element {
-    scale: 14
-    lines {
-      width: 1.1
-      color: 2154708295
-      priority: 170
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.1
-      color: 1296778819
-      dashdot {
-        dd: 4.0
-        dd: 3.2
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.2
-      color: 2154708295
-      priority: 170
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.5
-      color: 659244611
-      dashdot {
-        dd: 5.0
-        dd: 3.5
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 8
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.3
-      color: 1718500679
-      priority: 170
-    }
-    lines {
-      width: 2.0
-      color: 659244611
-      dashdot {
-        dd: 5.0
-        dd: 3.5
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.4
-      color: 1718500679
-      priority: 170
-    }
-    lines {
-      width: 2.4
-      color: 4933187
-      dashdot {
-        dd: 6.0
-        dd: 4.2
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.6
-      color: 862862663
-      priority: 170
-    }
-    lines {
-      width: 3.2
-      color: 4933187
-      dashdot {
-        dd: 8.0
-        dd: 5.5
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.8
-      color: 862862663
-      priority: 170
-    }
-    lines {
-      width: 4.2
-      color: 4933187
-      dashdot {
-        dd: 10.0
-        dd: 6.7
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.8
-      color: 862862663
-      priority: 170
-    }
-    lines {
-      width: 4.2
-      color: 4933187
-      dashdot {
-        dd: 10.0
-        dd: 6.7
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2950
-    }
-  }
-}
 cont {
   name: "highway-footway-bridge"
   element {
@@ -22331,7 +22786,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -22358,7 +22813,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -22390,7 +22845,7 @@ cont {
         dd: 6.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -22422,7 +22877,7 @@ cont {
         dd: 8.0
         dd: 3.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -22454,7 +22909,7 @@ cont {
         dd: 10.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -22486,7 +22941,7 @@ cont {
         dd: 10.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -22561,6 +23016,691 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-footway-demanding_alpine_hiking"
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1720994322
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1720994322
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 9718290
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 9718290
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-footway-demanding_mountain_hiking"
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1720994322
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1720994322
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 9718290
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 9718290
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-footway-difficult_alpine_hiking"
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1720994322
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1720994322
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 9718290
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 9718290
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-footway-hiking"
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1720994322
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1720994322
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 9718290
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 9718290
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-footway-mountain_hiking"
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 1720994322
+      dashdot {
+        dd: 5.0
+        dd: 2.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.4
+      color: 1720994322
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.2
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 9718290
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 9718290
+      dashdot {
+        dd: 10.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+}
 cont {
   name: "highway-footway-sidewalk"
   element {
@@ -22572,7 +23712,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
     }
   }
   element {
@@ -22584,7 +23724,7 @@ cont {
         dd: 6.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
   }
   element {
@@ -22596,7 +23736,7 @@ cont {
         dd: 8.0
         dd: 3.0
       }
-      priority: 155
+      priority: 180
     }
   }
   element {
@@ -22608,7 +23748,7 @@ cont {
         dd: 10.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
   }
   element {
@@ -22620,7 +23760,7 @@ cont {
         dd: 10.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
   }
 }
@@ -22635,7 +23775,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -22656,7 +23796,7 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -22676,7 +23816,7 @@ cont {
         dd: 6.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 5.8
@@ -22712,7 +23852,7 @@ cont {
         dd: 8.0
         dd: 3.0
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 7.4
@@ -22748,7 +23888,7 @@ cont {
         dd: 10.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 9.4
@@ -22784,7 +23924,7 @@ cont {
         dd: 10.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 9.4
@@ -25663,21 +26803,15 @@ cont {
   }
 }
 cont {
-  name: "highway-path-bicycle"
+  name: "highway-path-alpine_hiking"
   element {
     scale: 14
-    lines {
-      width: 1.1
-      color: 2154708295
-      priority: 170
-      cap: BUTTCAP
-    }
     lines {
       width: 0.9
       color: 1720994322
       dashdot {
         dd: 3.5
-        dd: 2.7
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
@@ -25685,18 +26819,12 @@ cont {
   }
   element {
     scale: 15
-    lines {
-      width: 1.2
-      color: 2154708295
-      priority: 170
-      cap: BUTTCAP
-    }
     lines {
       width: 1.1
       color: 1720994322
       dashdot {
         dd: 3.5
-        dd: 2.7
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
@@ -25712,17 +26840,12 @@ cont {
   }
   element {
     scale: 16
-    lines {
-      width: 1.3
-      color: 1718500679
-      priority: 170
-    }
     lines {
       width: 1.5
       color: 1720994322
       dashdot {
         dd: 4.0
-        dd: 3.2
+        dd: 2.5
       }
       priority: 180
     }
@@ -25737,17 +26860,12 @@ cont {
   }
   element {
     scale: 17
-    lines {
-      width: 1.4
-      color: 1718500679
-      priority: 170
-    }
     lines {
       width: 2.0
       color: 1720994322
       dashdot {
         dd: 4.0
-        dd: 3.2
+        dd: 2.5
       }
       priority: 180
     }
@@ -25762,17 +26880,12 @@ cont {
   }
   element {
     scale: 18
-    lines {
-      width: 1.6
-      color: 862862663
-      priority: 170
-    }
     lines {
       width: 2.8
       color: 865356306
       dashdot {
         dd: 6.0
-        dd: 4.7
+        dd: 3.5
       }
       priority: 180
     }
@@ -25787,17 +26900,12 @@ cont {
   }
   element {
     scale: 19
-    lines {
-      width: 1.8
-      color: 862862663
-      priority: 170
-    }
     lines {
       width: 3.7
       color: 865356306
       dashdot {
         dd: 8.0
-        dd: 6.2
+        dd: 4.5
       }
       priority: 180
     }
@@ -25813,16 +26921,148 @@ cont {
   element {
     scale: 20
     lines {
-      width: 1.8
-      color: 862862663
-      priority: 170
+      width: 3.7
+      color: 865356306
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
     }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-bicycle"
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.1
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 2.8
+      color: 865356306
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
     lines {
       width: 3.7
       color: 865356306
       dashdot {
         dd: 8.0
-        dd: 6.2
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 3.7
+      color: 865356306
+      dashdot {
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -25847,7 +27087,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -25866,7 +27106,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -25893,7 +27133,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -25925,7 +27165,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -25957,7 +27197,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -25989,7 +27229,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26021,7 +27261,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26034,14 +27274,14 @@ cont {
   }
 }
 cont {
-  name: "highway-path-difficult"
+  name: "highway-path-demanding_alpine_hiking"
   element {
     scale: 14
     lines {
       width: 0.9
       color: 1720994322
       dashdot {
-        dd: 1.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 180
@@ -26054,7 +27294,7 @@ cont {
       width: 1.1
       color: 1720994322
       dashdot {
-        dd: 1.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 180
@@ -26075,7 +27315,7 @@ cont {
       width: 1.5
       color: 1720994322
       dashdot {
-        dd: 1.8
+        dd: 4.0
         dd: 2.5
       }
       priority: 180
@@ -26095,7 +27335,7 @@ cont {
       width: 2.0
       color: 1720994322
       dashdot {
-        dd: 1.8
+        dd: 4.0
         dd: 2.5
       }
       priority: 180
@@ -26115,7 +27355,7 @@ cont {
       width: 2.8
       color: 865356306
       dashdot {
-        dd: 2.8
+        dd: 6.0
         dd: 3.5
       }
       priority: 180
@@ -26132,11 +27372,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.8
+      width: 3.7
       color: 865356306
       dashdot {
-        dd: 2.8
-        dd: 3.5
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -26152,11 +27392,11 @@ cont {
   element {
     scale: 20
     lines {
-      width: 2.8
+      width: 3.7
       color: 865356306
       dashdot {
-        dd: 2.8
-        dd: 3.5
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -26171,15 +27411,15 @@ cont {
   }
 }
 cont {
-  name: "highway-path-expert"
+  name: "highway-path-demanding_mountain_hiking"
   element {
     scale: 14
     lines {
       width: 0.9
-      color: 1716665907
+      color: 1720994322
       dashdot {
-        dd: 1.0
-        dd: 4.0
+        dd: 3.5
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
@@ -26189,10 +27429,10 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 1716665907
+      color: 1720994322
       dashdot {
-        dd: 1.0
-        dd: 4.0
+        dd: 3.5
+        dd: 2.0
       }
       priority: 180
       cap: BUTTCAP
@@ -26210,10 +27450,10 @@ cont {
     scale: 16
     lines {
       width: 1.5
-      color: 1716665907
+      color: 1720994322
       dashdot {
-        dd: 1.6
-        dd: 6.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 180
     }
@@ -26230,10 +27470,10 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 1716665907
+      color: 1720994322
       dashdot {
-        dd: 1.6
-        dd: 6.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 180
     }
@@ -26250,10 +27490,10 @@ cont {
     scale: 18
     lines {
       width: 2.8
-      color: 861027891
+      color: 865356306
       dashdot {
-        dd: 2.8
-        dd: 8.0
+        dd: 6.0
+        dd: 3.5
       }
       priority: 180
     }
@@ -26269,11 +27509,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.8
-      color: 861027891
+      width: 3.7
+      color: 865356306
       dashdot {
-        dd: 2.8
         dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -26289,11 +27529,285 @@ cont {
   element {
     scale: 20
     lines {
-      width: 2.8
-      color: 861027891
+      width: 3.7
+      color: 865356306
       dashdot {
-        dd: 2.8
         dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-difficult_alpine_hiking"
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.1
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 2.8
+      color: 865356306
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.7
+      color: 865356306
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 3.7
+      color: 865356306
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-hiking"
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.1
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 2.8
+      color: 865356306
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.7
+      color: 865356306
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 3.7
+      color: 865356306
+      dashdot {
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -26318,7 +27832,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -26331,7 +27845,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -26352,7 +27866,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26372,7 +27886,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26392,7 +27906,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26412,7 +27926,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26432,7 +27946,144 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-mountain_hiking"
+  element {
+    scale: 14
+    lines {
+      width: 0.9
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.1
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 2.8
+      color: 865356306
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 3.7
+      color: 865356306
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 3.7
+      color: 865356306
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
     }
     path_text {
       primary {
@@ -26455,7 +28106,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -26468,7 +28119,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -26489,7 +28140,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -26509,7 +28160,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 5.0
@@ -26545,7 +28196,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 6.6
@@ -26581,7 +28232,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 8.4
@@ -26617,7 +28268,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 8.4
@@ -35066,6 +36717,691 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-track-grade1"
+  element {
+    scale: 14
+    lines {
+      width: 1.1
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.4
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.9
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 861885229
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.3
+      color: 861885229
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 861885229
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 861885229
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+}
+cont {
+  name: "highway-track-grade2"
+  element {
+    scale: 14
+    lines {
+      width: 1.1
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.4
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.9
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.3
+      color: 861885229
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 861885229
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 861885229
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+}
+cont {
+  name: "highway-track-grade3"
+  element {
+    scale: 14
+    lines {
+      width: 1.1
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.4
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.9
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.3
+      color: 861885229
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 861885229
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 861885229
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+}
+cont {
+  name: "highway-track-grade4"
+  element {
+    scale: 14
+    lines {
+      width: 1.1
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.4
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.9
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.3
+      color: 861885229
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 861885229
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 861885229
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+}
+cont {
+  name: "highway-track-grade5"
+  element {
+    scale: 14
+    lines {
+      width: 1.1
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.4
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.9
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.3
+      color: 861885229
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.2
+      color: 861885229
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.2
+      color: 861885229
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+}
 cont {
   name: "highway-track-no-access"
   element {
@@ -49047,35 +51383,65 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 3425648640
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
     caption {
       primary {
-        height: 10
-        color: 9211020
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
         offset_y: 1
+        is_optional: true
       }
-      priority: 6700
+      priority: -3300
     }
   }
   element {
     scale: 19
+    area {
+      color: 3425648640
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
     caption {
       primary {
-        height: 10
-        color: 9211020
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
         offset_y: 1
+        is_optional: true
       }
-      priority: 6700
+      priority: -3300
     }
   }
   element {
     scale: 20
+    area {
+      color: 3425648640
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
     caption {
       primary {
-        height: 10
-        color: 9211020
+        height: 11
+        color: 2836760
+        stroke_color: 436602368
         offset_y: 1
+        is_optional: true
       }
-      priority: 6700
+      priority: -3300
     }
   }
 }
@@ -51269,7 +53635,7 @@ cont {
     lines {
       width: 1.5
       color: 1294016795
-      priority: 160
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -51278,7 +53644,7 @@ cont {
     lines {
       width: 1.8
       color: 1294016795
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
@@ -51294,7 +53660,7 @@ cont {
     lines {
       width: 3.0
       color: 857809179
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
@@ -51311,7 +53677,7 @@ cont {
     lines {
       width: 3.0
       color: 857809179
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
@@ -51328,7 +53694,7 @@ cont {
     lines {
       width: 4.0
       color: 857809179
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
@@ -51345,7 +53711,7 @@ cont {
     lines {
       width: 4.0
       color: 857809179
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin
index 9cd3b18d19..ebc15447ef 100644
Binary files a/data/drules_proto_outdoors_clear.bin and b/data/drules_proto_outdoors_clear.bin differ
diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt
index 22f42f2a6d..5d6a89cf9e 100644
--- a/data/drules_proto_outdoors_clear.txt
+++ b/data/drules_proto_outdoors_clear.txt
@@ -16227,7 +16227,7 @@ cont {
   element {
     scale: 10
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -16242,7 +16242,7 @@ cont {
   element {
     scale: 11
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -16257,7 +16257,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -16272,7 +16272,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -16287,7 +16287,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -16302,7 +16302,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -16317,7 +16317,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -16329,6 +16329,66 @@ cont {
       priority: 6700
     }
   }
+  element {
+    scale: 17
+    area {
+      color: 3430108454
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6967599
+        stroke_color: 872415231
+      }
+      priority: 6700
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 3430108454
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6967599
+        stroke_color: 872415231
+      }
+      priority: 6700
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 3430108454
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6967599
+        stroke_color: 872415231
+      }
+      priority: 6700
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 3430108454
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6967599
+        stroke_color: 872415231
+      }
+      priority: 6700
+    }
+  }
 }
 cont {
   name: "boundary-administrative-2"
@@ -16905,6 +16965,69 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    area {
+      color: 3431500856
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 3431500856
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 3431500856
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area"
@@ -17038,6 +17161,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-1"
@@ -17203,6 +17377,69 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    area {
+      color: 3431500856
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 3431500856
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 3431500856
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-2"
@@ -17336,6 +17573,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-3"
@@ -17469,6 +17757,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-4"
@@ -17602,6 +17941,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-5"
@@ -17735,6 +18125,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-6"
@@ -17868,6 +18309,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "building"
@@ -22148,8 +22640,8 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
-      color: 1297305067
+      width: 0.7
+      color: 1728022445
       priority: 330
       join: BEVELJOIN
       cap: BUTTCAP
@@ -22158,8 +22650,8 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.0
-      color: 1297305067
+      width: 0.8
+      color: 1308592045
       priority: 330
       join: BEVELJOIN
       cap: BUTTCAP
@@ -22169,7 +22661,7 @@ cont {
     scale: 13
     lines {
       width: 1.1
-      color: 861097451
+      color: 16746413
       priority: 330
       cap: BUTTCAP
     }
@@ -22185,8 +22677,8 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.3
-      color: 5459435
+      width: 1.4
+      color: 16746413
       priority: 330
       cap: BUTTCAP
     }
@@ -22202,8 +22694,8 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.5
-      color: 5459435
+      width: 1.6
+      color: 16746413
       priority: 330
       cap: BUTTCAP
     }
@@ -22219,8 +22711,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.7
-      color: 5459435
+      width: 1.9
+      color: 16746413
       priority: 330
     }
     path_text {
@@ -22235,8 +22727,8 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
-      color: 5459435
+      width: 2.3
+      color: 16746413
       priority: 330
     }
     path_text {
@@ -22251,8 +22743,8 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.4
-      color: 5459435
+      width: 2.8
+      color: 16746413
       priority: 330
     }
     path_text {
@@ -22267,8 +22759,8 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.4
-      color: 5459435
+      width: 2.8
+      color: 16746413
       priority: 330
     }
     path_text {
@@ -22283,8 +22775,8 @@ cont {
   element {
     scale: 20
     lines {
-      width: 2.4
-      color: 5459435
+      width: 2.8
+      color: 16746413
       priority: 330
     }
     path_text {
@@ -22302,8 +22794,8 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
-      color: 1297305067
+      width: 0.7
+      color: 1728022445
       priority: 330
       join: BEVELJOIN
       cap: BUTTCAP
@@ -22312,8 +22804,8 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.0
-      color: 1297305067
+      width: 0.8
+      color: 1308592045
       priority: 330
       join: BEVELJOIN
       cap: BUTTCAP
@@ -22323,7 +22815,7 @@ cont {
     scale: 13
     lines {
       width: 1.1
-      color: 861097451
+      color: 16746413
       priority: 330
       cap: BUTTCAP
     }
@@ -22339,8 +22831,8 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.3
-      color: 5459435
+      width: 1.4
+      color: 16746413
       priority: 330
       cap: BUTTCAP
     }
@@ -22356,14 +22848,14 @@ cont {
   element {
     scale: 15
     lines {
-      width: 4.0
+      width: 4.2
       color: 871230427
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.5
-      color: 5459435
+      width: 1.6
+      color: 16746413
       priority: 330
       cap: BUTTCAP
     }
@@ -22379,14 +22871,14 @@ cont {
   element {
     scale: 16
     lines {
-      width: 4.4
+      width: 4.8
       color: 871230427
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.7
-      color: 5459435
+      width: 1.9
+      color: 16746413
       priority: 330
     }
     path_text {
@@ -22401,20 +22893,20 @@ cont {
   element {
     scale: 17
     lines {
-      width: 7.0
+      width: 7.6
       color: 1300267136
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 6.0
+      width: 6.6
       color: 871230427
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 2.0
-      color: 5459435
+      width: 2.3
+      color: 16746413
       priority: 330
     }
     path_text {
@@ -22429,20 +22921,20 @@ cont {
   element {
     scale: 18
     lines {
-      width: 9.8
+      width: 10.6
       color: 1300267136
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 8.8
+      width: 9.6
       color: 871230427
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 2.4
-      color: 5459435
+      width: 2.8
+      color: 16746413
       priority: 330
     }
     path_text {
@@ -22457,20 +22949,20 @@ cont {
   element {
     scale: 19
     lines {
-      width: 10.8
+      width: 11.6
       color: 1300267136
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 9.8
+      width: 10.6
       color: 871230427
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 2.4
-      color: 5459435
+      width: 2.8
+      color: 16746413
       priority: 330
     }
     path_text {
@@ -22485,20 +22977,20 @@ cont {
   element {
     scale: 20
     lines {
-      width: 10.8
+      width: 11.6
       color: 1300267136
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 9.8
+      width: 10.6
       color: 871230427
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 2.4
-      color: 5459435
+      width: 2.8
+      color: 16746413
       priority: 330
     }
     path_text {
@@ -22516,8 +23008,8 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
-      color: 1297305067
+      width: 0.7
+      color: 1728022445
       priority: 330
       join: BEVELJOIN
       cap: BUTTCAP
@@ -22526,8 +23018,8 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.0
-      color: 1297305067
+      width: 0.8
+      color: 1308592045
       priority: 330
       join: BEVELJOIN
       cap: BUTTCAP
@@ -22537,7 +23029,7 @@ cont {
     scale: 13
     lines {
       width: 1.1
-      color: 861097451
+      color: 16746413
       priority: 330
       cap: BUTTCAP
     }
@@ -22553,8 +23045,8 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.3
-      color: 5459435
+      width: 1.4
+      color: 16746413
       priority: 330
       cap: BUTTCAP
     }
@@ -22570,8 +23062,8 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.5
-      color: 5459435
+      width: 1.6
+      color: 16746413
       priority: 330
       cap: BUTTCAP
     }
@@ -22587,8 +23079,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.7
-      color: 5459435
+      width: 1.9
+      color: 16746413
       priority: 330
     }
     path_text {
@@ -22603,18 +23095,18 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
-      color: 5459435
+      width: 2.3
+      color: 16746413
       priority: 330
     }
     lines {
-      width: 6.0
+      width: 6.6
       color: 1307438043
       priority: 50
       cap: BUTTCAP
     }
     lines {
-      width: 7.0
+      width: 7.6
       color: 1300267136
       dashdot {
         dd: 2.0
@@ -22635,18 +23127,18 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.4
-      color: 5459435
+      width: 2.8
+      color: 16746413
       priority: 330
     }
     lines {
-      width: 8.8
+      width: 9.6
       color: 1307438043
       priority: 50
       cap: BUTTCAP
     }
     lines {
-      width: 9.8
+      width: 10.6
       color: 1300267136
       dashdot {
         dd: 2.0
@@ -22667,18 +23159,18 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.4
-      color: 5459435
+      width: 2.8
+      color: 16746413
       priority: 330
     }
     lines {
-      width: 9.8
+      width: 10.6
       color: 1307438043
       priority: 50
       cap: BUTTCAP
     }
     lines {
-      width: 10.8
+      width: 11.6
       color: 1300267136
       dashdot {
         dd: 2.0
@@ -22699,18 +23191,18 @@ cont {
   element {
     scale: 20
     lines {
-      width: 2.4
-      color: 5459435
+      width: 2.8
+      color: 16746413
       priority: 330
     }
     lines {
-      width: 9.8
+      width: 10.6
       color: 1307438043
       priority: 50
       cap: BUTTCAP
     }
     lines {
-      width: 10.8
+      width: 11.6
       color: 1300267136
       dashdot {
         dd: 2.0
@@ -22954,6 +23446,200 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-footway-alpine_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1302351890
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
 cont {
   name: "highway-footway-area"
   element {
@@ -23176,250 +23862,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-footway-bicycle"
-  element {
-    scale: 11
-    lines {
-      width: 1.0
-      color: 16316664
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 180
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.0
-      color: 1297305067
-      priority: 170
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.1
-      color: 1308162296
-      dashdot {
-        dd: 3.5
-        dd: 2.5
-      }
-      priority: 180
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.1
-      color: 861097451
-      priority: 170
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.3
-      color: 871954680
-      dashdot {
-        dd: 4.0
-        dd: 3.0
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        stroke_color: 871230427
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.3
-      color: 5459435
-      priority: 170
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.6
-      color: 871954680
-      dashdot {
-        dd: 4.0
-        dd: 3.0
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 871230427
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.5
-      color: 5459435
-      priority: 170
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 871954680
-      dashdot {
-        dd: 6.0
-        dd: 4.5
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 11
-        color: 4473924
-        stroke_color: 871230427
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.7
-      color: 5459435
-      priority: 170
-    }
-    lines {
-      width: 2.6
-      color: 871954680
-      dashdot {
-        dd: 6.0
-        dd: 4.5
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 2.0
-      color: 5459435
-      priority: 170
-    }
-    lines {
-      width: 3.3
-      color: 871954680
-      dashdot {
-        dd: 8.0
-        dd: 6.0
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 2.4
-      color: 5459435
-      priority: 170
-    }
-    lines {
-      width: 4.0
-      color: 16316664
-      dashdot {
-        dd: 8.0
-        dd: 6.0
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 2.4
-      color: 5459435
-      priority: 170
-    }
-    lines {
-      width: 4.0
-      color: 16316664
-      dashdot {
-        dd: 8.0
-        dd: 6.0
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 2.4
-      color: 5459435
-      priority: 170
-    }
-    lines {
-      width: 4.0
-      color: 16316664
-      dashdot {
-        dd: 8.0
-        dd: 6.0
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2950
-    }
-  }
-}
 cont {
   name: "highway-footway-bridge"
   element {
@@ -23431,7 +23873,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23445,7 +23887,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23459,7 +23901,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -23480,7 +23922,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -23507,7 +23949,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -23534,7 +23976,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -23566,7 +24008,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -23598,7 +24040,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -23630,7 +24072,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -23662,7 +24104,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -23737,6 +24179,976 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-footway-demanding_alpine_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1302351890
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-footway-demanding_mountain_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1302351890
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-footway-difficult_alpine_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1302351890
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-footway-hiking"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1302351890
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-footway-mountain_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1302351890
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
 cont {
   name: "highway-footway-sidewalk"
   element {
@@ -23748,7 +25160,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
   }
   element {
@@ -23760,7 +25172,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
   }
   element {
@@ -23772,7 +25184,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
   }
   element {
@@ -23784,7 +25196,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
   }
   element {
@@ -23796,7 +25208,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
   }
 }
@@ -23811,7 +25223,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23825,7 +25237,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23839,7 +25251,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -23860,7 +25272,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -23881,7 +25293,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -23902,7 +25314,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -23922,7 +25334,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 7.6
@@ -23958,7 +25370,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 9.0
@@ -23994,7 +25406,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 9.0
@@ -24030,7 +25442,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 9.0
@@ -26907,6 +28319,200 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-path-alpine_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1302351890
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
 cont {
   name: "highway-path-bicycle"
   element {
@@ -26925,19 +28531,12 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 1.0
-      color: 1297305067
-      priority: 170
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
     lines {
       width: 1.1
       color: 1302351890
       dashdot {
         dd: 3.5
-        dd: 2.5
+        dd: 2.0
       }
       priority: 180
       join: BEVELJOIN
@@ -26946,18 +28545,12 @@ cont {
   }
   element {
     scale: 13
-    lines {
-      width: 1.1
-      color: 861097451
-      priority: 170
-      cap: BUTTCAP
-    }
     lines {
       width: 1.3
-      color: 866144274
+      color: 10506258
       dashdot {
         dd: 4.0
-        dd: 3.0
+        dd: 2.5
       }
       priority: 180
       cap: BUTTCAP
@@ -26973,18 +28566,12 @@ cont {
   }
   element {
     scale: 14
-    lines {
-      width: 1.3
-      color: 5459435
-      priority: 170
-      cap: BUTTCAP
-    }
     lines {
       width: 1.6
-      color: 866144274
+      color: 10506258
       dashdot {
         dd: 4.0
-        dd: 3.0
+        dd: 2.5
       }
       priority: 180
       cap: BUTTCAP
@@ -27000,18 +28587,12 @@ cont {
   }
   element {
     scale: 15
-    lines {
-      width: 1.5
-      color: 5459435
-      priority: 170
-      cap: BUTTCAP
-    }
     lines {
       width: 2.0
-      color: 866144274
+      color: 10506258
       dashdot {
         dd: 6.0
-        dd: 4.5
+        dd: 3.5
       }
       priority: 180
       cap: BUTTCAP
@@ -27027,17 +28608,12 @@ cont {
   }
   element {
     scale: 16
-    lines {
-      width: 1.7
-      color: 5459435
-      priority: 170
-    }
     lines {
       width: 2.6
-      color: 866144274
+      color: 10506258
       dashdot {
         dd: 6.0
-        dd: 4.5
+        dd: 3.5
       }
       priority: 180
     }
@@ -27052,17 +28628,12 @@ cont {
   }
   element {
     scale: 17
-    lines {
-      width: 2.0
-      color: 5459435
-      priority: 170
-    }
     lines {
       width: 3.3
-      color: 866144274
+      color: 10506258
       dashdot {
         dd: 8.0
-        dd: 6.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27077,17 +28648,12 @@ cont {
   }
   element {
     scale: 18
-    lines {
-      width: 2.4
-      color: 5459435
-      priority: 170
-    }
     lines {
       width: 4.0
       color: 10506258
       dashdot {
         dd: 8.0
-        dd: 6.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27102,17 +28668,12 @@ cont {
   }
   element {
     scale: 19
-    lines {
-      width: 2.4
-      color: 5459435
-      priority: 170
-    }
     lines {
       width: 4.0
       color: 10506258
       dashdot {
         dd: 8.0
-        dd: 6.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27127,17 +28688,12 @@ cont {
   }
   element {
     scale: 20
-    lines {
-      width: 2.4
-      color: 5459435
-      priority: 170
-    }
     lines {
       width: 4.0
       color: 10506258
       dashdot {
         dd: 8.0
-        dd: 6.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27162,7 +28718,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -27176,7 +28732,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -27190,7 +28746,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27211,7 +28767,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27238,7 +28794,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27265,7 +28821,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27297,7 +28853,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27329,7 +28885,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27361,7 +28917,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27393,7 +28949,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27406,28 +28962,28 @@ cont {
   }
 }
 cont {
-  name: "highway-path-difficult"
+  name: "highway-path-demanding_alpine_hiking"
   element {
     scale: 11
     lines {
       width: 1.0
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
       color: 1302351890
       dashdot {
-        dd: 1.0
-        dd: 2.0
-      }
-      priority: 180
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.1
-      color: 866144274
-      dashdot {
-        dd: 1.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 180
@@ -27441,7 +28997,7 @@ cont {
       width: 1.3
       color: 10506258
       dashdot {
-        dd: 1.5
+        dd: 4.0
         dd: 2.5
       }
       priority: 180
@@ -27462,7 +29018,7 @@ cont {
       width: 1.6
       color: 10506258
       dashdot {
-        dd: 1.5
+        dd: 4.0
         dd: 2.5
       }
       priority: 180
@@ -27483,8 +29039,8 @@ cont {
       width: 2.0
       color: 10506258
       dashdot {
-        dd: 2.5
-        dd: 4.0
+        dd: 6.0
+        dd: 3.5
       }
       priority: 180
       cap: BUTTCAP
@@ -27504,8 +29060,8 @@ cont {
       width: 2.6
       color: 10506258
       dashdot {
-        dd: 2.5
-        dd: 4.0
+        dd: 6.0
+        dd: 3.5
       }
       priority: 180
     }
@@ -27524,8 +29080,8 @@ cont {
       width: 3.3
       color: 10506258
       dashdot {
-        dd: 3.6
-        dd: 5.0
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27544,8 +29100,8 @@ cont {
       width: 4.0
       color: 10506258
       dashdot {
-        dd: 3.6
-        dd: 5.0
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27564,8 +29120,8 @@ cont {
       width: 4.0
       color: 10506258
       dashdot {
-        dd: 3.6
-        dd: 5.0
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27584,8 +29140,8 @@ cont {
       width: 4.0
       color: 10506258
       dashdot {
-        dd: 3.6
-        dd: 5.0
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27600,14 +29156,14 @@ cont {
   }
 }
 cont {
-  name: "highway-path-expert"
+  name: "highway-path-demanding_mountain_hiking"
   element {
     scale: 11
     lines {
       width: 1.0
-      color: 1295853079
+      color: 1721782290
       dashdot {
-        dd: 1.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 180
@@ -27619,9 +29175,9 @@ cont {
     scale: 12
     lines {
       width: 1.1
-      color: 859645463
+      color: 1302351890
       dashdot {
-        dd: 1.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 180
@@ -27633,10 +29189,10 @@ cont {
     scale: 13
     lines {
       width: 1.3
-      color: 4007447
+      color: 10506258
       dashdot {
-        dd: 1.4
-        dd: 5.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 180
       cap: BUTTCAP
@@ -27654,10 +29210,10 @@ cont {
     scale: 14
     lines {
       width: 1.6
-      color: 4007447
+      color: 10506258
       dashdot {
-        dd: 1.4
-        dd: 5.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 180
       cap: BUTTCAP
@@ -27675,10 +29231,10 @@ cont {
     scale: 15
     lines {
       width: 2.0
-      color: 4007447
+      color: 10506258
       dashdot {
-        dd: 2.3
-        dd: 9.0
+        dd: 6.0
+        dd: 3.5
       }
       priority: 180
       cap: BUTTCAP
@@ -27696,10 +29252,10 @@ cont {
     scale: 16
     lines {
       width: 2.6
-      color: 4007447
+      color: 10506258
       dashdot {
-        dd: 2.3
-        dd: 9.0
+        dd: 6.0
+        dd: 3.5
       }
       priority: 180
     }
@@ -27716,10 +29272,10 @@ cont {
     scale: 17
     lines {
       width: 3.3
-      color: 4007447
+      color: 10506258
       dashdot {
-        dd: 3.5
-        dd: 11.0
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27736,10 +29292,10 @@ cont {
     scale: 18
     lines {
       width: 4.0
-      color: 4007447
+      color: 10506258
       dashdot {
-        dd: 3.5
-        dd: 11.0
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27756,10 +29312,10 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 4007447
+      color: 10506258
       dashdot {
-        dd: 3.5
-        dd: 11.0
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27776,10 +29332,398 @@ cont {
     scale: 20
     lines {
       width: 4.0
-      color: 4007447
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-difficult_alpine_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 1721782290
       dashdot {
         dd: 3.5
-        dd: 11.0
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1302351890
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-hiking"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1302351890
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27804,7 +29748,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -27818,7 +29762,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -27832,7 +29776,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27853,7 +29797,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27874,7 +29818,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27895,7 +29839,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27915,7 +29859,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27935,7 +29879,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27955,7 +29899,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27975,7 +29919,201 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-mountain_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1302351890
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
     }
     path_text {
       primary {
@@ -27998,7 +30136,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -28012,7 +30150,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -28026,7 +30164,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -28047,7 +30185,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -28068,7 +30206,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -28089,7 +30227,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28109,7 +30247,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 7.6
@@ -28145,7 +30283,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 9.0
@@ -28181,7 +30319,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 9.0
@@ -28217,7 +30355,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 9.0
@@ -36970,6 +39108,976 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-track-grade1"
+  element {
+    scale: 11
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.3
+      color: 1298356016
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.6
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.5
+      color: 6510384
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.2
+      color: 6510384
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 4.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+}
+cont {
+  name: "highway-track-grade2"
+  element {
+    scale: 11
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.3
+      color: 1298356016
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.6
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.5
+      color: 6510384
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.2
+      color: 6510384
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 4.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+}
+cont {
+  name: "highway-track-grade3"
+  element {
+    scale: 11
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.3
+      color: 1298356016
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.6
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.5
+      color: 6510384
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.2
+      color: 6510384
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 4.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+}
+cont {
+  name: "highway-track-grade4"
+  element {
+    scale: 11
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.3
+      color: 1298356016
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.6
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.5
+      color: 6510384
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.2
+      color: 6510384
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 4.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+}
+cont {
+  name: "highway-track-grade5"
+  element {
+    scale: 11
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.3
+      color: 1298356016
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.6
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.5
+      color: 6510384
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 871230427
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.2
+      color: 6510384
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 4.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
+  }
+}
 cont {
   name: "highway-track-no-access"
   element {
@@ -51199,35 +54307,65 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 3431500856
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
     caption {
       primary {
-        height: 10
-        color: 4473924
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
         offset_y: 1
+        is_optional: true
       }
-      priority: 6700
+      priority: -3300
     }
   }
   element {
     scale: 19
+    area {
+      color: 3431500856
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
     caption {
       primary {
-        height: 10
-        color: 4473924
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
         offset_y: 1
+        is_optional: true
       }
-      priority: 6700
+      priority: -3300
     }
   }
   element {
     scale: 20
+    area {
+      color: 3431500856
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
     caption {
       primary {
-        height: 10
-        color: 4473924
+        height: 12
+        color: 3832097
+        stroke_color: 452984831
         offset_y: 1
+        is_optional: true
       }
-      priority: 6700
+      priority: -3300
     }
   }
 }
@@ -53444,7 +56582,7 @@ cont {
     lines {
       width: 1.5
       color: 1305595303
-      priority: 160
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -53453,7 +56591,7 @@ cont {
     lines {
       width: 1.8
       color: 1305595303
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
@@ -53469,7 +56607,7 @@ cont {
     lines {
       width: 3.0
       color: 869387687
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
@@ -53486,7 +56624,7 @@ cont {
     lines {
       width: 3.0
       color: 869387687
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
@@ -53503,7 +56641,7 @@ cont {
     lines {
       width: 4.0
       color: 869387687
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
@@ -53520,7 +56658,7 @@ cont {
     lines {
       width: 4.0
       color: 869387687
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 92af2daaf6..9a52aeba5b 100644
Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ
diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 49719b1950..78a2180b2e 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -16227,7 +16227,7 @@ cont {
   element {
     scale: 10
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -16242,7 +16242,7 @@ cont {
   element {
     scale: 11
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -16257,7 +16257,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -16272,7 +16272,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -16287,7 +16287,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -16302,7 +16302,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -16317,7 +16317,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 4000533798
+      color: 3430108454
       priority: 20
     }
     caption {
@@ -16329,6 +16329,66 @@ cont {
       priority: 6700
     }
   }
+  element {
+    scale: 17
+    area {
+      color: 3430108454
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6967599
+        stroke_color: 856032768
+      }
+      priority: 6700
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 3430108454
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6967599
+        stroke_color: 856032768
+      }
+      priority: 6700
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 3430108454
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6967599
+        stroke_color: 856032768
+      }
+      priority: 6700
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 3430108454
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6967599
+        stroke_color: 856032768
+      }
+      priority: 6700
+    }
+  }
 }
 cont {
   name: "boundary-administrative-2"
@@ -16905,6 +16965,69 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    area {
+      color: 3425648640
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 3425648640
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 3425648640
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area"
@@ -17038,6 +17161,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-1"
@@ -17203,6 +17377,69 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    area {
+      color: 3425648640
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 3425648640
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 3425648640
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-2"
@@ -17336,6 +17573,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-3"
@@ -17469,6 +17757,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-4"
@@ -17602,6 +17941,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-5"
@@ -17735,6 +18125,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "boundary-protected_area-6"
@@ -17868,6 +18309,57 @@ cont {
       priority: -3300
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3300
+    }
+  }
 }
 cont {
   name: "building"
@@ -22148,8 +22640,8 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
-      color: 1299070279
+      width: 0.7
+      color: 1718500679
       priority: 330
       join: BEVELJOIN
       cap: BUTTCAP
@@ -22158,7 +22650,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.0
+      width: 0.8
       color: 1299070279
       priority: 330
       join: BEVELJOIN
@@ -22169,7 +22661,7 @@ cont {
     scale: 13
     lines {
       width: 1.1
-      color: 862862663
+      color: 7224647
       priority: 330
       cap: BUTTCAP
     }
@@ -22185,7 +22677,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.3
+      width: 1.4
       color: 7224647
       priority: 330
       cap: BUTTCAP
@@ -22202,7 +22694,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.5
+      width: 1.6
       color: 7224647
       priority: 330
       cap: BUTTCAP
@@ -22219,7 +22711,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.7
+      width: 1.9
       color: 7224647
       priority: 330
     }
@@ -22235,7 +22727,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 2.3
       color: 7224647
       priority: 330
     }
@@ -22251,7 +22743,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.4
+      width: 2.8
       color: 7224647
       priority: 330
     }
@@ -22267,7 +22759,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.4
+      width: 2.8
       color: 7224647
       priority: 330
     }
@@ -22283,7 +22775,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 2.4
+      width: 2.8
       color: 7224647
       priority: 330
     }
@@ -22302,8 +22794,8 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
-      color: 1299070279
+      width: 0.7
+      color: 1718500679
       priority: 330
       join: BEVELJOIN
       cap: BUTTCAP
@@ -22312,7 +22804,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.0
+      width: 0.8
       color: 1299070279
       priority: 330
       join: BEVELJOIN
@@ -22323,7 +22815,7 @@ cont {
     scale: 13
     lines {
       width: 1.1
-      color: 862862663
+      color: 7224647
       priority: 330
       cap: BUTTCAP
     }
@@ -22339,7 +22831,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.3
+      width: 1.4
       color: 7224647
       priority: 330
       cap: BUTTCAP
@@ -22356,13 +22848,13 @@ cont {
   element {
     scale: 15
     lines {
-      width: 4.0
+      width: 4.2
       color: 858532890
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.5
+      width: 1.6
       color: 7224647
       priority: 330
       cap: BUTTCAP
@@ -22379,13 +22871,13 @@ cont {
   element {
     scale: 16
     lines {
-      width: 4.4
+      width: 4.8
       color: 858532890
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.7
+      width: 1.9
       color: 7224647
       priority: 330
     }
@@ -22401,19 +22893,19 @@ cont {
   element {
     scale: 17
     lines {
-      width: 7.0
+      width: 7.6
       color: 1297109072
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 6.0
+      width: 6.6
       color: 858532890
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 2.0
+      width: 2.3
       color: 7224647
       priority: 330
     }
@@ -22429,19 +22921,19 @@ cont {
   element {
     scale: 18
     lines {
-      width: 9.8
+      width: 10.6
       color: 1297109072
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 8.8
+      width: 9.6
       color: 858532890
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 2.4
+      width: 2.8
       color: 7224647
       priority: 330
     }
@@ -22457,19 +22949,19 @@ cont {
   element {
     scale: 19
     lines {
-      width: 10.8
+      width: 11.6
       color: 1297109072
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 9.8
+      width: 10.6
       color: 858532890
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 2.4
+      width: 2.8
       color: 7224647
       priority: 330
     }
@@ -22485,19 +22977,19 @@ cont {
   element {
     scale: 20
     lines {
-      width: 10.8
+      width: 11.6
       color: 1297109072
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 9.8
+      width: 10.6
       color: 858532890
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 2.4
+      width: 2.8
       color: 7224647
       priority: 330
     }
@@ -22516,8 +23008,8 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
-      color: 1299070279
+      width: 0.7
+      color: 1718500679
       priority: 330
       join: BEVELJOIN
       cap: BUTTCAP
@@ -22526,7 +23018,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.0
+      width: 0.8
       color: 1299070279
       priority: 330
       join: BEVELJOIN
@@ -22537,7 +23029,7 @@ cont {
     scale: 13
     lines {
       width: 1.1
-      color: 862862663
+      color: 7224647
       priority: 330
       cap: BUTTCAP
     }
@@ -22553,7 +23045,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.3
+      width: 1.4
       color: 7224647
       priority: 330
       cap: BUTTCAP
@@ -22570,7 +23062,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.5
+      width: 1.6
       color: 7224647
       priority: 330
       cap: BUTTCAP
@@ -22587,7 +23079,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.7
+      width: 1.9
       color: 7224647
       priority: 330
     }
@@ -22603,18 +23095,18 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 2.3
       color: 7224647
       priority: 330
     }
     lines {
-      width: 6.0
+      width: 6.6
       color: 1294740506
       priority: 50
       cap: BUTTCAP
     }
     lines {
-      width: 7.0
+      width: 7.6
       color: 1297109072
       dashdot {
         dd: 2.0
@@ -22635,18 +23127,18 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.4
+      width: 2.8
       color: 7224647
       priority: 330
     }
     lines {
-      width: 8.8
+      width: 9.6
       color: 1294740506
       priority: 50
       cap: BUTTCAP
     }
     lines {
-      width: 9.8
+      width: 10.6
       color: 1297109072
       dashdot {
         dd: 2.0
@@ -22667,18 +23159,18 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.4
+      width: 2.8
       color: 7224647
       priority: 330
     }
     lines {
-      width: 9.8
+      width: 10.6
       color: 1294740506
       priority: 50
       cap: BUTTCAP
     }
     lines {
-      width: 10.8
+      width: 11.6
       color: 1297109072
       dashdot {
         dd: 2.0
@@ -22699,18 +23191,18 @@ cont {
   element {
     scale: 20
     lines {
-      width: 2.4
+      width: 2.8
       color: 7224647
       priority: 330
     }
     lines {
-      width: 9.8
+      width: 10.6
       color: 1294740506
       priority: 50
       cap: BUTTCAP
     }
     lines {
-      width: 10.8
+      width: 11.6
       color: 1297109072
       dashdot {
         dd: 2.0
@@ -22954,6 +23446,200 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-footway-alpine_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1301563922
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+}
 cont {
   name: "highway-footway-area"
   element {
@@ -23176,250 +23862,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-footway-bicycle"
-  element {
-    scale: 11
-    lines {
-      width: 1.0
-      color: 4933187
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 180
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.0
-      color: 1299070279
-      priority: 170
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.1
-      color: 1296778819
-      dashdot {
-        dd: 3.5
-        dd: 2.5
-      }
-      priority: 180
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.1
-      color: 862862663
-      priority: 170
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.3
-      color: 860571203
-      dashdot {
-        dd: 4.0
-        dd: 3.0
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 6710886
-        stroke_color: 856756480
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.3
-      color: 7224647
-      priority: 170
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.6
-      color: 860571203
-      dashdot {
-        dd: 4.0
-        dd: 3.0
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 11
-        color: 6710886
-        stroke_color: 856756480
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.5
-      color: 7224647
-      priority: 170
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 860571203
-      dashdot {
-        dd: 6.0
-        dd: 4.5
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 11
-        color: 6710886
-        stroke_color: 856756480
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.7
-      color: 7224647
-      priority: 170
-    }
-    lines {
-      width: 2.6
-      color: 860571203
-      dashdot {
-        dd: 6.0
-        dd: 4.5
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 2.0
-      color: 7224647
-      priority: 170
-    }
-    lines {
-      width: 3.3
-      color: 860571203
-      dashdot {
-        dd: 8.0
-        dd: 6.0
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 2.4
-      color: 7224647
-      priority: 170
-    }
-    lines {
-      width: 4.0
-      color: 4933187
-      dashdot {
-        dd: 8.0
-        dd: 6.0
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 2.4
-      color: 7224647
-      priority: 170
-    }
-    lines {
-      width: 4.0
-      color: 4933187
-      dashdot {
-        dd: 8.0
-        dd: 6.0
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2950
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 2.4
-      color: 7224647
-      priority: 170
-    }
-    lines {
-      width: 4.0
-      color: 4933187
-      dashdot {
-        dd: 8.0
-        dd: 6.0
-      }
-      priority: 180
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 856032768
-      }
-      priority: 2950
-    }
-  }
-}
 cont {
   name: "highway-footway-bridge"
   element {
@@ -23431,7 +23873,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23445,7 +23887,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23459,7 +23901,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -23480,7 +23922,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -23507,7 +23949,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -23534,7 +23976,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -23566,7 +24008,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -23598,7 +24040,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -23630,7 +24072,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -23662,7 +24104,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -23737,6 +24179,976 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-footway-demanding_alpine_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1301563922
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-footway-demanding_mountain_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1301563922
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-footway-difficult_alpine_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1301563922
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-footway-hiking"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1301563922
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-footway-mountain_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1301563922
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+}
 cont {
   name: "highway-footway-sidewalk"
   element {
@@ -23748,7 +25160,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
   }
   element {
@@ -23760,7 +25172,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
   }
   element {
@@ -23772,7 +25184,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
   }
   element {
@@ -23784,7 +25196,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
   }
   element {
@@ -23796,7 +25208,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
   }
 }
@@ -23811,7 +25223,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23825,7 +25237,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23839,7 +25251,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -23860,7 +25272,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -23881,7 +25293,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -23902,7 +25314,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -23922,7 +25334,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 7.6
@@ -23958,7 +25370,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 9.0
@@ -23994,7 +25406,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 9.0
@@ -24030,7 +25442,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 9.0
@@ -26973,6 +28385,200 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-path-alpine_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1301563922
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+}
 cont {
   name: "highway-path-bicycle"
   element {
@@ -26991,19 +28597,12 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 1.0
-      color: 1299070279
-      priority: 170
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
     lines {
       width: 1.1
       color: 1301563922
       dashdot {
         dd: 3.5
-        dd: 2.5
+        dd: 2.0
       }
       priority: 180
       join: BEVELJOIN
@@ -27012,18 +28611,12 @@ cont {
   }
   element {
     scale: 13
-    lines {
-      width: 1.1
-      color: 862862663
-      priority: 170
-      cap: BUTTCAP
-    }
     lines {
       width: 1.3
-      color: 865356306
+      color: 9718290
       dashdot {
         dd: 4.0
-        dd: 3.0
+        dd: 2.5
       }
       priority: 180
       cap: BUTTCAP
@@ -27039,18 +28632,12 @@ cont {
   }
   element {
     scale: 14
-    lines {
-      width: 1.3
-      color: 7224647
-      priority: 170
-      cap: BUTTCAP
-    }
     lines {
       width: 1.6
-      color: 865356306
+      color: 9718290
       dashdot {
         dd: 4.0
-        dd: 3.0
+        dd: 2.5
       }
       priority: 180
       cap: BUTTCAP
@@ -27066,18 +28653,12 @@ cont {
   }
   element {
     scale: 15
-    lines {
-      width: 1.5
-      color: 7224647
-      priority: 170
-      cap: BUTTCAP
-    }
     lines {
       width: 2.0
-      color: 865356306
+      color: 9718290
       dashdot {
         dd: 6.0
-        dd: 4.5
+        dd: 3.5
       }
       priority: 180
       cap: BUTTCAP
@@ -27093,17 +28674,12 @@ cont {
   }
   element {
     scale: 16
-    lines {
-      width: 1.7
-      color: 7224647
-      priority: 170
-    }
     lines {
       width: 2.6
-      color: 865356306
+      color: 9718290
       dashdot {
         dd: 6.0
-        dd: 4.5
+        dd: 3.5
       }
       priority: 180
     }
@@ -27118,17 +28694,12 @@ cont {
   }
   element {
     scale: 17
-    lines {
-      width: 2.0
-      color: 7224647
-      priority: 170
-    }
     lines {
       width: 3.3
-      color: 865356306
+      color: 9718290
       dashdot {
         dd: 8.0
-        dd: 6.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27143,17 +28714,12 @@ cont {
   }
   element {
     scale: 18
-    lines {
-      width: 2.4
-      color: 7224647
-      priority: 170
-    }
     lines {
       width: 4.0
       color: 9718290
       dashdot {
         dd: 8.0
-        dd: 6.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27168,17 +28734,12 @@ cont {
   }
   element {
     scale: 19
-    lines {
-      width: 2.4
-      color: 7224647
-      priority: 170
-    }
     lines {
       width: 4.0
       color: 9718290
       dashdot {
         dd: 8.0
-        dd: 6.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27193,17 +28754,12 @@ cont {
   }
   element {
     scale: 20
-    lines {
-      width: 2.4
-      color: 7224647
-      priority: 170
-    }
     lines {
       width: 4.0
       color: 9718290
       dashdot {
         dd: 8.0
-        dd: 6.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27228,7 +28784,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -27242,7 +28798,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -27256,7 +28812,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27277,7 +28833,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27304,7 +28860,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27331,7 +28887,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27363,7 +28919,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27395,7 +28951,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27427,7 +28983,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27459,7 +29015,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27472,28 +29028,28 @@ cont {
   }
 }
 cont {
-  name: "highway-path-difficult"
+  name: "highway-path-demanding_alpine_hiking"
   element {
     scale: 11
     lines {
       width: 1.0
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
       color: 1301563922
       dashdot {
-        dd: 1.0
-        dd: 2.0
-      }
-      priority: 180
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.1
-      color: 865356306
-      dashdot {
-        dd: 1.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 180
@@ -27507,7 +29063,7 @@ cont {
       width: 1.3
       color: 9718290
       dashdot {
-        dd: 1.5
+        dd: 4.0
         dd: 2.5
       }
       priority: 180
@@ -27528,7 +29084,7 @@ cont {
       width: 1.6
       color: 9718290
       dashdot {
-        dd: 1.5
+        dd: 4.0
         dd: 2.5
       }
       priority: 180
@@ -27549,8 +29105,8 @@ cont {
       width: 2.0
       color: 9718290
       dashdot {
-        dd: 2.5
-        dd: 4.0
+        dd: 6.0
+        dd: 3.5
       }
       priority: 180
       cap: BUTTCAP
@@ -27570,8 +29126,8 @@ cont {
       width: 2.6
       color: 9718290
       dashdot {
-        dd: 2.5
-        dd: 4.0
+        dd: 6.0
+        dd: 3.5
       }
       priority: 180
     }
@@ -27590,8 +29146,8 @@ cont {
       width: 3.3
       color: 9718290
       dashdot {
-        dd: 3.6
-        dd: 5.0
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27610,8 +29166,8 @@ cont {
       width: 4.0
       color: 9718290
       dashdot {
-        dd: 3.6
-        dd: 5.0
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27630,8 +29186,8 @@ cont {
       width: 4.0
       color: 9718290
       dashdot {
-        dd: 3.6
-        dd: 5.0
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27650,8 +29206,8 @@ cont {
       width: 4.0
       color: 9718290
       dashdot {
-        dd: 3.6
-        dd: 5.0
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27666,14 +29222,14 @@ cont {
   }
 }
 cont {
-  name: "highway-path-expert"
+  name: "highway-path-demanding_mountain_hiking"
   element {
     scale: 11
     lines {
       width: 1.0
-      color: 1297235507
+      color: 1720994322
       dashdot {
-        dd: 1.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 180
@@ -27685,9 +29241,9 @@ cont {
     scale: 12
     lines {
       width: 1.1
-      color: 861027891
+      color: 1301563922
       dashdot {
-        dd: 1.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 180
@@ -27699,10 +29255,10 @@ cont {
     scale: 13
     lines {
       width: 1.3
-      color: 5389875
+      color: 9718290
       dashdot {
-        dd: 1.4
-        dd: 5.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 180
       cap: BUTTCAP
@@ -27720,10 +29276,10 @@ cont {
     scale: 14
     lines {
       width: 1.6
-      color: 5389875
+      color: 9718290
       dashdot {
-        dd: 1.4
-        dd: 5.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 180
       cap: BUTTCAP
@@ -27741,10 +29297,10 @@ cont {
     scale: 15
     lines {
       width: 2.0
-      color: 5389875
+      color: 9718290
       dashdot {
-        dd: 2.3
-        dd: 9.0
+        dd: 6.0
+        dd: 3.5
       }
       priority: 180
       cap: BUTTCAP
@@ -27762,10 +29318,10 @@ cont {
     scale: 16
     lines {
       width: 2.6
-      color: 5389875
+      color: 9718290
       dashdot {
-        dd: 2.3
-        dd: 9.0
+        dd: 6.0
+        dd: 3.5
       }
       priority: 180
     }
@@ -27782,10 +29338,10 @@ cont {
     scale: 17
     lines {
       width: 3.3
-      color: 5389875
+      color: 9718290
       dashdot {
-        dd: 3.5
-        dd: 11.0
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27802,10 +29358,10 @@ cont {
     scale: 18
     lines {
       width: 4.0
-      color: 5389875
+      color: 9718290
       dashdot {
-        dd: 3.5
-        dd: 11.0
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27822,10 +29378,10 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 5389875
+      color: 9718290
       dashdot {
-        dd: 3.5
-        dd: 11.0
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27842,10 +29398,398 @@ cont {
     scale: 20
     lines {
       width: 4.0
-      color: 5389875
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-difficult_alpine_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 1720994322
       dashdot {
         dd: 3.5
-        dd: 11.0
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1301563922
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-hiking"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1301563922
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
       }
       priority: 180
     }
@@ -27870,7 +29814,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -27884,7 +29828,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -27898,7 +29842,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27919,7 +29863,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27940,7 +29884,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -27961,7 +29905,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -27981,7 +29925,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28001,7 +29945,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28021,7 +29965,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28041,7 +29985,201 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-mountain_hiking"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 1301563922
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 180
     }
     path_text {
       primary {
@@ -28064,7 +30202,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -28078,7 +30216,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 155
+      priority: 180
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -28092,7 +30230,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -28113,7 +30251,7 @@ cont {
         dd: 4.0
         dd: 2.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -28134,7 +30272,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
       cap: BUTTCAP
     }
     path_text {
@@ -28155,7 +30293,7 @@ cont {
         dd: 6.0
         dd: 3.5
       }
-      priority: 155
+      priority: 180
     }
     path_text {
       primary {
@@ -28175,7 +30313,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 7.6
@@ -28211,7 +30349,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 9.0
@@ -28247,7 +30385,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 9.0
@@ -28283,7 +30421,7 @@ cont {
         dd: 8.0
         dd: 4.5
       }
-      priority: 155
+      priority: 180
     }
     lines {
       width: 9.0
@@ -37174,6 +39312,976 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-track-grade1"
+  element {
+    scale: 11
+    lines {
+      width: 1.1
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.3
+      color: 1298092845
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.6
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.5
+      color: 6247213
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.2
+      color: 6247213
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 4.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+}
+cont {
+  name: "highway-track-grade2"
+  element {
+    scale: 11
+    lines {
+      width: 1.1
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.3
+      color: 1298092845
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.6
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.5
+      color: 6247213
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.2
+      color: 6247213
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 4.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+}
+cont {
+  name: "highway-track-grade3"
+  element {
+    scale: 11
+    lines {
+      width: 1.1
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.3
+      color: 1298092845
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.6
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.5
+      color: 6247213
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.2
+      color: 6247213
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 4.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+}
+cont {
+  name: "highway-track-grade4"
+  element {
+    scale: 11
+    lines {
+      width: 1.1
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.3
+      color: 1298092845
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.6
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.5
+      color: 6247213
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.2
+      color: 6247213
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 4.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+}
+cont {
+  name: "highway-track-grade5"
+  element {
+    scale: 11
+    lines {
+      width: 1.1
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.3
+      color: 1298092845
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 180
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.6
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.5
+      color: 6247213
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 11
+        color: 6710886
+        stroke_color: 856756480
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.2
+      color: 6247213
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 4.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 180
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 7829367
+        stroke_color: 856032768
+      }
+      priority: 2780
+    }
+  }
+}
 cont {
   name: "highway-track-no-access"
   element {
@@ -51463,35 +54571,65 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 3425648640
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
     caption {
       primary {
-        height: 10
-        color: 9211020
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
         offset_y: 1
+        is_optional: true
       }
-      priority: 6700
+      priority: -3300
     }
   }
   element {
     scale: 19
+    area {
+      color: 3425648640
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
     caption {
       primary {
-        height: 10
-        color: 9211020
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
         offset_y: 1
+        is_optional: true
       }
-      priority: 6700
+      priority: -3300
     }
   }
   element {
     scale: 20
+    area {
+      color: 3425648640
+      priority: 20
+    }
+    symbol {
+      name: "nparkf-outline-m"
+      priority: 6700
+    }
     caption {
       primary {
-        height: 10
-        color: 9211020
+        height: 12
+        color: 2836760
+        stroke_color: 436602368
         offset_y: 1
+        is_optional: true
       }
-      priority: 6700
+      priority: -3300
     }
   }
 }
@@ -53708,7 +56846,7 @@ cont {
     lines {
       width: 1.5
       color: 1294016795
-      priority: 160
+      priority: 180
       cap: BUTTCAP
     }
   }
@@ -53717,7 +56855,7 @@ cont {
     lines {
       width: 1.8
       color: 1294016795
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
@@ -53733,7 +56871,7 @@ cont {
     lines {
       width: 3.0
       color: 857809179
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
@@ -53750,7 +56888,7 @@ cont {
     lines {
       width: 3.0
       color: 857809179
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
@@ -53767,7 +56905,7 @@ cont {
     lines {
       width: 4.0
       color: 857809179
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
@@ -53784,7 +56922,7 @@ cont {
     lines {
       width: 4.0
       color: 857809179
-      priority: 160
+      priority: 180
     }
     caption {
       primary {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 1957187780..a9a66c7ca7 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 4ca1dc6771..57dc9210e5 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -8916,7 +8916,7 @@ cont {
     scale: 18
     lines {
       width: 1.0
-      color: 1716933887
+      color: 1728022445
       priority: 130
     }
   }
@@ -8924,7 +8924,7 @@ cont {
     scale: 19
     lines {
       width: 1.0
-      color: 1716933887
+      color: 1728022445
       priority: 130
     }
   }
@@ -8932,7 +8932,7 @@ cont {
     scale: 20
     lines {
       width: 1.0
-      color: 1716933887
+      color: 1728022445
       priority: 130
     }
   }
@@ -8943,7 +8943,7 @@ cont {
     scale: 18
     lines {
       width: 1.0
-      color: 1716933887
+      color: 1728022445
       priority: 130
     }
   }
@@ -8951,7 +8951,7 @@ cont {
     scale: 19
     lines {
       width: 1.0
-      color: 1716933887
+      color: 1728022445
       priority: 130
     }
   }
@@ -8959,7 +8959,7 @@ cont {
     scale: 20
     lines {
       width: 1.0
-      color: 1716933887
+      color: 1728022445
       priority: 130
     }
   }
@@ -9004,14 +9004,26 @@ cont {
   }
 }
 cont {
-  name: "highway-footway-area"
+  name: "highway-footway-alpine_hiking"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
   element {
     scale: 18
     lines {
-      width: 1.5
-      color: 1308425468
+      width: 1.1
+      color: 1721782290
       dashdot {
-        dd: 5.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 130
@@ -9021,10 +9033,10 @@ cont {
     scale: 19
     lines {
       width: 1.5
-      color: 1308425468
+      color: 1721782290
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9033,17 +9045,17 @@ cont {
     scale: 20
     lines {
       width: 1.5
-      color: 1308425468
+      color: 1721782290
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
   }
 }
 cont {
-  name: "highway-footway-bicycle"
+  name: "highway-footway-area"
   element {
     scale: 18
     lines {
@@ -9159,6 +9171,261 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-footway-demanding_alpine_hiking"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-footway-demanding_mountain_hiking"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-footway-difficult_alpine_hiking"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-footway-hiking"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-footway-mountain_hiking"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+}
 cont {
   name: "highway-footway-sidewalk"
   element {
@@ -11949,6 +12216,57 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-path-alpine_hiking"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+}
 cont {
   name: "highway-path-bicycle"
   element {
@@ -12052,7 +12370,7 @@ cont {
   }
 }
 cont {
-  name: "highway-path-difficult"
+  name: "highway-path-demanding_alpine_hiking"
   element {
     scale: 17
     lines {
@@ -12103,7 +12421,109 @@ cont {
   }
 }
 cont {
-  name: "highway-path-expert"
+  name: "highway-path-demanding_mountain_hiking"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-path-difficult_alpine_hiking"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-path-hiking"
   element {
     scale: 17
     lines {
@@ -12204,6 +12624,57 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-path-mountain_hiking"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 1721782290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 1721782290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+}
 cont {
   name: "highway-pedestrian"
   element {
@@ -19724,6 +20195,347 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-track-grade1"
+  element {
+    scale: 14
+    lines {
+      width: 1.4
+      color: 1308425468
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 130
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 1308425468
+      dashdot {
+        dd: 2.2
+        dd: 1.26
+      }
+      priority: 130
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.4
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.9
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2.5
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 2.5
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-track-grade2"
+  element {
+    scale: 16
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.4
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.9
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2.5
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 2.5
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-track-grade3"
+  element {
+    scale: 16
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.4
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.9
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2.5
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 2.5
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-track-grade4"
+  element {
+    scale: 16
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.4
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.9
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2.5
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 2.5
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-track-grade5"
+  element {
+    scale: 16
+    lines {
+      width: 1.1
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.4
+      color: 1717786416
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.9
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2.5
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 2.5
+      color: 1717786416
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+}
 cont {
   name: "highway-track-no-access"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index fb2f5005ad..9622539d2c 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 73aca95be3..e4465bfb6f 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -9004,14 +9004,26 @@ cont {
   }
 }
 cont {
-  name: "highway-footway-area"
+  name: "highway-footway-alpine_hiking"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
   element {
     scale: 18
     lines {
-      width: 1.5
-      color: 1294673959
+      width: 1.1
+      color: 1720994322
       dashdot {
-        dd: 5.0
+        dd: 3.5
         dd: 2.0
       }
       priority: 130
@@ -9021,10 +9033,10 @@ cont {
     scale: 19
     lines {
       width: 1.5
-      color: 1294673959
+      color: 1720994322
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
@@ -9033,17 +9045,17 @@ cont {
     scale: 20
     lines {
       width: 1.5
-      color: 1294673959
+      color: 1720994322
       dashdot {
-        dd: 5.0
-        dd: 2.0
+        dd: 4.0
+        dd: 2.5
       }
       priority: 130
     }
   }
 }
 cont {
-  name: "highway-footway-bicycle"
+  name: "highway-footway-area"
   element {
     scale: 18
     lines {
@@ -9159,6 +9171,261 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-footway-demanding_alpine_hiking"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-footway-demanding_mountain_hiking"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-footway-difficult_alpine_hiking"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-footway-hiking"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-footway-mountain_hiking"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+}
 cont {
   name: "highway-footway-sidewalk"
   element {
@@ -12081,6 +12348,57 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-path-alpine_hiking"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+}
 cont {
   name: "highway-path-bicycle"
   element {
@@ -12184,7 +12502,7 @@ cont {
   }
 }
 cont {
-  name: "highway-path-difficult"
+  name: "highway-path-demanding_alpine_hiking"
   element {
     scale: 17
     lines {
@@ -12235,7 +12553,109 @@ cont {
   }
 }
 cont {
-  name: "highway-path-expert"
+  name: "highway-path-demanding_mountain_hiking"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-path-difficult_alpine_hiking"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-path-hiking"
   element {
     scale: 17
     lines {
@@ -12336,6 +12756,57 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-path-mountain_hiking"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 1720994322
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 1720994322
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+}
 cont {
   name: "highway-pedestrian"
   element {
@@ -20132,6 +20603,347 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-track-grade1"
+  element {
+    scale: 14
+    lines {
+      width: 1.4
+      color: 1296910148
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 130
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 1296910148
+      dashdot {
+        dd: 2.2
+        dd: 1.26
+      }
+      priority: 130
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.1
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.4
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.9
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2.5
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 2.5
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-track-grade2"
+  element {
+    scale: 16
+    lines {
+      width: 1.1
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.4
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.9
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2.5
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 2.5
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-track-grade3"
+  element {
+    scale: 16
+    lines {
+      width: 1.1
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.4
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.9
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2.5
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 2.5
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-track-grade4"
+  element {
+    scale: 16
+    lines {
+      width: 1.1
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.4
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.9
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2.5
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 2.5
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-track-grade5"
+  element {
+    scale: 16
+    lines {
+      width: 1.1
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.4
+      color: 1717523245
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.9
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2.5
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 2.5
+      color: 1717523245
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 130
+    }
+  }
+}
 cont {
   name: "highway-track-no-access"
   element {
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 05ef35973b..6568ee8026 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -57,7 +57,6 @@ highway|service;3;
 waterway|stream;4;
 highway|unclassified;5;
 natural|water;6;
-# Paved/formed urban looking footpaths (e.g. paved highway=path are converted into footways, see osm2type.cpp).
 highway|footway;7;
 highway|track;8;
 highway|tertiary;9;
@@ -69,8 +68,6 @@ highway|secondary;13;
 # Using service= together with usage=main is a mismapping, but people do it, so exclude explicitly.
 railway|rail|main;[railway=rail][usage=main][!highspeed][!service];;name;int_name;14;
 landuse|residential;15;
-# Unpaved paths and trails (e.g. unpaved highway=footway are converted into paths,
-# while segregated shared paths into footway + cycleway, see osm2type.cpp).
 highway|path;16;
 highway|bus_stop;17;
 # ~4M usages.
@@ -94,22 +91,21 @@ railway|rail;28;
 highway|service|parking_aisle;[highway=service][service=parking_aisle];;name;int_name;29;
 place|hamlet;30;
 highway|road;31;
-deprecated:highway|track|grade2:04.2024;[highway=track][tracktype=grade2];x;name;int_name;32;highway|track
+highway|track|grade2;[highway=track][tracktype=grade2];;name;int_name;32;
 natural|wetland;33;
-deprecated:highway|track|grade3:04.4024;[highway=track][tracktype=grade3];x;name;int_name;34;highway|track
+highway|track|grade3;[highway=track][tracktype=grade3];;name;int_name;34;
 deprecated:boundary|administrative|8:04.2024;[boundary=administrative][admin_level=8];x;name;int_name;35;
 amenity|school;36;
-# Dedicated/segregated cycleways (e.g. segregated paths are converted into cycleways + footways, see osm2type.cpp).
 highway|cycleway;37;
 landuse|farm;38;
 amenity|place_of_worship;39;
-deprecated:highway|track|grade1:04.2024;[highway=track][tracktype=grade1];x;name;int_name;40;highway|track
+highway|track|grade1;[highway=track][tracktype=grade1];;name;int_name;40;
 addr:interpolation|odd;41;
 highway|service|driveway;[highway=service][service=driveway];;name;int_name;42;
 addr:interpolation|even;43;
 highway|motorway_link;44;
 waterway|stream|intermittent;[waterway=stream][intermittent=yes];;name;int_name;45;
-deprecated:highway|track|grade4:04.2024;[highway=track][tracktype=grade4];x;name;int_name;46;highway|track
+highway|track|grade4;[highway=track][tracktype=grade4];;name;int_name;46;
 natural|water|pond;[natural=water][water=pond];;name;int_name;47;
 landuse|farmland;48;
 barrier|fence;49;
@@ -117,8 +113,7 @@ natural|water|lake;[natural=water][water=lake];;name;int_name;50;
 # ~3M usages. TODO: consolidate all other footway=link/etc. values into highway-footway-minor.
 highway|footway|crossing;[highway=footway][footway=crossing];;name;int_name;51;
 waterway|riverbank;52;
-# 1M+ usages.
-highway|path|bicycle;[highway=path][bicycle=yes],[highway=path][bicycle=designated],[highway=path][bicycle=permissive];;;;53;
+highway|path|bicycle;[highway=path][bicycle?];;name;int_name;53;
 landuse|meadow;54;
 highway|living_street;55;
 man_made|survey_point;56;
@@ -128,7 +123,7 @@ highway|steps;59;
 waterway|ditch;60;
 amenity|restaurant;61;
 landuse|reservoir;62;
-deprecated:highway|track|grade5:04.2024;[highway=track][tracktype=grade5];x;name;int_name;63;highway|track
+highway|track|grade5;[highway=track][tracktype=grade5];;name;int_name;63;
 amenity|bench;64;
 # Branch railway lines include ordinary railway=rail w/o any specific usage= or service=, ~500k usages.
 # Using service= together with usage=branch is a mismapping, but people do it, so exclude explicitly.
@@ -192,7 +187,7 @@ amenity|recycling|container;[amenity=recycling][recycling_type=container];;name;
 leisure|garden;110;
 landuse|commercial;111;
 railway|station;112;
-deprecated:highway|path|hiking:04.2024;[highway=path][route=hiking],[highway=path][sac_scale=hiking];x;name;int_name;113;highway|path
+highway|path|hiking;[highway=path][route=hiking],[highway=path][sac_scale=hiking];;name;int_name;113;
 amenity|hospital;114;
 # TODO: merge with "intermittent".
 waterway|stream|ephemeral;[waterway=stream][intermittent=ephemeral];;name;int_name;115;
@@ -221,8 +216,7 @@ leisure|garden|residential;[leisure=garden][garden:type=residential];;name;int_n
 amenity|fire_station;138;
 landuse|retail;139;
 leisure|nature_reserve;140;
-# TODO: ~1M usages, use a short ID.
-highway|footway|bicycle;[highway=footway][bicycle=yes],[highway=footway][bicycle=designated],[highway=footway][bicycle=permissive];;;;141;
+deprecated:leisure|pitch|tennis:01.2020;[leisure=pitch][sport=tennis];x;name;int_name;141;leisure|pitch
 tourism|information;142;
 highway|motorway_link|bridge;[highway=motorway_link][bridge?];;name;int_name;143;
 # Usually there is something else in place of the old railway, e.g. highway=path,
@@ -249,7 +243,7 @@ shop|bakery;162;
 highway|construction;163;
 highway|cycleway|bridge;[highway=cycleway][bridge?];;name;int_name;164;
 leisure|sports_centre;165;
-deprecated:highway|path|mountain_hiking:04.2024;[highway=path][sac_scale=mountain_hiking];x;name;int_name;166;highway|path
+highway|path|mountain_hiking;[highway=path][sac_scale=mountain_hiking];;name;int_name;166;
 tourism|camp_site;167;
 highway|bridleway;168;
 natural|heath;169;
@@ -385,7 +379,7 @@ highway|secondary|tunnel;[highway=secondary][tunnel?];;name;int_name;297;
 # TODO: its a mismapping likely, if there is a bridge structure still, then it should be railway=disused.
 railway|abandoned|bridge;[railway=abandoned][bridge?];;name;int_name;298;
 man_made|lighthouse;299;
-deprecated:highway|path|demanding_mountain_hiking:04.2024;[highway=path][sac_scale=demanding_mountain_hiking];x;name;int_name;300;highway|path|difficult
+highway|path|demanding_mountain_hiking;[highway=path][sac_scale=demanding_mountain_hiking];;name;int_name;300;
 man_made|storage_tank;301;
 man_made|silo;302;
 power|generator;303;
@@ -399,7 +393,7 @@ highway|primary_link|bridge;[highway=primary_link][bridge?];;name;int_name;310;
 man_made|tower|communication;[man_made=tower][tower:type=communication];;name;int_name;311;
 sport|equestrian;312;
 tourism|information|office;[tourism=information][information=office];;name;int_name;313;
-deprecated:highway|footway|hiking:04.2024;[highway=footway][sac_scale=hiking];x;name;int_name;314;highway|path
+highway|footway|hiking;[highway=footway][sac_scale=hiking];;name;int_name;314;
 aeroway|gate;315;
 # TODO: railway=preserved is deprecated in OSM, recommended mapping is railway:preserved=yes + railway=*
 railway|preserved;316;
@@ -438,7 +432,7 @@ railway|tram|bridge;[railway=tram][bridge?];;name;int_name;346;
 piste:type|downhill|advanced;[piste:type=downhill][piste:difficulty=advanced];;name;int_name;347;
 sport|shooting;348;
 place|country;349;
-deprecated:highway|path|alpine_hiking:04.2024;[highway=path][sac_scale=alpine_hiking];x;name;int_name;350;highway|path|expert
+highway|path|alpine_hiking;[highway=path][sac_scale=alpine_hiking];;name;int_name;350;
 tourism|zoo|petting;[tourism=zoo][zoo=petting_zoo];;name;int_name;351;
 sport|scuba_diving;352;
 deprecated:highway|cycleway|permissive:12.2023;[highway=cycleway][access=permissive];x;name;int_name;353;highway|cycleway
@@ -450,7 +444,7 @@ amenity|parking|street_side;[amenity=parking][parking=street_side];;name;int_nam
 amenity|parking|multi-storey;[amenity=parking][parking=multi-storey];;name;int_name;359;
 # TODO: its being replaced by landuse-recreation_ground, merge in there.
 leisure|recreation_ground;360;
-deprecated:highway|footway|mountain_hiking:04.2024;[highway=footway][sac_scale=mountain_hiking];x;name;int_name;361;highway|path
+highway|footway|mountain_hiking;[highway=footway][sac_scale=mountain_hiking];;name;int_name;361;
 deprecated:highway|service|driveway|bridge:01.2020;[highway=service][service=driveway][bridge?];x;name;int_name;362;highway|service|driveway
 amenity|parking|multi-storey|fee;[amenity=parking][parking=multi-storey][fee];;name;int_name;363;
 sport|9pin;364;
@@ -484,7 +478,7 @@ sport|american_football;391;
 landuse|education;392;
 man_made|cairn;393;
 railway|preserved|bridge;[railway=preserved][bridge?];;name;int_name;394;
-deprecated:highway|path|demanding_alpine_hiking:04.2024;[highway=path][sac_scale=demanding_alpine_hiking];x;name;int_name;395;highway|path|expert
+highway|path|demanding_alpine_hiking;[highway=path][sac_scale=demanding_alpine_hiking];;name;int_name;395;
 railway|rail|spur|tunnel;[railway=rail][service=spur][!usage][tunnel?];;name;int_name;396;
 highway|secondary_link|bridge;[highway=secondary_link][bridge?];;name;int_name;397;
 railway|tram|tunnel;[railway=tram][tunnel?];;name;int_name;398;
@@ -517,7 +511,6 @@ highway|road|tunnel;[highway=road][tunnel?];;name;int_name;423;
 sport|archery;424;
 healthcare|podiatrist;425;
 healthcare|psychotherapist;426;
-# TODO: deprecated, migrate to ford=*
 highway|ford;427;
 area:highway|path;428;
 deprecated:railway|siding:06.2023;429;x
@@ -535,7 +528,7 @@ natural|shingle;440;
 aerialway|t-bar;441;
 amenity|parking|lane|fee;[amenity=parking][parking=lane][fee];;name;int_name;442;
 amenity|parking|street_side|fee;[amenity=parking][parking=street_side][fee];;name;int_name;443;
-deprecated:highway|path|difficult_alpine_hiking:04.2024;[highway=path][sac_scale=difficult_alpine_hiking];x;name;int_name;444;highway|path|expert
+highway|path|difficult_alpine_hiking;[highway=path][sac_scale=difficult_alpine_hiking];;name;int_name;444;
 earthquake:damage|spontaneous_camp;445;
 natural|water|drain;[natural=water][water=drain];;name;int_name;446;
 deprecated:railway|yard:06.2023;447;x
@@ -543,7 +536,7 @@ natural|water|ditch;[natural=water][water=ditch];;name;int_name;448;
 natural|water|moat;[natural=water][water=moat];;name;int_name;449;
 natural|water|wastewater;[natural=water][water=wastewater];;name;int_name;450;
 deprecated:railway|razed:06.2023;451;x
-deprecated:highway|footway|demanding_mountain_hiking:04.2024;[highway=footway][sac_scale=demanding_mountain_hiking];x;name;int_name;452;highway|path|difficult
+highway|footway|demanding_mountain_hiking;[highway=footway][sac_scale=demanding_mountain_hiking];;name;int_name;452;
 amenity|shelter|basic_hut;[amenity=shelter][shelter_type=basic_hut];;name;int_name;453;
 amenity|shelter|lean_to;[amenity=shelter][shelter_type=lean_to];;name;int_name;454;
 landuse|orchard;455;
@@ -555,9 +548,8 @@ deprecated|deprecated;460;x
 sport|handball;461;
 deprecated:boundary|administrative|city:04.2024;[boundary=administrative][border_type=city];x;name;int_name;462;
 piste:type|downhill|freeride;[piste:type=downhill][piste:difficulty=freeride],[piste:type=downhill][piste:grooming=backcountry][!piste:difficulty];;name;int_name;463;
-# _path_grade is a surrogate tag which combines sac_scale and trail_visibility, see osm2type.cpp
-highway|path|difficult;[highway=path][_path_grade=difficult];;name;int_name;464;
-highway|path|expert;[highway=path][_path_grade=expert];;name;int_name;465;
+deprecated|deprecated;464;x
+deprecated|deprecated;465;x
 piste:type|downhill|expert;[piste:type=downhill][piste:difficulty=expert];;name;int_name;466;
 landuse|salt_pond;467;
 cemetery|grave;468;
@@ -621,7 +613,7 @@ railway|funicular|bridge;[railway=funicular][bridge?];;name;int_name;525;
 deprecated|deprecated;526;x
 deprecated|deprecated;527;x
 highway|primary_link|tunnel;[highway=primary_link][tunnel?];;name;int_name;528;
-deprecated:highway|footway|alpine_hiking:04.2024;[highway=footway][sac_scale=alpine_hiking];x;name;int_name;529;highway|path|expert
+highway|footway|alpine_hiking;[highway=footway][sac_scale=alpine_hiking];;name;int_name;529;
 deprecated|deprecated;530;x
 deprecated|deprecated;531;x
 deprecated|deprecated;532;x
@@ -647,7 +639,7 @@ deprecated|deprecated;551;x
 deprecated|deprecated;552;x
 deprecated|deprecated;553;x
 deprecated|deprecated;554;x
-deprecated:highway|footway|demanding_alpine_hiking:04.2024;[highway=footway][sac_scale=demanding_alpine_hiking];x;name;int_name;555;highway|path|expert
+highway|footway|demanding_alpine_hiking;[highway=footway][sac_scale=demanding_alpine_hiking];;name;int_name;555;
 deprecated|deprecated;556;x
 deprecated|deprecated;557;x
 deprecated|deprecated;558;x
@@ -683,7 +675,7 @@ aerialway|mixed_lift;587;
 deprecated|deprecated;588;x
 deprecated|deprecated;589;x
 deprecated|deprecated;590;x
-highway|track|grade3|permissive;[highway=track][tracktype=grade3][access=permissive];x;name;int_name;591;highway|track
+highway|track|grade3|permissive;[highway=track][tracktype=grade3][access=permissive];x;name;int_name;591;highway|track|grade3
 deprecated|deprecated;592;x
 deprecated|deprecated;593;x
 deprecated|deprecated;594;x
@@ -719,11 +711,11 @@ deprecated|deprecated;623;x
 deprecated|deprecated;624;x
 deprecated|deprecated;625;x
 deprecated:railway|siding|bridge:06.2023;626;x
-deprecated:highway|footway|difficult_alpine_hiking:04.2024;[highway=footway][sac_scale=difficult_alpine_hiking];x;name;int_name;627;highway|path|expert
+highway|footway|difficult_alpine_hiking;[highway=footway][sac_scale=difficult_alpine_hiking];;name;int_name;627;
 deprecated|deprecated;628;x
 deprecated|deprecated;629;x
 deprecated|deprecated;630;x
-highway|track|grade5|permissive;[highway=track][tracktype=grade5][access=permissive];x;name;int_name;631;highway|track
+highway|track|grade5|permissive;[highway=track][tracktype=grade5][access=permissive];x;name;int_name;631;highway|track|grade5
 deprecated|deprecated;632;x
 deprecated|deprecated;633;x
 highway|tertiary_link|tunnel;[highway=tertiary_link][tunnel?];;name;int_name;634;
@@ -767,7 +759,7 @@ deprecated|deprecated;671;x
 deprecated|deprecated;672;x
 deprecated|deprecated;673;x
 deprecated|deprecated;674;x
-highway|track|grade4|permissive;[highway=track][tracktype=grade4][access=permissive];x;name;int_name;675;highway|track
+highway|track|grade4|permissive;[highway=track][tracktype=grade4][access=permissive];x;name;int_name;675;highway|track|grade4
 deprecated|deprecated;676;x
 deprecated|deprecated;677;x
 deprecated|deprecated;678;x
@@ -913,9 +905,9 @@ deprecated|deprecated;817;x
 deprecated|deprecated;818;x
 deprecated|deprecated;819;x
 deprecated|deprecated;820;x
-highway|track|grade3|no-access;[highway=track][tracktype=grade3][access=no];x;name;int_name;821;highway|track
-highway|track|grade4|no-access;[highway=track][tracktype=grade4][access=no];x;name;int_name;822;highway|track
-highway|track|grade5|no-access;[highway=track][tracktype=grade5][access=no];x;name;int_name;823;highway|track
+highway|track|grade3|no-access;[highway=track][tracktype=grade3][access=no];x;name;int_name;821;highway|track|grade3
+highway|track|grade4|no-access;[highway=track][tracktype=grade4][access=no];x;name;int_name;822;highway|track|grade4
+highway|track|grade5|no-access;[highway=track][tracktype=grade5][access=no];x;name;int_name;823;highway|track|grade5
 highway|track|no-access;[highway=track][access=no];;name;int_name;824;
 deprecated|deprecated;825;x
 deprecated|deprecated;826;x
diff --git a/data/patterns.txt b/data/patterns.txt
index 730a234d1b..fdf033e8f1 100644
--- a/data/patterns.txt
+++ b/data/patterns.txt
@@ -28,11 +28,7 @@
 6.0 2.5
 8.0 3.0
 10.0 3.5
-4.0 3.2
-5.0 3.5
-6.0 4.2
-8.0 5.5
-10.0 6.7
+3.5 2.0
 2.0 1.0
 3.6 1.6
 5.0 2.2
@@ -41,19 +37,9 @@
 16.2 8.1
 5.0 5.0
 4.0 4.0
-3.5 2.0
 4.0 2.5
 6.0 3.5
 8.0 4.5
-3.5 2.7
-6.0 4.7
-8.0 6.2
-1.0 2.0
-1.8 2.5
-2.8 3.5
-1.0 4.0
-1.6 6.0
-2.8 8.0
 1.5 1.3
 1.8 1.6
 2.5 2.2
@@ -84,16 +70,6 @@
 7.0 1.2
 9.0 1.7
 12.0 2.2
-3.5 2.5
-4.0 3.0
-6.0 4.5
-8.0 6.0
-1.5 2.5
-2.5 4.0
-3.6 5.0
-1.4 5.0
-2.3 9.0
-3.5 11.0
 12.0 4.0
 6.0 8.5 12.0 2.3
 1.0 50.0
@@ -102,6 +78,8 @@
 2.5 7.0
 5.2 5.2
 3.5 3.5
+2.0 1.35
+2.2 1.26
 10.1 10.1
 0.8 12.0
 1.15 14.0
diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt
index 1f258e603e..29e75370fd 100644
--- a/data/replaced_tags.txt
+++ b/data/replaced_tags.txt
@@ -47,8 +47,6 @@ shop=estate_agent : office=estate_agent
 shop=locksmith : craft=locksmith
 shop=auction_house : shop=auction
 shop=vacant : disused:shop=yes
-
-# TODO: highway=ford is deprecated, use ford=* directly; and convert boat into a ferry?
 ford=boat : highway=ford
 ford=intermittent : highway=ford
 ford=seasonal : highway=ford
diff --git a/data/strings/strings.txt b/data/strings/strings.txt
index eee3cc94fa..ebcc186593 100644
--- a/data/strings/strings.txt
+++ b/data/strings/strings.txt
@@ -15303,6 +15303,51 @@
     zh-Hans = 该地点的名称
     zh-Hant = 該地點的名稱
 
+  [editor_default_language_hint]
+    tags = android,ios
+    comment = The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name
+    en = As it is written in the local language
+    af = Soos dit in die plaaslike taal geskryf is
+    ar = كما هو مكتوب باللغة المحلية
+    az = Yerli dildə yazıldığı kimi
+    be = На мясцовай мове
+    bg = Както е написано на местния език
+    ca = Com està escrit en la llengua local
+    cs = Jak je napsáno v místním jazyce
+    da = Som det står skrevet på det lokale sprog
+    de = Wie in der lokalen Sprache geschrieben
+    el = Όπως είναι γραμμένο στην τοπική γλώσσα
+    es = Como está escrito en la lengua local
+    et = Nagu on kirjutatud kohalikus keeles
+    eu = Bertako hizkuntzan idatzita dagoenez
+    fa = همانطور که به زبان محلی نوشته شده است
+    fi = Paikallisella kielellä kirjoitettuna
+    fr = Comme c'est écrit dans la langue locale
+    he = כפי שנכתב בשפה המקומית
+    hi = जैसा कि स्थानीय भाषा में लिखा गया है
+    hu = Ahogy a helyi nyelven írva van
+    id = Seperti yang tertulis dalam bahasa lokal
+    it = Come è scritto nella lingua locale
+    ja = 現地の言葉でこう書かれている。
+    ko = 현지 언어로 작성되었으므로
+    lt = Kaip rašoma vietos kalba
+    mr = स्थानिक भाषेत लिहिल्याप्रमाणे
+    nb = Som det står skrevet på det lokale språket
+    nl = Zoals het in de plaatselijke taal geschreven staat
+    pl = Jak napisano w lokalnym języku
+    pt = Como escrito na língua local
+    ro = Așa cum este scris în limba locală
+    ru = На местном языке
+    sk = Tak, ako sa píše v miestnom jazyku
+    sv = Som det står skrivet på det lokala språket
+    sw = Kama ilivyoandikwa katika lugha ya kienyeji
+    th = ตามที่เขียนเป็นภาษาท้องถิ่น
+    tr = Yerel dilde yazıldığı gibi
+    uk = Місцевою мовою
+    vi = Vì nó được viết bằng ngôn ngữ địa phương
+    zh-Hans = 当地语言写道
+    zh-Hant = 因為它是用當地語言寫的
+
   [editor_edit_place_category_title]
     tags = android,ios
     en = Category
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 94209ad8a0..fa791cbf08 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -12208,6 +12208,18 @@
     zh-Hans = 行人过街天桥
     zh-Hant = 行人穿越道
 
+  [type.highway.footway.alpine_hiking]
+    ref = type.highway.path
+    de = Alpinwanderweg
+    es = Camino de senderismo alpino
+    et = Alpi matkarada
+    nl = Alpine wandelpad
+    pl = Ścieżka wspinaczkowa
+    pt = Caminho pedonal
+    pt-BR = Caminho pedonal
+    sk = Turistický chodník
+    zh-Hans = 步行道路
+
   [type.highway.footway.area]
     ref = type.highway.footway
     en = Pedestrian Area
@@ -12241,6 +12253,60 @@
     ru = Пешеходный мост
     sk = Most pre chodcov
 
+  [type.highway.footway.demanding_alpine_hiking]
+    ref = type.highway.path
+    de = Anspruchsvoller Alpinwanderweg
+    et = Nõudlik alpi matkarada
+    fi = Vaativa alppivaellus
+    nl = Uitdagend alpine bergklimpad
+    pt = Caminho pedonal
+    pt-BR = Caminho pedonal difícil
+    zh-Hans = 步行道路
+
+  [type.highway.footway.demanding_mountain_hiking]
+    ref = type.highway.path
+    de = Anspruchsvoller Bergwanderweg
+    fi = Vaativa vuoristovaellus
+    nl = Uitdagend bergwandelpad
+    pt = Caminho pedonal
+    pt-BR = Caminho pedonal difícil
+    sk = Náročný horský chodník
+    zh-Hans = 步行道路
+
+  [type.highway.footway.difficult_alpine_hiking]
+    ref = type.highway.path
+    de = Schwieriger Alpinwanderweg
+    et = Nõudlik mägimatkarada
+    fi = Vaikea alppivaellus
+    nl = Moeilijk alpine bergklimpad
+    pt = Caminho pedonal
+    pt-BR = Caminho pedonal difícil
+    sk = Náročný turistický chodník
+    zh-Hans = 步行道路
+
+  [type.highway.footway.hiking]
+    ref = type.highway.path
+    de = Wanderweg
+    es = Sendero
+    fi = Vaellus
+    nl = Wandelpad
+    pt = Caminho pedonal
+    pt-BR = Caminho pedonal
+    sk = Turistický chodník
+    zh-Hans = 步行道路
+
+  [type.highway.footway.mountain_hiking]
+    ref = type.highway.path
+    de = Bergwanderweg
+    es = Sendero de montaña
+    et = Mägirada
+    fi = Vuoristovaellus
+    nl = Bergpad
+    pt = Caminho pedonal
+    pt-BR = Caminho pedonal
+    sk = Horský turistický chodník
+    zh-Hans = 步行道路
+
   [type.highway.footway.tunnel]
     ref = type.highway.road.tunnel
     en = Pedestrian Tunnel
@@ -12511,17 +12577,16 @@
     zh-Hans = 小道
     zh-Hant = 人行步道
 
-  [type.highway.path.difficult]
-    comment = Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad.
+  [type.highway.path.alpine_hiking]
     ref = type.highway.path
-    en = Difficult or Indistinct Trail
-    ru = Сложная или плохо видимая тропа
-
-  [type.highway.path.expert]
-    comment = Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme.
-    ref = type.highway.path
-    en = Expert or Indiscernible Trail
-    ru = Очень сложная или неразличимая тропа
+    de = Alpinwanderweg
+    es = Camino de senderismo alpino
+    et = Alpi matkarada
+    fi = Alppivaellus
+    nl = Alpine wandelpad
+    pl = Ścieżka wspinaczkowa
+    pt-BR = Caminho pedonal
+    sk = Turistický chodník
 
   [type.highway.path.bicycle]
     ref = type.highway.path
@@ -12542,12 +12607,44 @@
     tr = Bisiklet ve Yürüyüş Yolu
     uk = Велопішохідна доріжка
 
-  [type.highway.footway.bicycle]
-    ref = type.highway.path.bicycle
-
   [type.highway.path.bridge]
     ref = type.highway.road.bridge
 
+  [type.highway.path.demanding_alpine_hiking]
+    ref = type.highway.path
+    de = Anspruchsvoller Alpinwanderweg
+    es = Camino de senderismo alpino exigente
+    et = Nõudlik alpi matkarada
+    fi = Vaativa alppivaellus
+    pt-BR = Caminho pedonal difícil
+    sk = Náročný turistický chodník
+
+  [type.highway.path.demanding_mountain_hiking]
+    ref = type.highway.path
+    de = Anspruchsvoller Bergwanderweg
+    es = Camino de senderismo de montaña exigente
+    et = Nõudlik mägimatkarada
+    fi = Vaativa vuoristovaellus
+    pt-BR = Caminho pedonal difícil
+    sk = Náročný horský chodník
+
+  [type.highway.path.difficult_alpine_hiking]
+    ref = type.highway.path
+    de = Schwieriger Alpinwanderweg
+    et = Raske alpi matkarada
+    fi = Vaikea alppivaellus
+    pt-BR = Caminho pedonal difícil
+    sk = Obtiažny turistický chodník
+
+  [type.highway.path.hiking]
+    ref = type.highway.path
+    de = Wanderweg
+    es = Sendero
+    fi = Vaellus
+    nl = Wandelpad
+    pt-BR = Caminho pedonal
+    sk = Turistický chodník
+
   [type.highway.path.horse]
     ref = type.highway.path
     en = Bridle Path
@@ -12564,6 +12661,19 @@
     tr = Atlı Yolu
     uk = Кінна стежка
 
+  [type.highway.path.mountain_hiking]
+    ref = type.highway.path
+    de = Bergwanderweg
+    es = Sendero de montaña
+    et = Mägitee
+    fi = Vuoristovaellus
+    nl = Bergpad
+    pt-BR = Caminho pedonal
+    sk = Horský turistický chodník
+
+  [type.highway.path.permissive]
+    ref = type.highway.path
+
   [type.highway.path.tunnel]
     ref = type.highway.road.tunnel
 
@@ -13357,9 +13467,24 @@
   [type.highway.track.grade1]
     ref = type.highway.track
 
+  [type.highway.track.grade2]
+    ref = type.highway.track
+
+  [type.highway.track.grade3]
+    ref = type.highway.track
+
+  [type.highway.track.grade4]
+    ref = type.highway.track
+
+  [type.highway.track.grade5]
+    ref = type.highway.track
+
   [type.highway.track.no.access]
     ref = type.highway.track
 
+  [type.highway.track.permissive]
+    ref = type.highway.track
+
   [type.highway.track.tunnel]
     ref = type.highway.road.tunnel
     de = Straßentunnel
@@ -29563,43 +29688,38 @@
     af = Vakansiewoonstel
     ar = شُقَق عطلة
     az = Apart otel
-    be = Кватэра для адпачынку
-    bg = Ваканционен апартамент
-    ca = Apartament de vacances
-    cs = Prázdninový apartmán
-    da = Ferielejlighed
+    cs = Byty
+    da = Lejligheder
     de = Ferienwohnung
-    el = Διαμέρισμα διακοπών
-    es = Apartamento de vacaciones
-    et = Puhkuse korter
-    eu = Oporretako apartamentua
-    fa = آپارتمان تعطیلات
+    el = Διαμερίσματα
+    es = Apartamentos
+    et = Korterid
+    eu = Apartamentuak
+    fa = اپارتمان
     fi = Loma-asunnot
     fr = Appart'hôtel
-    he = דירת נופש
     hi = अवकाश अपार्टमेंट
-    hu = Nyaraló apartman
-    id = Apartemen Liburan
-    it = Appartamento vacanze
-    ja = ホリデー・アパート
-    ko = 홀리데이 아파트
-    lt = Atostogoms nuomojami butai
-    mr = हॉलिडे अपार्टमेंट
-    nb = Ferieleilighet
-    nl = Appartement
-    pl = Apartament wakacyjny
-    pt = Apartamento de férias
-    ro = Apartament de vacanță
-    ru = Квартира для отдыха
-    sk = Prázdninový apartmán
-    sv = Semesterlägenhet
-    sw = Ghorofa ya Likizo
-    th = ฮอลิเดย์ อพาร์ตเมนต์
-    tr = Tatil Apartmanı
-    uk = Апартаменти для відпочинку
-    vi = Căn hộ nghỉ dưỡng
-    zh-Hans = 度假公寓
-    zh-Hant = 假日公寓
+    hu = Apartmanok
+    id = Apartemen
+    it = Appartamento
+    ja = アパート
+    ko = 아파트
+    mr = सदनिका
+    nb = Leiligheter
+    nl = Appartementen
+    pl = Apartamenty
+    pt = Apartamentos
+    pt-BR = Apartamentos
+    ro = Apartamente
+    ru = Апартаменты
+    sk = Apartmány
+    sv = Lägenheter
+    th = อพาร์ตเมนต์
+    tr = Apart Otel
+    uk = Апартаменти
+    vi = Căn hộ
+    zh-Hans = 公寓
+    zh-Hant = 公寓
 
   [type.tourism.artwork]
     en = Artwork
diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss
index 3115746cf0..db661f5f52 100644
--- a/data/styles/clear/include/Basemap.mapcss
+++ b/data/styles/clear/include/Basemap.mapcss
@@ -170,13 +170,13 @@ area|z12-13[natural=scrub],
 {fill-color: @green0;}
 
 /* Next types are hardcoded to have a hatching-style fill, see drape_frontend/stylist.cpp */
-area|z10-17[leisure=nature_reserve],
-area|z10-17[boundary=national_park],
-area|z10-17[boundary=protected_area][protect_class=1],
+area|z10-[leisure=nature_reserve],
+area|z10-[boundary=national_park],
+area|z10-[boundary=protected_area][protect_class=1],
 {fill-opacity: 0.2; fill-color: @green6;}
 
-area|z10-16[boundary=aboriginal_lands],
-{fill-opacity: 0.07; fill-color: @indigenous_lands;}
+area|z10-[boundary=aboriginal_lands]
+{fill-opacity: 0.2; fill-color: @indigenous_lands;}
 
 area|z10-[landuse=military][military=danger_area],
 {fill-opacity: 1.0; fill-color: @military;}
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 70120eb80c..3e9381eb2e 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -80,16 +80,18 @@ node|z13-[natural=peak][!name],
 {text: none;}
 
 
-node|z12-17[boundary=national_park],
-area|z12-17[boundary=national_park],
-node|z12-17[boundary=protected_area],
-area|z12-17[boundary=protected_area],
-node|z12-17[leisure=nature_reserve],
-area|z12-17[leisure=nature_reserve],
+node|z12-[boundary=national_park],
+area|z12-[boundary=national_park],
+node|z12-[boundary=protected_area],
+area|z12-[boundary=protected_area],
+node|z12-[leisure=nature_reserve],
+area|z12-[leisure=nature_reserve]
 {text: name;text-offset: 1;text-color: @park_label;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;text-halo-radius:0.5;}
 
-area|z10-16[boundary=aboriginal_lands],
+area|z10-[boundary=aboriginal_lands],
 {text: name;font-size: 10;text-color: @indigenous_label;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;text-halo-radius:0.5;}
+area|z17-[boundary=aboriginal_lands],
+{font-size: 11;}
 
 node|z14[natural=cave_entrance],
 {icon-image: cave-s.svg;}
@@ -153,12 +155,12 @@ area|z12-14[boundary=protected_area],
 node|z12-14[leisure=nature_reserve],
 area|z12-14[leisure=nature_reserve],
 {icon-image: nparkf-outline-s.svg; font-size: 10; icon-min-distance: 12;}
-node|z15-17[boundary=national_park],
-area|z15-17[boundary=national_park],
-node|z15-17[boundary=protected_area],
-area|z15-17[boundary=protected_area],
-node|z15-17[leisure=nature_reserve],
-area|z15-17[leisure=nature_reserve],
+node|z15-[boundary=national_park],
+area|z15-[boundary=national_park],
+node|z15-[boundary=protected_area],
+area|z15-[boundary=protected_area],
+node|z15-[leisure=nature_reserve],
+area|z15-[leisure=nature_reserve]
 {icon-image: nparkf-outline-m.svg; font-size: 11; text-halo-opacity: 0.9;}
 
 area|z13[landuse=forest][name],
diff --git a/data/styles/clear/include/Roads.mapcss b/data/styles/clear/include/Roads.mapcss
index 940450748f..86cda9dba5 100644
--- a/data/styles/clear/include/Roads.mapcss
+++ b/data/styles/clear/include/Roads.mapcss
@@ -638,10 +638,8 @@ line|z19-[highway=busway],
 line|z13-[highway=pedestrian],
 line|z13-[highway=ford]
 {color: @pedestrian;opacity: 0.85;}
-line|z13-[highway=cycleway],
-line|z14-[highway=footway][bicycle=yes]::cycleline,
-line|z14-[highway=path][bicycle=yes]::cycleline,
-{color: @cycleway; opacity: 0.5;}
+line|z13-[highway=cycleway]
+{color: @cycleway;opacity: 0.7;}
 line|z13-[highway=construction],
 {color: @construction;opacity: 0.7;}
 line|z13-[highway=pedestrian][bridge?]::bridgewhite,
@@ -674,14 +672,12 @@ line|z14-[highway=bridleway]
 {color: @bridleway;opacity: 0.6;}
 line|z15-[highway=footway],
 {color: @footway;opacity: 0.75;}
-line|z14-[highway=footway][bicycle=yes],
-{color: @footway; opacity: 0.85;}
 line|z15-[highway=steps],
 {color: @footway;opacity: 0.85;}
 line|z14-[highway=path],
+/* Important to be declared after ordinary [highway=footway] to avoid overriding. */
+line|z14-[highway=footway][sac_scale],
 {color: @path;opacity: 0.6;}
-line|z14-[highway=path][_path_grade=expert],
-{color: @path_expert; opacity: 0.6;}
 line|z14-[piste:type=hike],
 {color: @piste; opacity: 0.4;}
 line|z17-[highway=footway][tunnel?]::tunnelBackground,
@@ -753,31 +749,19 @@ line|z16-[highway=pedestrian][bridge?]::bridgeblack,
 /* 8.4 Cycleway 13-22 ZOOM */
 
 line|z13[highway=cycleway]
-{width: 0.9;}
-line|z14[highway=cycleway],
-line|z14[highway=footway][bicycle=yes]::cycleline,
-line|z14[highway=path][bicycle=yes]::cycleline,
-{width: 1.1;}
-line|z15[highway=cycleway]
-line|z15[highway=footway][bicycle=yes]::cycleline,
-line|z15[highway=path][bicycle=yes]::cycleline,
+{width: 1;}
+line|z14[highway=cycleway]
 {width: 1.2;}
-line|z16[highway=cycleway],
-line|z16[highway=footway][bicycle=yes]::cycleline,
-line|z16[highway=path][bicycle=yes]::cycleline,
-{width: 1.3; opacity: 0.6;}
-line|z17[highway=cycleway],
-line|z17[highway=footway][bicycle=yes]::cycleline,
-line|z17[highway=path][bicycle=yes]::cycleline,
-{width: 1.4; opacity: 0.6;}
-line|z18[highway=cycleway],
-line|z18[highway=footway][bicycle=yes]::cycleline,
-line|z18[highway=path][bicycle=yes]::cycleline,
-{width: 1.6; opacity: 0.8;}
-line|z19-[highway=cycleway],
-line|z19-[highway=footway][bicycle=yes]::cycleline,
-line|z19-[highway=path][bicycle=yes]::cycleline,
-{width: 1.8; opacity: 0.8;}
+line|z15[highway=cycleway]
+{width: 1.4;}
+line|z16[highway=cycleway]
+{width: 1.6;}
+line|z17[highway=cycleway]
+{width: 1.8;}
+line|z18[highway=cycleway]
+{width: 2; opacity: 0.9;}
+line|z19-[highway=cycleway]
+{width: 2.2; opacity: 0.9;}
 
 line|z17[highway=cycleway][tunnel?]::tunnelBackground
 {casing-width-add: 1;}
@@ -826,17 +810,22 @@ line|z19-[highway=construction],
 
 /* 8.6 Track & Path 14-22 ZOOM */
 
+line|z14[highway=track][tracktype=grade1],
 line|z14[highway=raceway],
 {width: 1;}
+line|z15[highway=track][tracktype=grade1],
 line|z15[highway=raceway],
 line|z15[leisure=track][!area]
 {width: 1.5;}
+line|z16[highway=track][tracktype=grade1],
 line|z16[highway=raceway],
 line|z16[leisure=track][!area]
 {width: 1.8;}
+line|z17-18[highway=track][tracktype=grade1],
 line|z17-18[highway=raceway],
 line|z17-18[leisure=track][!area]
 {width:3; opacity: 0.8;}
+line|z19-[highway=track][tracktype=grade1],
 line|z19-[highway=raceway],
 line|z19-[leisure=track][!area]
 {width:4; opacity: 0.8;}
@@ -855,57 +844,28 @@ line|z19-[highway=track],
 {width: 4.2; dashes: 12,3.5; opacity: 0.8;}
 
 line|z14[highway=path],
+line|z14[highway=footway][sac_scale],
 line|z14[piste:type=hike],
 {width: 0.9; dashes: 3.5,2;}
 line|z15[highway=path],
+line|z15[highway=footway][sac_scale],
 line|z15[piste:type=hike],
 {width: 1.1; dashes: 3.5,2;}
 line|z16[highway=path],
+line|z16[highway=footway][sac_scale],
 line|z16[piste:type=hike],
 {width: 1.5; dashes: 4,2.5;}
 line|z17[highway=path],
+line|z17[highway=footway][sac_scale],
 line|z17-[piste:type=hike],
 {width: 2; dashes: 4,2.5;}
 line|z18[highway=path],
+line|z18[highway=footway][sac_scale],
 {width: 2.8; dashes: 6,3.5; opacity: 0.8;}
 line|z19-[highway=path],
+line|z19-[highway=footway][sac_scale],
 {width: 3.7; dashes: 8,4.5; opacity: 0.8;}
 
-line|z14[highway=path][bicycle=yes],
-{width: 0.9; dashes: 3.5,2.7;}
-line|z15[highway=path][bicycle=yes],
-{width: 1.1; dashes: 3.5,2.7;}
-line|z16[highway=path][bicycle=yes],
-{width: 1.5; dashes: 4,3.2;}
-line|z17[highway=path][bicycle=yes],
-{width: 2; dashes: 4,3.2;}
-line|z18[highway=path][bicycle=yes],
-{width: 2.8; dashes: 6,4.7; opacity: 0.8;}
-line|z19-[highway=path][bicycle=yes],
-{width: 3.7; dashes: 8,6.2; opacity: 0.8;}
-
-line|z14[highway=path][_path_grade=difficult],
-{width: 0.9; dashes: 1,2;}
-line|z15[highway=path][_path_grade=difficult],
-{width: 1.1; dashes: 1,2;}
-line|z16[highway=path][_path_grade=difficult],
-{width: 1.5; dashes: 1.8,2.5;}
-line|z17[highway=path][_path_grade=difficult],
-{width: 2; dashes: 1.8,2.5;}
-line|z18-[highway=path][_path_grade=difficult],
-{width: 2.8; dashes: 2.8,3.5;}
-
-line|z14[highway=path][_path_grade=expert],
-{width: 0.9; dashes: 1,4;}
-line|z15[highway=path][_path_grade=expert],
-{width: 1.1; dashes: 1,4;}
-line|z16[highway=path][_path_grade=expert],
-{width: 1.5; dashes: 1.6,6;}
-line|z17[highway=path][_path_grade=expert],
-{width: 2; dashes: 1.6,6;}
-line|z18-[highway=path][_path_grade=expert],
-{width: 2.8; dashes: 2.8,8;}
-
 line|z17-[highway=path][tunnel?]::tunnelBackground
 {casing-width-add: 0.5;}
 line|z17-[highway=path][tunnel?]::tunnelCasing
@@ -940,19 +900,6 @@ line|z18[highway=footway]
 line|z19-[highway=footway],
 {width: 4.2; dashes: 10,3.5; opacity: 1;}
 
-line|z14[highway=footway][bicycle=yes],
-{width: 1.1; dashes: 4,3.2; opacity: 0.7;}
-line|z15[highway=footway][bicycle=yes],
-{width: 1.5; dashes: 5,3.5;}
-line|z16[highway=footway][bicycle=yes],
-{width: 2; dashes: 5,3.5;}
-line|z17[highway=footway][bicycle=yes],
-{width: 2.4; dashes: 6,4.2; opacity: 1;}
-line|z18[highway=footway][bicycle=yes],
-{width: 3.2; dashes: 8,5.5; opacity: 1;}
-line|z19-[highway=footway][bicycle=yes],
-{width: 4.2; dashes: 10,6.7; opacity: 1;}
-
 /* Don't display sidewalks and pedestrian crossings on z15. */
 line|z15[highway=footway][footway=sidewalk],
 line|z15[highway=footway][footway=crossing],
diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/clear/include/priorities_3_FG.prio.txt
index 7d72106787..ad70614ea5 100644
--- a/data/styles/clear/include/priorities_3_FG.prio.txt
+++ b/data/styles/clear/include/priorities_3_FG.prio.txt
@@ -268,26 +268,42 @@ highway-bridleway                                   # line z14- (also has pathte
 highway-bridleway-bridge                            # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
 highway-bridleway-tunnel                            # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
 highway-footway                                     # line z15- (also has pathtext z15-)
+highway-footway-alpine_hiking                       # line z14- (also has pathtext z15-)
 highway-footway-area                                # line z15- and area z14- (also has pathtext z15-)
-highway-footway-bicycle                             # line z14- (also has line::cycleline z14-, pathtext z15-)
+highway-footway-bridge                              # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-footway-demanding_alpine_hiking             # line z14- (also has pathtext z15-)
+highway-footway-demanding_mountain_hiking           # line z14- (also has pathtext z15-)
+highway-footway-difficult_alpine_hiking             # line z14- (also has pathtext z15-)
+highway-footway-hiking                              # line z14- (also has pathtext z15-)
+highway-footway-mountain_hiking                     # line z14- (also has pathtext z15-)
+highway-footway-sidewalk                            # line z16-
+highway-footway-tunnel                              # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
 highway-path                                        # line z14- (also has pathtext z15-)
-highway-path-bicycle                                # line z14- (also has line::cycleline z14-, pathtext z15-)
-highway-path-difficult                              # line z14- (also has pathtext z15-)
-highway-path-expert                                 # line z14- (also has pathtext z15-)
+highway-path-alpine_hiking                          # line z14- (also has pathtext z15-)
+highway-path-bicycle                                # line z14- (also has pathtext z15-)
+highway-path-bridge                                 # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-path-demanding_alpine_hiking                # line z14- (also has pathtext z15-)
+highway-path-demanding_mountain_hiking              # line z14- (also has pathtext z15-)
+highway-path-difficult_alpine_hiking                # line z14- (also has pathtext z15-)
+highway-path-hiking                                 # line z14- (also has pathtext z15-)
+highway-path-horse                                  # line z14- (also has pathtext z15-)
+highway-path-mountain_hiking                        # line z14- (also has pathtext z15-)
+highway-path-tunnel                                 # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
 highway-raceway                                     # line z14- (also has pathtext z16-)
 highway-track                                       # line z14- (also has pathtext z15-)
 highway-track-area                                  # line z14- (also has pathtext z15-)
 highway-track-bridge                                # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-track-grade1                                # line z14- (also has pathtext z15-)
+highway-track-grade2                                # line z14- (also has pathtext z15-)
+highway-track-grade3                                # line z14- (also has pathtext z15-)
+highway-track-grade4                                # line z14- (also has pathtext z15-)
+highway-track-grade5                                # line z14- (also has pathtext z15-)
 highway-track-no-access                             # line z14- (also has pathtext z15-)
 highway-track-tunnel                                # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+leisure-track                                       # line z15- (also has caption z16-)
 === 180
 
-highway-footway-bicycle::cycleline                  # line::cycleline z14- (also has line z14-, pathtext z15-)
-highway-path-bicycle::cycleline                     # line::cycleline z14- (also has line z14-, pathtext z15-)
-=== 170
-
 highway-construction                                # line z13- (also has pathtext z15-)
-leisure-track                                       # line z15- (also has caption z16-)
 railway-abandoned                                   # line z16-
 railway-abandoned-bridge                            # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
 railway-abandoned-tunnel                            # line z16-
@@ -298,14 +314,6 @@ railway-preserved-bridge                            # line z15- (also has line::
 railway-preserved-tunnel                            # line z15-
 === 160
 
-highway-footway-bridge                              # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-footway-sidewalk                            # line z16-
-highway-footway-tunnel                              # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-highway-path-bridge                                 # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-path-horse                                  # line z14- (also has pathtext z15-)
-highway-path-tunnel                                 # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-=== 155
-
 highway-bridleway-bridge::bridgewhite               # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-)
 highway-cycleway-bridge::bridgewhite                # line::bridgewhite z15- (also has line z13-, line::bridgeblack z17-, pathtext z15-)
 highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
@@ -450,12 +458,12 @@ waterway-dam                                        # line z14- and area z14- (a
 === 30
 
 amenity-prison                                      # area z12- (also has icon z17-, caption(optional) z17-)
-boundary-aboriginal_lands                           # area z10-16 (also has caption z10-16)
-boundary-national_park                              # area z10-17 (also has icon z11-17, caption(optional) z12-17)
-boundary-protected_area-1                           # area z10-17 (also has icon z11-17, caption(optional) z12-17)
+boundary-aboriginal_lands                           # area z10- (also has caption z10-)
+boundary-national_park                              # area z10- (also has icon z11-, caption(optional) z12-)
+boundary-protected_area-1                           # area z10- (also has icon z11-, caption(optional) z12-)
 landuse-military                                    # area z12- (also has icon z16-, caption(optional) z17-)
 landuse-military-danger_area                        # area z10- (also has icon z16-, caption(optional) z17-)
-leisure-nature_reserve                              # area z10-17 (also has icon z11-17, caption(optional) z12-17, caption z18-)
+leisure-nature_reserve                              # area z10- (also has icon z11-, caption(optional) z12-)
 === 20
 
 piste:type-snow_park                                # area z14- (also has caption z15-)
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index a2a732ad40..f979ae1d12 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -94,16 +94,16 @@ highway-trunk-bridge::shield                        # shield::shield z10- (also
 highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z7-, line(casing) z12-)
 === 6740
 
-boundary-aboriginal_lands                           # caption z10-16 (also has area z10-16)
-boundary-national_park                              # icon z11-17 (also has caption(optional) z12-17, area z10-17)
-boundary-protected_area                             # icon z11-17 (also has caption(optional) z12-17)
-boundary-protected_area-1                           # icon z11-17 (also has caption(optional) z12-17, area z10-17)
-boundary-protected_area-2                           # icon z11-17 (also has caption(optional) z12-17)
-boundary-protected_area-3                           # icon z11-17 (also has caption(optional) z12-17)
-boundary-protected_area-4                           # icon z11-17 (also has caption(optional) z12-17)
-boundary-protected_area-5                           # icon z11-17 (also has caption(optional) z12-17)
-boundary-protected_area-6                           # icon z11-17 (also has caption(optional) z12-17)
-leisure-nature_reserve                              # icon z11-17 and caption z18- (also has caption(optional) z12-17, area z10-17)
+boundary-aboriginal_lands                           # caption z10- (also has area z10-)
+boundary-national_park                              # icon z11- (also has caption(optional) z12-, area z10-)
+boundary-protected_area                             # icon z11- (also has caption(optional) z12-)
+boundary-protected_area-1                           # icon z11- (also has caption(optional) z12-, area z10-)
+boundary-protected_area-2                           # icon z11- (also has caption(optional) z12-)
+boundary-protected_area-3                           # icon z11- (also has caption(optional) z12-)
+boundary-protected_area-4                           # icon z11- (also has caption(optional) z12-)
+boundary-protected_area-5                           # icon z11- (also has caption(optional) z12-)
+boundary-protected_area-6                           # icon z11- (also has caption(optional) z12-)
+leisure-nature_reserve                              # icon z11- (also has caption(optional) z12-, area z10-)
 === 6700
 
 landuse-reservoir                                   # caption z10- (also has area z12-)
@@ -663,7 +663,6 @@ highway-cycleway-tunnel                             # pathtext z15- (also has li
 area:highway-footway                                # caption z15- (also has area z14-)
 highway-footway                                     # pathtext z15- (also has line z15-)
 highway-footway-area                                # pathtext z15- (also has line z15-, area z14-)
-highway-footway-bicycle                             # pathtext z15- (also has line z14-, line::cycleline z14-)
 highway-footway-bridge                              # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-)
 highway-footway-tunnel                              # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 highway-tertiary_link                               # pathtext z18- (also has line z14-)
@@ -692,12 +691,22 @@ natural-rock                                        # icon z17- (also has captio
 highway-bridleway                                   # pathtext z15- (also has line z14-)
 highway-bridleway-bridge                            # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-)
 highway-bridleway-tunnel                            # pathtext z15- (also has line z14-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-footway-alpine_hiking                       # pathtext z15- (also has line z14-)
+highway-footway-demanding_alpine_hiking             # pathtext z15- (also has line z14-)
+highway-footway-demanding_mountain_hiking           # pathtext z15- (also has line z14-)
+highway-footway-difficult_alpine_hiking             # pathtext z15- (also has line z14-)
+highway-footway-hiking                              # pathtext z15- (also has line z14-)
+highway-footway-mountain_hiking                     # pathtext z15- (also has line z14-)
 highway-path                                        # pathtext z15- (also has line z14-)
-highway-path-bicycle                                # pathtext z15- (also has line z14-, line::cycleline z14-)
+highway-path-alpine_hiking                          # pathtext z15- (also has line z14-)
+highway-path-bicycle                                # pathtext z15- (also has line z14-)
 highway-path-bridge                                 # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-path-difficult                              # pathtext z15- (also has line z14-)
-highway-path-expert                                 # pathtext z15- (also has line z14-)
+highway-path-demanding_alpine_hiking                # pathtext z15- (also has line z14-)
+highway-path-demanding_mountain_hiking              # pathtext z15- (also has line z14-)
+highway-path-difficult_alpine_hiking                # pathtext z15- (also has line z14-)
+highway-path-hiking                                 # pathtext z15- (also has line z14-)
 highway-path-horse                                  # pathtext z15- (also has line z14-)
+highway-path-mountain_hiking                        # pathtext z15- (also has line z14-)
 highway-path-tunnel                                 # pathtext z15- (also has line z14-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2820
 
@@ -709,6 +718,11 @@ highway-steps-tunnel                                # pathtext z16- (also has li
 highway-track                                       # pathtext z15- (also has line z14-)
 highway-track-area                                  # pathtext z15- (also has line z14-)
 highway-track-bridge                                # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-track-grade1                                # pathtext z15- (also has line z14-)
+highway-track-grade2                                # pathtext z15- (also has line z14-)
+highway-track-grade3                                # pathtext z15- (also has line z14-)
+highway-track-grade4                                # pathtext z15- (also has line z14-)
+highway-track-grade5                                # pathtext z15- (also has line z14-)
 highway-track-no-access                             # pathtext z15- (also has line z14-)
 highway-track-tunnel                                # pathtext z15- (also has line z14-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2780
@@ -1241,15 +1255,15 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # railway-station                                   # caption(optional) z12- (also has icon z12-)
 # === -3200
 
-# boundary-national_park                            # caption(optional) z12-17 (also has icon z11-17, area z10-17)
-# boundary-protected_area                           # caption(optional) z12-17 (also has icon z11-17)
-# boundary-protected_area-1                         # caption(optional) z12-17 (also has icon z11-17, area z10-17)
-# boundary-protected_area-2                         # caption(optional) z12-17 (also has icon z11-17)
-# boundary-protected_area-3                         # caption(optional) z12-17 (also has icon z11-17)
-# boundary-protected_area-4                         # caption(optional) z12-17 (also has icon z11-17)
-# boundary-protected_area-5                         # caption(optional) z12-17 (also has icon z11-17)
-# boundary-protected_area-6                         # caption(optional) z12-17 (also has icon z11-17)
-# leisure-nature_reserve                            # caption(optional) z12-17 (also has icon z11-17, caption z18-, area z10-17)
+# boundary-national_park                            # caption(optional) z12- (also has icon z11-, area z10-)
+# boundary-protected_area                           # caption(optional) z12- (also has icon z11-)
+# boundary-protected_area-1                         # caption(optional) z12- (also has icon z11-, area z10-)
+# boundary-protected_area-2                         # caption(optional) z12- (also has icon z11-)
+# boundary-protected_area-3                         # caption(optional) z12- (also has icon z11-)
+# boundary-protected_area-4                         # caption(optional) z12- (also has icon z11-)
+# boundary-protected_area-5                         # caption(optional) z12- (also has icon z11-)
+# boundary-protected_area-6                         # caption(optional) z12- (also has icon z11-)
+# leisure-nature_reserve                            # caption(optional) z12- (also has icon z11-, area z10-)
 # === -3300
 
 # barrier-toll_booth                                # caption(optional) z14- (also has icon z12-)
diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss
index 5ef3903709..aac8bdd266 100644
--- a/data/styles/clear/style-clear/colors.mapcss
+++ b/data/styles/clear/style-clear/colors.mapcss
@@ -110,11 +110,10 @@
 @residential: #F8F8F8;
 @pedestrian: #F8F8F8;
 @footway: #F8F8F8;
-@cycleway: #5654FF;
+@cycleway: #FF87AD;
 @construction: #BBBBAA;
 @track: #635730;
 @path: #A05012;
-@path_expert: #3D2617;
 @bridleway: #3D361E;
 
 /* 5.2 Bridges */
diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss
index f8b3b43f0c..72db026734 100644
--- a/data/styles/clear/style-night/colors.mapcss
+++ b/data/styles/clear/style-night/colors.mapcss
@@ -114,7 +114,6 @@
 @construction: #332F2D;
 @track: #5F532D;
 @path: #944A12;
-@path_expert: #523E33;
 @bridleway: #2B2827;
 
 /* 5.2 Bridges */
diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss
index 9fd59c0a20..8215d6c527 100644
--- a/data/styles/outdoors/include/Icons.mapcss
+++ b/data/styles/outdoors/include/Icons.mapcss
@@ -37,12 +37,12 @@ node|z11-[natural=peak][!name],
 area|z13-[natural=bare_rock][!name],
 {text: none;}
 
-node|z11-17[boundary=national_park],
-area|z11-17[boundary=national_park],
-node|z11-17[boundary=protected_area],
-area|z11-17[boundary=protected_area],
-node|z11-17[leisure=nature_reserve],
-area|z11-17[leisure=nature_reserve],
+node|z11-[boundary=national_park],
+area|z11-[boundary=national_park],
+node|z11-[boundary=protected_area],
+area|z11-[boundary=protected_area],
+node|z11-[leisure=nature_reserve],
+area|z11-[leisure=nature_reserve],
 area|z13-[landuse=forest][name],
 {text: name;text-offset: 1;text-color: @park_label;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;text-halo-radius:0.5;font-size: 10;}
 
@@ -64,20 +64,20 @@ node|z10-12[leisure=nature_reserve],
 area|z10-12[leisure=nature_reserve],
 area|z12[landuse=forest][name],
 {icon-image: nparkf-outline-s.svg;}
-node|z13-17[boundary=national_park],
-area|z13-17[boundary=national_park],
-node|z13-17[boundary=protected_area],
-area|z13-17[boundary=protected_area],
-node|z13-17[leisure=nature_reserve],
-area|z13-17[leisure=nature_reserve],
+node|z13-[boundary=national_park],
+area|z13-[boundary=national_park],
+node|z13-[boundary=protected_area],
+area|z13-[boundary=protected_area],
+node|z13-[leisure=nature_reserve],
+area|z13-[leisure=nature_reserve],
 area|z13-[landuse=forest][name],
 {icon-image: nparkf-outline-m.svg;font-size: 11;text-halo-opacity: 0.9;}
-node|z17[boundary=national_park],
-area|z17[boundary=national_park],
-node|z17[boundary=protected_area],
-area|z17[boundary=protected_area],
-node|z17[leisure=nature_reserve],
-area|z17[leisure=nature_reserve],
+node|z17-[boundary=national_park],
+area|z17-[boundary=national_park],
+node|z17-[boundary=protected_area],
+area|z17-[boundary=protected_area],
+node|z17-[leisure=nature_reserve],
+area|z17-[leisure=nature_reserve],
 area|z17-[landuse=forest][name],
 {font-size: 12;}
 
diff --git a/data/styles/outdoors/include/Roads.mapcss b/data/styles/outdoors/include/Roads.mapcss
index 6c67c80226..e33b2ffba2 100644
--- a/data/styles/outdoors/include/Roads.mapcss
+++ b/data/styles/outdoors/include/Roads.mapcss
@@ -88,11 +88,9 @@ line|z12-[highway=steps],
 {color: @footway; opacity: 1;}
 
 line|z11-[highway=path],
+line|z11-[highway=footway][sac_scale],
 {color: @path; opacity: 1;}
 
-line|z11-[highway=path][_path_grade=expert],
-{color: @path_expert; opacity: 1;}
-
 line|z12-[piste:type=hike],
 {color: @piste; opacity: 0.7;}
 
@@ -100,8 +98,6 @@ line|z11-[highway=bridleway],
 {color: @path; opacity: 1;}
 
 line|z11-[highway=cycleway],
-line|z12-[highway=footway][bicycle=yes]::cycleline,
-line|z12-[highway=path][bicycle=yes]::cycleline,
 {color: @cycleway; opacity: 1;}
 
 line|z11[highway=track],
@@ -124,12 +120,14 @@ line|z18-[highway=track],
 line|z11[highway=footway],
 {width: 1; dashes: 3.5,2;}
 line|z11[highway=path],
+line|z11[highway=footway][sac_scale],
 {width: 1; dashes: 3.5,2; opacity: 0.6;}
 line|z12[highway=footway],
 /* Make steps on z12-14 look same as footways, z15- follows main style */
 line|z12[highway=steps],
 {width: 1.1; dashes: 3.5,2;}
 line|z12[highway=path],
+line|z12[highway=footway][sac_scale],
 line|z12[piste:type=hike],
 {width: 1.1; dashes: 3.5,2; opacity: 0.7;}
 line|z13[highway=path],
@@ -159,65 +157,6 @@ line|z18-[piste:type=hike],
 line|z18-[highway=footway],
 {width: 4; dashes: 8,4.5;}
 
-line|z13-[highway=path][bicycle=yes],
-line|z13-[highway=footway][bicycle=yes],
-{opacity: 0.8;}
-
-line|z12[highway=path][bicycle=yes],
-line|z12[highway=footway][bicycle=yes],
-{width: 1.1; dashes: 3.5,2.5; opacity: 0.7;}
-line|z13[highway=path][bicycle=yes],
-line|z13[highway=footway][bicycle=yes],
-{width: 1.3; dashes: 4,3;}
-line|z14[highway=path][bicycle=yes],
-line|z14[highway=footway][bicycle=yes],
-{width: 1.6; dashes: 4,3;}
-line|z15[highway=path][bicycle=yes],
-line|z15[highway=footway][bicycle=yes],
-{width: 2; dashes: 6,4.5;}
-line|z16[highway=path][bicycle=yes],
-line|z16[highway=footway][bicycle=yes],
-{width: 2.6; dashes: 6,4.5;}
-line|z17[highway=path][bicycle=yes],
-line|z17[highway=footway][bicycle=yes],
-{width: 3.3; dashes: 8,6;}
-line|z18-[highway=path][bicycle=yes],
-line|z18-[highway=footway][bicycle=yes],
-{width: 4; dashes: 8,6; opacity: 1;}
-
-line|z11[highway=path][_path_grade=difficult],
-line|z11[highway=path][_path_grade=expert],
-{width: 1; dashes: 1,2; opacity: 0.7;}
-line|z12[highway=path][_path_grade=difficult],
-line|z12[highway=path][_path_grade=expert],
-{width: 1.1; dashes: 1,2; opacity: 0.8;}
-
-line|z13[highway=path][_path_grade=difficult],
-{width: 1.3; dashes: 1.5,2.5;}
-line|z14[highway=path][_path_grade=difficult],
-{width: 1.6; dashes: 1.5,2.5;}
-line|z15[highway=path][_path_grade=difficult],
-{width: 2; dashes: 2.5,4;}
-line|z16[highway=path][_path_grade=difficult],
-{width: 2.6; dashes: 2.5,4;}
-line|z17[highway=path][_path_grade=difficult],
-{width: 3.3; dashes: 3.6,5;}
-line|z18-[highway=path][_path_grade=difficult],
-{width: 4; dashes: 3.6,5;}
-
-line|z13[highway=path][_path_grade=expert],
-{width: 1.3; dashes: 1.4,5;}
-line|z14[highway=path][_path_grade=expert],
-{width: 1.6; dashes: 1.4,5;}
-line|z15[highway=path][_path_grade=expert],
-{width: 2; dashes: 2.3,9;}
-line|z16[highway=path][_path_grade=expert],
-{width: 2.6; dashes: 2.3,9;}
-line|z17[highway=path][_path_grade=expert],
-{width: 3.3; dashes: 3.5,11;}
-line|z18-[highway=path][_path_grade=expert],
-{width: 4; dashes: 3.5,11;}
-
 /* Don't display sidewalks and pedestrian crossings till z16. */
 line|z11-15[highway=footway][footway=sidewalk],
 line|z11-15[highway=footway][footway=crossing],
@@ -241,35 +180,21 @@ line|z18-[highway=bridleway],
 {width: 4; dashes: 12,2.2;}
 
 line|z11[highway=cycleway],
-{width: 0.9; opacity: 0.7;}
+{width: 0.7; opacity: 0.6;}
 line|z12[highway=cycleway],
-line|z12[highway=footway][bicycle=yes]::cycleline,
-line|z12[highway=path][bicycle=yes]::cycleline,
-{width: 1; opacity: 0.7;}
+{width: 0.8; opacity: 0.7;}
 line|z13[highway=cycleway],
-line|z13[highway=footway][bicycle=yes]::cycleline,
-line|z13[highway=path][bicycle=yes]::cycleline,
-{width: 1.1; opacity: 0.8;}
+{width: 1.1;}
 line|z14[highway=cycleway],
-line|z14[highway=footway][bicycle=yes]::cycleline,
-line|z14[highway=path][bicycle=yes]::cycleline,
-{width: 1.3;}
+{width: 1.4;}
 line|z15[highway=cycleway],
-line|z15[highway=footway][bicycle=yes]::cycleline,
-line|z15[highway=path][bicycle=yes]::cycleline,
-{width: 1.5;}
+{width: 1.6;}
 line|z16[highway=cycleway],
-line|z16[highway=footway][bicycle=yes]::cycleline,
-line|z16[highway=path][bicycle=yes]::cycleline,
-{width: 1.7;}
+{width: 1.9;}
 line|z17[highway=cycleway],
-line|z17[highway=footway][bicycle=yes]::cycleline,
-line|z17[highway=path][bicycle=yes]::cycleline,
-{width: 2;}
+{width: 2.3;}
 line|z18-[highway=cycleway],
-line|z18-[highway=footway][bicycle=yes]::cycleline,
-line|z18-[highway=path][bicycle=yes]::cycleline,
-{width: 2.4;}
+{width: 2.8;}
 
 
 /* Ski pistes */
diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt
index 67dceba427..a90d77befd 100644
--- a/data/styles/outdoors/include/priorities_3_FG.prio.txt
+++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt
@@ -268,26 +268,42 @@ highway-bridleway                                   # line z11- (also has pathte
 highway-bridleway-bridge                            # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
 highway-bridleway-tunnel                            # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
 highway-footway                                     # line z11- (also has pathtext z13-)
+highway-footway-alpine_hiking                       # line z11- (also has pathtext z13-)
 highway-footway-area                                # line z11- and area z14- (also has pathtext z13-)
-highway-footway-bicycle                             # line z11- (also has line::cycleline z12-, pathtext z13-)
+highway-footway-bridge                              # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
+highway-footway-demanding_alpine_hiking             # line z11- (also has pathtext z13-)
+highway-footway-demanding_mountain_hiking           # line z11- (also has pathtext z13-)
+highway-footway-difficult_alpine_hiking             # line z11- (also has pathtext z13-)
+highway-footway-hiking                              # line z11- (also has pathtext z13-)
+highway-footway-mountain_hiking                     # line z11- (also has pathtext z13-)
+highway-footway-sidewalk                            # line z16-
+highway-footway-tunnel                              # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
 highway-path                                        # line z11- (also has pathtext z13-)
-highway-path-bicycle                                # line z11- (also has line::cycleline z12-, pathtext z13-)
-highway-path-difficult                              # line z11- (also has pathtext z13-)
-highway-path-expert                                 # line z11- (also has pathtext z13-)
+highway-path-alpine_hiking                          # line z11- (also has pathtext z13-)
+highway-path-bicycle                                # line z11- (also has pathtext z13-)
+highway-path-bridge                                 # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
+highway-path-demanding_alpine_hiking                # line z11- (also has pathtext z13-)
+highway-path-demanding_mountain_hiking              # line z11- (also has pathtext z13-)
+highway-path-difficult_alpine_hiking                # line z11- (also has pathtext z13-)
+highway-path-hiking                                 # line z11- (also has pathtext z13-)
+highway-path-horse                                  # line z11- (also has pathtext z13-)
+highway-path-mountain_hiking                        # line z11- (also has pathtext z13-)
+highway-path-tunnel                                 # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
 highway-raceway                                     # line z14- (also has pathtext z16-)
 highway-track                                       # line z11- (also has pathtext z13-)
 highway-track-area                                  # line z11- (also has pathtext z13-)
 highway-track-bridge                                # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
+highway-track-grade1                                # line z11- (also has pathtext z13-)
+highway-track-grade2                                # line z11- (also has pathtext z13-)
+highway-track-grade3                                # line z11- (also has pathtext z13-)
+highway-track-grade4                                # line z11- (also has pathtext z13-)
+highway-track-grade5                                # line z11- (also has pathtext z13-)
 highway-track-no-access                             # line z11- (also has pathtext z13-)
 highway-track-tunnel                                # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
+leisure-track                                       # line z15- (also has caption z16-)
 === 180
 
-highway-footway-bicycle::cycleline                  # line::cycleline z12- (also has line z11-, pathtext z13-)
-highway-path-bicycle::cycleline                     # line::cycleline z12- (also has line z11-, pathtext z13-)
-=== 170
-
 highway-construction                                # line z11- (also has pathtext z15-)
-leisure-track                                       # line z15- (also has caption z16-)
 railway-abandoned                                   # line z13-
 railway-abandoned-bridge                            # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-)
 railway-abandoned-tunnel                            # line z13-
@@ -298,14 +314,6 @@ railway-preserved-bridge                            # line z13- (also has line::
 railway-preserved-tunnel                            # line z13-
 === 160
 
-highway-footway-bridge                              # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
-highway-footway-sidewalk                            # line z16-
-highway-footway-tunnel                              # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
-highway-path-bridge                                 # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
-highway-path-horse                                  # line z11- (also has pathtext z13-)
-highway-path-tunnel                                 # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
-=== 155
-
 highway-bridleway-bridge::bridgewhite               # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
 highway-cycleway-bridge::bridgewhite                # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
 highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-)
@@ -450,12 +458,12 @@ waterway-dam                                        # line z14- and area z14- (a
 === 30
 
 amenity-prison                                      # area z12- (also has icon z17-, caption(optional) z17-)
-boundary-aboriginal_lands                           # area z10-16 (also has caption z10-16)
-boundary-national_park                              # area z10-17 (also has icon z10-17, caption(optional) z11-17)
-boundary-protected_area-1                           # area z10-17 (also has icon z10-17, caption(optional) z11-17)
+boundary-aboriginal_lands                           # area z10- (also has caption z10-)
+boundary-national_park                              # area z10- (also has icon z10-, caption(optional) z11-)
+boundary-protected_area-1                           # area z10- (also has icon z10-, caption(optional) z11-)
 landuse-military                                    # area z12- (also has icon z16-, caption(optional) z17-)
 landuse-military-danger_area                        # area z10- (also has icon z16-, caption(optional) z17-)
-leisure-nature_reserve                              # area z10-17 (also has icon z10-17, caption(optional) z11-17, caption z18-)
+leisure-nature_reserve                              # area z10- (also has icon z10-, caption(optional) z11-)
 === 20
 
 piste:type-downhill-advanced-area                   # area z13-
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 786ae8c9f6..3ead5e97e0 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -94,16 +94,16 @@ highway-trunk-bridge::shield                        # shield::shield z10- (also
 highway-trunk-tunnel::shield                        # shield::shield z10- (also has pathtext z10-, line z7-, line(casing) z12-)
 === 6740
 
-boundary-aboriginal_lands                           # caption z10-16 (also has area z10-16)
-boundary-national_park                              # icon z10-17 (also has caption(optional) z11-17, area z10-17)
-boundary-protected_area                             # icon z10-17 (also has caption(optional) z11-17)
-boundary-protected_area-1                           # icon z10-17 (also has caption(optional) z11-17, area z10-17)
-boundary-protected_area-2                           # icon z10-17 (also has caption(optional) z11-17)
-boundary-protected_area-3                           # icon z10-17 (also has caption(optional) z11-17)
-boundary-protected_area-4                           # icon z10-17 (also has caption(optional) z11-17)
-boundary-protected_area-5                           # icon z10-17 (also has caption(optional) z11-17)
-boundary-protected_area-6                           # icon z10-17 (also has caption(optional) z11-17)
-leisure-nature_reserve                              # icon z10-17 and caption z18- (also has caption(optional) z11-17, area z10-17)
+boundary-aboriginal_lands                           # caption z10- (also has area z10-)
+boundary-national_park                              # icon z10- (also has caption(optional) z11-, area z10-)
+boundary-protected_area                             # icon z10- (also has caption(optional) z11-)
+boundary-protected_area-1                           # icon z10- (also has caption(optional) z11-, area z10-)
+boundary-protected_area-2                           # icon z10- (also has caption(optional) z11-)
+boundary-protected_area-3                           # icon z10- (also has caption(optional) z11-)
+boundary-protected_area-4                           # icon z10- (also has caption(optional) z11-)
+boundary-protected_area-5                           # icon z10- (also has caption(optional) z11-)
+boundary-protected_area-6                           # icon z10- (also has caption(optional) z11-)
+leisure-nature_reserve                              # icon z10- (also has caption(optional) z11-, area z10-)
 === 6700
 
 landuse-reservoir                                   # caption z10- (also has area z12-)
@@ -663,7 +663,6 @@ highway-cycleway-tunnel                             # pathtext z13- (also has li
 area:highway-footway                                # caption z15- (also has area z14-)
 highway-footway                                     # pathtext z13- (also has line z11-)
 highway-footway-area                                # pathtext z13- (also has line z11-, area z14-)
-highway-footway-bicycle                             # pathtext z13- (also has line z11-, line::cycleline z12-)
 highway-footway-bridge                              # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-)
 highway-footway-tunnel                              # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 highway-tertiary_link                               # pathtext z18- (also has line z14-)
@@ -692,12 +691,22 @@ natural-rock                                        # icon z14- (also has captio
 highway-bridleway                                   # pathtext z13- (also has line z11-)
 highway-bridleway-bridge                            # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-)
 highway-bridleway-tunnel                            # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-footway-alpine_hiking                       # pathtext z13- (also has line z11-)
+highway-footway-demanding_alpine_hiking             # pathtext z13- (also has line z11-)
+highway-footway-demanding_mountain_hiking           # pathtext z13- (also has line z11-)
+highway-footway-difficult_alpine_hiking             # pathtext z13- (also has line z11-)
+highway-footway-hiking                              # pathtext z13- (also has line z11-)
+highway-footway-mountain_hiking                     # pathtext z13- (also has line z11-)
 highway-path                                        # pathtext z13- (also has line z11-)
-highway-path-bicycle                                # pathtext z13- (also has line z11-, line::cycleline z12-)
+highway-path-alpine_hiking                          # pathtext z13- (also has line z11-)
+highway-path-bicycle                                # pathtext z13- (also has line z11-)
 highway-path-bridge                                 # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-path-difficult                              # pathtext z13- (also has line z11-)
-highway-path-expert                                 # pathtext z13- (also has line z11-)
+highway-path-demanding_alpine_hiking                # pathtext z13- (also has line z11-)
+highway-path-demanding_mountain_hiking              # pathtext z13- (also has line z11-)
+highway-path-difficult_alpine_hiking                # pathtext z13- (also has line z11-)
+highway-path-hiking                                 # pathtext z13- (also has line z11-)
 highway-path-horse                                  # pathtext z13- (also has line z11-)
+highway-path-mountain_hiking                        # pathtext z13- (also has line z11-)
 highway-path-tunnel                                 # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2820
 
@@ -709,6 +718,11 @@ highway-steps-tunnel                                # pathtext z13- (also has li
 highway-track                                       # pathtext z13- (also has line z11-)
 highway-track-area                                  # pathtext z13- (also has line z11-)
 highway-track-bridge                                # pathtext z13- (also has line z11-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-track-grade1                                # pathtext z13- (also has line z11-)
+highway-track-grade2                                # pathtext z13- (also has line z11-)
+highway-track-grade3                                # pathtext z13- (also has line z11-)
+highway-track-grade4                                # pathtext z13- (also has line z11-)
+highway-track-grade5                                # pathtext z13- (also has line z11-)
 highway-track-no-access                             # pathtext z13- (also has line z11-)
 highway-track-tunnel                                # pathtext z13- (also has line z11-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2780
@@ -1241,15 +1255,15 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # railway-station                                   # caption(optional) z12- (also has icon z12-)
 # === -3200
 
-# boundary-national_park                            # caption(optional) z11-17 (also has icon z10-17, area z10-17)
-# boundary-protected_area                           # caption(optional) z11-17 (also has icon z10-17)
-# boundary-protected_area-1                         # caption(optional) z11-17 (also has icon z10-17, area z10-17)
-# boundary-protected_area-2                         # caption(optional) z11-17 (also has icon z10-17)
-# boundary-protected_area-3                         # caption(optional) z11-17 (also has icon z10-17)
-# boundary-protected_area-4                         # caption(optional) z11-17 (also has icon z10-17)
-# boundary-protected_area-5                         # caption(optional) z11-17 (also has icon z10-17)
-# boundary-protected_area-6                         # caption(optional) z11-17 (also has icon z10-17)
-# leisure-nature_reserve                            # caption(optional) z11-17 (also has icon z10-17, caption z18-, area z10-17)
+# boundary-national_park                            # caption(optional) z11- (also has icon z10-, area z10-)
+# boundary-protected_area                           # caption(optional) z11- (also has icon z10-)
+# boundary-protected_area-1                         # caption(optional) z11- (also has icon z10-, area z10-)
+# boundary-protected_area-2                         # caption(optional) z11- (also has icon z10-)
+# boundary-protected_area-3                         # caption(optional) z11- (also has icon z10-)
+# boundary-protected_area-4                         # caption(optional) z11- (also has icon z10-)
+# boundary-protected_area-5                         # caption(optional) z11- (also has icon z10-)
+# boundary-protected_area-6                         # caption(optional) z11- (also has icon z10-)
+# leisure-nature_reserve                            # caption(optional) z11- (also has icon z10-, area z10-)
 # === -3300
 
 # barrier-toll_booth                                # caption(optional) z14- (also has icon z12-)
diff --git a/data/styles/outdoors/style-clear/colors.mapcss b/data/styles/outdoors/style-clear/colors.mapcss
index 8596f549a0..9c57dff9e7 100644
--- a/data/styles/outdoors/style-clear/colors.mapcss
+++ b/data/styles/outdoors/style-clear/colors.mapcss
@@ -32,8 +32,6 @@
 /* 5.ROADS */
 /* 5.1 All roads */
 
-@cycleway: #534DEB; /* slightly darker than in main */
-
 @construction: #ABAB9A;
 
 /* 5.5 Transport */
diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss
index 0b84e05e2f..4678c3a77e 100644
--- a/data/styles/vehicle/include/Roads.mapcss
+++ b/data/styles/vehicle/include/Roads.mapcss
@@ -633,6 +633,7 @@ line|z19-[highway=construction],
 
 /* 8.7 Footway & Steps 18-22 ZOOM */
 
+/* [highway=footway] should be defined before [highway=footway][sac_scale] in 8.6. */
 line|z18-[highway=footway],
 line|z18-[highway=steps],
 {color: @footway; opacity: 0.7; width: 1.5; dashes: 5,2;}
@@ -647,6 +648,21 @@ line|z18-[highway=steps][tunnel?],
 
 /* 8.6 Track & Path 16-22 ZOOM */
 
+line|z14-[highway=track][tracktype=grade1],
+{color: @pedestrian; opacity: 0.7;}
+
+line|z14[highway=track][tracktype=grade1],
+{width: 1.4;dashes: 2,1.35;}
+line|z15[highway=track][tracktype=grade1],
+{width: 2;dashes: 2.2,1.26;}
+line|z16[highway=track][tracktype=grade1],
+{width: 2.6;dashes: 3.3,1.8;}
+line|z17-18[highway=track][tracktype=grade1],
+{width: 3;dashes: 4,1.8;}
+line|z19-[highway=track][tracktype=grade1],
+{width: 4;dashes: 6.3,2.7;}
+
+
 line|z16-[highway=track],
 {color: @track; opacity: 0.6; width: 1.1; dashes: 6,2.5;}
 line|z17[highway=track],
@@ -659,10 +675,13 @@ line|z16-[highway=track][tunnel?],
 {width: 0;}
 
 line|z17-[highway=path],
+line|z17-[highway=footway][sac_scale],
 {color: @path; opacity: 0.6; width: 0.9; dashes: 3.5,2;}
 line|z18[highway=path],
+line|z18[highway=footway][sac_scale],
 {width: 1.1; dashes: 3.5,2;}
 line|z19-[highway=path],
+line|z19-[highway=footway][sac_scale],
 {width: 1.5; dashes: 4,2.5;}
 line|z17-[highway=path][tunnel?],
 {width: 0;}
diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt
index d0ae8468e7..d680d5e56f 100644
--- a/data/styles/vehicle/include/priorities_3_FG.prio.txt
+++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt
@@ -247,22 +247,36 @@ highway-bridleway-bridge                            # line z18-
 highway-cycleway                                    # line z18-
 highway-cycleway-bridge                             # line z18-
 highway-footway                                     # line z18-
+highway-footway-alpine_hiking                       # line z17-
 highway-footway-area                                # line z18-
-highway-footway-bicycle                             # line z18-
 highway-footway-bridge                              # line z18-
+highway-footway-demanding_alpine_hiking             # line z17-
+highway-footway-demanding_mountain_hiking           # line z17-
+highway-footway-difficult_alpine_hiking             # line z17-
+highway-footway-hiking                              # line z17-
+highway-footway-mountain_hiking                     # line z17-
 highway-footway-sidewalk                            # line z19-
 highway-path                                        # line z17-
+highway-path-alpine_hiking                          # line z17-
 highway-path-bicycle                                # line z17-
 highway-path-bridge                                 # line z17-
-highway-path-difficult                              # line z17-
-highway-path-expert                                 # line z17-
+highway-path-demanding_alpine_hiking                # line z17-
+highway-path-demanding_mountain_hiking              # line z17-
+highway-path-difficult_alpine_hiking                # line z17-
+highway-path-hiking                                 # line z17-
 highway-path-horse                                  # line z17-
+highway-path-mountain_hiking                        # line z17-
 highway-pedestrian                                  # line z18-
 highway-pedestrian-area                             # line z18-
 highway-pedestrian-bridge                           # line z18-
 highway-track                                       # line z16-
 highway-track-area                                  # line z16-
 highway-track-bridge                                # line z16-
+highway-track-grade1                                # line z14-
+highway-track-grade2                                # line z16-
+highway-track-grade3                                # line z16-
+highway-track-grade4                                # line z16-
+highway-track-grade5                                # line z16-
 highway-track-no-access                             # line z16-
 === 130
 
diff --git a/data/styles/vehicle/style-clear/colors.mapcss b/data/styles/vehicle/style-clear/colors.mapcss
index 24beb0fc84..e52c4bac68 100644
--- a/data/styles/vehicle/style-clear/colors.mapcss
+++ b/data/styles/vehicle/style-clear/colors.mapcss
@@ -22,7 +22,7 @@
 @unclassified: #FCFCFC;
 @pedestrian: #FCFCFC;
 @footway: #FCFCFC;
-@cycleway: #5654FF;
+@cycleway: #FF87AD;
 @construction: #BBBBAA;
 @track: #635730;
 @path: #A05012;
diff --git a/data/types.txt b/data/types.txt
index 656f961166..5dff35ab9f 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -29,21 +29,21 @@
 *highway|service|parking_aisle
 *place|hamlet
 *highway|road
-highway|track
+*highway|track|grade2
 *natural|wetland
-highway|track
+*highway|track|grade3
 mapswithme
 *amenity|school
 *highway|cycleway
 *landuse|farm
 *amenity|place_of_worship
-highway|track
+*highway|track|grade1
 *addr:interpolation|odd
 *highway|service|driveway
 *addr:interpolation|even
 *highway|motorway_link
 *waterway|stream|intermittent
-highway|track
+*highway|track|grade4
 *natural|water|pond
 *landuse|farmland
 *barrier|fence
@@ -60,7 +60,7 @@ highway|track
 *waterway|ditch
 *amenity|restaurant
 *landuse|reservoir
-highway|track
+*highway|track|grade5
 *amenity|bench
 *railway|rail|branch
 *highway|trunk
@@ -110,7 +110,7 @@ mapswithme
 *leisure|garden
 *landuse|commercial
 *railway|station
-highway|path
+*highway|path|hiking
 *amenity|hospital
 *waterway|stream|ephemeral
 *highway|trunk|bridge
@@ -138,7 +138,7 @@ landuse|forest|mixed
 *amenity|fire_station
 *landuse|retail
 *leisure|nature_reserve
-*highway|footway|bicycle
+leisure|pitch
 *tourism|information
 *highway|motorway_link|bridge
 *railway|abandoned
@@ -163,7 +163,7 @@ highway|footway
 *highway|construction
 *highway|cycleway|bridge
 *leisure|sports_centre
-highway|path
+*highway|path|mountain_hiking
 *tourism|camp_site
 *highway|bridleway
 *natural|heath
@@ -297,7 +297,7 @@ mapswithme
 *highway|secondary|tunnel
 *railway|abandoned|bridge
 *man_made|lighthouse
-highway|path|difficult
+*highway|path|demanding_mountain_hiking
 *man_made|storage_tank
 *man_made|silo
 *power|generator
@@ -311,7 +311,7 @@ man_made|pipeline
 *man_made|tower|communication
 *sport|equestrian
 *tourism|information|office
-highway|path
+*highway|footway|hiking
 *aeroway|gate
 *railway|preserved
 *highway|path|horse
@@ -347,7 +347,7 @@ amenity|parking|permissive
 *piste:type|downhill|advanced
 *sport|shooting
 *place|country
-highway|path|expert
+*highway|path|alpine_hiking
 *tourism|zoo|petting
 *sport|scuba_diving
 highway|cycleway
@@ -358,7 +358,7 @@ highway|cycleway
 *amenity|parking|street_side
 *amenity|parking|multi-storey
 *leisure|recreation_ground
-highway|path
+*highway|footway|mountain_hiking
 highway|service|driveway
 *amenity|parking|multi-storey|fee
 *sport|9pin
@@ -392,7 +392,7 @@ highway|service|driveway
 *landuse|education
 *man_made|cairn
 *railway|preserved|bridge
-highway|path|expert
+*highway|path|demanding_alpine_hiking
 *railway|rail|spur|tunnel
 *highway|secondary_link|bridge
 *railway|tram|tunnel
@@ -441,7 +441,7 @@ mapswithme
 *aerialway|t-bar
 *amenity|parking|lane|fee
 *amenity|parking|street_side|fee
-highway|path|expert
+*highway|path|difficult_alpine_hiking
 *earthquake:damage|spontaneous_camp
 *natural|water|drain
 mapswithme
@@ -449,7 +449,7 @@ mapswithme
 *natural|water|moat
 *natural|water|wastewater
 mapswithme
-highway|path|difficult
+*highway|footway|demanding_mountain_hiking
 *amenity|shelter|basic_hut
 *amenity|shelter|lean_to
 *landuse|orchard
@@ -461,8 +461,8 @@ mapswithme
 *sport|handball
 mapswithme
 *piste:type|downhill|freeride
-*highway|path|difficult
-*highway|path|expert
+mapswithme
+mapswithme
 *piste:type|downhill|expert
 *landuse|salt_pond
 *cemetery|grave
@@ -526,7 +526,7 @@ mapswithme
 mapswithme
 mapswithme
 *highway|primary_link|tunnel
-highway|path|expert
+*highway|footway|alpine_hiking
 mapswithme
 mapswithme
 mapswithme
@@ -552,7 +552,7 @@ mapswithme
 mapswithme
 mapswithme
 mapswithme
-highway|path|expert
+*highway|footway|demanding_alpine_hiking
 mapswithme
 mapswithme
 mapswithme
@@ -588,7 +588,7 @@ mapswithme
 mapswithme
 mapswithme
 mapswithme
-highway|track
+highway|track|grade3
 mapswithme
 mapswithme
 mapswithme
@@ -624,11 +624,11 @@ mapswithme
 mapswithme
 mapswithme
 mapswithme
-highway|path|expert
+*highway|footway|difficult_alpine_hiking
 mapswithme
 mapswithme
 mapswithme
-highway|track
+highway|track|grade5
 mapswithme
 mapswithme
 *highway|tertiary_link|tunnel
@@ -672,7 +672,7 @@ mapswithme
 mapswithme
 mapswithme
 mapswithme
-highway|track
+highway|track|grade4
 mapswithme
 mapswithme
 mapswithme
@@ -818,9 +818,9 @@ mapswithme
 mapswithme
 mapswithme
 mapswithme
-highway|track
-highway|track
-highway|track
+highway|track|grade3
+highway|track|grade4
+highway|track|grade5
 *highway|track|no-access
 mapswithme
 mapswithme
diff --git a/data/visibility.txt b/data/visibility.txt
index 821058f10d..c6940accd9 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -414,10 +414,15 @@ world  000000000000000000000  +
             {}
         elevator  000000000000000000000  -
         footway  000000000000000000111  +
+            alpine_hiking  000000000000000001111  -
             area  000000000000000000111  -
-            bicycle  000000000000000000111  -
             bridge  000000000000000000111  -
             crossing  000000000000000000111  -
+            demanding_alpine_hiking  000000000000000001111  -
+            demanding_mountain_hiking  000000000000000001111  -
+            difficult_alpine_hiking  000000000000000001111  -
+            hiking  000000000000000001111  -
+            mountain_hiking  000000000000000001111  -
             sidewalk  000000000000000000011  -
             tunnel  000000000000000000000  -
             {}
@@ -436,11 +441,15 @@ world  000000000000000000000  +
             tunnel  000000000011111111111  -
             {}
         path  000000000000000001111  +
+            alpine_hiking  000000000000000001111  -
             bicycle  000000000000000001111  -
             bridge  000000000000000001111  -
-            difficult  000000000000000001111  -
-            expert  000000000000000001111  -
+            demanding_alpine_hiking  000000000000000001111  -
+            demanding_mountain_hiking  000000000000000001111  -
+            difficult_alpine_hiking  000000000000000001111  -
+            hiking  000000000000000001111  -
             horse  000000000000000001111  -
+            mountain_hiking  000000000000000001111  -
             tunnel  000000000000000000000  -
             {}
         pedestrian  000000000000000000111  +
@@ -499,6 +508,11 @@ world  000000000000000000000  +
         track  000000000000000011111  +
             area  000000000000000011111  -
             bridge  000000000000000011111  -
+            grade1  000000000000001111111  -
+            grade2  000000000000000011111  -
+            grade3  000000000000000011111  -
+            grade4  000000000000000011111  -
+            grade5  000000000000000011111  -
             no-access  000000000000000011111  -
             tunnel  000000000000000000000  -
             {}
diff --git a/data/vulkan_shaders/reflection.json b/data/vulkan_shaders/reflection.json
index 8e8e1be3e3..2c98b0d469 100644
--- a/data/vulkan_shaders/reflection.json
+++ b/data/vulkan_shaders/reflection.json
@@ -1 +1 @@
-[{"prg":0,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":0,"vs_size":3772,"fs_off":3772,"fs_size":2552},{"prg":1,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":6324,"vs_size":3412,"fs_off":9736,"fs_size":1508},{"prg":2,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}]},"vs_off":11244,"vs_size":3560,"fs_off":14804,"fs_size":1756},{"prg":3,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":16560,"vs_size":4468,"fs_off":21028,"fs_size":2508},{"prg":4,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":23536,"vs_size":4468,"fs_off":28004,"fs_size":2508},{"prg":5,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":30512,"vs_size":4440,"fs_off":34952,"fs_size":2084},{"prg":6,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":37036,"vs_size":3768,"fs_off":40804,"fs_size":2084},{"prg":7,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":42888,"vs_size":3104,"fs_off":45992,"fs_size":1992},{"prg":8,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":47984,"vs_size":3104,"fs_off":51088,"fs_size":1992},{"prg":9,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":53080,"vs_size":3352,"fs_off":56432,"fs_size":1336},{"prg":10,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":57768,"vs_size":3352,"fs_off":61120,"fs_size":1336},{"prg":11,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":62456,"vs_size":3692,"fs_off":66148,"fs_size":1904},{"prg":12,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":68052,"vs_size":2716,"fs_off":70768,"fs_size":1336},{"prg":13,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":72104,"vs_size":5084,"fs_off":77188,"fs_size":1332},{"prg":14,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":78520,"vs_size":3696,"fs_off":82216,"fs_size":2092},{"prg":15,"info":{"vs_uni":0,"fs_uni":-1,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":84308,"vs_size":5436,"fs_off":89744,"fs_size":1800},{"prg":16,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}]},"vs_off":91544,"vs_size":5452,"fs_off":96996,"fs_size":1828},{"prg":17,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":98824,"vs_size":3988,"fs_off":102812,"fs_size":1508},{"prg":18,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":104320,"vs_size":3516,"fs_off":107836,"fs_size":1716},{"prg":19,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":109552,"vs_size":1820,"fs_off":111372,"fs_size":1416},{"prg":20,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":112788,"vs_size":2064,"fs_off":114852,"fs_size":1416},{"prg":21,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":116268,"vs_size":3640,"fs_off":119908,"fs_size":1540},{"prg":22,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":121448,"vs_size":4140,"fs_off":125588,"fs_size":1540},{"prg":23,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":127128,"vs_size":5812,"fs_off":132940,"fs_size":1868},{"prg":24,"info":{"vs_uni":0,"fs_uni":-1,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":134808,"vs_size":4976,"fs_off":139784,"fs_size":832},{"prg":25,"info":{"vs_uni":0,"fs_uni":-1,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":140616,"vs_size":4440,"fs_off":145056,"fs_size":1984},{"prg":26,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":147040,"vs_size":5928,"fs_off":152968,"fs_size":4644},{"prg":27,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":157612,"vs_size":5928,"fs_off":163540,"fs_size":4240},{"prg":28,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":167780,"vs_size":5228,"fs_off":173008,"fs_size":2332},{"prg":29,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":175340,"vs_size":4772,"fs_off":180112,"fs_size":3332},{"prg":30,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":183444,"vs_size":3624,"fs_off":187068,"fs_size":2344},{"prg":31,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":189412,"vs_size":4468,"fs_off":193880,"fs_size":2508},{"prg":32,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":196388,"vs_size":4468,"fs_off":200856,"fs_size":2508},{"prg":33,"info":{"vs_uni":-1,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":203364,"vs_size":1104,"fs_off":204468,"fs_size":992},{"prg":34,"info":{"vs_uni":-1,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":205460,"vs_size":920,"fs_off":206380,"fs_size":1180},{"prg":35,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":207560,"vs_size":2044,"fs_off":209604,"fs_size":1904},{"prg":36,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":211508,"vs_size":2416,"fs_off":213924,"fs_size":1856},{"prg":37,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":215780,"vs_size":1880,"fs_off":217660,"fs_size":1628},{"prg":38,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":219288,"vs_size":1880,"fs_off":221168,"fs_size":1692},{"prg":39,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":222860,"vs_size":4280,"fs_off":227140,"fs_size":2552},{"prg":40,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":229692,"vs_size":4056,"fs_off":233748,"fs_size":1508},{"prg":41,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}]},"vs_off":235256,"vs_size":4204,"fs_off":239460,"fs_size":1756},{"prg":42,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":241216,"vs_size":4904,"fs_off":246120,"fs_size":2508},{"prg":43,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":248628,"vs_size":4904,"fs_off":253532,"fs_size":2508},{"prg":44,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":256040,"vs_size":4904,"fs_off":260944,"fs_size":2508},{"prg":45,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":263452,"vs_size":4904,"fs_off":268356,"fs_size":2508},{"prg":46,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":270864,"vs_size":4928,"fs_off":275792,"fs_size":2084},{"prg":47,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":277876,"vs_size":4412,"fs_off":282288,"fs_size":2084},{"prg":48,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}]},"vs_off":284372,"vs_size":6368,"fs_off":290740,"fs_size":3820},{"prg":49,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":294560,"vs_size":3492,"fs_off":298052,"fs_size":1616},{"prg":50,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":299668,"vs_size":5984,"fs_off":305652,"fs_size":2428},{"prg":51,"info":{"vs_uni":0,"fs_uni":-1,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":308080,"vs_size":1924,"fs_off":310004,"fs_size":4236},{"prg":52,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_smaaArea","idx":2,"frag":1},{"name":"u_smaaSearch","idx":3,"frag":1}]},"vs_off":314240,"vs_size":2300,"fs_off":316540,"fs_size":12356},{"prg":53,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_blendingWeightTex","idx":2,"frag":1}]},"vs_off":328896,"vs_size":1372,"fs_off":330268,"fs_size":3696}]
\ No newline at end of file
+[{"prg":0,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":0,"vs_size":3772,"fs_off":3772,"fs_size":2552},{"prg":1,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":6324,"vs_size":3412,"fs_off":9736,"fs_size":1508},{"prg":2,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}]},"vs_off":11244,"vs_size":3560,"fs_off":14804,"fs_size":1756},{"prg":3,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":16560,"vs_size":4468,"fs_off":21028,"fs_size":2508},{"prg":4,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":23536,"vs_size":4468,"fs_off":28004,"fs_size":2508},{"prg":5,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":30512,"vs_size":4440,"fs_off":34952,"fs_size":2084},{"prg":6,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":37036,"vs_size":3768,"fs_off":40804,"fs_size":2084},{"prg":7,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":42888,"vs_size":3768,"fs_off":46656,"fs_size":1760},{"prg":8,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":48416,"vs_size":3104,"fs_off":51520,"fs_size":1992},{"prg":9,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":53512,"vs_size":3104,"fs_off":56616,"fs_size":1992},{"prg":10,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":58608,"vs_size":3352,"fs_off":61960,"fs_size":1336},{"prg":11,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":63296,"vs_size":3352,"fs_off":66648,"fs_size":1336},{"prg":12,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":67984,"vs_size":3692,"fs_off":71676,"fs_size":1904},{"prg":13,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":73580,"vs_size":2716,"fs_off":76296,"fs_size":1336},{"prg":14,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":77632,"vs_size":5084,"fs_off":82716,"fs_size":1332},{"prg":15,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":84048,"vs_size":3696,"fs_off":87744,"fs_size":2092},{"prg":16,"info":{"vs_uni":0,"fs_uni":-1,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":89836,"vs_size":5436,"fs_off":95272,"fs_size":1800},{"prg":17,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}]},"vs_off":97072,"vs_size":5452,"fs_off":102524,"fs_size":1828},{"prg":18,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":104352,"vs_size":3988,"fs_off":108340,"fs_size":1508},{"prg":19,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":109848,"vs_size":3516,"fs_off":113364,"fs_size":1716},{"prg":20,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":115080,"vs_size":1820,"fs_off":116900,"fs_size":1416},{"prg":21,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":118316,"vs_size":2064,"fs_off":120380,"fs_size":1416},{"prg":22,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":121796,"vs_size":3640,"fs_off":125436,"fs_size":1540},{"prg":23,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":126976,"vs_size":4140,"fs_off":131116,"fs_size":1540},{"prg":24,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":132656,"vs_size":5812,"fs_off":138468,"fs_size":1868},{"prg":25,"info":{"vs_uni":0,"fs_uni":-1,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":140336,"vs_size":4976,"fs_off":145312,"fs_size":832},{"prg":26,"info":{"vs_uni":0,"fs_uni":-1,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":146144,"vs_size":4440,"fs_off":150584,"fs_size":1984},{"prg":27,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":152568,"vs_size":5928,"fs_off":158496,"fs_size":4644},{"prg":28,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":163140,"vs_size":5928,"fs_off":169068,"fs_size":4240},{"prg":29,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":173308,"vs_size":5228,"fs_off":178536,"fs_size":2332},{"prg":30,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":180868,"vs_size":4772,"fs_off":185640,"fs_size":3332},{"prg":31,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":188972,"vs_size":3624,"fs_off":192596,"fs_size":2344},{"prg":32,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":194940,"vs_size":4468,"fs_off":199408,"fs_size":2508},{"prg":33,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":201916,"vs_size":4468,"fs_off":206384,"fs_size":2508},{"prg":34,"info":{"vs_uni":-1,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":208892,"vs_size":1104,"fs_off":209996,"fs_size":992},{"prg":35,"info":{"vs_uni":-1,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":210988,"vs_size":920,"fs_off":211908,"fs_size":1180},{"prg":36,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":213088,"vs_size":2044,"fs_off":215132,"fs_size":1904},{"prg":37,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":217036,"vs_size":2416,"fs_off":219452,"fs_size":1856},{"prg":38,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":221308,"vs_size":1880,"fs_off":223188,"fs_size":1628},{"prg":39,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":224816,"vs_size":1880,"fs_off":226696,"fs_size":1692},{"prg":40,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":228388,"vs_size":4280,"fs_off":232668,"fs_size":2552},{"prg":41,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":235220,"vs_size":4056,"fs_off":239276,"fs_size":1508},{"prg":42,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}]},"vs_off":240784,"vs_size":4204,"fs_off":244988,"fs_size":1756},{"prg":43,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":246744,"vs_size":4904,"fs_off":251648,"fs_size":2508},{"prg":44,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":254156,"vs_size":4904,"fs_off":259060,"fs_size":2508},{"prg":45,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":261568,"vs_size":4904,"fs_off":266472,"fs_size":2508},{"prg":46,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":268980,"vs_size":4904,"fs_off":273884,"fs_size":2508},{"prg":47,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":276392,"vs_size":4928,"fs_off":281320,"fs_size":2084},{"prg":48,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":283404,"vs_size":4412,"fs_off":287816,"fs_size":2084},{"prg":49,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":289900,"vs_size":4412,"fs_off":294312,"fs_size":1760},{"prg":50,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}]},"vs_off":296072,"vs_size":6368,"fs_off":302440,"fs_size":3820},{"prg":51,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":306260,"vs_size":3492,"fs_off":309752,"fs_size":1616},{"prg":52,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":311368,"vs_size":5984,"fs_off":317352,"fs_size":2428},{"prg":53,"info":{"vs_uni":0,"fs_uni":-1,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":319780,"vs_size":1924,"fs_off":321704,"fs_size":4236},{"prg":54,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_smaaArea","idx":2,"frag":1},{"name":"u_smaaSearch","idx":3,"frag":1}]},"vs_off":325940,"vs_size":2300,"fs_off":328240,"fs_size":12356},{"prg":55,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_blendingWeightTex","idx":2,"frag":1}]},"vs_off":340596,"vs_size":1372,"fs_off":341968,"fs_size":3696}]
\ No newline at end of file
diff --git a/data/vulkan_shaders/shaders_pack.spv b/data/vulkan_shaders/shaders_pack.spv
index 86b20c1433..7473733c3f 100644
Binary files a/data/vulkan_shaders/shaders_pack.spv and b/data/vulkan_shaders/shaders_pack.spv differ
diff --git a/drape/drape_global.hpp b/drape/drape_global.hpp
index 68cb3d3b4d..17cdcf6aee 100644
--- a/drape/drape_global.hpp
+++ b/drape/drape_global.hpp
@@ -59,13 +59,15 @@ using DrapeID = uint64_t;
 struct FontDecl
 {
   FontDecl() = default;
-  FontDecl(Color const & color, float size, Color const & outlineColor = Color::Transparent())
-    : m_color(color), m_outlineColor(outlineColor), m_size(size)
+  FontDecl(Color const & color, float size, bool isSdf = true,
+           Color const & outlineColor = Color::Transparent())
+    : m_color(color), m_outlineColor(outlineColor), m_size(size), m_isSdf(isSdf)
   {}
 
   Color m_color = Color::Transparent();
   Color m_outlineColor = Color::Transparent();
   float m_size = 0;
+  bool m_isSdf = true;
 };
 
 struct TitleDecl
diff --git a/drape/drape_tests/font_texture_tests.cpp b/drape/drape_tests/font_texture_tests.cpp
index 8aadcf1275..a4576da3a1 100644
--- a/drape/drape_tests/font_texture_tests.cpp
+++ b/drape/drape_tests/font_texture_tests.cpp
@@ -100,9 +100,10 @@ UNIT_TEST(UploadingGlyphs)
   GlyphManager mng(args);
   DummyGlyphIndex index(m2::PointU(kTextureSize, kTextureSize), make_ref(&mng), make_ref(&glyphGenerator));
   size_t count = 1;  // invalid symbol glyph has mapped internally.
-  count += (index.MapResource(GlyphKey(0x58)) != nullptr) ? 1 : 0;
-  count += (index.MapResource(GlyphKey(0x59)) != nullptr) ? 1 : 0;
-  count += (index.MapResource(GlyphKey(0x61)) != nullptr) ? 1 : 0;
+  using dp::kDynamicGlyphSize;
+  count += (index.MapResource(GlyphKey(0x58, kDynamicGlyphSize)) != nullptr) ? 1 : 0;
+  count += (index.MapResource(GlyphKey(0x59, kDynamicGlyphSize)) != nullptr) ? 1 : 0;
+  count += (index.MapResource(GlyphKey(0x61, kDynamicGlyphSize)) != nullptr) ? 1 : 0;
   while (index.GetPendingNodesCount() < count)
     ;
 
@@ -119,12 +120,12 @@ UNIT_TEST(UploadingGlyphs)
   index.UploadResources(make_ref(&context), make_ref(&tex));
 
   count = 0;
-  count += (index.MapResource(GlyphKey(0x68)) != nullptr) ? 1 : 0;
-  count += (index.MapResource(GlyphKey(0x30)) != nullptr) ? 1 : 0;
-  count += (index.MapResource(GlyphKey(0x62)) != nullptr) ? 1 : 0;
-  count += (index.MapResource(GlyphKey(0x65)) != nullptr) ? 1 : 0;
-  count += (index.MapResource(GlyphKey(0x400)) != nullptr) ? 1 : 0;
-  count += (index.MapResource(GlyphKey(0x401)) != nullptr) ? 1 : 0;
+  count += (index.MapResource(GlyphKey(0x68, kDynamicGlyphSize)) != nullptr) ? 1 : 0;
+  count += (index.MapResource(GlyphKey(0x30, kDynamicGlyphSize)) != nullptr) ? 1 : 0;
+  count += (index.MapResource(GlyphKey(0x62, kDynamicGlyphSize)) != nullptr) ? 1 : 0;
+  count += (index.MapResource(GlyphKey(0x65, kDynamicGlyphSize)) != nullptr) ? 1 : 0;
+  count += (index.MapResource(GlyphKey(0x400, kDynamicGlyphSize)) != nullptr) ? 1 : 0;
+  count += (index.MapResource(GlyphKey(0x401, kDynamicGlyphSize)) != nullptr) ? 1 : 0;
   while (index.GetPendingNodesCount() < count)
     ;
 
diff --git a/drape/drape_tests/glyph_mng_tests.cpp b/drape/drape_tests/glyph_mng_tests.cpp
index f48ca471cf..555921ed4c 100644
--- a/drape/drape_tests/glyph_mng_tests.cpp
+++ b/drape/drape_tests/glyph_mng_tests.cpp
@@ -50,7 +50,7 @@ public:
     std::vector<dp::Glyph> glyphs;
     auto generateGlyph = [this, &glyphs](strings::UniChar c)
     {
-      dp::Glyph g = m_mng->GetGlyph(c);
+      dp::Glyph g = m_mng->GetGlyph(c, dp::kDynamicGlyphSize);
       glyphs.push_back(dp::GlyphManager::GenerateGlyph(g, m_mng->GetSdfScale()));
       g.m_image.Destroy();
     };
diff --git a/drape/font_constants.hpp b/drape/font_constants.hpp
index cca4896d79..225397fd89 100644
--- a/drape/font_constants.hpp
+++ b/drape/font_constants.hpp
@@ -3,4 +3,5 @@
 namespace dp
 {
 uint32_t constexpr kSdfBorder = 4;
+int constexpr kDynamicGlyphSize = -1;
 }  // namespace dp
diff --git a/drape/font_texture.cpp b/drape/font_texture.cpp
index 4073b1c3fe..137b1c1fc6 100644
--- a/drape/font_texture.cpp
+++ b/drape/font_texture.cpp
@@ -81,7 +81,8 @@ m2::RectF GlyphPacker::MapTextureCoords(const m2::RectU & pixelRect) const
 
 bool GlyphPacker::IsFull() const { return m_isFull; }
 
-GlyphIndex::GlyphIndex(m2::PointU const & size, ref_ptr<GlyphManager> mng, ref_ptr<GlyphGenerator> generator)
+GlyphIndex::GlyphIndex(m2::PointU const & size, ref_ptr<GlyphManager> mng,
+                       ref_ptr<GlyphGenerator> generator)
   : m_packer(size)
   , m_mng(mng)
   , m_generator(generator)
@@ -95,7 +96,7 @@ GlyphIndex::GlyphIndex(m2::PointU const & size, ref_ptr<GlyphManager> mng, ref_p
   uint32_t constexpr kPredefinedGlyphsCount = 128;
   for (uint32_t i = 0; i < kPredefinedGlyphsCount; ++i)
   {
-    auto const key = GlyphKey(i);
+    auto const key = GlyphKey(i, kDynamicGlyphSize);
 
     MapResource(key, newResource);
   }
@@ -157,7 +158,7 @@ ref_ptr<Texture::ResourceInfo> GlyphIndex::MapResource(GlyphKey const & key, boo
 
   newResource = true;
 
-  Glyph glyph = m_mng->GetGlyph(key.GetUnicodePoint());
+  Glyph glyph = m_mng->GetGlyph(key.GetUnicodePoint(), key.GetFixedSize());
   m2::RectU r;
   if (!m_packer.PackGlyph(glyph.m_image.m_width, glyph.m_image.m_height, r))
   {
@@ -169,8 +170,8 @@ ref_ptr<Texture::ResourceInfo> GlyphIndex::MapResource(GlyphKey const & key, boo
         "packerSize =", m_packer.GetSize()));
     }
 
-    auto const invalidGlyph = m_mng->GetInvalidGlyph();
-    auto invalidGlyphIndex = m_index.find(GlyphKey(invalidGlyph.m_code));
+    auto const invalidGlyph = m_mng->GetInvalidGlyph(key.GetFixedSize());
+    auto invalidGlyphIndex = m_index.find(GlyphKey(invalidGlyph.m_code, key.GetFixedSize()));
     if (invalidGlyphIndex != m_index.end())
     {
       newResource = false;
@@ -255,4 +256,17 @@ void GlyphIndex::UploadResources(ref_ptr<dp::GraphicsContext> context, ref_ptr<T
     glyph.m_image.Destroy();
   }
 }
+
+/*
+uint32_t GlyphIndex::GetAbsentGlyphsCount(strings::UniString const & text, int fixedHeight) const
+{
+  uint32_t count = 0;
+  for (strings::UniChar const & c : text)
+  {
+    if (m_index.find(GlyphKey(c, fixedHeight)) == m_index.end())
+      count++;
+  }
+  return count;
+}
+*/
 }  // namespace dp
diff --git a/drape/font_texture.hpp b/drape/font_texture.hpp
index f51c47a4e5..1775105629 100644
--- a/drape/font_texture.hpp
+++ b/drape/font_texture.hpp
@@ -34,20 +34,25 @@ private:
 class GlyphKey : public Texture::Key
 {
 public:
-  GlyphKey(strings::UniChar unicodePoint)
+  GlyphKey(strings::UniChar unicodePoint, int fixedSize)
     : m_unicodePoint(unicodePoint)
+    , m_fixedSize(fixedSize)
   {}
 
   Texture::ResourceType GetType() const override { return Texture::ResourceType::Glyph; }
   strings::UniChar GetUnicodePoint() const { return m_unicodePoint; }
+  int GetFixedSize() const { return m_fixedSize; }
 
   bool operator<(GlyphKey const & g) const
   {
+    if (m_unicodePoint == g.m_unicodePoint)
+      return m_fixedSize < g.m_fixedSize;
     return m_unicodePoint < g.m_unicodePoint;
   }
 
 private:
   strings::UniChar m_unicodePoint;
+  int m_fixedSize;
 };
 
 class GlyphInfo : public Texture::ResourceInfo
@@ -81,6 +86,8 @@ public:
 
   bool CanBeGlyphPacked(uint32_t glyphsCount) const;
 
+  //uint32_t GetAbsentGlyphsCount(strings::UniString const & text, int fixedHeight) const;
+
   // ONLY for unit-tests. DO NOT use this function anywhere else.
   size_t GetPendingNodesCount();
 
@@ -126,6 +133,11 @@ public:
     return m_index.CanBeGlyphPacked(newKeysCount);
   }
 
+//  uint32_t GetAbsentGlyphsCount(strings::UniString const & text, int fixedHeight) const
+//  {
+//    return m_index.GetAbsentGlyphsCount(text, fixedHeight);
+//  }
+
 private:
   GlyphIndex m_index;
 };
diff --git a/drape/glyph.hpp b/drape/glyph.hpp
index 350cebdd2c..bfd1494047 100644
--- a/drape/glyph.hpp
+++ b/drape/glyph.hpp
@@ -46,6 +46,7 @@ struct Glyph
   GlyphImage m_image;
   int m_fontIndex;
   strings::UniChar m_code;
+  int m_fixedSize;
 };
 }  // namespace dp
 
diff --git a/drape/glyph_manager.cpp b/drape/glyph_manager.cpp
index 8940d223d7..cf26b13f0f 100644
--- a/drape/glyph_manager.cpp
+++ b/drape/glyph_manager.cpp
@@ -146,9 +146,9 @@ public:
 
   bool HasGlyph(strings::UniChar unicodePoint) const { return FT_Get_Char_Index(m_fontFace, unicodePoint) != 0; }
 
-  Glyph GetGlyph(strings::UniChar unicodePoint, uint32_t baseHeight) const
+  Glyph GetGlyph(strings::UniChar unicodePoint, uint32_t baseHeight, bool isSdf) const
   {
-    uint32_t const glyphHeight = baseHeight * m_sdfScale;
+    uint32_t const glyphHeight = isSdf ? baseHeight * m_sdfScale : baseHeight;
 
     FREETYPE_CHECK(FT_Set_Pixel_Sizes(m_fontFace, glyphHeight, glyphHeight));
     FREETYPE_CHECK(FT_Load_Glyph(m_fontFace, FT_Get_Char_Index(m_fontFace, unicodePoint), FT_LOAD_RENDER));
@@ -161,19 +161,39 @@ public:
 
     FT_Bitmap const bitmap = m_fontFace->glyph->bitmap;
 
-    float const scale = 1.0f / m_sdfScale;
+    float const scale = isSdf ? 1.0f / m_sdfScale : 1.0f;
 
     SharedBufferManager::shared_buffer_ptr_t data;
     uint32_t imageWidth = bitmap.width;
     uint32_t imageHeight = bitmap.rows;
     if (bitmap.buffer != nullptr)
     {
-      sdf_image::SdfImage const img(bitmap.rows, bitmap.pitch, bitmap.buffer, m_sdfScale * kSdfBorder);
-      imageWidth = std::round(img.GetWidth() * scale);
-      imageHeight = std::round(img.GetHeight() * scale);
+      if (isSdf)
+      {
+        sdf_image::SdfImage const img(bitmap.rows, bitmap.pitch, bitmap.buffer, m_sdfScale * kSdfBorder);
+        imageWidth = std::round(img.GetWidth() * scale);
+        imageHeight = std::round(img.GetHeight() * scale);
 
-      data = SharedBufferManager::instance().reserveSharedBuffer(bitmap.rows * bitmap.pitch);
-      std::memcpy(data->data(), bitmap.buffer, data->size());
+        data = SharedBufferManager::instance().reserveSharedBuffer(bitmap.rows * bitmap.pitch);
+        std::memcpy(data->data(), bitmap.buffer, data->size());
+      }
+      else
+      {
+        imageHeight += 2 * kSdfBorder;
+        imageWidth += 2 * kSdfBorder;
+
+        data = SharedBufferManager::instance().reserveSharedBuffer(imageWidth * imageHeight);
+        auto ptr = data->data();
+        std::memset(ptr, 0, data->size());
+
+        for (size_t row = kSdfBorder; row < bitmap.rows + kSdfBorder; ++row)
+        {
+          size_t const dstBaseIndex = row * imageWidth + kSdfBorder;
+          size_t const srcBaseIndex = (row - kSdfBorder) * bitmap.pitch;
+          for (int column = 0; column < bitmap.pitch; ++column)
+            ptr[dstBaseIndex + column] = bitmap.buffer[srcBaseIndex + column];
+        }
+      }
     }
 
     Glyph result;
@@ -183,6 +203,7 @@ public:
                         bbox.xMin * scale, bbox.yMin * scale, true};
 
     result.m_code = unicodePoint;
+    result.m_fixedSize = isSdf ? kDynamicGlyphSize : static_cast<int>(baseHeight);
     FT_Done_Glyph(glyph);
 
     return result;
@@ -211,14 +232,14 @@ public:
 
   static void Close(FT_Stream) {}
 
-  void MarkGlyphReady(strings::UniChar code)
+  void MarkGlyphReady(strings::UniChar code, int fixedHeight)
   {
-    m_readyGlyphs.emplace(code);
+    m_readyGlyphs.emplace(code, fixedHeight);
   }
 
-  bool IsGlyphReady(strings::UniChar code) const
+  bool IsGlyphReady(strings::UniChar code, int fixedHeight) const
   {
-    return m_readyGlyphs.find(code) != m_readyGlyphs.end();
+    return m_readyGlyphs.find(std::make_pair(code, fixedHeight)) != m_readyGlyphs.end();
   }
 
   std::string GetName() const { return std::string(m_fontFace->family_name) + ':' + m_fontFace->style_name; }
@@ -229,7 +250,7 @@ private:
   FT_Face m_fontFace;
   uint32_t m_sdfScale;
 
-  std::set<strings::UniChar> m_readyGlyphs;
+  std::set<std::pair<strings::UniChar, int>> m_readyGlyphs;
 };
 
 // Information about single unicode block.
@@ -526,14 +547,15 @@ int GlyphManager::FindFontIndexInBlock(UnicodeBlock const & block, strings::UniC
   return kInvalidFont;
 }
 
-Glyph GlyphManager::GetGlyph(strings::UniChar unicodePoint)
+Glyph GlyphManager::GetGlyph(strings::UniChar unicodePoint, int fixedHeight)
 {
   int const fontIndex = GetFontIndex(unicodePoint);
   if (fontIndex == kInvalidFont)
-    return GetInvalidGlyph();
+    return GetInvalidGlyph(fixedHeight);
 
   auto const & f = m_impl->m_fonts[fontIndex];
-  Glyph glyph = f->GetGlyph(unicodePoint, m_impl->m_baseGlyphHeight);
+  bool const isSdf = fixedHeight < 0;
+  Glyph glyph = f->GetGlyph(unicodePoint, isSdf ? m_impl->m_baseGlyphHeight : fixedHeight, isSdf);
   glyph.m_fontIndex = fontIndex;
   return glyph;
 }
@@ -547,18 +569,29 @@ Glyph GlyphManager::GenerateGlyph(Glyph const & glyph, uint32_t sdfScale)
     resultGlyph.m_metrics = glyph.m_metrics;
     resultGlyph.m_fontIndex = glyph.m_fontIndex;
     resultGlyph.m_code = glyph.m_code;
-    sdf_image::SdfImage img(glyph.m_image.m_bitmapRows, glyph.m_image.m_bitmapPitch,
-                            glyph.m_image.m_data->data(), sdfScale * kSdfBorder);
+    resultGlyph.m_fixedSize = glyph.m_fixedSize;
 
-    img.GenerateSDF(1.0f / static_cast<float>(sdfScale));
+    if (glyph.m_fixedSize < 0)
+    {
+      sdf_image::SdfImage img(glyph.m_image.m_bitmapRows, glyph.m_image.m_bitmapPitch,
+                              glyph.m_image.m_data->data(), sdfScale * kSdfBorder);
 
-    ASSERT_EQUAL(img.GetWidth(), glyph.m_image.m_width, ());
-    ASSERT_EQUAL(img.GetHeight(), glyph.m_image.m_height, ());
+      img.GenerateSDF(1.0f / static_cast<float>(sdfScale));
 
-    size_t const bufferSize = base::NextPowOf2(glyph.m_image.m_width * glyph.m_image.m_height);
-    resultGlyph.m_image.m_data = SharedBufferManager::instance().reserveSharedBuffer(bufferSize);
+      ASSERT_EQUAL(img.GetWidth(), glyph.m_image.m_width, ());
+      ASSERT_EQUAL(img.GetHeight(), glyph.m_image.m_height, ());
 
-    img.GetData(*resultGlyph.m_image.m_data);
+      size_t const bufferSize = base::NextPowOf2(glyph.m_image.m_width * glyph.m_image.m_height);
+      resultGlyph.m_image.m_data = SharedBufferManager::instance().reserveSharedBuffer(bufferSize);
+
+      img.GetData(*resultGlyph.m_image.m_data);
+    }
+    else
+    {
+      size_t const bufferSize = base::NextPowOf2(glyph.m_image.m_width * glyph.m_image.m_height);
+      resultGlyph.m_image.m_data = SharedBufferManager::instance().reserveSharedBuffer(bufferSize);
+      resultGlyph.m_image.m_data->assign(glyph.m_image.m_data->begin(), glyph.m_image.m_data->end());
+    }
 
     resultGlyph.m_image.m_width = glyph.m_image.m_width;
     resultGlyph.m_image.m_height = glyph.m_image.m_height;
@@ -574,10 +607,10 @@ void GlyphManager::MarkGlyphReady(Glyph const & glyph)
 {
   ASSERT_GREATER_OR_EQUAL(glyph.m_fontIndex, 0, ());
   ASSERT_LESS(glyph.m_fontIndex, static_cast<int>(m_impl->m_fonts.size()), ());
-  m_impl->m_fonts[glyph.m_fontIndex]->MarkGlyphReady(glyph.m_code);
+  m_impl->m_fonts[glyph.m_fontIndex]->MarkGlyphReady(glyph.m_code, glyph.m_fixedSize);
 }
 
-bool GlyphManager::AreGlyphsReady(strings::UniString const & str) const
+bool GlyphManager::AreGlyphsReady(strings::UniString const & str, int fixedSize) const
 {
   for (auto const & code : str)
   {
@@ -585,24 +618,28 @@ bool GlyphManager::AreGlyphsReady(strings::UniString const & str) const
     if (fontIndex == kInvalidFont)
       return false;
 
-    if (!m_impl->m_fonts[fontIndex]->IsGlyphReady(code))
+    if (!m_impl->m_fonts[fontIndex]->IsGlyphReady(code, fixedSize))
       return false;
   }
 
   return true;
 }
 
-Glyph const & GlyphManager::GetInvalidGlyph() const
+Glyph const & GlyphManager::GetInvalidGlyph(int fixedSize) const
 {
+  strings::UniChar constexpr kInvalidGlyphCode = 0x9;
+  int constexpr kFontId = 0;
+
   static bool s_inited = false;
   static Glyph s_glyph;
 
   if (!s_inited)
   {
-    strings::UniChar constexpr kInvalidGlyphCode = 0x9;
-    int constexpr kFontId = 0;
     ASSERT(!m_impl->m_fonts.empty(), ());
-    s_glyph = m_impl->m_fonts[kFontId]->GetGlyph(kInvalidGlyphCode, m_impl->m_baseGlyphHeight);
+    bool const isSdf = fixedSize < 0 ;
+    s_glyph = m_impl->m_fonts[kFontId]->GetGlyph(kInvalidGlyphCode,
+                                                 isSdf ? m_impl->m_baseGlyphHeight : fixedSize,
+                                                 isSdf);
     s_glyph.m_metrics.m_isValid = false;
     s_glyph.m_fontIndex = kFontId;
     s_glyph.m_code = kInvalidGlyphCode;
diff --git a/drape/glyph_manager.hpp b/drape/glyph_manager.hpp
index 9c1d371134..c02b7fbe26 100644
--- a/drape/glyph_manager.hpp
+++ b/drape/glyph_manager.hpp
@@ -32,12 +32,12 @@ public:
   explicit GlyphManager(Params const & params);
   ~GlyphManager();
 
-  Glyph GetGlyph(strings::UniChar unicodePoints);
+  Glyph GetGlyph(strings::UniChar unicodePoints, int fixedHeight);
 
   void MarkGlyphReady(Glyph const & glyph);
-  bool AreGlyphsReady(strings::UniString const & str) const;
+  bool AreGlyphsReady(strings::UniString const & str, int fixedSize) const;
 
-  Glyph const & GetInvalidGlyph() const;
+  Glyph const & GetInvalidGlyph(int fixedSize) const;
 
   uint32_t GetBaseGlyphHeight() const;
   uint32_t GetSdfScale() const;
diff --git a/drape/texture_manager.cpp b/drape/texture_manager.cpp
index abeb0a587e..b4dd8e63c3 100644
--- a/drape/texture_manager.cpp
+++ b/drape/texture_manager.cpp
@@ -296,14 +296,15 @@ void TextureManager::GetRegionBase(ref_ptr<Texture> tex, TextureManager::BaseReg
     m_nothingToUpload.clear();
 }
 
-void TextureManager::GetGlyphsRegions(ref_ptr<FontTexture> tex, strings::UniString const & text, TGlyphsBuffer & regions)
+void TextureManager::GetGlyphsRegions(ref_ptr<FontTexture> tex, strings::UniString const & text,
+                                      int fixedHeight, TGlyphsBuffer & regions)
 {
   ASSERT(tex != nullptr, ());
 
   std::vector<GlyphKey> keys;
   keys.reserve(text.size());
   for (auto const c : text)
-    keys.emplace_back(c);
+    keys.emplace_back(c, fixedHeight);
 
   bool hasNew = false;
   auto resourcesInfo = tex->FindResources(keys, hasNew);
@@ -324,25 +325,27 @@ void TextureManager::GetGlyphsRegions(ref_ptr<FontTexture> tex, strings::UniStri
     m_nothingToUpload.clear();
 }
 
-uint32_t TextureManager::GetNumberOfUnfoundCharacters(strings::UniString const & text, HybridGlyphGroup const & group)
+uint32_t TextureManager::GetNumberOfUnfoundCharacters(strings::UniString const & text, int fixedHeight,
+                                                      HybridGlyphGroup const & group)
 {
   uint32_t cnt = 0;
   for (auto const c : text)
   {
-    if (group.m_glyphs.find(c) == group.m_glyphs.end())
+    if (group.m_glyphs.find(std::make_pair(c, fixedHeight)) == group.m_glyphs.end())
       cnt++;
   }
 
   return cnt;
 }
 
-void TextureManager::MarkCharactersUsage(strings::UniString const & text, HybridGlyphGroup & group)
+void TextureManager::MarkCharactersUsage(strings::UniString const & text, int fixedHeight,
+                                         HybridGlyphGroup & group)
 {
   for (auto const & c : text)
-    group.m_glyphs.emplace(c);
+    group.m_glyphs.emplace(c, fixedHeight);
 }
 
-size_t TextureManager::FindHybridGlyphsGroup(strings::UniString const & text)
+size_t TextureManager::FindHybridGlyphsGroup(strings::UniString const & text, int fixedHeight)
 {
   if (m_hybridGlyphGroups.empty())
   {
@@ -367,12 +370,12 @@ size_t TextureManager::FindHybridGlyphsGroup(strings::UniString const & text)
   // Looking for a hybrid texture which contains text entirely.
   for (size_t i = 0; i < m_hybridGlyphGroups.size() - 1; i++)
   {
-    if (GetNumberOfUnfoundCharacters(text, m_hybridGlyphGroups[i]) == 0)
+    if (GetNumberOfUnfoundCharacters(text, fixedHeight, m_hybridGlyphGroups[i]) == 0)
       return i;
   }
 
   // Check if we can contain text in the last hybrid texture.
-  uint32_t const unfoundChars = GetNumberOfUnfoundCharacters(text, group);
+  uint32_t const unfoundChars = GetNumberOfUnfoundCharacters(text, fixedHeight, group);
   uint32_t const newCharsCount = static_cast<uint32_t>(group.m_glyphs.size()) + unfoundChars;
   if (newCharsCount >= m_maxGlypsCount || !group.m_texture->HasEnoughSpace(unfoundChars))
     m_hybridGlyphGroups.push_back(HybridGlyphGroup());
@@ -380,12 +383,12 @@ size_t TextureManager::FindHybridGlyphsGroup(strings::UniString const & text)
   return m_hybridGlyphGroups.size() - 1;
 }
 
-size_t TextureManager::FindHybridGlyphsGroup(TMultilineText const & text)
+size_t TextureManager::FindHybridGlyphsGroup(TMultilineText const & text, int fixedHeight)
 {
   strings::UniString combinedString;
   MultilineTextToUniString(text, combinedString);
 
-  return FindHybridGlyphsGroup(combinedString);
+  return FindHybridGlyphsGroup(combinedString, fixedHeight);
 }
 
 void TextureManager::Init(ref_ptr<dp::GraphicsContext> context, Params const & params)
@@ -571,22 +574,49 @@ void TextureManager::GetColorRegion(Color const & color, ColorRegion & region)
   GetRegionBase(make_ref(m_colorTexture), region, ColorKey(color));
 }
 
-void TextureManager::GetGlyphRegions(TMultilineText const & text, TMultilineGlyphsBuffer & buffers)
+void TextureManager::GetGlyphRegions(TMultilineText const & text, int fixedHeight,
+                                     TMultilineGlyphsBuffer & buffers)
 {
   std::lock_guard<std::mutex> lock(m_calcGlyphsMutex);
-  CalcGlyphRegions<TMultilineText, TMultilineGlyphsBuffer>(text, buffers);
+  CalcGlyphRegions<TMultilineText, TMultilineGlyphsBuffer>(text, fixedHeight, buffers);
 }
 
-void TextureManager::GetGlyphRegions(strings::UniString const & text, TGlyphsBuffer & regions)
+void TextureManager::GetGlyphRegions(strings::UniString const & text, int fixedHeight,
+                                     TGlyphsBuffer & regions)
 {
   std::lock_guard<std::mutex> lock(m_calcGlyphsMutex);
-  CalcGlyphRegions<strings::UniString, TGlyphsBuffer>(text, regions);
+  CalcGlyphRegions<strings::UniString, TGlyphsBuffer>(text, fixedHeight, regions);
 }
 
-bool TextureManager::AreGlyphsReady(strings::UniString const & str) const
+/*
+uint32_t TextureManager::GetAbsentGlyphsCount(ref_ptr<Texture> texture,
+                                              strings::UniString const & text,
+                                              int fixedHeight) const
+{
+  if (texture == nullptr)
+    return 0;
+
+  ASSERT(dynamic_cast<FontTexture *>(texture.get()) != nullptr, ());
+  return static_cast<FontTexture *>(texture.get())->GetAbsentGlyphsCount(text, fixedHeight);
+}
+
+uint32_t TextureManager::GetAbsentGlyphsCount(ref_ptr<Texture> texture, TMultilineText const & text,
+                                              int fixedHeight) const
+{
+  if (texture == nullptr)
+    return 0;
+
+  uint32_t count = 0;
+  for (size_t i = 0; i < text.size(); ++i)
+    count += GetAbsentGlyphsCount(texture, text[i], fixedHeight);
+  return count;
+}
+*/
+
+bool TextureManager::AreGlyphsReady(strings::UniString const & str, int fixedHeight) const
 {
   CHECK(m_isInitialized, ());
-  return m_glyphManager->AreGlyphsReady(str);
+  return m_glyphManager->AreGlyphsReady(str, fixedHeight);
 }
 
 ref_ptr<Texture> TextureManager::GetSymbolsTexture() const
diff --git a/drape/texture_manager.hpp b/drape/texture_manager.hpp
index 90340382dc..d4bef159ab 100644
--- a/drape/texture_manager.hpp
+++ b/drape/texture_manager.hpp
@@ -100,10 +100,10 @@ public:
   using TGlyphsBuffer = buffer_vector<GlyphRegion, 128>;
   using TMultilineGlyphsBuffer = buffer_vector<TGlyphsBuffer, 4>;
 
-  void GetGlyphRegions(TMultilineText const & text, TMultilineGlyphsBuffer & buffers);
-  void GetGlyphRegions(strings::UniString const & text, TGlyphsBuffer & regions);
+  void GetGlyphRegions(TMultilineText const & text, int fixedHeight, TMultilineGlyphsBuffer & buffers);
+  void GetGlyphRegions(strings::UniString const & text, int fixedHeight, TGlyphsBuffer & regions);
   // This method must be called only on Frontend renderer's thread.
-  bool AreGlyphsReady(strings::UniString const & str) const;
+  bool AreGlyphsReady(strings::UniString const & str, int fixedHeight) const;
 
   // On some devices OpenGL driver can't resolve situation when we upload to a texture on a thread
   // and use this texture to render on another thread. By this we move UpdateDynamicTextures call
@@ -147,7 +147,7 @@ private:
       : m_texture(nullptr)
     {}
 
-    std::set<strings::UniChar> m_glyphs;
+    std::set<std::pair<strings::UniChar, int>> m_glyphs;
     ref_ptr<Texture> m_texture;
   };
 
@@ -157,34 +157,37 @@ private:
   ref_ptr<Texture> AllocateGlyphTexture();
   void GetRegionBase(ref_ptr<Texture> tex, TextureManager::BaseRegion & region, Texture::Key const & key);
 
-  void GetGlyphsRegions(ref_ptr<FontTexture> tex, strings::UniString const & text, TGlyphsBuffer & regions);
+  void GetGlyphsRegions(ref_ptr<FontTexture> tex, strings::UniString const & text,
+                        int fixedHeight, TGlyphsBuffer & regions);
 
-  size_t FindHybridGlyphsGroup(strings::UniString const & text);
-  size_t FindHybridGlyphsGroup(TMultilineText const & text);
+  size_t FindHybridGlyphsGroup(strings::UniString const & text, int fixedHeight);
+  size_t FindHybridGlyphsGroup(TMultilineText const & text, int fixedHeight);
 
-  static uint32_t GetNumberOfUnfoundCharacters(strings::UniString const & text, HybridGlyphGroup const & group) ;
+  static uint32_t GetNumberOfUnfoundCharacters(strings::UniString const & text, int fixedHeight,
+                                        HybridGlyphGroup const & group) ;
 
-  static void MarkCharactersUsage(strings::UniString const & text, HybridGlyphGroup & group);
+  static void MarkCharactersUsage(strings::UniString const & text, int fixedHeight, HybridGlyphGroup & group);
 
   template<typename TGlyphGroup>
-  void FillResultBuffer(strings::UniString const & text, TGlyphGroup & group, TGlyphsBuffer & regions)
+  void FillResultBuffer(strings::UniString const & text, int fixedHeight, TGlyphGroup & group,
+                        TGlyphsBuffer & regions)
   {
     if (group.m_texture == nullptr)
       group.m_texture = AllocateGlyphTexture();
 
-    GetGlyphsRegions(group.m_texture, text, regions);
+    GetGlyphsRegions(group.m_texture, text, fixedHeight, regions);
   }
 
   template<typename TGlyphGroup>
-  void FillResults(strings::UniString const & text, TGlyphsBuffer & buffers,
+  void FillResults(strings::UniString const & text, int fixedHeight, TGlyphsBuffer & buffers,
                    TGlyphGroup & group)
   {
-    MarkCharactersUsage(text, group);
-    FillResultBuffer<TGlyphGroup>(text, group, buffers);
+    MarkCharactersUsage(text, fixedHeight, group);
+    FillResultBuffer<TGlyphGroup>(text, fixedHeight, group, buffers);
   }
 
   template<typename TGlyphGroup>
-  void FillResults(TMultilineText const & text, TMultilineGlyphsBuffer & buffers,
+  void FillResults(TMultilineText const & text, int fixedHeight, TMultilineGlyphsBuffer & buffers,
                    TGlyphGroup & group)
   {
      buffers.resize(text.size());
@@ -192,20 +195,25 @@ private:
      {
        strings::UniString const & str = text[i];
        TGlyphsBuffer & buffer = buffers[i];
-       FillResults<TGlyphGroup>(str, buffer, group);
+       FillResults<TGlyphGroup>(str, fixedHeight, buffer, group);
      }
   }
 
   template<typename TText, typename TBuffer>
-  void CalcGlyphRegions(TText const & text, TBuffer & buffers)
+  void CalcGlyphRegions(TText const & text, int fixedHeight, TBuffer & buffers)
   {
     CHECK(m_isInitialized, ());
-    size_t const hybridGroupIndex = FindHybridGlyphsGroup(text);
+    size_t const hybridGroupIndex = FindHybridGlyphsGroup(text, fixedHeight);
     ASSERT(hybridGroupIndex != GetInvalidGlyphGroup(), ());
     HybridGlyphGroup & group = m_hybridGlyphGroups[hybridGroupIndex];
-    FillResults<HybridGlyphGroup>(text, buffers, group);
+    FillResults<HybridGlyphGroup>(text, fixedHeight, buffers, group);
   }
 
+//  uint32_t GetAbsentGlyphsCount(ref_ptr<Texture> texture, strings::UniString const & text,
+//                                int fixedHeight) const;
+//  uint32_t GetAbsentGlyphsCount(ref_ptr<Texture> texture, TMultilineText const & text,
+//                                int fixedHeight) const;
+
   void UpdateGlyphTextures(ref_ptr<dp::GraphicsContext> context);
   bool HasAsyncRoutines() const;
 
diff --git a/drape_frontend/apply_feature_functors.cpp b/drape_frontend/apply_feature_functors.cpp
index 9638c75684..f0e57befe5 100644
--- a/drape_frontend/apply_feature_functors.cpp
+++ b/drape_frontend/apply_feature_functors.cpp
@@ -166,6 +166,8 @@ void CaptionDefProtoToFontDecl(CaptionDefProto const * capRule, dp::FontDecl & p
 
   if (capRule->stroke_color() != 0)
     params.m_outlineColor = ToDrapeColor(capRule->stroke_color());
+  else
+    params.m_isSdf = df::VisualParams::Instance().IsSdfPrefered();
 }
 
 void ShieldRuleProtoToFontDecl(ShieldRuleProto const * shieldRule, dp::FontDecl & params)
@@ -175,6 +177,8 @@ void ShieldRuleProtoToFontDecl(ShieldRuleProto const * shieldRule, dp::FontDecl
   params.m_size = static_cast<float>(std::max(kMinVisibleFontSize, shieldRule->height() * vs));
   if (shieldRule->text_stroke_color() != 0)
     params.m_outlineColor = ToDrapeColor(shieldRule->text_stroke_color());
+  else
+    params.m_isSdf = df::VisualParams::Instance().IsSdfPrefered();
 }
 
 dp::Anchor GetAnchor(int offsetX, int offsetY)
@@ -933,7 +937,7 @@ void ApplyLineFeatureAdditional::GetRoadShieldsViewParams(ref_ptr<dp::TextureMan
   textParams.m_startOverlayRank = dp::OverlayRank1;
 
   TextLayout textLayout;
-  textLayout.Init(strings::MakeUniString(roadNumber), font.m_size, texMng);
+  textLayout.Init(strings::MakeUniString(roadNumber), font.m_size, font.m_isSdf, texMng);
 
   // Calculate width and height of a shield.
   shieldPixelSize.x = textLayout.GetPixelLength() + 2.0 * borderWidth;
diff --git a/drape_frontend/gui/gui_text.cpp b/drape_frontend/gui/gui_text.cpp
index dab5ac4ee3..1c221f5f96 100644
--- a/drape_frontend/gui/gui_text.cpp
+++ b/drape_frontend/gui/gui_text.cpp
@@ -131,7 +131,7 @@ void StaticLabel::CacheStaticText(std::string const & text, char const * delim,
     result.m_alphabet.insert(str.begin(), str.end());
 
   dp::TextureManager::TMultilineGlyphsBuffer buffers;
-  mng->GetGlyphRegions(textParts, buffers);
+  mng->GetGlyphRegions(textParts, dp::kDynamicGlyphSize, buffers);
 
 #ifdef DEBUG
   ASSERT_EQUAL(textParts.size(), buffers.size(), ());
@@ -308,7 +308,7 @@ ref_ptr<dp::Texture> MutableLabel::SetAlphabet(std::string const & alphabet,
   base::SortUnique(str);
 
   dp::TextureManager::TGlyphsBuffer buffer;
-  mng->GetGlyphRegions(str, buffer);
+  mng->GetGlyphRegions(str, dp::kDynamicGlyphSize, buffer);
   m_alphabet.reserve(buffer.size());
 
   ASSERT_EQUAL(str.size(), buffer.size(), ());
@@ -495,7 +495,8 @@ bool MutableLabelHandle::Update(ScreenBase const & screen)
     for (auto const & node : m_textView->GetAlphabet())
       alphabetStr.push_back(node.first);
 
-    m_glyphsReady = m_textureManager->AreGlyphsReady(alphabetStr);
+    m_glyphsReady = m_textureManager->AreGlyphsReady(alphabetStr,
+      dp::kDynamicGlyphSize);
   }
 
   if (!m_glyphsReady)
@@ -592,7 +593,7 @@ StaticLabelHandle::StaticLabelHandle(uint32_t id, ref_ptr<dp::TextureManager> te
 bool StaticLabelHandle::Update(ScreenBase const & screen)
 {
   if (!m_glyphsReady)
-    m_glyphsReady = m_textureManager->AreGlyphsReady(m_alphabet);
+    m_glyphsReady = m_textureManager->AreGlyphsReady(m_alphabet, dp::kDynamicGlyphSize);
 
   if (!m_glyphsReady)
     return false;
diff --git a/drape_frontend/path_text_handle.cpp b/drape_frontend/path_text_handle.cpp
index ba1424aef0..979a6ab470 100644
--- a/drape_frontend/path_text_handle.cpp
+++ b/drape_frontend/path_text_handle.cpp
@@ -252,11 +252,15 @@ end:
 }
 
 
-PathTextHandle::PathTextHandle(dp::OverlayID const & id, std::shared_ptr<PathTextContext> const & context,
-                               float depth, uint32_t textIndex, uint64_t priority,
-                               ref_ptr<dp::TextureManager> textureManager, int minVisibleScale, bool isBillboard)
+PathTextHandle::PathTextHandle(dp::OverlayID const & id,
+                               std::shared_ptr<PathTextContext> const & context,
+                               float depth, uint32_t textIndex,
+                               uint64_t priority, int fixedHeight,
+                               ref_ptr<dp::TextureManager> textureManager,
+                               int minVisibleScale,
+                               bool isBillboard)
   : TextHandle(id, context->GetLayout()->GetText(), dp::Center, priority,
-               textureManager, minVisibleScale, isBillboard)
+               fixedHeight, textureManager, minVisibleScale, isBillboard)
   , m_context(context)
   , m_textIndex(textIndex)
   , m_depth(depth)
diff --git a/drape_frontend/path_text_handle.hpp b/drape_frontend/path_text_handle.hpp
index 343deeae84..737d2020ee 100644
--- a/drape_frontend/path_text_handle.hpp
+++ b/drape_frontend/path_text_handle.hpp
@@ -46,8 +46,11 @@ private:
 class PathTextHandle : public df::TextHandle
 {
 public:
-  PathTextHandle(dp::OverlayID const & id, std::shared_ptr<PathTextContext> const & context, float depth,
-                 uint32_t textIndex, uint64_t priority, ref_ptr<dp::TextureManager> textureManager,
+  PathTextHandle(dp::OverlayID const & id,
+                 std::shared_ptr<PathTextContext> const & context,
+                 float depth, uint32_t textIndex,
+                 uint64_t priority, int fixedHeight,
+                 ref_ptr<dp::TextureManager> textureManager,
                  int minVisibleScale, bool isBillboard);
 
   void BeforeUpdate() override;
diff --git a/drape_frontend/path_text_shape.cpp b/drape_frontend/path_text_shape.cpp
index 4d7899acc3..49a6d5ec2c 100644
--- a/drape_frontend/path_text_shape.cpp
+++ b/drape_frontend/path_text_shape.cpp
@@ -41,6 +41,7 @@ bool PathTextShape::CalculateLayout(ref_ptr<dp::TextureManager> textures)
                                                    ? m_params.m_mainText
                                                    : m_params.m_mainText + kSpaces + m_params.m_auxText),
                                                m_params.m_textFont.m_size,
+                                               m_params.m_textFont.m_isSdf,
                                                textures);
   uint32_t const glyphCount = layout->GetGlyphCount();
   if (glyphCount == 0)
@@ -77,8 +78,11 @@ void PathTextShape::DrawPathTextPlain(ref_ptr<dp::GraphicsContext> context,
   dp::TextureManager::ColorRegion color;
   textures->GetColorRegion(m_params.m_textFont.m_color, color);
 
-  auto state = CreateRenderState(gpu::Program::Text, DepthLayer::OverlayLayer);
-  state.SetProgram3d(gpu::Program::TextBillboard);
+  auto state = CreateRenderState(layout->GetFixedHeight() > 0 ?
+                                 gpu::Program::TextFixed : gpu::Program::Text,
+                                 DepthLayer::OverlayLayer);
+  state.SetProgram3d(layout->GetFixedHeight() > 0 ?
+                     gpu::Program::TextFixedBillboard : gpu::Program::TextBillboard);
   state.SetDepthTestEnabled(m_params.m_depthTestEnabled);
   state.SetColorTexture(color.GetTexture());
   state.SetMaskTexture(layout->GetMaskTexture());
@@ -150,8 +154,9 @@ drape_ptr<dp::OverlayHandle> PathTextShape::CreateOverlayHandle(uint32_t textInd
                           m_tileCoords, m_baseTextIndex + textIndex);
   auto const layout = m_context->GetLayout();
   auto const priority = GetOverlayPriority(textIndex, layout->GetText().size());
-  return make_unique_dp<PathTextHandle>(overlayId, m_context, m_params.m_depth, textIndex, priority,
-                                          textures, m_params.m_minVisibleScale, true /* isBillboard */);
+  return make_unique_dp<PathTextHandle>(overlayId, m_context, m_params.m_depth,
+                                        textIndex, priority, layout->GetFixedHeight(),
+                                        textures, m_params.m_minVisibleScale, true /* isBillboard */);
 }
 
 void PathTextShape::Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher> batcher,
diff --git a/drape_frontend/text_handle.cpp b/drape_frontend/text_handle.cpp
index 14b973a373..432c84cf9a 100644
--- a/drape_frontend/text_handle.cpp
+++ b/drape_frontend/text_handle.cpp
@@ -10,19 +10,24 @@
 
 namespace df
 {
-TextHandle::TextHandle(dp::OverlayID const & id, strings::UniString const & text, dp::Anchor anchor, uint64_t priority,
-                       ref_ptr<dp::TextureManager> textureManager, int minVisibleScale, bool isBillboard)
+TextHandle::TextHandle(dp::OverlayID const & id, strings::UniString const & text,
+                       dp::Anchor anchor, uint64_t priority, int fixedHeight,
+                       ref_ptr<dp::TextureManager> textureManager,
+                       int minVisibleScale, bool isBillboard)
   : OverlayHandle(id, anchor, priority, minVisibleScale, isBillboard)
   , m_forceUpdateNormals(false)
   , m_isLastVisible(false)
   , m_text(text)
   , m_textureManager(textureManager)
   , m_glyphsReady(false)
+  , m_fixedHeight(fixedHeight)
 {}
 
 TextHandle::TextHandle(dp::OverlayID const & id, strings::UniString const & text, dp::Anchor anchor,
-                       uint64_t priority, ref_ptr<dp::TextureManager> textureManager,
-                       gpu::TTextDynamicVertexBuffer && normals, int minVisibleScale, bool isBillboard)
+                       uint64_t priority, int fixedHeight,
+                       ref_ptr<dp::TextureManager> textureManager,
+                       gpu::TTextDynamicVertexBuffer && normals, int minVisibleScale,
+                       bool isBillboard)
   : OverlayHandle(id, anchor, priority, minVisibleScale, isBillboard)
   , m_buffer(std::move(normals))
   , m_forceUpdateNormals(false)
@@ -30,6 +35,7 @@ TextHandle::TextHandle(dp::OverlayID const & id, strings::UniString const & text
   , m_text(text)
   , m_textureManager(textureManager)
   , m_glyphsReady(false)
+  , m_fixedHeight(fixedHeight)
 {}
 
 void TextHandle::GetAttributeMutation(ref_ptr<dp::AttributeBufferMutator> mutator) const
@@ -60,7 +66,7 @@ void TextHandle::GetAttributeMutation(ref_ptr<dp::AttributeBufferMutator> mutato
 bool TextHandle::Update(ScreenBase const & screen)
 {
   if (!m_glyphsReady)
-    m_glyphsReady = m_textureManager->AreGlyphsReady(m_text);
+    m_glyphsReady = m_textureManager->AreGlyphsReady(m_text, m_fixedHeight);
 
   return m_glyphsReady;
 }
diff --git a/drape_frontend/text_handle.hpp b/drape_frontend/text_handle.hpp
index 713c10e5b1..2dd060350d 100644
--- a/drape_frontend/text_handle.hpp
+++ b/drape_frontend/text_handle.hpp
@@ -19,12 +19,12 @@ class TextHandle : public dp::OverlayHandle
 {
 public:
   TextHandle(dp::OverlayID const & id, strings::UniString const & text,
-             dp::Anchor anchor, uint64_t priority,
+             dp::Anchor anchor, uint64_t priority, int fixedHeight,
              ref_ptr<dp::TextureManager> textureManager,
              int minVisibleScale, bool isBillboard);
 
   TextHandle(dp::OverlayID const & id, strings::UniString const & text,
-             dp::Anchor anchor, uint64_t priority,
+             dp::Anchor anchor, uint64_t priority, int fixedHeight,
              ref_ptr<dp::TextureManager> textureManager,
              gpu::TTextDynamicVertexBuffer && normals,
              int minVisibleScale, bool IsBillboard);
@@ -51,5 +51,6 @@ private:
   strings::UniString m_text;
   ref_ptr<dp::TextureManager> m_textureManager;
   bool m_glyphsReady;
+  int m_fixedHeight;
 };
 }  // namespace df
diff --git a/drape_frontend/text_layout.cpp b/drape_frontend/text_layout.cpp
index 212e6eb780..8557584dd7 100644
--- a/drape_frontend/text_layout.cpp
+++ b/drape_frontend/text_layout.cpp
@@ -290,14 +290,16 @@ double GetTextMinPeriod(double pixelTextLength)
 }
 }  // namespace
 
-void TextLayout::Init(strings::UniString && text, float fontSize, ref_ptr<dp::TextureManager> textures)
+void TextLayout::Init(strings::UniString && text, float fontSize, bool isSdf, ref_ptr<dp::TextureManager> textures)
 {
   m_text = std::move(text);
   auto const & vpi = VisualParams::Instance();
   float const fontScale = static_cast<float>(vpi.GetFontScale());
   float const baseSize = static_cast<float>(vpi.GetGlyphBaseSize());
-  m_textSizeRatio = fontSize * fontScale / baseSize;
-  textures->GetGlyphRegions(m_text, m_metrics);
+  m_textSizeRatio = isSdf ? (fontSize * fontScale / baseSize) : 1.0f;
+  m_fixedHeight = isSdf ? dp::kDynamicGlyphSize
+                        : static_cast<int>(fontSize * fontScale);
+  textures->GetGlyphRegions(m_text, m_fixedHeight, m_metrics);
 }
 
 ref_ptr<dp::Texture> TextLayout::GetMaskTexture() const
@@ -330,7 +332,8 @@ float TextLayout::GetPixelLength() const
 
 float TextLayout::GetPixelHeight() const
 {
-  return m_textSizeRatio * VisualParams::Instance().GetGlyphBaseSize();
+  return m_fixedHeight > 0 ? m_fixedHeight
+                           : m_textSizeRatio * VisualParams::Instance().GetGlyphBaseSize();
 }
 
 strings::UniString const & TextLayout::GetText() const
@@ -338,8 +341,9 @@ strings::UniString const & TextLayout::GetText() const
   return m_text;
 }
 
-StraightTextLayout::StraightTextLayout(strings::UniString const & text, float fontSize,
-                                       ref_ptr<dp::TextureManager> textures, dp::Anchor anchor, bool forceNoWrap)
+StraightTextLayout::StraightTextLayout(strings::UniString const & text, float fontSize, bool isSdf,
+                                       ref_ptr<dp::TextureManager> textures, dp::Anchor anchor,
+                                       bool forceNoWrap)
 {
   strings::UniString visibleText = bidi::log2vis(text);
   // Possible if name has strange symbols only.
@@ -352,7 +356,7 @@ StraightTextLayout::StraightTextLayout(strings::UniString const & text, float fo
   else
     delimIndexes.push_back(visibleText.size());
 
-  TBase::Init(std::move(visibleText), fontSize, textures);
+  TBase::Init(std::move(visibleText), fontSize, isSdf, textures);
   CalculateOffsets(anchor, m_textSizeRatio, m_metrics, delimIndexes, m_offsets, m_pixelSize, m_rowsCount);
 }
 
@@ -422,10 +426,10 @@ void StraightTextLayout::CacheDynamicGeometry(glsl::vec2 const & pixelOffset,
 }
 
 PathTextLayout::PathTextLayout(m2::PointD const & tileCenter, strings::UniString const & text,
-                               float fontSize, ref_ptr<dp::TextureManager> textures)
+                               float fontSize, bool isSdf, ref_ptr<dp::TextureManager> textures)
   : m_tileCenter(tileCenter)
 {
-  Init(bidi::log2vis(text), fontSize, textures);
+  Init(bidi::log2vis(text), fontSize, isSdf, textures);
 }
 
 void PathTextLayout::CacheStaticGeometry(dp::TextureManager::ColorRegion const & colorRegion,
diff --git a/drape_frontend/text_layout.hpp b/drape_frontend/text_layout.hpp
index f791389792..38aa452748 100644
--- a/drape_frontend/text_layout.hpp
+++ b/drape_frontend/text_layout.hpp
@@ -30,12 +30,13 @@ class TextLayout
 public:
   virtual ~TextLayout() = default;
 
-  void Init(strings::UniString && text, float fontSize, ref_ptr<dp::TextureManager> textures);
+  void Init(strings::UniString && text, float fontSize, bool isSdf, ref_ptr<dp::TextureManager> textures);
 
   ref_ptr<dp::Texture> GetMaskTexture() const;
   uint32_t GetGlyphCount() const;
   float GetPixelLength() const;
   float GetPixelHeight() const;
+  int GetFixedHeight() const { return m_fixedHeight; }
   strings::UniString const & GetText() const;
 
 protected:
@@ -44,13 +45,14 @@ protected:
   dp::TextureManager::TGlyphsBuffer m_metrics;
   strings::UniString m_text;
   float m_textSizeRatio = 0.0f;
+  int m_fixedHeight = dp::kDynamicGlyphSize;
 };
 
 class StraightTextLayout : public TextLayout
 {
   using TBase = TextLayout;
 public:
-  StraightTextLayout(strings::UniString const & text, float fontSize,
+  StraightTextLayout(strings::UniString const & text, float fontSize, bool isSdf,
                      ref_ptr<dp::TextureManager> textures, dp::Anchor anchor, bool forceNoWrap);
 
   void CacheStaticGeometry(dp::TextureManager::ColorRegion const & colorRegion,
@@ -98,7 +100,7 @@ class PathTextLayout : public TextLayout
   using TBase = TextLayout;
 public:
   PathTextLayout(m2::PointD const & tileCenter, strings::UniString const & text,
-                 float fontSize, ref_ptr<dp::TextureManager> textures);
+                 float fontSize, bool isSdf, ref_ptr<dp::TextureManager> textures);
 
   void CacheStaticGeometry(dp::TextureManager::ColorRegion const & colorRegion,
                            dp::TextureManager::ColorRegion const & outlineRegion,
diff --git a/drape_frontend/text_shape.cpp b/drape_frontend/text_shape.cpp
index 6a230322c4..70f433cbef 100644
--- a/drape_frontend/text_shape.cpp
+++ b/drape_frontend/text_shape.cpp
@@ -29,9 +29,10 @@ public:
   StraightTextHandle(dp::OverlayID const & id, strings::UniString const & text,
                      dp::Anchor anchor, glsl::vec2 const & pivot,
                      glsl::vec2 const & pxSize, glsl::vec2 const & offset,
-                     uint64_t priority, ref_ptr<dp::TextureManager> textureManager, bool isOptional,
+                     uint64_t priority, int fixedHeight,
+                     ref_ptr<dp::TextureManager> textureManager, bool isOptional,
                      gpu::TTextDynamicVertexBuffer && normals, int minVisibleScale, bool isBillboard)
-    : TextHandle(id, text, anchor, priority, textureManager, std::move(normals), minVisibleScale,
+    : TextHandle(id, text, anchor, priority, fixedHeight, textureManager, std::move(normals), minVisibleScale,
                  isBillboard)
     , m_pivot(glsl::ToPoint(pivot))
     , m_offset(glsl::ToPoint(offset))
@@ -39,7 +40,8 @@ public:
     , m_isOptional(isOptional)
   {}
 
-  void SetDynamicSymbolSizes(StraightTextLayout const & layout, std::vector<m2::PointF> const & symbolSizes,
+  void SetDynamicSymbolSizes(StraightTextLayout const & layout,
+                             std::vector<m2::PointF> const & symbolSizes,
                              dp::Anchor symbolAnchor)
   {
     m_layout = make_unique_dp<StraightTextLayout>(layout);
@@ -238,7 +240,7 @@ void TextShape::Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher>
   ASSERT(!titleDecl.m_primaryText.empty(), ());
   StraightTextLayout primaryLayout(
       strings::MakeUniString(titleDecl.m_primaryText), titleDecl.m_primaryTextFont.m_size,
-      textures, titleDecl.m_anchor, titleDecl.m_forceNoWrap);
+      titleDecl.m_primaryTextFont.m_isSdf, textures, titleDecl.m_anchor, titleDecl.m_forceNoWrap);
 
 
   if (m_params.m_limitedText)
@@ -247,7 +249,8 @@ void TextShape::Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher>
     {
       float const newFontSize = titleDecl.m_primaryTextFont.m_size * m_params.m_limits.y / y;
       primaryLayout = StraightTextLayout(strings::MakeUniString(titleDecl.m_primaryText), newFontSize,
-                                         textures, titleDecl.m_anchor, titleDecl.m_forceNoWrap);
+                                         titleDecl.m_primaryTextFont.m_isSdf, textures,
+                                         titleDecl.m_anchor, titleDecl.m_forceNoWrap);
     }
   }
 
@@ -260,8 +263,8 @@ void TextShape::Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher>
   }
   else
   {
-    StraightTextLayout secondaryLayout{strings::MakeUniString(titleDecl.m_secondaryText),
-        titleDecl.m_secondaryTextFont.m_size, textures, titleDecl.m_anchor, titleDecl.m_forceNoWrap};
+    StraightTextLayout secondaryLayout{strings::MakeUniString(titleDecl.m_secondaryText), titleDecl.m_secondaryTextFont.m_size,
+        titleDecl.m_secondaryTextFont.m_isSdf, textures, titleDecl.m_anchor, titleDecl.m_forceNoWrap};
 
     if (secondaryLayout.GetGlyphCount() > 0)
     {
@@ -314,14 +317,18 @@ void TextShape::DrawSubStringPlain(ref_ptr<dp::GraphicsContext> context,
 
   layout.CacheStaticGeometry(color, staticBuffer);
 
-  auto state = CreateRenderState(gpu::Program::Text, m_params.m_depthLayer);
-  state.SetProgram3d(gpu::Program::TextBillboard);
+  bool const isNonSdfText = layout.GetFixedHeight() > 0;
+  auto state = CreateRenderState(isNonSdfText ? gpu::Program::TextFixed : gpu::Program::Text, m_params.m_depthLayer);
+  state.SetProgram3d(isNonSdfText ? gpu::Program::TextFixedBillboard : gpu::Program::TextBillboard);
   state.SetDepthTestEnabled(m_params.m_depthTestEnabled);
 
   ASSERT(color.GetTexture() == outline.GetTexture(), ());
   state.SetColorTexture(color.GetTexture());
   state.SetMaskTexture(layout.GetMaskTexture());
 
+  if (isNonSdfText)
+    state.SetTextureFilter(dp::TextureFilter::Nearest);
+
   gpu::TTextDynamicVertexBuffer initialDynBuffer(dynamicBuffer.size());
 
   m2::PointF const & pixelSize = layout.GetPixelSize();
@@ -334,6 +341,7 @@ void TextShape::DrawSubStringPlain(ref_ptr<dp::GraphicsContext> context,
                                                                             glsl::vec2(pixelSize.x, pixelSize.y),
                                                                             finalOffset,
                                                                             GetOverlayPriority(),
+                                                                            layout.GetFixedHeight(),
                                                                             textures,
                                                                             isOptional,
                                                                             std::move(dynamicBuffer),
@@ -396,6 +404,7 @@ void TextShape::DrawSubStringOutlined(ref_ptr<dp::GraphicsContext> context,
                                                                             glsl::vec2(pixelSize.x, pixelSize.y),
                                                                             finalOffset,
                                                                             GetOverlayPriority(),
+                                                                            layout.GetFixedHeight(),
                                                                             textures,
                                                                             isOptional,
                                                                             std::move(dynamicBuffer),
diff --git a/drape_frontend/transit_scheme_builder.cpp b/drape_frontend/transit_scheme_builder.cpp
index 51a0a32b30..94d6149b43 100644
--- a/drape_frontend/transit_scheme_builder.cpp
+++ b/drape_frontend/transit_scheme_builder.cpp
@@ -210,7 +210,7 @@ void PlaceTitles(std::vector<TitleInfo> & titles, float textSize,
   size_t summaryRowsCount = 0;
   for (auto & name : titles)
   {
-    df::StraightTextLayout layout(strings::MakeUniString(name.m_text), textSize,
+    df::StraightTextLayout layout(strings::MakeUniString(name.m_text), textSize, false /* isSdf */,
                                   textures, dp::Left, false /* forceNoWrap */);
     name.m_pixelSize = layout.GetPixelSize() + m2::PointF(4.0f * vs, 4.0f * vs);
     name.m_rowsCount = layout.GetRowsCount();
diff --git a/drape_frontend/user_mark_shapes.cpp b/drape_frontend/user_mark_shapes.cpp
index 3b45564ddc..3aede7376d 100644
--- a/drape_frontend/user_mark_shapes.cpp
+++ b/drape_frontend/user_mark_shapes.cpp
@@ -65,12 +65,16 @@ void AlignVertical(float halfHeight, dp::Anchor anchor, glsl::vec2 & up, glsl::v
                       dp::Bottom, up, down);
 }
 
-TextLayout MakePrimaryTextLayout(dp::TitleDecl const & titleDecl, ref_ptr<dp::TextureManager> textures)
+TextLayout MakePrimaryTextLayout(dp::TitleDecl const & titleDecl,
+                                 ref_ptr<dp::TextureManager> textures)
 {
   dp::FontDecl const & fontDecl = titleDecl.m_primaryTextFont;
   auto const vs = static_cast<float>(df::VisualParams::Instance().GetVisualScale());
+  bool const isSdf = fontDecl.m_outlineColor != dp::Color::Transparent() ||
+                     df::VisualParams::Instance().IsSdfPrefered();
   TextLayout textLayout;
-  textLayout.Init(strings::MakeUniString(titleDecl.m_primaryText), fontDecl.m_size * vs,textures);
+  textLayout.Init(strings::MakeUniString(titleDecl.m_primaryText), fontDecl.m_size * vs, isSdf,
+                  textures);
   return textLayout;
 }
 
@@ -279,6 +283,11 @@ void GenerateTextShapes(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Textur
     params.m_titleDecl.m_secondaryTextFont.m_size *= vs;
     params.m_titleDecl.m_primaryOffset *= vs;
     params.m_titleDecl.m_secondaryOffset *= vs;
+    bool const isSdf = df::VisualParams::Instance().IsSdfPrefered();
+    params.m_titleDecl.m_primaryTextFont.m_isSdf =
+        params.m_titleDecl.m_primaryTextFont.m_outlineColor != dp::Color::Transparent() || isSdf;
+    params.m_titleDecl.m_secondaryTextFont.m_isSdf =
+        params.m_titleDecl.m_secondaryTextFont.m_outlineColor != dp::Color::Transparent() || isSdf;
 
     params.m_depthTestEnabled = renderInfo.m_depthTestEnabled;
     params.m_depth = renderInfo.m_depth;
diff --git a/drape_frontend/visual_params.cpp b/drape_frontend/visual_params.cpp
index 027f97fe68..33d2b9d3a6 100644
--- a/drape_frontend/visual_params.cpp
+++ b/drape_frontend/visual_params.cpp
@@ -58,6 +58,12 @@ uint32_t VisualParams::GetGlyphSdfScale() const
   return (m_visualScale <= 1.0) ? 3 : 4;
 }
 
+bool VisualParams::IsSdfPrefered() const
+{
+  ASSERT_INITED;
+  return m_visualScale >= kHdpiScale;
+}
+
 uint32_t VisualParams::GetGlyphBaseSize() const
 {
   ASSERT_INITED;
diff --git a/drape_frontend/visual_params.hpp b/drape_frontend/visual_params.hpp
index 927baa9a23..54a6d81234 100644
--- a/drape_frontend/visual_params.hpp
+++ b/drape_frontend/visual_params.hpp
@@ -58,6 +58,7 @@ public:
   };
 
   GlyphVisualParams const & GetGlyphVisualParams() const;
+  bool IsSdfPrefered() const;
   uint32_t GetGlyphSdfScale() const;
   uint32_t GetGlyphBaseSize() const;
   double GetFontScale() const;
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index b9a1670225..1cb9d1168e 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -813,7 +813,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Hwtag)
     auto const params = GetFeatureBuilderParams(tags);
 
     TEST_EQUAL(params.m_types.size(), 8, (params));
-    TEST(params.IsTypeExist(GetType({"highway", "footway", "bicycle"})), (params));
+    TEST(params.IsTypeExist(GetType({"highway", "footway"})), (params));
     TEST(params.IsTypeExist(GetType({"hwtag", "yesbicycle"})), ());
     TEST(!params.IsTypeExist(GetType({"hwtag", "yesfoot"})), ());
 
@@ -938,7 +938,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Surface)
     auto const params = GetFeatureBuilderParams(tags);
 
     TEST_EQUAL(params.m_types.size(), 2, (params));
-    TEST(params.IsTypeExist(GetType({"highway", "track"})), (params));
+    TEST(params.IsTypeExist(GetType({"highway", "track", "grade1"})), (params));
     TEST(params.IsTypeExist(GetType({"psurface", "paved_bad"})), (params));
   }
 }
@@ -2817,8 +2817,14 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
     {{"highway", "busway", "tunnel"}, {{"highway", "busway"}, {"tunnel", "any_value"}}},
     {{"highway", "cycleway", "bridge"}, {{"highway", "cycleway"}, {"bridge", "any_value"}}},
     {{"highway", "cycleway", "tunnel"}, {{"highway", "cycleway"}, {"tunnel", "any_value"}}},
+    {{"highway", "footway", "alpine_hiking"}, {{"highway", "footway"}, {"sac_scale", "alpine_hiking"}}},
     {{"highway", "footway", "area"}, {{"highway", "footway"}, {"area", "any_value"}}},
     {{"highway", "footway", "bridge"}, {{"highway", "footway"}, {"bridge", "any_value"}}},
+    {{"highway", "footway", "demanding_alpine_hiking"}, {{"highway", "footway"}, {"sac_scale", "demanding_alpine_hiking"}}},
+    {{"highway", "footway", "demanding_mountain_hiking"}, {{"highway", "footway"}, {"sac_scale", "demanding_mountain_hiking"}}},
+    {{"highway", "footway", "difficult_alpine_hiking"}, {{"highway", "footway"}, {"sac_scale", "difficult_alpine_hiking"}}},
+    {{"highway", "footway", "hiking"}, {{"highway", "footway"}, {"sac_scale", "hiking"}}},
+    {{"highway", "footway", "mountain_hiking"}, {{"highway", "footway"}, {"sac_scale", "mountain_hiking"}}},
     {{"highway", "footway"}, {{"highway", "footway"}, {"footway", "unsupported_value"}}},
     {{"highway", "footway", "sidewalk"}, {{"highway", "footway"}, {"footway", "sidewalk"}}},
     {{"highway", "footway", "crossing"}, {{"highway", "footway"}, {"footway", "crossing"}}},
@@ -2830,11 +2836,16 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
     {{"highway", "motorway", "tunnel"}, {{"highway", "motorway"}, {"tunnel", "any_value"}}},
     {{"highway", "motorway_link", "bridge"}, {{"highway", "motorway_link"}, {"bridge", "any_value"}}},
     {{"highway", "motorway_link", "tunnel"}, {{"highway", "motorway_link"}, {"tunnel", "any_value"}}},
+    {{"highway", "path", "alpine_hiking"}, {{"highway", "path"}, {"sac_scale", "alpine_hiking"}}},
     {{"highway", "path", "bridge"}, {{"highway", "path"}, {"bridge", "any_value"}}},
+    {{"highway", "path", "demanding_alpine_hiking"}, {{"highway", "path"}, {"sac_scale", "demanding_alpine_hiking"}}},
+    {{"highway", "path", "demanding_mountain_hiking"}, {{"highway", "path"}, {"sac_scale", "demanding_mountain_hiking"}}},
+    {{"highway", "path", "difficult_alpine_hiking"}, {{"highway", "path"}, {"sac_scale", "difficult_alpine_hiking"}}},
+    {{"highway", "path", "hiking"}, {{"highway", "path"}, {"route", "hiking"}}},
+    {{"highway", "path", "hiking"}, {{"highway", "path"}, {"sac_scale", "hiking"}}},
     {{"highway", "path", "horse"}, {{"highway", "path"}, {"horse", "any_value"}}},
+    {{"highway", "path", "mountain_hiking"}, {{"highway", "path"}, {"sac_scale", "mountain_hiking"}}},
     {{"highway", "path", "tunnel"}, {{"highway", "path"}, {"tunnel", "any_value"}}},
-    {{"highway", "path", "difficult"}, {{"highway", "path"}, {"_path_grade", "difficult"}}},
-    {{"highway", "path", "expert"}, {{"highway", "path"}, {"_path_grade", "expert"}}},
     {{"highway", "pedestrian", "area"}, {{"highway", "pedestrian"}, {"area", "any_value"}}},
     {{"highway", "pedestrian", "bridge"}, {{"highway", "pedestrian"}, {"bridge", "any_value"}}},
     {{"highway", "pedestrian", "tunnel"}, {{"highway", "pedestrian"}, {"tunnel", "any_value"}}},
@@ -2864,6 +2875,11 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
     {{"highway", "tertiary_link", "tunnel"}, {{"highway", "tertiary_link"}, {"tunnel", "any_value"}}},
     {{"highway", "track", "area"}, {{"highway", "track"}, {"area", "any_value"}}},
     {{"highway", "track", "bridge"}, {{"highway", "track"}, {"bridge", "any_value"}}},
+    {{"highway", "track", "grade1"}, {{"highway", "track"}, {"tracktype", "grade1"}}},
+    {{"highway", "track", "grade2"}, {{"highway", "track"}, {"tracktype", "grade2"}}},
+    {{"highway", "track", "grade3"}, {{"highway", "track"}, {"tracktype", "grade3"}}},
+    {{"highway", "track", "grade4"}, {{"highway", "track"}, {"tracktype", "grade4"}}},
+    {{"highway", "track", "grade5"}, {{"highway", "track"}, {"tracktype", "grade5"}}},
     {{"highway", "track", "tunnel"}, {{"highway", "track"}, {"tunnel", "any_value"}}},
     {{"highway", "trunk", "bridge"}, {{"highway", "trunk"}, {"bridge", "any_value"}}},
     {{"highway", "trunk", "tunnel"}, {{"highway", "trunk"}, {"tunnel", "any_value"}}},
@@ -3045,105 +3061,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
   }
 }
 
-UNIT_CLASS_TEST(TestWithClassificator, OsmType_HighwayTypesConversion)
-{
-  using Type = std::vector<std::string>;
-  std::vector<std::pair<Type, Tags>> const conversions = {
-    {{"highway", "cycleway"}, {{"highway", "path"}, {"foot", "no"}, {"bicycle", "yes"}}},
-
-    // Paved etc. paths to footways.
-    {{"highway", "footway"}, {{"highway", "path"}, {"surface", "paved"}}},
-    {{"highway", "footway"}, {{"highway", "path"}, {"surface", "paved"}, {"smoothness", "bad"}}},
-    {{"highway", "footway"}, {{"highway", "path"}, {"surface", "compacted"}, {"smoothness", "intermediate"}}},
-    {{"highway", "footway"}, {{"highway", "path"}, {"surface", "gravel"}, {"smoothness", "good"}}},
-    {{"highway", "footway", "sidewalk"}, {{"highway", "path"}, {"surface", "gravel"}, {"footway", "sidewalk"}}},
-    {{"highway", "footway"}, {{"highway", "path"}, {"smoothness", "good"}}},
-    {{"highway", "footway", "crossing"}, {{"highway", "path"}, {"footway", "crossing"}}},
-    {{"highway", "footway"}, {{"highway", "path"}, {"lit", "yes"}}},
-    {{"highway", "footway"}, {{"highway", "path"}, {"segregated", "no"}}},
-    // No conversion.
-    {{"highway", "path"}, {{"highway", "path"}, {"surface", "unpaved"}}},
-    {{"highway", "path"}, {{"highway", "path"}, {"surface", "compacted"}, {"smoothness", "bad"}}},
-    {{"highway", "path"}, {{"highway", "path"}, {"surface", "gravel"}, {"tracktype", "grade3"}}},
-    {{"highway", "path"}, {{"highway", "path"}, {"surface", "gravel"}, {"tracktype", "grade1"}, {"sac_scale", "hiking"}}},
-    {{"highway", "path"}, {{"highway", "path"}, {"smoothness", "good"}, {"tracktype", "grade3"}}},
-    {{"highway", "path"}, {{"highway", "path"}, {"tracktype", "grade3"}, {"footway", "sidewalk"}}},
-    {{"highway", "path"}, {{"highway", "path"}, {"smoothness", "intermediate"}}},
-    {{"highway", "path"}, {{"highway", "path"}, {"lit", "no"}}},
-
-    // Unpaved etc. footways to paths.
-    {{"highway", "path"}, {{"highway", "footway"}, {"surface", "unpaved"}}},
-    {{"highway", "path"}, {{"highway", "footway"}, {"surface", "unpaved"}, {"smoothness", "excellent"}}},
-    {{"highway", "path"}, {{"highway", "footway"}, {"surface", "compacted"}, {"smoothness", "bad"}}},
-    {{"highway", "path"}, {{"highway", "footway"}, {"smoothness", "bad"}}},
-    {{"highway", "path"}, {{"highway", "footway"}, {"sac_scale", "hiking"}}},
-    {{"highway", "path"}, {{"highway", "footway"}, {"trail_visibility", "good"}}},
-    {{"highway", "path"}, {{"highway", "footway"}, {"tracktype", "grade2"}, {"sac_scale", "hiking"}}},
-    // TODO(@pastk): ford=* is converted to highway=ford via replaced_tags.txt; get rid of highway=ford
-    {{"highway", "footway"}, {{"highway", "footway"}, {"ford", "stepping_stones"}}},
-    {{"highway", "path"}, {{"highway", "footway"}, {"informal", "yes"}}},
-    // No conversion.
-    {{"highway", "footway"}, {{"highway", "footway"}, {"surface", "paved"}}},
-    {{"highway", "footway"}, {{"highway", "footway"}, {"surface", "compacted"}, {"smoothness", "good"}}},
-    {{"highway", "footway"}, {{"highway", "footway"}, {"smoothness", "good"}, {"tracktype", "grade2"}}},
-    {{"highway", "footway"}, {{"highway", "footway"}, {"tracktype", "grade1"}, {"sac_scale", "hiking"}}},
-    {{"highway", "footway", "sidewalk"}, {{"highway", "footway"}, {"tracktype", "grade2"}, {"footway", "sidewalk"}}},
-    {{"highway", "footway"}, {{"highway", "footway"}, {"lit", "no"}}},
-  };
-
-  for (auto const & type : conversions)
-  {
-    auto const params = GetFeatureBuilderParams(type.second);
-    TEST(params.IsTypeExist(GetType(type.first)), (type, params));
-  }
-
-  std::vector<std::pair<std::vector<Type>, Tags>> const complexConversions = {
-    // Add an explicit footway to a segregated cycleway.
-    {{{"highway", "cycleway"}, {"highway", "footway"}}, {{"highway", "cycleway"}, {"segregated", "yes"}}},
-    {{{"highway", "cycleway"}, {"highway", "footway"}, {"hwtag", "yesfoot"}}, {{"highway", "cycleway"}, {"sidewalk", "right"}}},
-
-    // Segregated path becomes cycleway + footway.
-    {{{"highway", "cycleway"}, {"highway", "footway"}}, {{"highway", "path"}, {"segregated", "yes"}}},
-    
-    // A non-segregated cycleway becomes shared path/footway + bicycle=designated.
-    {{{"highway", "footway", "bicycle"}, {"hwtag", "yesbicycle"}}, {{"highway", "cycleway"}, {"segregated", "no"}, {"foot", "designated"}}},
-    {{{"highway", "path", "bicycle"}, {"hwtag", "yesbicycle"}, {"hwtag", "yesfoot"}, {"psurface", "unpaved_good"}}, {{"highway", "cycleway"}, {"foot", "yes"}, {"surface", "unpaved"}}},
-  };
-
-  for (auto const & type : complexConversions)
-  {
-    auto const & results = type.first;
-    auto const params = GetFeatureBuilderParams(type.second);
-    TEST_EQUAL(params.m_types.size(), results.size(), (type, params));
-    for (auto const & result : results)
-    {
-      TEST(params.IsTypeExist(GetType(result)), (type, params));
-    }
-  }
-}
-
-UNIT_CLASS_TEST(TestWithClassificator, OsmType_PathGrades)
-{
-  using Type = std::vector<std::string>;
-  std::vector<std::pair<Type, Tags>> const conversions = {
-    {{"highway", "path"}, {{"highway", "path"}, {"sac_scale", "mountain_hiking"}, {"trail_visibility", "intermediate"}}},
-    {{"highway", "path"}, {{"highway", "path"}, {"sac_scale", "unsupported_value"}, {"trail_visibility", "unsupported_value"}}},
-
-    {{"highway", "path", "difficult"}, {{"highway", "path"}, {"sac_scale", "demanding_mountain_hiking"}, {"trail_visibility", "excellent"}}},
-    {{"highway", "path", "difficult"}, {{"highway", "path"}, {"trail_visibility", "bad"}}},    
-
-    {{"highway", "path", "expert"}, {{"highway", "path"}, {"sac_scale", "alpine_hiking"}}},
-    {{"highway", "path", "expert"}, {{"highway", "path"}, {"trail_visibility", "horrible"}}},
-    {{"highway", "path", "expert"}, {{"highway", "path"}, {"sac_scale", "difficult_alpine_hiking"}, {"trail_visibility", "no"}}},
-  };
-
-  for (auto const & type : conversions)
-  {
-    auto const params = GetFeatureBuilderParams(type.second);
-    TEST(params.IsTypeExist(GetType(type.first)), (type, params));
-  }
-}
-
 UNIT_CLASS_TEST(TestWithClassificator, OsmType_MultipleComplexTypesSmoke)
 {
   using Type = std::vector<std::string>;
diff --git a/generator/generator_tests/raw_generator_test.cpp b/generator/generator_tests/raw_generator_test.cpp
index 4c148386e2..8d47c38b5f 100644
--- a/generator/generator_tests/raw_generator_test.cpp
+++ b/generator/generator_tests/raw_generator_test.cpp
@@ -513,7 +513,6 @@ UNIT_TEST(Relation_Wiki)
         TEST(fb.GetMetadata().Get(feature::Metadata::FMD_WIKIPEDIA).empty(), ());
         break;
       }
-      default: TEST(false, ()); break;
       }
     });
 
diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp
index 0b27448b8e..6bbf3a5a71 100644
--- a/generator/osm2type.cpp
+++ b/generator/osm2type.cpp
@@ -568,7 +568,7 @@ string MatchCity(ms::LatLon const & ll)
   return {};
 }
 
-string DetermineSurfaceAndHighwayType(OsmElement * p)
+string DetermineSurface(OsmElement * p)
 {
   string surface;
   string smoothness;
@@ -582,23 +582,25 @@ string DetermineSurfaceAndHighwayType(OsmElement * p)
       surface = tag.m_value;
     else if (tag.m_key == "smoothness")
       smoothness = tag.m_value;
-    else if (tag.m_key == "surface:grade") // discouraged, 25k usages as of 2024
+    else if (tag.m_key == "surface:grade")
       (void)strings::to_double(tag.m_value, surfaceGrade);
     else if (tag.m_key == "tracktype")
       trackGrade = tag.m_value;
-    else if (tag.m_key == "highway" && tag.m_value != "ford")
+    else if (tag.m_key == "highway")
       highway = tag.m_value;
     else if (tag.m_key == "4wd_only" && (tag.m_value == "yes" || tag.m_value == "recommended"))
       return "unpaved_bad";
   }
 
+  if (highway.empty() || (surface.empty() && smoothness.empty()))
+    return {};
+
   // According to https://wiki.openstreetmap.org/wiki/Key:surface
   static base::StringIL pavedSurfaces = {
       "asphalt",  "cobblestone", "chipseal", "concrete",
       "metal", "paved", "paving_stones", "sett", "unhewn_cobblestone", "wood"
   };
 
-  // All not explicitly listed surface types are considered unpaved good, e.g. "compacted", "fine_gravel".
   static base::StringIL badSurfaces = {
       "cobblestone", "dirt", "earth", "grass", "gravel", "ground", "metal", "mud", "rock", "unpaved",
       "pebblestone", "sand", "sett", "snow", "stepping_stones", "unhewn_cobblestone", "wood", "woodchips"
@@ -621,7 +623,6 @@ string DetermineSurfaceAndHighwayType(OsmElement * p)
   auto const Has = [](base::StringIL const & il, string const & v)
   {
     bool res = false;
-    // Also matches compound values like concrete:plates, sand/dirt, etc. if a single part matches.
     strings::Tokenize(v, ";:/", [&il, &res](std::string_view sv)
     {
       if (!res)
@@ -630,115 +631,6 @@ string DetermineSurfaceAndHighwayType(OsmElement * p)
     return res;
   };
 
-  /* Convert between highway=path/footway/cycleway depending on surface and other tags.
-   * The goal is to end up with following clear types:
-   *   footway - for paved/formed urban looking pedestrian paths
-   *   footway + yesbicycle - same but shared with cyclists
-   *   path - for unpaved paths and trails
-   *   path + yesbicycle - same but explicitly shared with cyclists
-   *   cycleway - dedicated for cyclists (segregated from pedestrians)
-   * I.e. segregated shared paths should have both footway and cycleway types.
-   */
-  string const kCycleway = "cycleway";
-  string const kFootway = "footway";
-  string const kPath = "path";
-  if (highway == kFootway || highway == kPath || highway == kCycleway)
-  {
-    static base::StringIL goodPathSmoothness = {
-        "excellent", "good", "very_good", "intermediate"
-    };
-    static base::StringIL gravelSurface = {
-        "gravel", "fine_gravel", "pebblestone"
-    };
-    bool const hasQuality = !smoothness.empty() || !trackGrade.empty();
-    bool const isGood = (smoothness.empty() || Has(goodPathSmoothness, smoothness)) &&
-                        (trackGrade.empty() || trackGrade == "grade1" || trackGrade == "grade2");
-    bool const isMed = (smoothness == "intermediate" || trackGrade == "grade2");
-    bool const hasTrailTags = p->HasTag("sac_scale") || p->HasTag("trail_visibility") ||
-                              p->HasTag("ford") || p->HasTag("informal", "yes");
-    bool const hasUrbanTags = p->HasTag("footway") || p->HasTag("segregated") ||
-                              (p->HasTag("lit") && !p->HasTag("lit", "no"));
-
-    bool isFormed = !surface.empty() && Has(pavedSurfaces, surface);
-    // Treat "compacted" as formed when in good or default quality.
-    if (surface == "compacted" && isGood)
-      isFormed = true;
-    // Treat "gravel"-like surfaces as formed only when it has urban tags or a certain good quality and no trail tags.
-    if (Has(gravelSurface, surface) && isGood && (hasUrbanTags || (hasQuality && !hasTrailTags)))
-      isFormed = true;
-
-    auto const ConvertTo = [&](string const & newType)
-    {
-      // TODO(@pastk): remove redundant tags, e.g. if converted to cycleway then remove "bicycle=yes".
-      LOG(LDEBUG, ("Convert", DebugPrintID(*p), "to", newType, isFormed, isGood, hasTrailTags, hasUrbanTags, p->m_tags));
-      p->UpdateTag("highway", newType);
-    };
-
-    auto const ConvertPathOrFootway = [&](bool const toPath)
-    {
-      string const toType = toPath ? kPath : kFootway;
-      if (!surface.empty())
-      {
-        if (toPath ? !isFormed : isFormed)
-          ConvertTo(toType);
-      }
-      else
-      {
-        if (hasQuality && !isMed)
-        {
-          if (toPath ? !isGood : isGood)
-            ConvertTo(toType);
-        }
-        else if (toPath ? (hasTrailTags && !hasUrbanTags) : (!hasTrailTags && hasUrbanTags))
-          ConvertTo(toType);
-      }
-    };
-
-    if (highway == kCycleway)
-    {
-      static base::StringIL segregatedSidewalks = {
-          "right", "left", "both"
-      };
-      if (p->HasTag("segregated", "yes") || Has(segregatedSidewalks, p->GetTag("sidewalk")))
-      {
-        LOG(LDEBUG, ("Add a separate footway to", DebugPrintID(*p), p->m_tags));
-        p->AddTag("highway", kFootway);
-      }
-      else
-      {
-        string const foot = p->GetTag("foot");
-        if (foot == "designated" || foot == "yes")
-        {
-          // A non-segregated shared footway/cycleway.
-          ConvertTo(kFootway);
-          p->AddTag("bicycle", "designated");
-          ConvertPathOrFootway(true /* toPath */); // In case its unpaved.
-        }
-      }
-    }
-    else if (highway == kPath)
-    {
-      if (p->HasTag("segregated", "yes"))
-      {
-        ConvertTo(kCycleway);
-        LOG(LDEBUG, ("Add a separate footway to", DebugPrintID(*p), p->m_tags));
-        p->AddTag("highway", kFootway);
-      }
-      else if (p->HasTag("foot", "no") && (p->HasTag("bicycle", "yes") || p->HasTag("bicycle", "designated")))
-        ConvertTo(kCycleway);
-      else if (!p->HasTag("foot", "no"))
-        ConvertPathOrFootway(false /* toPath */);
-    }
-    else
-    {
-      CHECK_EQUAL(highway, kFootway, ());
-      ConvertPathOrFootway(true /* toPath */);
-    }
-  }
-
-  if (highway.empty() || (surface.empty() && smoothness.empty()))
-    return {};
-
   bool isGood = true;
   bool isPaved = true;
 
@@ -788,36 +680,6 @@ string DetermineSurfaceAndHighwayType(OsmElement * p)
   return psurface;
 }
 
-string DeterminePathGrade(OsmElement * p)
-{
-  if (!p->HasTag("highway", "path"))
-    return {};
-
-  string scale = p->GetTag("sac_scale");
-  string visibility = p->GetTag("trail_visibility");
-  
-  if (scale.empty() && visibility.empty())
-    return {};
-
-  static base::StringIL expertScales = {
-      "alpine_hiking", "demanding_alpine_hiking", "difficult_alpine_hiking"
-  };
-  static base::StringIL difficultVisibilities = {
-      "bad", "poor" // poor is not official
-  };
-  static base::StringIL expertVisibilities = {
-      "horrible", "no", "very_bad" // very_bad is not official
-  };
-
-  if (base::IsExist(expertScales, scale) || base::IsExist(expertVisibilities, visibility))
-    return "expert";
-  else if (scale == "demanding_mountain_hiking" || base::IsExist(difficultVisibilities, visibility))
-    return "difficult";
-
-  // hiking & mountain_hiking scales, excellent, good, intermediate & unknown visibilities means "no grade"
-  return {};
-}
-
 void PreprocessElement(OsmElement * p, CalculateOriginFnT const & calcOrg)
 {
   bool hasLayer = false;
@@ -898,9 +760,7 @@ void PreprocessElement(OsmElement * p, CalculateOriginFnT const & calcOrg)
     p->AddTag("area", "yes");
   }
 
-  p->AddTag("psurface", DetermineSurfaceAndHighwayType(p));
-
-  p->AddTag("_path_grade", DeterminePathGrade(p));
+  p->AddTag("psurface", DetermineSurface(p));
 
   string const kCuisineKey = "cuisine";
   auto cuisines = p->GetTag(kCuisineKey);
@@ -939,7 +799,7 @@ void PreprocessElement(OsmElement * p, CalculateOriginFnT const & calcOrg)
         normalized = "coffee_shop";
 
       if (first)
-        p->UpdateTag(kCuisineKey, normalized);
+        p->UpdateTag(kCuisineKey, [&normalized](string & value) { value = normalized; });
       else
         p->AddTag(kCuisineKey, normalized);
 
@@ -959,7 +819,7 @@ void PreprocessElement(OsmElement * p, CalculateOriginFnT const & calcOrg)
       strings::Trim(type);
 
       if (first)
-        p->UpdateTag(kAerodromeTypeKey, type);
+        p->UpdateTag(kAerodromeTypeKey, [&type](auto & value) { value = type; });
       else
         p->AddTag(kAerodromeTypeKey, type);
 
@@ -1000,7 +860,7 @@ void PreprocessElement(OsmElement * p, CalculateOriginFnT const & calcOrg)
   static CountriesLoader s_countriesChecker;
 
   auto const dePlace = p->GetTag("de:place");
-  p->UpdateTagFn("place", [&](string & value)
+  p->UpdateTag("place", [&](string & value)
   {
     // 1. Replace a value of 'place' with a value of 'de:place' because most people regard
     // places names as 'de:place' defines it.
@@ -1022,7 +882,7 @@ void PreprocessElement(OsmElement * p, CalculateOriginFnT const & calcOrg)
   });
 
   if (isCapital)
-    p->UpdateTag("capital", "2");
+    p->UpdateTag("capital", [&](string & value) { value = "2"; });
 }
 
 bool IsCarDesignatedHighway(uint32_t type)
diff --git a/generator/osm_element.hpp b/generator/osm_element.hpp
index 9f0d1f4943..af1dd3ec93 100644
--- a/generator/osm_element.hpp
+++ b/generator/osm_element.hpp
@@ -109,7 +109,7 @@ struct OsmElement
   bool HasTag(std::string const & key, std::string const & value) const;
 
   template <class Fn>
-  void UpdateTagFn(std::string const & key, Fn && fn)
+  void UpdateTag(std::string const & key, Fn && fn)
   {
     for (auto & tag : m_tags)
     {
@@ -125,10 +125,6 @@ struct OsmElement
     if (!value.empty())
       AddTag(key, value);
   }
-  void UpdateTag(std::string const & key, std::string const & value)
-  {
-    UpdateTagFn(key, [&value](auto & v) { v = value; });
-  }
 
   /// @todo return string_view
   std::string GetTag(std::string const & key) const;
diff --git a/generator/tag_admixer.hpp b/generator/tag_admixer.hpp
index 11059239cd..d1519fe20d 100644
--- a/generator/tag_admixer.hpp
+++ b/generator/tag_admixer.hpp
@@ -117,7 +117,7 @@ public:
       // Our goal here - to make some capitals visible in World map.
       // The simplest way is to upgrade population to 45000,
       // according to our visibility rules in mapcss files.
-      element.UpdateTagFn("population", [] (std::string & v)
+      element.UpdateTag("population", [] (std::string & v)
       {
         uint64_t n;
         if (!strings::to_uint64(v, n) || n < 45000)
@@ -215,7 +215,7 @@ public:
       for (auto const & tag : r->m_tags)
       {
         if (r->m_update)
-          element.UpdateTag(tag.m_key, tag.m_value);
+          element.UpdateTag(tag.m_key, [&tag](std::string & value) { value = tag.m_value; });
         else
           element.AddTag(tag);
       }
@@ -285,7 +285,7 @@ public:
     if (elements != m_elements.end())
     {
       for (OsmElement::Tag const & tag : elements->second)
-        element.UpdateTag(tag.m_key, tag.m_value);
+        element.UpdateTag(tag.m_key, [&tag](std::string & v) { v = tag.m_value; });
     }
   }
 
diff --git a/indexer/editable_map_object.cpp b/indexer/editable_map_object.cpp
index 838acc9077..a6ff23f97c 100644
--- a/indexer/editable_map_object.cpp
+++ b/indexer/editable_map_object.cpp
@@ -24,8 +24,7 @@ namespace
 bool ExtractName(StringUtf8Multilang const & names, int8_t const langCode,
                  vector<osm::LocalizedName> & result)
 {
-  if (StringUtf8Multilang::kUnsupportedLanguageCode == langCode ||
-      StringUtf8Multilang::kDefaultCode == langCode)
+  if (StringUtf8Multilang::kUnsupportedLanguageCode == langCode)
   {
     return false;
   }
@@ -45,113 +44,6 @@ bool ExtractName(StringUtf8Multilang const & names, int8_t const langCode,
 
   return true;
 }
-
-size_t PushMwmLanguages(StringUtf8Multilang const & names, vector<int8_t> const & mwmLanguages,
-                        vector<osm::LocalizedName> & result)
-{
-  size_t count = 0;
-  static size_t const kMaxCountMwmLanguages = 2;
-
-  for (size_t i = 0; i < mwmLanguages.size() && count < kMaxCountMwmLanguages; ++i)
-  {
-    if (ExtractName(names, mwmLanguages[i], result))
-      ++count;
-  }
-
-  return count;
-}
-
-osm::FakeNames MakeFakeSource(StringUtf8Multilang const & source,
-                              vector<int8_t> const & mwmLanguages, StringUtf8Multilang & fakeSource)
-{
-  string_view defaultName;
-  // Fake names works for mono language (official) speaking countries-only.
-  if (mwmLanguages.size() != 1 || !source.GetString(StringUtf8Multilang::kDefaultCode, defaultName))
-    return {};
-
-  osm::FakeNames fakeNames;
-  fakeSource = source;
-
-  // Mwm name has higher priority then English name.
-  for (auto const code : {mwmLanguages.front(), StringUtf8Multilang::kEnglishCode})
-  {
-    string_view tempName;
-    if (!source.GetString(code, tempName))
-    {
-      tempName = defaultName;
-      fakeSource.AddString(code, defaultName);
-    }
-    fakeNames.m_names.emplace_back(code, std::string(tempName));
-  }
-
-  fakeNames.m_defaultName = defaultName;
-  return fakeNames;
-}
-
-// Tries to set default name from the localized name. Returns false when there's no such localized name.
-bool TryToFillDefaultNameFromCode(int8_t const code, StringUtf8Multilang & names)
-{
-  string_view newDefaultName;
-  if (code != StringUtf8Multilang::kUnsupportedLanguageCode)
-    names.GetString(code, newDefaultName);
-
-  // Default name can not be empty.
-  if (!newDefaultName.empty())
-  {
-    names.AddString(StringUtf8Multilang::kDefaultCode, newDefaultName);
-    return true;
-  }
-
-  return false;
-}
-
-// Tries to set default name to any non-empty localized name.
-// This is the case when fake names were cleared.
-void TryToFillDefaultNameFromAnyLanguage(StringUtf8Multilang & names)
-{
-  names.ForEach([&names](int8_t langCode, string_view name)
-  {
-    if (name.empty() || langCode == StringUtf8Multilang::kDefaultCode)
-      return base::ControlFlow::Continue;
-
-    names.AddString(StringUtf8Multilang::kDefaultCode, name);
-    return base::ControlFlow::Break;
-  });
-}
-
-void RemoveFakesFromName(osm::FakeNames const & fakeNames, StringUtf8Multilang & name)
-{
-  vector<int8_t> codesToExclude;
-  string_view defaultName;
-  name.GetString(StringUtf8Multilang::kDefaultCode, defaultName);
-
-  for (auto const & item : fakeNames.m_names)
-  {
-    string_view tempName;
-    if (!name.GetString(item.m_code, tempName))
-      continue;
-
-    // No need to save in case when name is empty, duplicate of default name or was not changed.
-    if (tempName.empty() || tempName == defaultName ||
-        (tempName == item.m_filledName && tempName == fakeNames.m_defaultName))
-    {
-      codesToExclude.push_back(item.m_code);
-    }
-  }
-
-  if (codesToExclude.empty())
-    return;
-
-  StringUtf8Multilang nameWithoutFakes;
-  name.ForEach([&codesToExclude, &nameWithoutFakes](int8_t langCode, string_view value)
-  {
-    auto const it = find(codesToExclude.begin(), codesToExclude.end(), langCode);
-    if (it == codesToExclude.end())
-      nameWithoutFakes.AddString(langCode, value);
-  });
-
-  name = nameWithoutFakes;
-}
 }  // namespace
 
 // LocalizedName -----------------------------------------------------------------------------------
@@ -193,7 +85,7 @@ vector<MapObject::MetadataID> EditableMapObject::GetEditableProperties() const
   return props;
 }
 
-NamesDataSource EditableMapObject::GetNamesDataSource(bool needFakes /* = true */)
+NamesDataSource EditableMapObject::GetNamesDataSource()
 {
   auto const mwmInfo = GetID().m_mwmId.GetInfo();
 
@@ -205,19 +97,6 @@ NamesDataSource EditableMapObject::GetNamesDataSource(bool needFakes /* = true *
 
   auto const userLangCode = StringUtf8Multilang::GetLangIndex(languages::GetCurrentNorm());
 
-  if (needFakes)
-  {
-    StringUtf8Multilang fakeSource;
-    m_fakeNames = MakeFakeSource(m_name, mwmLanguages, fakeSource);
-
-    if (!m_fakeNames.m_names.empty())
-      return GetNamesDataSource(fakeSource, mwmLanguages, userLangCode);
-  }
-  else
-  {
-    RemoveFakeNames(m_fakeNames, m_name);
-  }
-
   return GetNamesDataSource(m_name, mwmLanguages, userLangCode);
 }
 
@@ -229,24 +108,14 @@ NamesDataSource EditableMapObject::GetNamesDataSource(StringUtf8Multilang const
   NamesDataSource result;
   auto & names = result.names;
   auto & mandatoryCount = result.mandatoryNamesCount;
-  // Push Mwm languages.
-  mandatoryCount = PushMwmLanguages(source, mwmLanguages, names);
 
-  // Push english name.
-  if (ExtractName(source, StringUtf8Multilang::kEnglishCode, names))
-    ++mandatoryCount;
-
-  // Push user's language.
-  if (ExtractName(source, userLangCode, names))
+  // Push default/native for country language.
+  if (ExtractName(source, StringUtf8Multilang::kDefaultCode, names))
     ++mandatoryCount;
 
   // Push other languages.
   source.ForEach([&names, mandatoryCount](int8_t const code, string_view name)
   {
-    // Exclude default name.
-    if (StringUtf8Multilang::kDefaultCode == code)
-      return;
-
     auto const mandatoryNamesEnd = names.begin() + mandatoryCount;
     // Exclude languages which are already in container (languages with top priority).
     auto const it = find_if(
@@ -308,30 +177,6 @@ void EditableMapObject::SetName(StringUtf8Multilang const & name) { m_name = nam
 void EditableMapObject::SetName(string_view name, int8_t langCode)
 {
   strings::Trim(name);
-
-  if (m_namesAdvancedMode)
-  {
-    m_name.AddString(langCode, name);
-    return;
-  }
-
-  if (!name.empty() && !m_name.HasString(StringUtf8Multilang::kDefaultCode))
-  {
-    const auto mwmInfo = GetID().m_mwmId.GetInfo();
-
-    if (mwmInfo)
-    {
-      vector<int8_t> mwmLanguages;
-      mwmInfo->GetRegionData().GetLanguages(mwmLanguages);
-
-      if (CanUseAsDefaultName(langCode, mwmLanguages))
-      {
-        m_name.AddString(StringUtf8Multilang::kDefaultCode, name);
-        return;
-      }
-    }
-  }
-
   m_name.AddString(langCode, name);
 }
 
@@ -350,43 +195,6 @@ bool EditableMapObject::CanUseAsDefaultName(int8_t const lang, vector<int8_t> co
   return false;
 }
 
-// static
-void EditableMapObject::RemoveFakeNames(FakeNames const & fakeNames, StringUtf8Multilang & name)
-{
-  if (fakeNames.m_names.empty())
-    return;
-
-  int8_t newDefaultNameCode = StringUtf8Multilang::kUnsupportedLanguageCode;
-  size_t changedCount = 0;
-  string_view defaultName;
-  name.GetString(StringUtf8Multilang::kDefaultCode, defaultName);
-
-  // New default name calculation priority: 1. name on mwm language, 2. english name.
-  for (auto it = fakeNames.m_names.rbegin(); it != fakeNames.m_names.rend(); ++it)
-  {
-    string_view tempName;
-    if (!name.GetString(it->m_code, tempName))
-      continue;
-
-    if (tempName != it->m_filledName)
-    {
-      if (!tempName.empty())
-        newDefaultNameCode = it->m_code;
-
-      ++changedCount;
-    }
-  }
-
-  // If all previously filled fake names were changed - try to change the default name.
-  if (changedCount == fakeNames.m_names.size())
-  {
-    if (!TryToFillDefaultNameFromCode(newDefaultNameCode, name))
-      TryToFillDefaultNameFromAnyLanguage(name);
-  }
-
-  RemoveFakesFromName(fakeNames, name);
-}
-
 void EditableMapObject::SetMercator(m2::PointD const & center) { m_mercator = center; }
 
 void EditableMapObject::SetType(uint32_t featureType)
@@ -562,9 +370,6 @@ void EditableMapObject::RemoveBlankAndDuplicationsForDefault()
 
 void EditableMapObject::RemoveNeedlessNames()
 {
-  if (!IsNamesAdvancedModeEnabled())
-    RemoveFakeNames(m_fakeNames, m_name);
-
   RemoveBlankAndDuplicationsForDefault();
 }
 
diff --git a/indexer/editable_map_object.hpp b/indexer/editable_map_object.hpp
index feb684febb..eb3566a418 100644
--- a/indexer/editable_map_object.hpp
+++ b/indexer/editable_map_object.hpp
@@ -47,9 +47,8 @@ struct LocalizedName
 };
 
 /// Class which contains vector of localized names with following priority:
-///  1. Names for Mwm languages
-///  2. User`s language name
-///  3. Other names
+///  1. Default Name
+///  2. Other names
 /// and mandatoryNamesCount - count of names which should be always shown.
 struct NamesDataSource
 {
@@ -57,30 +56,6 @@ struct NamesDataSource
   size_t mandatoryNamesCount = 0;
 };
 
-struct FakeName
-{
-  FakeName(int8_t code, std::string filledName)
-    : m_code(code)
-    , m_filledName(filledName)
-  {
-  }
-
-  int8_t m_code;
-  std::string m_filledName;
-};
-/// Contains information about fake names which were added for user convenience.
-struct FakeNames
-{
-  void Clear()
-  {
-    m_names.clear();
-    m_defaultName.clear();
-  }
-
-  std::vector<FakeName> m_names;
-  std::string m_defaultName;
-};
-
 struct LocalizedStreet
 {
   std::string m_defaultName;
@@ -102,7 +77,7 @@ public:
   std::vector<MetadataID> GetEditableProperties() const;
 
   /// See comment for NamesDataSource class.
-  NamesDataSource GetNamesDataSource(bool addFakes = true);
+  NamesDataSource GetNamesDataSource();
   LocalizedStreet const & GetStreet() const;
   std::vector<LocalizedStreet> const & GetNearbyStreets() const;
 
@@ -142,9 +117,6 @@ public:
 
   /// Special mark that it's a point feature, not area or line.
   void SetPointType();
-  /// Enables advanced mode with direct access to default name and disables any recalculations.
-  void EnableNamesAdvancedMode() { m_namesAdvancedMode = true; }
-  bool IsNamesAdvancedModeEnabled() const { return m_namesAdvancedMode; }
   /// Remove blank names and default name duplications.
   void RemoveBlankAndDuplicationsForDefault();
   /// Calls RemoveBlankNames or RemoveFakeNames depending on mode.
@@ -166,8 +138,6 @@ public:
   static NamesDataSource GetNamesDataSource(StringUtf8Multilang const & source,
                                             std::vector<int8_t> const & nativeMwmLanguages,
                                             int8_t const userLanguage);
-  /// Removes fake names (which were added for user convenience) from name.
-  static void RemoveFakeNames(FakeNames const & fakeNames, StringUtf8Multilang & name);
 
   /// Compares editable fields connected with feature ignoring street.
   friend bool AreObjectsEqualIgnoringStreet(EditableMapObject const & lhs, EditableMapObject const & rhs);
@@ -176,7 +146,5 @@ private:
   LocalizedStreet m_street;
   std::vector<LocalizedStreet> m_nearbyStreets;
   EditableProperties m_editableProperties;
-  FakeNames m_fakeNames;
-  bool m_namesAdvancedMode = false;
 };
 }  // namespace osm
diff --git a/indexer/indexer_tests/editable_map_object_test.cpp b/indexer/indexer_tests/editable_map_object_test.cpp
index 82c4928de2..26ba90efaf 100644
--- a/indexer/indexer_tests/editable_map_object_test.cpp
+++ b/indexer/indexer_tests/editable_map_object_test.cpp
@@ -275,54 +275,35 @@ UNIT_TEST(EditableMapObject_GetNamesDataSource)
   auto const namesDataSource = EditableMapObject::GetNamesDataSource(
       emo.GetNameMultilang(), nativeMwmLanguages, GetLangCode("ko"));
 
-  TEST_EQUAL(namesDataSource.names.size(), 9, ("All names except the default should be pushed into "
-                                           "data source plus empty mandatory names"));
-  TEST_EQUAL(namesDataSource.mandatoryNamesCount, 4,
-             ("Mandatory names count should be equal to Mwm languages + user`s language"));
-  TEST_EQUAL(namesDataSource.names[0].m_code, GetLangCode("de"),
-             ("German must be first because it is first in the list of languages for MWM"));
-  TEST_EQUAL(namesDataSource.names[1].m_code, GetLangCode("fr"),
-             ("French must be second because it is second in the list of languages for MWM"));
-  TEST_EQUAL(namesDataSource.names[2].m_code, GetLangCode("en"),
-             ("English name should be placed after Mwm languages"));
-  TEST_EQUAL(namesDataSource.names[3].m_code, GetLangCode("ko"),
-             ("Korean should be fourth because the user’s langue must be followed by English."));
+  TEST_EQUAL(namesDataSource.names.size(), 9,("All names including the default should be pushed into data source"));
+  TEST_EQUAL(namesDataSource.mandatoryNamesCount, 1,("Mandatory names count should always be 1"));
+  TEST_EQUAL(namesDataSource.names[0].m_code, GetLangCode("default"),("Default is always first in the list"));
 
   {
     vector<int8_t> nativeMwmLanguages = {GetLangCode("de"), GetLangCode("fr")};
 
     auto const namesDataSource = EditableMapObject::GetNamesDataSource(
         emo.GetNameMultilang(), nativeMwmLanguages, GetLangCode("fr"));
-    TEST_EQUAL(namesDataSource.names.size(), 9,
-               ("All names + empty mandatory names should be pushed into "
-                "the data source, except the default one."));
-    TEST_EQUAL(namesDataSource.mandatoryNamesCount, 3,
-               ("Mandatory names count should be equal to MWM languages + "
-                "The English language + user`s language. Excluding repetiton"));
+    TEST_EQUAL(namesDataSource.names.size(), 9,("All names including the default should be pushed into data source"));
+    TEST_EQUAL(namesDataSource.mandatoryNamesCount, 1,("Mandatory names count should always be 1"));
   }
   {
     vector<int8_t> nativeMwmLanguages = {GetLangCode("fr"), GetLangCode("en")};
 
     auto const namesDataSource = EditableMapObject::GetNamesDataSource(
         emo.GetNameMultilang(), nativeMwmLanguages, GetLangCode("fr"));
-    TEST_EQUAL(namesDataSource.names.size(), 9,
-               ("All names + empty mandatory names should be pushed into "
-                "the data source, except the default one."));
-    TEST_EQUAL(namesDataSource.mandatoryNamesCount, 2,
-               ("Mandatory names count should be equal to MWM languages + "
-                "The English language + user`s language. Excluding repetiton"));
+    TEST_EQUAL(namesDataSource.names.size(), 9,("All names including the default should be pushed into data source"));
+    TEST_EQUAL(namesDataSource.mandatoryNamesCount, 1,("Mandatory names count should always be 1"));
   }
   {
     vector<int8_t> nativeMwmLanguages = {GetLangCode("en"), GetLangCode("en")};
 
     auto const namesDataSource = EditableMapObject::GetNamesDataSource(
         emo.GetNameMultilang(), nativeMwmLanguages, GetLangCode("en"));
-    TEST_EQUAL(namesDataSource.names.size(), 8,
-               ("All names + empty mandatory names should be pushed into "
-                "the data source, except the default one."));
+    TEST_EQUAL(namesDataSource.names.size(), 9,
+               ("All names including the default should be pushed into data source"));
     TEST_EQUAL(namesDataSource.mandatoryNamesCount, 1,
-               ("Mandatory names count should be equal to MWM languages + "
-                "The English language + user`s language. Excluding repetiton"));
+               ("Mandatory names count should always be 1"));
   }
 }
 
@@ -372,221 +353,6 @@ UNIT_TEST(EditableMapObject_SetInternet)
   setInternetAndCheck(bunkerEmo, feature::Internet::Wlan, true);
 }
 
-UNIT_TEST(EditableMapObject_RemoveFakeNames)
-{
-  EditableMapObject emo;
-  StringUtf8Multilang name;
-  osm::FakeNames fakeNames;
-
-  name.AddString(GetLangCode("default"), "Default name");
-  name.AddString(GetLangCode("ru"), "Default name");
-  name.AddString(GetLangCode("en"), "Default name");
-  fakeNames.m_names.push_back({GetLangCode("ru"), "Default name"});
-  fakeNames.m_names.push_back({GetLangCode("en"), "Default name"});
-  fakeNames.m_defaultName = "Default name";
-
-  EditableMapObject::RemoveFakeNames(fakeNames, name);
-
-  CheckExpectations(name, {{"default", "Default name"}});
-
-  name.Clear();
-  fakeNames.Clear();
-
-  name.AddString(GetLangCode("default"), "Default name");
-  name.AddString(GetLangCode("ru"), "Changed name");
-  name.AddString(GetLangCode("en"), "Default name");
-  fakeNames.m_names.push_back({GetLangCode("ru"), "Default name"});
-  fakeNames.m_names.push_back({GetLangCode("en"), "Default name"});
-  fakeNames.m_defaultName = "Default name";
-
-  EditableMapObject::RemoveFakeNames(fakeNames, name);
-
-  CheckExpectations(name, {{"default", "Default name"}, {"ru", "Changed name"}});
-
-  name.Clear();
-  fakeNames.Clear();
-
-  name.AddString(GetLangCode("default"), "Default name");
-  name.AddString(GetLangCode("ru"), "Default name");
-  name.AddString(GetLangCode("en"), "Changed name");
-  fakeNames.m_names.push_back({GetLangCode("ru"), "Default name"});
-  fakeNames.m_names.push_back({GetLangCode("en"), "Default name"});
-  fakeNames.m_defaultName = "Default name";
-
-  EditableMapObject::RemoveFakeNames(fakeNames, name);
-
-  CheckExpectations(name, {{"default", "Default name"}, {"en", "Changed name"}});
-
-  name.Clear();
-  fakeNames.Clear();
-
-  name.AddString(GetLangCode("default"), "Default name");
-  name.AddString(GetLangCode("ru"), "Changed name");
-  name.AddString(GetLangCode("en"), "Changed name");
-  fakeNames.m_names.push_back({GetLangCode("ru"), "Default name"});
-  fakeNames.m_names.push_back({GetLangCode("en"), "Default name"});
-  fakeNames.m_defaultName = "Default name";
-
-  EditableMapObject::RemoveFakeNames(fakeNames, name);
-
-  CheckExpectations(name, {{"default", "Changed name"}});
-
-  name.Clear();
-  fakeNames.Clear();
-
-  name.AddString(GetLangCode("default"), "Default name");
-  name.AddString(GetLangCode("ru"), "Changed name ru");
-  name.AddString(GetLangCode("en"), "Changed name en");
-  fakeNames.m_names.push_back({GetLangCode("ru"), "Default name"});
-  fakeNames.m_names.push_back({GetLangCode("en"), "Default name"});
-  fakeNames.m_defaultName = "Default name";
-
-  EditableMapObject::RemoveFakeNames(fakeNames, name);
-
-  CheckExpectations(name, {{"default", "Changed name ru"}, {"en", "Changed name en"}});
-
-  name.Clear();
-  fakeNames.Clear();
-
-  name.AddString(GetLangCode("default"), "Changed by other logic");
-  name.AddString(GetLangCode("ru"), "Default name");
-  name.AddString(GetLangCode("en"), "Changed name en");
-  fakeNames.m_names.push_back({GetLangCode("ru"), "Default name"});
-  fakeNames.m_names.push_back({GetLangCode("en"), "Default name"});
-  fakeNames.m_defaultName = "Default name";
-
-  EditableMapObject::RemoveFakeNames(fakeNames, name);
-
-  CheckExpectations(name, {{"default", "Changed by other logic"}, {"en", "Changed name en"}});
-
-  name.Clear();
-  fakeNames.Clear();
-
-  name.AddString(GetLangCode("default"), "Changed by other logic");
-  name.AddString(GetLangCode("ru"), "Changed name ru");
-  name.AddString(GetLangCode("en"), "Changed name en");
-  fakeNames.m_names.push_back({GetLangCode("ru"), "Default name"});
-  fakeNames.m_names.push_back({GetLangCode("en"), "Default name"});
-  fakeNames.m_defaultName = "Default name";
-
-  EditableMapObject::RemoveFakeNames(fakeNames, name);
-
-  CheckExpectations(name, {{"default", "Changed name ru"}, {"en", "Changed name en"}});
-
-  name.Clear();
-  fakeNames.Clear();
-
-  name.AddString(GetLangCode("default"), "Changed by other logic");
-  name.AddString(GetLangCode("ru"), "Default name");
-  name.AddString(GetLangCode("en"), "Default name");
-  fakeNames.m_names.push_back({GetLangCode("ru"), "Default name"});
-  fakeNames.m_names.push_back({GetLangCode("en"), "Default name"});
-  fakeNames.m_defaultName = "Default name";
-
-  EditableMapObject::RemoveFakeNames(fakeNames, name);
-
-  CheckExpectations(name, {{"default", "Changed by other logic"}});
-
-  name.Clear();
-  fakeNames.Clear();
-
-  name.AddString(GetLangCode("default"), "Default name");
-  name.AddString(GetLangCode("ru"), "");
-  name.AddString(GetLangCode("en"), "Changed name en");
-  fakeNames.m_names.push_back({GetLangCode("ru"), "Default name"});
-  fakeNames.m_names.push_back({GetLangCode("en"), "Default name"});
-  fakeNames.m_defaultName = "Default name";
-
-  EditableMapObject::RemoveFakeNames(fakeNames, name);
-
-  CheckExpectations(name, {{"default", "Changed name en"}});
-
-  name.Clear();
-  fakeNames.Clear();
-
-  name.AddString(GetLangCode("default"), "Default name");
-  name.AddString(GetLangCode("ru"), "");
-  name.AddString(GetLangCode("en"), "");
-  fakeNames.m_names.push_back({GetLangCode("ru"), "Default name"});
-  fakeNames.m_names.push_back({GetLangCode("en"), "Default name"});
-  fakeNames.m_defaultName = "Default name";
-
-  EditableMapObject::RemoveFakeNames(fakeNames, name);
-
-  CheckExpectations(name, {{"default", "Default name"}});
-
-  name.Clear();
-  fakeNames.Clear();
-
-  name.AddString(GetLangCode("default"), "Changed by other logic");
-  name.AddString(GetLangCode("ru"), "");
-  name.AddString(GetLangCode("en"), "");
-  name.AddString(GetLangCode("de"), "Deutch name");
-  fakeNames.m_names.push_back({GetLangCode("ru"), "Default name"});
-  fakeNames.m_names.push_back({GetLangCode("en"), "Default name"});
-  fakeNames.m_defaultName = "Default name";
-
-  EditableMapObject::RemoveFakeNames(fakeNames, name);
-
-  CheckExpectations(name, {{"default", "Deutch name"}, {"de", "Deutch name"}});
-
-  name.Clear();
-  fakeNames.Clear();
-
-  name.AddString(GetLangCode("default"), "Default name");
-  name.AddString(GetLangCode("ru"), "Test name");
-  name.AddString(GetLangCode("en"), "Default name");
-  fakeNames.m_names.push_back({GetLangCode("ru"), "Test name"});
-  fakeNames.m_names.push_back({GetLangCode("en"), "Default name"});
-  fakeNames.m_defaultName = "Default name";
-
-  EditableMapObject::RemoveFakeNames(fakeNames, name);
-
-  CheckExpectations(name, {{"default", "Default name"}, {"ru", "Test name"}});
-
-  name.Clear();
-  fakeNames.Clear();
-
-  name.AddString(GetLangCode("default"), "Default name");
-  name.AddString(GetLangCode("ru"), "Test name changed");
-  name.AddString(GetLangCode("en"), "Default name changed");
-  fakeNames.m_names.push_back({GetLangCode("ru"), "Test name"});
-  fakeNames.m_names.push_back({GetLangCode("en"), "Default name"});
-  fakeNames.m_defaultName = "Default name";
-
-  EditableMapObject::RemoveFakeNames(fakeNames, name);
-
-  CheckExpectations(name, {{"default", "Test name changed"}, {"en", "Default name changed"}});
-
-  name.Clear();
-  fakeNames.Clear();
-
-  name.AddString(GetLangCode("default"), "Default name");
-  name.AddString(GetLangCode("ru"), "Test name");
-  name.AddString(GetLangCode("en"), "Second test name changed");
-  fakeNames.m_names.push_back({GetLangCode("ru"), "Test name"});
-  fakeNames.m_names.push_back({GetLangCode("en"), "Second test name"});
-  fakeNames.m_defaultName = "Default name";
-
-  EditableMapObject::RemoveFakeNames(fakeNames, name);
-
-  CheckExpectations(name, {{"default", "Default name"}, {"ru", "Test name"}, {"en", "Second test name changed"}});
-
-  name.Clear();
-  fakeNames.Clear();
-
-  name.AddString(GetLangCode("default"), "Default name");
-  name.AddString(GetLangCode("ru"), "");
-  name.AddString(GetLangCode("en"), "Second test name changed");
-  fakeNames.m_names.push_back({GetLangCode("ru"), "Test name"});
-  fakeNames.m_names.push_back({GetLangCode("en"), "Second test name"});
-  fakeNames.m_defaultName = "Default name";
-
-  EditableMapObject::RemoveFakeNames(fakeNames, name);
-
-  CheckExpectations(name, {{"default", "Second test name changed"}});
-}
-
 UNIT_TEST(EditableMapObject_RemoveBlankNames)
 {
   auto const getCountOfNames = [](StringUtf8Multilang const & names)
diff --git a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift
index 7abff41767..d2d150ea22 100644
--- a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift
+++ b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift
@@ -74,33 +74,29 @@ final class BMCViewController: MWMViewController {
   }
 
   private func shareCategoryFile(at index: Int, anchor: UIView) {
-    UIApplication.shared.showLoadingOverlay()
     viewModel.shareCategoryFile(at: index, handler: sharingResultHandler(anchorView: anchor))
   }
 
   private func shareAllCategories(anchor: UIView?) {
-    UIApplication.shared.showLoadingOverlay()
     viewModel.shareAllCategories(handler: sharingResultHandler(anchorView: anchor))
   }
 
   private func sharingResultHandler(anchorView: UIView?) -> SharingResultCompletionHandler {
     { [weak self] status, url in
-      UIApplication.shared.hideLoadingOverlay {
-        guard let self else { return }
-        switch status {
-        case .success:
-          let shareController = ActivityViewController.share(for: url, message: L("share_bookmarks_email_body"))
-          { [weak self] _, _, _, _ in
-            self?.viewModel?.finishShareCategory()
-          }
-          shareController?.present(inParentViewController: self, anchorView: anchorView)
-        case .emptyCategory:
-          MWMAlertViewController.activeAlert().presentInfoAlert(L("bookmarks_error_title_share_empty"),
-                                                                text: L("bookmarks_error_message_share_empty"))
-        case .fileError, .archiveError:
-          MWMAlertViewController.activeAlert().presentInfoAlert(L("dialog_routing_system_error"),
-                                                                text: L("bookmarks_error_message_share_general"))
+      guard let self else { return }
+      switch status {
+      case .success:
+        let shareController = ActivityViewController.share(for: url, message: L("share_bookmarks_email_body"))
+        { [weak self] _, _, _, _ in
+          self?.viewModel?.finishShareCategory()
         }
+        shareController?.present(inParentViewController: self, anchorView: anchorView)
+      case .emptyCategory:
+        MWMAlertViewController.activeAlert().presentInfoAlert(L("bookmarks_error_title_share_empty"),
+                                                              text: L("bookmarks_error_message_share_empty"))
+      case .fileError, .archiveError:
+        MWMAlertViewController.activeAlert().presentInfoAlert(L("dialog_routing_system_error"),
+                                                              text: L("bookmarks_error_message_share_general"))
       }
     }
   }
diff --git a/iphone/Maps/Categories/UIApplication+LoadingOverlay.swift b/iphone/Maps/Categories/UIApplication+LoadingOverlay.swift
deleted file mode 100644
index c51b985500..0000000000
--- a/iphone/Maps/Categories/UIApplication+LoadingOverlay.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-extension UIApplication {
-  private static let overlayViewController = LoadingOverlayViewController()
-
-  @objc
-  func showLoadingOverlay(completion: (() -> Void)? = nil) {
-    guard let window = self.windows.first(where: { $0.isKeyWindow }) else {
-      completion?()
-      return
-    }
-
-    DispatchQueue.main.async {
-      UIApplication.overlayViewController.modalPresentationStyle = .overFullScreen
-      UIApplication.overlayViewController.modalTransitionStyle = .crossDissolve
-      window.rootViewController?.present(UIApplication.overlayViewController, animated: true, completion: completion)
-    }
-  }
-
-  @objc
-  func hideLoadingOverlay(completion: (() -> Void)? = nil) {
-    DispatchQueue.main.async {
-      UIApplication.overlayViewController.dismiss(animated: true, completion: completion)
-    }
-  }
-}
diff --git a/iphone/Maps/Classes/LoadingOverlay/LoadingOverlayViewController.swift b/iphone/Maps/Classes/LoadingOverlay/LoadingOverlayViewController.swift
deleted file mode 100644
index 6ed26097d7..0000000000
--- a/iphone/Maps/Classes/LoadingOverlay/LoadingOverlayViewController.swift
+++ /dev/null
@@ -1,29 +0,0 @@
-final class LoadingOverlayViewController: UIViewController {
-  private var activityIndicator: UIActivityIndicatorView = {
-    let indicator: UIActivityIndicatorView
-    if #available(iOS 13.0, *) {
-      indicator = UIActivityIndicatorView(style: .large)
-    } else {
-      indicator = UIActivityIndicatorView(style: .whiteLarge)
-    }
-    indicator.color = .white
-    indicator.startAnimating()
-    indicator.translatesAutoresizingMaskIntoConstraints = false
-    return indicator
-  }()
-
-  override func viewDidLoad() {
-    super.viewDidLoad()
-    view.backgroundColor = UIColor.black.withAlphaComponent(0.3)
-    setupViews()
-  }
-
-  private func setupViews() {
-    view.addSubview(activityIndicator)
-    NSLayoutConstraint.activate([
-      activityIndicator.centerXAnchor.constraint(equalTo: view.centerXAnchor),
-      activityIndicator.centerYAnchor.constraint(equalTo: view.centerYAnchor)
-    ])
-    view.isUserInteractionEnabled = false
-  }
-}
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index 1f103892d9..d144305c3d 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "اسم المكان";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "كما هو مكتوب باللغة المحلية";
+
 "editor_edit_place_category_title" = "الفئة";
 
 "whatsnew_editor_message_1" = "قم بإضافة أماكن جديدة للخريطة، وعدل أماكن حالية مباشرة من التطبيق.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "عبور المشاة";
 
+"type.highway.footway.alpine_hiking" = "مسار";
+
 "type.highway.footway.area" = "منطقة مشاة";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "جسر للمشاة";
 
+"type.highway.footway.demanding_alpine_hiking" = "مسار";
+
+"type.highway.footway.demanding_mountain_hiking" = "مسار";
+
+"type.highway.footway.difficult_alpine_hiking" = "مسار";
+
+"type.highway.footway.hiking" = "مسار";
+
+"type.highway.footway.mountain_hiking" = "مسار";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "نفق للمشاة";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "مسار";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "مسار";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "مسار";
+"type.highway.path.alpine_hiking" = "مسار";
 
 "type.highway.path.bicycle" = "مسار للمشاة والدراجات معاً";
 
-"type.highway.footway.bicycle" = "مسار للمشاة والدراجات معاً";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "جسر";
 
+"type.highway.path.demanding_alpine_hiking" = "مسار";
+
+"type.highway.path.demanding_mountain_hiking" = "مسار";
+
+"type.highway.path.difficult_alpine_hiking" = "مسار";
+
+"type.highway.path.hiking" = "مسار";
+
 "type.highway.path.horse" = "مسار";
 
+"type.highway.path.mountain_hiking" = "مسار";
+
+"type.highway.path.permissive" = "مسار";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "نفق";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "شارع";
 
+"type.highway.track.grade2" = "شارع";
+
+"type.highway.track.grade3" = "شارع";
+
+"type.highway.track.grade4" = "شارع";
+
+"type.highway.track.grade5" = "شارع";
+
 "type.highway.track.no.access" = "شارع";
 
+"type.highway.track.permissive" = "شارع";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "نفق";
 
diff --git a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
index 61e33901e7..e6dd2a44e8 100644
--- a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Yerin adı";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Yerli dildə yazıldığı kimi";
+
 "editor_edit_place_category_title" = "Kateqoriya";
 
 "whatsnew_editor_message_1" = "Xəritəyə yeni yerlər əlavə edin və mövcud yerləri birbaşa tətbiqdən redaktə edin.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Piyada keçidi";
 
+"type.highway.footway.alpine_hiking" = "Yol";
+
 "type.highway.footway.area" = "Piyada ərazisi";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Körpü";
 
+"type.highway.footway.demanding_alpine_hiking" = "Yol";
+
+"type.highway.footway.demanding_mountain_hiking" = "Yol";
+
+"type.highway.footway.difficult_alpine_hiking" = "Yol";
+
+"type.highway.footway.hiking" = "Yol";
+
+"type.highway.footway.mountain_hiking" = "Yol";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Tunel";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Yol";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Yol";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Yol";
+"type.highway.path.alpine_hiking" = "Yol";
 
 "type.highway.path.bicycle" = "Velosiped və Gəzinti Yolu";
 
-"type.highway.footway.bicycle" = "Velosiped və Gəzinti Yolu";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Körpü";
 
+"type.highway.path.demanding_alpine_hiking" = "Yol";
+
+"type.highway.path.demanding_mountain_hiking" = "Yol";
+
+"type.highway.path.difficult_alpine_hiking" = "Yol";
+
+"type.highway.path.hiking" = "Yol";
+
 "type.highway.path.horse" = "Atlı yolu";
 
+"type.highway.path.mountain_hiking" = "Yol";
+
+"type.highway.path.permissive" = "Yol";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Uçuş zolağı";
 
+"type.highway.track.grade2" = "Uçuş zolağı";
+
+"type.highway.track.grade3" = "Uçuş zolağı";
+
+"type.highway.track.grade4" = "Uçuş zolağı";
+
+"type.highway.track.grade5" = "Uçuş zolağı";
+
 "type.highway.track.no.access" = "Uçuş zolağı";
 
+"type.highway.track.permissive" = "Uçuş zolağı";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunel";
 
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index d4d4b17b4c..b447715ccb 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Назва месца";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "На мясцовай мове";
+
 "editor_edit_place_category_title" = "Катэгорыя";
 
 "whatsnew_editor_message_1" = "Стварайце на мапе новыя месцы і рэдагуйце існуючыя прама ў праграме.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Пешаходны пераход";
 
+"type.highway.footway.alpine_hiking" = "Path";
+
 "type.highway.footway.area" = "Foot Path";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Мост";
 
+"type.highway.footway.demanding_alpine_hiking" = "Path";
+
+"type.highway.footway.demanding_mountain_hiking" = "Path";
+
+"type.highway.footway.difficult_alpine_hiking" = "Path";
+
+"type.highway.footway.hiking" = "Path";
+
+"type.highway.footway.mountain_hiking" = "Path";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Тунэль";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Path";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Path";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Path";
+"type.highway.path.alpine_hiking" = "Path";
 
 "type.highway.path.bicycle" = "Path";
 
-"type.highway.footway.bicycle" = "Path";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Мост";
 
+"type.highway.path.demanding_alpine_hiking" = "Path";
+
+"type.highway.path.demanding_mountain_hiking" = "Path";
+
+"type.highway.path.difficult_alpine_hiking" = "Path";
+
+"type.highway.path.hiking" = "Path";
+
 "type.highway.path.horse" = "Path";
 
+"type.highway.path.mountain_hiking" = "Path";
+
+"type.highway.path.permissive" = "Path";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Тунэль";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Track";
 
+"type.highway.track.grade2" = "Track";
+
+"type.highway.track.grade3" = "Track";
+
+"type.highway.track.grade4" = "Track";
+
+"type.highway.track.grade5" = "Track";
+
 "type.highway.track.no.access" = "Track";
 
+"type.highway.track.permissive" = "Track";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Тунэль";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Горны прытулак з абслугоўваннем";
 
-"type.tourism.apartment" = "Кватэра для адпачынку";
+"type.tourism.apartment" = "Holiday Apartment";
 
 "type.tourism.artwork" = "Artwork";
 
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index ae229238f9..51c23c08d6 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Име на мястото";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Както е написано на местния език";
+
 "editor_edit_place_category_title" = "Категория";
 
 "whatsnew_editor_message_1" = "Добавяне на нови места в картата и редакция на съществуващите директно от приложението.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Пешеходно пресичане";
 
+"type.highway.footway.alpine_hiking" = "Path";
+
 "type.highway.footway.area" = "Foot Path";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Мост";
 
+"type.highway.footway.demanding_alpine_hiking" = "Path";
+
+"type.highway.footway.demanding_mountain_hiking" = "Path";
+
+"type.highway.footway.difficult_alpine_hiking" = "Path";
+
+"type.highway.footway.hiking" = "Path";
+
+"type.highway.footway.mountain_hiking" = "Path";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Тунел";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Path";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Path";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Path";
+"type.highway.path.alpine_hiking" = "Path";
 
 "type.highway.path.bicycle" = "Path";
 
-"type.highway.footway.bicycle" = "Path";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Мост";
 
+"type.highway.path.demanding_alpine_hiking" = "Path";
+
+"type.highway.path.demanding_mountain_hiking" = "Path";
+
+"type.highway.path.difficult_alpine_hiking" = "Path";
+
+"type.highway.path.hiking" = "Path";
+
 "type.highway.path.horse" = "Path";
 
+"type.highway.path.mountain_hiking" = "Path";
+
+"type.highway.path.permissive" = "Path";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Тунел";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Track";
 
+"type.highway.track.grade2" = "Track";
+
+"type.highway.track.grade3" = "Track";
+
+"type.highway.track.grade4" = "Track";
+
+"type.highway.track.grade5" = "Track";
+
 "type.highway.track.no.access" = "Track";
 
+"type.highway.track.permissive" = "Track";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Тунел";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Планинска хижа";
 
-"type.tourism.apartment" = "Ваканционен апартамент";
+"type.tourism.apartment" = "Holiday Apartment";
 
 "type.tourism.artwork" = "Artwork";
 
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
index aef566dab8..3123ad3822 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Nom del lloc";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Com està escrit en la llengua local";
+
 "editor_edit_place_category_title" = "Categoria";
 
 "whatsnew_editor_message_1" = "Afegiu llocs al mapa, i editeu-ne els existents directament des de l'aplicació.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Pas de vianants";
 
+"type.highway.footway.alpine_hiking" = "Path";
+
 "type.highway.footway.area" = "Foot Path";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Pedestrian Bridge";
 
+"type.highway.footway.demanding_alpine_hiking" = "Path";
+
+"type.highway.footway.demanding_mountain_hiking" = "Path";
+
+"type.highway.footway.difficult_alpine_hiking" = "Path";
+
+"type.highway.footway.hiking" = "Path";
+
+"type.highway.footway.mountain_hiking" = "Path";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Pedestrian Tunnel";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Path";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Path";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Path";
+"type.highway.path.alpine_hiking" = "Path";
 
 "type.highway.path.bicycle" = "Path";
 
-"type.highway.footway.bicycle" = "Path";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Bridge";
 
+"type.highway.path.demanding_alpine_hiking" = "Path";
+
+"type.highway.path.demanding_mountain_hiking" = "Path";
+
+"type.highway.path.difficult_alpine_hiking" = "Path";
+
+"type.highway.path.hiking" = "Path";
+
 "type.highway.path.horse" = "Path";
 
+"type.highway.path.mountain_hiking" = "Path";
+
+"type.highway.path.permissive" = "Path";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunnel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Track";
 
+"type.highway.track.grade2" = "Track";
+
+"type.highway.track.grade3" = "Track";
+
+"type.highway.track.grade4" = "Track";
+
+"type.highway.track.grade5" = "Track";
+
 "type.highway.track.no.access" = "Track";
 
+"type.highway.track.permissive" = "Track";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunnel";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Lodge de muntanya";
 
-"type.tourism.apartment" = "Apartament de vacances";
+"type.tourism.apartment" = "Holiday Apartment";
 
 "type.tourism.artwork" = "Artwork";
 
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 6d46e4ca84..5ff1c77ec4 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Název místa";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Jak je napsáno v místním jazyce";
+
 "editor_edit_place_category_title" = "Kategorie";
 
 "whatsnew_editor_message_1" = "Přidejte na mapu nová místa a upravte existující místa přímo z aplikace.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Přechod pro chodce";
 
+"type.highway.footway.alpine_hiking" = "Cesta";
+
 "type.highway.footway.area" = "Cesta";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Most";
 
+"type.highway.footway.demanding_alpine_hiking" = "Cesta";
+
+"type.highway.footway.demanding_mountain_hiking" = "Cesta";
+
+"type.highway.footway.difficult_alpine_hiking" = "Cesta";
+
+"type.highway.footway.hiking" = "Cesta";
+
+"type.highway.footway.mountain_hiking" = "Cesta";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Tunel";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Cesta";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Cesta";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Cesta";
+"type.highway.path.alpine_hiking" = "Cesta";
 
 "type.highway.path.bicycle" = "Cesta";
 
-"type.highway.footway.bicycle" = "Cesta";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Most";
 
+"type.highway.path.demanding_alpine_hiking" = "Cesta";
+
+"type.highway.path.demanding_mountain_hiking" = "Cesta";
+
+"type.highway.path.difficult_alpine_hiking" = "Cesta";
+
+"type.highway.path.hiking" = "Cesta";
+
 "type.highway.path.horse" = "Cesta";
 
+"type.highway.path.mountain_hiking" = "Cesta";
+
+"type.highway.path.permissive" = "Cesta";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Ulice";
 
+"type.highway.track.grade2" = "Ulice";
+
+"type.highway.track.grade3" = "Ulice";
+
+"type.highway.track.grade4" = "Ulice";
+
+"type.highway.track.grade5" = "Ulice";
+
 "type.highway.track.no.access" = "Ulice";
 
+"type.highway.track.permissive" = "Ulice";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunel";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Horská chata";
 
-"type.tourism.apartment" = "Prázdninový apartmán";
+"type.tourism.apartment" = "Byty";
 
 "type.tourism.artwork" = "Umělecké dílo";
 
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index f54168626a..cce33134a8 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Stedets navn";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Som det står skrevet på det lokale sprog";
+
 "editor_edit_place_category_title" = "Kategori";
 
 "whatsnew_editor_message_1" = "Tilføj nye steder til kortet og redigér eksisterende direkte fra app'en.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Fodgængerovergang";
 
+"type.highway.footway.alpine_hiking" = "Sti";
+
 "type.highway.footway.area" = "Sti";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Bro";
 
+"type.highway.footway.demanding_alpine_hiking" = "Sti";
+
+"type.highway.footway.demanding_mountain_hiking" = "Sti";
+
+"type.highway.footway.difficult_alpine_hiking" = "Sti";
+
+"type.highway.footway.hiking" = "Sti";
+
+"type.highway.footway.mountain_hiking" = "Sti";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Tunnel";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Sti";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Sti";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Sti";
+"type.highway.path.alpine_hiking" = "Sti";
 
 "type.highway.path.bicycle" = "Sti";
 
-"type.highway.footway.bicycle" = "Sti";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Bro";
 
+"type.highway.path.demanding_alpine_hiking" = "Sti";
+
+"type.highway.path.demanding_mountain_hiking" = "Sti";
+
+"type.highway.path.difficult_alpine_hiking" = "Sti";
+
+"type.highway.path.hiking" = "Sti";
+
 "type.highway.path.horse" = "Sti";
 
+"type.highway.path.mountain_hiking" = "Sti";
+
+"type.highway.path.permissive" = "Sti";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunnel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Gade";
 
+"type.highway.track.grade2" = "Gade";
+
+"type.highway.track.grade3" = "Gade";
+
+"type.highway.track.grade4" = "Gade";
+
+"type.highway.track.grade5" = "Gade";
+
 "type.highway.track.no.access" = "Gade";
 
+"type.highway.track.permissive" = "Gade";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunnel";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Bjerghytte";
 
-"type.tourism.apartment" = "Ferielejlighed";
+"type.tourism.apartment" = "Lejligheder";
 
 "type.tourism.artwork" = "Kunstværk";
 
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index edff1f6704..ad65e4a21e 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Name des Ortes";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Wie in der lokalen Sprache geschrieben";
+
 "editor_edit_place_category_title" = "Kategorie";
 
 "whatsnew_editor_message_1" = "Fügen Sie auf der Karte einen neuen Ort hinzu und bearbeiten Sie existierende Orte direkt in der App.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Fußgängerübergang";
 
+"type.highway.footway.alpine_hiking" = "Alpinwanderweg";
+
 "type.highway.footway.area" = "Fußweg";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Brücke";
 
+"type.highway.footway.demanding_alpine_hiking" = "Anspruchsvoller Alpinwanderweg";
+
+"type.highway.footway.demanding_mountain_hiking" = "Anspruchsvoller Bergwanderweg";
+
+"type.highway.footway.difficult_alpine_hiking" = "Schwieriger Alpinwanderweg";
+
+"type.highway.footway.hiking" = "Wanderweg";
+
+"type.highway.footway.mountain_hiking" = "Bergwanderweg";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Fußgängertunnel";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Weg";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Weg";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Weg";
+"type.highway.path.alpine_hiking" = "Alpinwanderweg";
 
 "type.highway.path.bicycle" = "Radweg";
 
-"type.highway.footway.bicycle" = "Radweg";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Brücke";
 
+"type.highway.path.demanding_alpine_hiking" = "Anspruchsvoller Alpinwanderweg";
+
+"type.highway.path.demanding_mountain_hiking" = "Anspruchsvoller Bergwanderweg";
+
+"type.highway.path.difficult_alpine_hiking" = "Schwieriger Alpinwanderweg";
+
+"type.highway.path.hiking" = "Wanderweg";
+
 "type.highway.path.horse" = "Reitweg";
 
+"type.highway.path.mountain_hiking" = "Bergwanderweg";
+
+"type.highway.path.permissive" = "Weg";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunnel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Forst-/Feldweg";
 
+"type.highway.track.grade2" = "Forst-/Feldweg";
+
+"type.highway.track.grade3" = "Forst-/Feldweg";
+
+"type.highway.track.grade4" = "Forst-/Feldweg";
+
+"type.highway.track.grade5" = "Forst-/Feldweg";
+
 "type.highway.track.no.access" = "Forst-/Feldweg";
 
+"type.highway.track.permissive" = "Forst-/Feldweg";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Straßentunnel";
 
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 56f51cde4b..ef14866c7f 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Όνομα τοποθεσίας";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Όπως είναι γραμμένο στην τοπική γλώσσα";
+
 "editor_edit_place_category_title" = "Κατηγορία";
 
 "whatsnew_editor_message_1" = "Προσθέστε νέες τοποθεσίες στο χάρτη, και επεξεργαστείτε τις υπάρχουσες απευθείας από την εφαρμογή.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Διάβαση πεζών";
 
+"type.highway.footway.alpine_hiking" = "Διαδρομή";
+
 "type.highway.footway.area" = "Διαδρομή";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Γέφυρα";
 
+"type.highway.footway.demanding_alpine_hiking" = "Διαδρομή";
+
+"type.highway.footway.demanding_mountain_hiking" = "Διαδρομή";
+
+"type.highway.footway.difficult_alpine_hiking" = "Διαδρομή";
+
+"type.highway.footway.hiking" = "Διαδρομή";
+
+"type.highway.footway.mountain_hiking" = "Διαδρομή";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Σήραγγα";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Διαδρομή";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Διαδρομή";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Διαδρομή";
+"type.highway.path.alpine_hiking" = "Διαδρομή";
 
 "type.highway.path.bicycle" = "Διαδρομή";
 
-"type.highway.footway.bicycle" = "Διαδρομή";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Γέφυρα";
 
+"type.highway.path.demanding_alpine_hiking" = "Διαδρομή";
+
+"type.highway.path.demanding_mountain_hiking" = "Διαδρομή";
+
+"type.highway.path.difficult_alpine_hiking" = "Διαδρομή";
+
+"type.highway.path.hiking" = "Διαδρομή";
+
 "type.highway.path.horse" = "Διαδρομή";
 
+"type.highway.path.mountain_hiking" = "Διαδρομή";
+
+"type.highway.path.permissive" = "Διαδρομή";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Σήραγγα";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Οδός";
 
+"type.highway.track.grade2" = "Οδός";
+
+"type.highway.track.grade3" = "Οδός";
+
+"type.highway.track.grade4" = "Οδός";
+
+"type.highway.track.grade5" = "Οδός";
+
 "type.highway.track.no.access" = "Οδός";
 
+"type.highway.track.permissive" = "Οδός";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Σήραγγα";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Ορεινό καταφύγιο";
 
-"type.tourism.apartment" = "Διαμέρισμα διακοπών";
+"type.tourism.apartment" = "Διαμερίσματα";
 
 "type.tourism.artwork" = "Έργα τέχνης";
 
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 34477dead5..68afd2709f 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Name of the place";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "As it is written in the local language";
+
 "editor_edit_place_category_title" = "Category";
 
 "whatsnew_editor_message_1" = "Add new places to the map, and edit existing ones directly from the app.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Pedestrian Crossing";
 
+"type.highway.footway.alpine_hiking" = "Path";
+
 "type.highway.footway.area" = "Foot Path";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Pedestrian Bridge";
 
+"type.highway.footway.demanding_alpine_hiking" = "Path";
+
+"type.highway.footway.demanding_mountain_hiking" = "Path";
+
+"type.highway.footway.difficult_alpine_hiking" = "Path";
+
+"type.highway.footway.hiking" = "Path";
+
+"type.highway.footway.mountain_hiking" = "Path";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Pedestrian Tunnel";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Path";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Path";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Path";
+"type.highway.path.alpine_hiking" = "Path";
 
 "type.highway.path.bicycle" = "Path";
 
-"type.highway.footway.bicycle" = "Path";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Bridge";
 
+"type.highway.path.demanding_alpine_hiking" = "Path";
+
+"type.highway.path.demanding_mountain_hiking" = "Path";
+
+"type.highway.path.difficult_alpine_hiking" = "Path";
+
+"type.highway.path.hiking" = "Path";
+
 "type.highway.path.horse" = "Path";
 
+"type.highway.path.mountain_hiking" = "Path";
+
+"type.highway.path.permissive" = "Path";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunnel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Track";
 
+"type.highway.track.grade2" = "Track";
+
+"type.highway.track.grade3" = "Track";
+
+"type.highway.track.grade4" = "Track";
+
+"type.highway.track.grade5" = "Track";
+
 "type.highway.track.no.access" = "Track";
 
+"type.highway.track.permissive" = "Track";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunnel";
 
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index 91852713f9..c7e2333159 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Name of the place";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "As it is written in the local language";
+
 "editor_edit_place_category_title" = "Category";
 
 "whatsnew_editor_message_1" = "Add new places to the map, and edit existing ones directly from the app.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Pedestrian Crossing";
 
+"type.highway.footway.alpine_hiking" = "Path";
+
 "type.highway.footway.area" = "Pedestrian Area";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Pedestrian Bridge";
 
+"type.highway.footway.demanding_alpine_hiking" = "Path";
+
+"type.highway.footway.demanding_mountain_hiking" = "Path";
+
+"type.highway.footway.difficult_alpine_hiking" = "Path";
+
+"type.highway.footway.hiking" = "Path";
+
+"type.highway.footway.mountain_hiking" = "Path";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Pedestrian Tunnel";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Path";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Difficult or Indistinct Trail";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Expert or Indiscernible Trail";
+"type.highway.path.alpine_hiking" = "Path";
 
 "type.highway.path.bicycle" = "Cycle & Foot Path";
 
-"type.highway.footway.bicycle" = "Cycle & Foot Path";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Bridge";
 
+"type.highway.path.demanding_alpine_hiking" = "Path";
+
+"type.highway.path.demanding_mountain_hiking" = "Path";
+
+"type.highway.path.difficult_alpine_hiking" = "Path";
+
+"type.highway.path.hiking" = "Path";
+
 "type.highway.path.horse" = "Bridle Path";
 
+"type.highway.path.mountain_hiking" = "Path";
+
+"type.highway.path.permissive" = "Path";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunnel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Track";
 
+"type.highway.track.grade2" = "Track";
+
+"type.highway.track.grade3" = "Track";
+
+"type.highway.track.grade4" = "Track";
+
+"type.highway.track.grade5" = "Track";
+
 "type.highway.track.no.access" = "Track";
 
+"type.highway.track.permissive" = "Track";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunnel";
 
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index c5ba991a46..12b012855d 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Nombre del lugar";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Como está escrito en la lengua local";
+
 "editor_edit_place_category_title" = "Categoría";
 
 "whatsnew_editor_message_1" = "Añadir lugares nuevos al mapa y editar los lugares actuales directamente desde la aplicación.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Cruce peatonal";
 
+"type.highway.footway.alpine_hiking" = "Camino de senderismo alpino";
+
 "type.highway.footway.area" = "Camino";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Puente";
 
+"type.highway.footway.demanding_alpine_hiking" = "Camino";
+
+"type.highway.footway.demanding_mountain_hiking" = "Camino";
+
+"type.highway.footway.difficult_alpine_hiking" = "Camino";
+
+"type.highway.footway.hiking" = "Sendero";
+
+"type.highway.footway.mountain_hiking" = "Sendero de montaña";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Túnel";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Camino";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Camino";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Camino";
+"type.highway.path.alpine_hiking" = "Camino";
 
 "type.highway.path.bicycle" = "Camino";
 
-"type.highway.footway.bicycle" = "Camino";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Puente";
 
+"type.highway.path.demanding_alpine_hiking" = "Camino";
+
+"type.highway.path.demanding_mountain_hiking" = "Camino";
+
+"type.highway.path.difficult_alpine_hiking" = "Camino";
+
+"type.highway.path.hiking" = "Camino";
+
 "type.highway.path.horse" = "Camino";
 
+"type.highway.path.mountain_hiking" = "Camino";
+
+"type.highway.path.permissive" = "Camino";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Túnel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Pista";
 
+"type.highway.track.grade2" = "Pista";
+
+"type.highway.track.grade3" = "Pista";
+
+"type.highway.track.grade4" = "Pista";
+
+"type.highway.track.grade5" = "Pista";
+
 "type.highway.track.no.access" = "Pista";
 
+"type.highway.track.permissive" = "Pista";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Túnel";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Albergue de montaña";
 
-"type.tourism.apartment" = "Apartamento de vacaciones";
+"type.tourism.apartment" = "Apartamentos";
 
 "type.tourism.artwork" = "Obras de arte";
 
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 85bd5b336f..d0a552a80e 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Nombre del lugar";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Como está escrito en la lengua local";
+
 "editor_edit_place_category_title" = "Categoría";
 
 "whatsnew_editor_message_1" = "Añadir lugares nuevos al mapa y editar los lugares actuales directamente desde la aplicación.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Paso de peatones";
 
+"type.highway.footway.alpine_hiking" = "Camino de senderismo alpino";
+
 "type.highway.footway.area" = "Zona peatonal";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Puente peatonal";
 
+"type.highway.footway.demanding_alpine_hiking" = "Camino";
+
+"type.highway.footway.demanding_mountain_hiking" = "Camino";
+
+"type.highway.footway.difficult_alpine_hiking" = "Camino";
+
+"type.highway.footway.hiking" = "Sendero";
+
+"type.highway.footway.mountain_hiking" = "Sendero de montaña";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Túnel peatonal";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Camino";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Camino";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Camino";
+"type.highway.path.alpine_hiking" = "Camino de senderismo alpino";
 
 "type.highway.path.bicycle" = "Camino para bicicletas";
 
-"type.highway.footway.bicycle" = "Camino para bicicletas";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Puente";
 
+"type.highway.path.demanding_alpine_hiking" = "Camino de senderismo alpino exigente";
+
+"type.highway.path.demanding_mountain_hiking" = "Camino de senderismo de montaña exigente";
+
+"type.highway.path.difficult_alpine_hiking" = "Camino";
+
+"type.highway.path.hiking" = "Sendero";
+
 "type.highway.path.horse" = "Sendero de herradura";
 
+"type.highway.path.mountain_hiking" = "Sendero de montaña";
+
+"type.highway.path.permissive" = "Camino";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Túnel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Pista";
 
+"type.highway.track.grade2" = "Pista";
+
+"type.highway.track.grade3" = "Pista";
+
+"type.highway.track.grade4" = "Pista";
+
+"type.highway.track.grade5" = "Pista";
+
 "type.highway.track.no.access" = "Pista";
 
+"type.highway.track.permissive" = "Pista";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Túnel";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Albergue de montaña";
 
-"type.tourism.apartment" = "Apartamento de vacaciones";
+"type.tourism.apartment" = "Apartamentos";
 
 "type.tourism.artwork" = "Obras de arte";
 
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
index ac76e54141..14a12ca35a 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Koha nimi";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Nagu on kirjutatud kohalikus keeles";
+
 "editor_edit_place_category_title" = "Kategooria";
 
 "whatsnew_editor_message_1" = "Lisa kaardile uusi kohti ja muuda olemasolevaid otse rakenduses.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Jalakäijate ülekäigurada";
 
+"type.highway.footway.alpine_hiking" = "Alpi matkarada";
+
 "type.highway.footway.area" = "Jalakäijate ala";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Jalakäijate sild";
 
+"type.highway.footway.demanding_alpine_hiking" = "Nõudlik alpi matkarada";
+
+"type.highway.footway.demanding_mountain_hiking" = "Rada";
+
+"type.highway.footway.difficult_alpine_hiking" = "Nõudlik mägimatkarada";
+
+"type.highway.footway.hiking" = "Rada";
+
+"type.highway.footway.mountain_hiking" = "Mägirada";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Jalakäijate tunnel";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Rada";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Rada";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Rada";
+"type.highway.path.alpine_hiking" = "Alpi matkarada";
 
 "type.highway.path.bicycle" = "Jalgratta- ja jalgtee";
 
-"type.highway.footway.bicycle" = "Jalgratta- ja jalgtee";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Sild";
 
+"type.highway.path.demanding_alpine_hiking" = "Nõudlik alpi matkarada";
+
+"type.highway.path.demanding_mountain_hiking" = "Nõudlik mägimatkarada";
+
+"type.highway.path.difficult_alpine_hiking" = "Raske alpi matkarada";
+
+"type.highway.path.hiking" = "Rada";
+
 "type.highway.path.horse" = "Valjarada";
 
+"type.highway.path.mountain_hiking" = "Mägitee";
+
+"type.highway.path.permissive" = "Rada";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunnel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Rada";
 
+"type.highway.track.grade2" = "Rada";
+
+"type.highway.track.grade3" = "Rada";
+
+"type.highway.track.grade4" = "Rada";
+
+"type.highway.track.grade5" = "Rada";
+
 "type.highway.track.no.access" = "Rada";
 
+"type.highway.track.permissive" = "Rada";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunnel";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Mägimajake";
 
-"type.tourism.apartment" = "Puhkuse korter";
+"type.tourism.apartment" = "Korterid";
 
 "type.tourism.artwork" = "Kunstiteos";
 
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index b2749632b1..2b78b633cf 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Tokiaren izena";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Bertako hizkuntzan idatzita dagoenez";
+
 "editor_edit_place_category_title" = "Kategoria";
 
 "whatsnew_editor_message_1" = "Gehitu toki berriak mapan eta editatu uneko tokiak zuzenean aplikaziotik.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Oinezkoen pasabidea";
 
+"type.highway.footway.alpine_hiking" = "Bidea";
+
 "type.highway.footway.area" = "Bidea";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Zubia";
 
+"type.highway.footway.demanding_alpine_hiking" = "Bidea";
+
+"type.highway.footway.demanding_mountain_hiking" = "Bidea";
+
+"type.highway.footway.difficult_alpine_hiking" = "Bidea";
+
+"type.highway.footway.hiking" = "Bidea";
+
+"type.highway.footway.mountain_hiking" = "Bidea";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Tunel";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Bidea";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Bidea";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Bidea";
+"type.highway.path.alpine_hiking" = "Bidea";
 
 "type.highway.path.bicycle" = "Bidea";
 
-"type.highway.footway.bicycle" = "Bidea";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Zubia";
 
+"type.highway.path.demanding_alpine_hiking" = "Bidea";
+
+"type.highway.path.demanding_mountain_hiking" = "Bidea";
+
+"type.highway.path.difficult_alpine_hiking" = "Bidea";
+
+"type.highway.path.hiking" = "Bidea";
+
 "type.highway.path.horse" = "Bidea";
 
+"type.highway.path.mountain_hiking" = "Bidea";
+
+"type.highway.path.permissive" = "Bidea";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Kalea";
 
+"type.highway.track.grade2" = "Kalea";
+
+"type.highway.track.grade3" = "Kalea";
+
+"type.highway.track.grade4" = "Kalea";
+
+"type.highway.track.grade5" = "Kalea";
+
 "type.highway.track.no.access" = "Kalea";
 
+"type.highway.track.permissive" = "Kalea";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunel";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Mendiko ostatua";
 
-"type.tourism.apartment" = "Oporretako apartamentua";
+"type.tourism.apartment" = "Apartamentuak";
 
 "type.tourism.artwork" = "Artelanak";
 
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 4af9d16039..6d8935255c 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "نام مکان";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "همانطور که به زبان محلی نوشته شده است";
+
 "editor_edit_place_category_title" = "دسته بندی";
 
 "whatsnew_editor_message_1" = "اضافه کردن مکان به نقشه و ویرایش آن مستقیما از طریق این اپلیکیشن.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "محل عبور عابر پیاده";
 
+"type.highway.footway.alpine_hiking" = "مسیر";
+
 "type.highway.footway.area" = "مسیر";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "پل";
 
+"type.highway.footway.demanding_alpine_hiking" = "مسیر";
+
+"type.highway.footway.demanding_mountain_hiking" = "مسیر";
+
+"type.highway.footway.difficult_alpine_hiking" = "مسیر";
+
+"type.highway.footway.hiking" = "مسیر";
+
+"type.highway.footway.mountain_hiking" = "مسیر";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "تونل";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "مسیر";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "مسیر";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "مسیر";
+"type.highway.path.alpine_hiking" = "مسیر";
 
 "type.highway.path.bicycle" = "مسیر";
 
-"type.highway.footway.bicycle" = "مسیر";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "پل";
 
+"type.highway.path.demanding_alpine_hiking" = "مسیر";
+
+"type.highway.path.demanding_mountain_hiking" = "مسیر";
+
+"type.highway.path.difficult_alpine_hiking" = "مسیر";
+
+"type.highway.path.hiking" = "مسیر";
+
 "type.highway.path.horse" = "مسیر";
 
+"type.highway.path.mountain_hiking" = "مسیر";
+
+"type.highway.path.permissive" = "مسیر";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "تونل";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "جاده";
 
+"type.highway.track.grade2" = "جاده";
+
+"type.highway.track.grade3" = "جاده";
+
+"type.highway.track.grade4" = "جاده";
+
+"type.highway.track.grade5" = "جاده";
+
 "type.highway.track.no.access" = "جاده";
 
+"type.highway.track.permissive" = "جاده";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "تونل";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "اقامتگاه کوهستانی";
 
-"type.tourism.apartment" = "آپارتمان تعطیلات";
+"type.tourism.apartment" = "اپارتمان";
 
 "type.tourism.artwork" = "گردشگری";
 
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index cdd12734ab..487d3d016a 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Paikan nimi";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Paikallisella kielellä kirjoitettuna";
+
 "editor_edit_place_category_title" = "Kategoria";
 
 "whatsnew_editor_message_1" = "Lisää karttaan uusia paikkoja ja muokkaa sovelluksessa olevia karttoja suoraan sovelluksessa.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Jalankulkijoiden ylitys";
 
+"type.highway.footway.alpine_hiking" = "Polku";
+
 "type.highway.footway.area" = "Jalankulkualue";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Jalankulkusilta";
 
+"type.highway.footway.demanding_alpine_hiking" = "Vaativa alppivaellus";
+
+"type.highway.footway.demanding_mountain_hiking" = "Vaativa vuoristovaellus";
+
+"type.highway.footway.difficult_alpine_hiking" = "Vaikea alppivaellus";
+
+"type.highway.footway.hiking" = "Vaellus";
+
+"type.highway.footway.mountain_hiking" = "Vuoristovaellus";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Jalankulkutunneli";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Polku";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Polku";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Polku";
+"type.highway.path.alpine_hiking" = "Alppivaellus";
 
 "type.highway.path.bicycle" = "Pyörä- ja jalkatie";
 
-"type.highway.footway.bicycle" = "Pyörä- ja jalkatie";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Silta";
 
+"type.highway.path.demanding_alpine_hiking" = "Vaativa alppivaellus";
+
+"type.highway.path.demanding_mountain_hiking" = "Vaativa vuoristovaellus";
+
+"type.highway.path.difficult_alpine_hiking" = "Vaikea alppivaellus";
+
+"type.highway.path.hiking" = "Vaellus";
+
 "type.highway.path.horse" = "Ratsastuspolku";
 
+"type.highway.path.mountain_hiking" = "Vuoristovaellus";
+
+"type.highway.path.permissive" = "Polku";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunneli";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Katu";
 
+"type.highway.track.grade2" = "Katu";
+
+"type.highway.track.grade3" = "Katu";
+
+"type.highway.track.grade4" = "Katu";
+
+"type.highway.track.grade5" = "Katu";
+
 "type.highway.track.no.access" = "Katu";
 
+"type.highway.track.permissive" = "Katu";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunneli";
 
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index a14d7533a8..52c022f2ef 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Nom du lieu";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Comme c'est écrit dans la langue locale";
+
 "editor_edit_place_category_title" = "Catégorie";
 
 "whatsnew_editor_message_1" = "Ajoutez de nouveaux lieux sur la carte et modifiez les lieux existants directement depuis l'appli.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Passage pour piétons";
 
+"type.highway.footway.alpine_hiking" = "Chemin";
+
 "type.highway.footway.area" = "Chemin";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Pont";
 
+"type.highway.footway.demanding_alpine_hiking" = "Chemin";
+
+"type.highway.footway.demanding_mountain_hiking" = "Chemin";
+
+"type.highway.footway.difficult_alpine_hiking" = "Chemin";
+
+"type.highway.footway.hiking" = "Chemin";
+
+"type.highway.footway.mountain_hiking" = "Chemin";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Tunnel";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Chemin";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Chemin";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Chemin";
+"type.highway.path.alpine_hiking" = "Chemin";
 
 "type.highway.path.bicycle" = "Chemin";
 
-"type.highway.footway.bicycle" = "Chemin";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Pont";
 
+"type.highway.path.demanding_alpine_hiking" = "Chemin";
+
+"type.highway.path.demanding_mountain_hiking" = "Chemin";
+
+"type.highway.path.difficult_alpine_hiking" = "Chemin";
+
+"type.highway.path.hiking" = "Chemin";
+
 "type.highway.path.horse" = "Chemin";
 
+"type.highway.path.mountain_hiking" = "Chemin";
+
+"type.highway.path.permissive" = "Chemin";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunnel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Piste";
 
+"type.highway.track.grade2" = "Piste";
+
+"type.highway.track.grade3" = "Piste";
+
+"type.highway.track.grade4" = "Piste";
+
+"type.highway.track.grade5" = "Piste";
+
 "type.highway.track.no.access" = "Piste";
 
+"type.highway.track.permissive" = "Piste";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunnel";
 
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index c929b28306..8360dc2137 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "שם המקום";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "כפי שנכתב בשפה המקומית";
+
 "editor_edit_place_category_title" = "קטגוריה";
 
 "whatsnew_editor_message_1" = "הוספת מקומות חדשים למפה, ועריכת מקומות קיימים ישירות מהאפליקציה.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "מעבר הולכי רגל";
 
+"type.highway.footway.alpine_hiking" = "Path";
+
 "type.highway.footway.area" = "Foot Path";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "לְגַשֵׁר";
 
+"type.highway.footway.demanding_alpine_hiking" = "Path";
+
+"type.highway.footway.demanding_mountain_hiking" = "Path";
+
+"type.highway.footway.difficult_alpine_hiking" = "Path";
+
+"type.highway.footway.hiking" = "Path";
+
+"type.highway.footway.mountain_hiking" = "Path";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "מִנהָרָה";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Path";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Path";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Path";
+"type.highway.path.alpine_hiking" = "Path";
 
 "type.highway.path.bicycle" = "Path";
 
-"type.highway.footway.bicycle" = "Path";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "לְגַשֵׁר";
 
+"type.highway.path.demanding_alpine_hiking" = "Path";
+
+"type.highway.path.demanding_mountain_hiking" = "Path";
+
+"type.highway.path.difficult_alpine_hiking" = "Path";
+
+"type.highway.path.hiking" = "Path";
+
 "type.highway.path.horse" = "Path";
 
+"type.highway.path.mountain_hiking" = "Path";
+
+"type.highway.path.permissive" = "Path";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "מִנהָרָה";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Track";
 
+"type.highway.track.grade2" = "Track";
+
+"type.highway.track.grade3" = "Track";
+
+"type.highway.track.grade4" = "Track";
+
+"type.highway.track.grade5" = "Track";
+
 "type.highway.track.no.access" = "Track";
 
+"type.highway.track.permissive" = "Track";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "מִנהָרָה";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "בקתת הרים";
 
-"type.tourism.apartment" = "דירת נופש";
+"type.tourism.apartment" = "Holiday Apartment";
 
 "type.tourism.artwork" = "Artwork";
 
diff --git a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
index 756b042c5d..f6869c21c5 100644
--- a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "स्थान का नाम";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "जैसा कि स्थानीय भाषा में लिखा गया है";
+
 "editor_edit_place_category_title" = "वर्ग";
 
 "whatsnew_editor_message_1" = "Add new places to the map, and edit existing ones directly from the app.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "पैदल पार पथ";
 
+"type.highway.footway.alpine_hiking" = "पथ";
+
 "type.highway.footway.area" = "पैदलपथ";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Pedestrian Bridge";
 
+"type.highway.footway.demanding_alpine_hiking" = "पथ";
+
+"type.highway.footway.demanding_mountain_hiking" = "पथ";
+
+"type.highway.footway.difficult_alpine_hiking" = "पथ";
+
+"type.highway.footway.hiking" = "पथ";
+
+"type.highway.footway.mountain_hiking" = "पथ";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Pedestrian Tunnel";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "पथ";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "पथ";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "पथ";
+"type.highway.path.alpine_hiking" = "पथ";
 
 "type.highway.path.bicycle" = "पथ";
 
-"type.highway.footway.bicycle" = "पथ";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Bridge";
 
+"type.highway.path.demanding_alpine_hiking" = "पथ";
+
+"type.highway.path.demanding_mountain_hiking" = "पथ";
+
+"type.highway.path.difficult_alpine_hiking" = "पथ";
+
+"type.highway.path.hiking" = "पथ";
+
 "type.highway.path.horse" = "पथ";
 
+"type.highway.path.mountain_hiking" = "पथ";
+
+"type.highway.path.permissive" = "पथ";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunnel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "सड़क";
 
+"type.highway.track.grade2" = "सड़क";
+
+"type.highway.track.grade3" = "सड़क";
+
+"type.highway.track.grade4" = "सड़क";
+
+"type.highway.track.grade5" = "सड़क";
+
 "type.highway.track.no.access" = "सड़क";
 
+"type.highway.track.permissive" = "सड़क";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunnel";
 
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index bf533c88a2..b0726a9767 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Hely neve";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Ahogy a helyi nyelven írva van";
+
 "editor_edit_place_category_title" = "Kategória";
 
 "whatsnew_editor_message_1" = "Adj hozzá új helyeket a térképhez, és szerkeszd a meglévőket közvetlenül az alkalmazásból.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Gyalogátkelőhely";
 
+"type.highway.footway.alpine_hiking" = "Ösvény";
+
 "type.highway.footway.area" = "Ösvény";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Híd";
 
+"type.highway.footway.demanding_alpine_hiking" = "Ösvény";
+
+"type.highway.footway.demanding_mountain_hiking" = "Ösvény";
+
+"type.highway.footway.difficult_alpine_hiking" = "Ösvény";
+
+"type.highway.footway.hiking" = "Ösvény";
+
+"type.highway.footway.mountain_hiking" = "Ösvény";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Alagút";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Ösvény";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Ösvény";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Ösvény";
+"type.highway.path.alpine_hiking" = "Ösvény";
 
 "type.highway.path.bicycle" = "Ösvény";
 
-"type.highway.footway.bicycle" = "Ösvény";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Híd";
 
+"type.highway.path.demanding_alpine_hiking" = "Ösvény";
+
+"type.highway.path.demanding_mountain_hiking" = "Ösvény";
+
+"type.highway.path.difficult_alpine_hiking" = "Ösvény";
+
+"type.highway.path.hiking" = "Ösvény";
+
 "type.highway.path.horse" = "Ösvény";
 
+"type.highway.path.mountain_hiking" = "Ösvény";
+
+"type.highway.path.permissive" = "Ösvény";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Alagút";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Utca";
 
+"type.highway.track.grade2" = "Utca";
+
+"type.highway.track.grade3" = "Utca";
+
+"type.highway.track.grade4" = "Utca";
+
+"type.highway.track.grade5" = "Utca";
+
 "type.highway.track.no.access" = "Utca";
 
+"type.highway.track.permissive" = "Utca";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Alagút";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Hegyi kunyhó";
 
-"type.tourism.apartment" = "Nyaraló apartman";
+"type.tourism.apartment" = "Apartmanok";
 
 "type.tourism.artwork" = "Szobor";
 
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index 162f1a51f6..92193d7b9f 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Nama tempat";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Seperti yang tertulis dalam bahasa lokal";
+
 "editor_edit_place_category_title" = "Kategori";
 
 "whatsnew_editor_message_1" = "Tambahkan tempat-tempat baru di peta, dan edit peta-peta yang ada langsung dari aplikasi.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Penyeberangan Pejalan Kaki";
 
+"type.highway.footway.alpine_hiking" = "Jalur";
+
 "type.highway.footway.area" = "Jalur";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Menjembatani";
 
+"type.highway.footway.demanding_alpine_hiking" = "Jalur";
+
+"type.highway.footway.demanding_mountain_hiking" = "Jalur";
+
+"type.highway.footway.difficult_alpine_hiking" = "Jalur";
+
+"type.highway.footway.hiking" = "Jalur";
+
+"type.highway.footway.mountain_hiking" = "Jalur";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Terowongan";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Jalur";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Jalur";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Jalur";
+"type.highway.path.alpine_hiking" = "Jalur";
 
 "type.highway.path.bicycle" = "Jalur";
 
-"type.highway.footway.bicycle" = "Jalur";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Menjembatani";
 
+"type.highway.path.demanding_alpine_hiking" = "Jalur";
+
+"type.highway.path.demanding_mountain_hiking" = "Jalur";
+
+"type.highway.path.difficult_alpine_hiking" = "Jalur";
+
+"type.highway.path.hiking" = "Jalur";
+
 "type.highway.path.horse" = "Jalur";
 
+"type.highway.path.mountain_hiking" = "Jalur";
+
+"type.highway.path.permissive" = "Jalur";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Terowongan";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Jalan";
 
+"type.highway.track.grade2" = "Jalan";
+
+"type.highway.track.grade3" = "Jalan";
+
+"type.highway.track.grade4" = "Jalan";
+
+"type.highway.track.grade5" = "Jalan";
+
 "type.highway.track.no.access" = "Jalan";
 
+"type.highway.track.permissive" = "Jalan";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Terowongan";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Penginapan gunung";
 
-"type.tourism.apartment" = "Apartemen Liburan";
+"type.tourism.apartment" = "Apartemen";
 
 "type.tourism.artwork" = "Pariwisata";
 
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 608835a467..d04a8d58e9 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Nome del luogo";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Come è scritto nella lingua locale";
+
 "editor_edit_place_category_title" = "Categoria";
 
 "whatsnew_editor_message_1" = "Aggiungi nuovi luoghi sulla mappa e modifica quelli esistenti direttamente dall'app.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Attraversamento pedonale";
 
+"type.highway.footway.alpine_hiking" = "Sentiero";
+
 "type.highway.footway.area" = "Sentiero";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Ponte";
 
+"type.highway.footway.demanding_alpine_hiking" = "Sentiero";
+
+"type.highway.footway.demanding_mountain_hiking" = "Sentiero";
+
+"type.highway.footway.difficult_alpine_hiking" = "Sentiero";
+
+"type.highway.footway.hiking" = "Sentiero";
+
+"type.highway.footway.mountain_hiking" = "Sentiero";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Tunnel";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Sentiero";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Sentiero";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Sentiero";
+"type.highway.path.alpine_hiking" = "Sentiero";
 
 "type.highway.path.bicycle" = "Sentiero";
 
-"type.highway.footway.bicycle" = "Sentiero";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Ponte";
 
+"type.highway.path.demanding_alpine_hiking" = "Sentiero";
+
+"type.highway.path.demanding_mountain_hiking" = "Sentiero";
+
+"type.highway.path.difficult_alpine_hiking" = "Sentiero";
+
+"type.highway.path.hiking" = "Sentiero";
+
 "type.highway.path.horse" = "Sentiero";
 
+"type.highway.path.mountain_hiking" = "Sentiero";
+
+"type.highway.path.permissive" = "Sentiero";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunnel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Via";
 
+"type.highway.track.grade2" = "Via";
+
+"type.highway.track.grade3" = "Via";
+
+"type.highway.track.grade4" = "Via";
+
+"type.highway.track.grade5" = "Via";
+
 "type.highway.track.no.access" = "Via";
 
+"type.highway.track.permissive" = "Via";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunnel";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Rifugio di montagna";
 
-"type.tourism.apartment" = "Appartamento vacanze";
+"type.tourism.apartment" = "Appartamento";
 
 "type.tourism.artwork" = "Opera d'arte";
 
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index 71c9fd1907..49cb48bcb3 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "場所の名前";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "現地の言葉でこう書かれている。";
+
 "editor_edit_place_category_title" = "カテゴリ";
 
 "whatsnew_editor_message_1" = "アプリから直接地図に新しい場所を追加したり、既存の場所を編集できます。";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "横断歩道";
 
+"type.highway.footway.alpine_hiking" = "歩道";
+
 "type.highway.footway.area" = "歩道";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "橋";
 
+"type.highway.footway.demanding_alpine_hiking" = "歩道";
+
+"type.highway.footway.demanding_mountain_hiking" = "歩道";
+
+"type.highway.footway.difficult_alpine_hiking" = "歩道";
+
+"type.highway.footway.hiking" = "歩道";
+
+"type.highway.footway.mountain_hiking" = "歩道";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "トンネル";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "歩道";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "歩道";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "歩道";
+"type.highway.path.alpine_hiking" = "歩道";
 
 "type.highway.path.bicycle" = "歩道";
 
-"type.highway.footway.bicycle" = "歩道";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "橋";
 
+"type.highway.path.demanding_alpine_hiking" = "歩道";
+
+"type.highway.path.demanding_mountain_hiking" = "歩道";
+
+"type.highway.path.difficult_alpine_hiking" = "歩道";
+
+"type.highway.path.hiking" = "歩道";
+
 "type.highway.path.horse" = "歩道";
 
+"type.highway.path.mountain_hiking" = "歩道";
+
+"type.highway.path.permissive" = "歩道";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "トンネル";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "ストリート";
 
+"type.highway.track.grade2" = "ストリート";
+
+"type.highway.track.grade3" = "ストリート";
+
+"type.highway.track.grade4" = "ストリート";
+
+"type.highway.track.grade5" = "ストリート";
+
 "type.highway.track.no.access" = "ストリート";
 
+"type.highway.track.permissive" = "ストリート";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "トンネル";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "山小屋";
 
-"type.tourism.apartment" = "ホリデー・アパート";
+"type.tourism.apartment" = "アパート";
 
 "type.tourism.artwork" = "芸術";
 
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 63d4b166b6..98a82f6cc2 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "장소 이름";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "현지 언어로 작성되었으므로";
+
 "editor_edit_place_category_title" = "범주";
 
 "whatsnew_editor_message_1" = "지도에 새로운 장소를 추가하고 응용 프로그램에서 직접 기존 편집 할 수 있습니다.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "횡단보도";
 
+"type.highway.footway.alpine_hiking" = "길";
+
 "type.highway.footway.area" = "길";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "다리";
 
+"type.highway.footway.demanding_alpine_hiking" = "길";
+
+"type.highway.footway.demanding_mountain_hiking" = "길";
+
+"type.highway.footway.difficult_alpine_hiking" = "길";
+
+"type.highway.footway.hiking" = "길";
+
+"type.highway.footway.mountain_hiking" = "길";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "터널";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "길";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "길";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "길";
+"type.highway.path.alpine_hiking" = "길";
 
 "type.highway.path.bicycle" = "길";
 
-"type.highway.footway.bicycle" = "길";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "다리";
 
+"type.highway.path.demanding_alpine_hiking" = "길";
+
+"type.highway.path.demanding_mountain_hiking" = "길";
+
+"type.highway.path.difficult_alpine_hiking" = "길";
+
+"type.highway.path.hiking" = "길";
+
 "type.highway.path.horse" = "길";
 
+"type.highway.path.mountain_hiking" = "길";
+
+"type.highway.path.permissive" = "길";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "터널";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "거리";
 
+"type.highway.track.grade2" = "거리";
+
+"type.highway.track.grade3" = "거리";
+
+"type.highway.track.grade4" = "거리";
+
+"type.highway.track.grade5" = "거리";
+
 "type.highway.track.no.access" = "거리";
 
+"type.highway.track.permissive" = "거리";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "터널";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "마운틴 롯지";
 
-"type.tourism.apartment" = "홀리데이 아파트";
+"type.tourism.apartment" = "아파트";
 
 "type.tourism.artwork" = "작품";
 
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
index 644b299d94..24414b0b15 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "ठिकाणाचे नाव";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "स्थानिक भाषेत लिहिल्याप्रमाणे";
+
 "editor_edit_place_category_title" = "प्रवर्ग";
 
 "whatsnew_editor_message_1" = "नकाशावर नवीन ठिकाणे जोडा आणि विद्यमान ठिकाणे थेट ऍप मधून संपादित करा.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "पादचारी ओलांडणे";
 
+"type.highway.footway.alpine_hiking" = "पथ";
+
 "type.highway.footway.area" = "पादचारी झोन";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "पादचारी पूल";
 
+"type.highway.footway.demanding_alpine_hiking" = "पथ";
+
+"type.highway.footway.demanding_mountain_hiking" = "पथ";
+
+"type.highway.footway.difficult_alpine_hiking" = "पथ";
+
+"type.highway.footway.hiking" = "पथ";
+
+"type.highway.footway.mountain_hiking" = "पथ";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "पादचारी बोगदा";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "पथ";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "पथ";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "पथ";
+"type.highway.path.alpine_hiking" = "पथ";
 
 "type.highway.path.bicycle" = "सायकल आणि पाऊलवाट";
 
-"type.highway.footway.bicycle" = "सायकल आणि पाऊलवाट";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "पूल";
 
+"type.highway.path.demanding_alpine_hiking" = "पथ";
+
+"type.highway.path.demanding_mountain_hiking" = "पथ";
+
+"type.highway.path.difficult_alpine_hiking" = "पथ";
+
+"type.highway.path.hiking" = "पथ";
+
 "type.highway.path.horse" = "पथ";
 
+"type.highway.path.mountain_hiking" = "पथ";
+
+"type.highway.path.permissive" = "पथ";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "बोगदा";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "ट्रॅक";
 
+"type.highway.track.grade2" = "ट्रॅक";
+
+"type.highway.track.grade3" = "ट्रॅक";
+
+"type.highway.track.grade4" = "ट्रॅक";
+
+"type.highway.track.grade5" = "ट्रॅक";
+
 "type.highway.track.no.access" = "ट्रॅक";
 
+"type.highway.track.permissive" = "ट्रॅक";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "बोगदा";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "माउंटन लॉज";
 
-"type.tourism.apartment" = "हॉलिडे अपार्टमेंट";
+"type.tourism.apartment" = "सदनिका";
 
 "type.tourism.artwork" = "कलाकृती";
 
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 7635af5708..5a3a4ab1cb 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Navn på stedet";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Som det står skrevet på det lokale språket";
+
 "editor_edit_place_category_title" = "Kategori";
 
 "whatsnew_editor_message_1" = "Legg til nye steder i kartet og rediger eksisterende steder direkte fra appen.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Fotgjengerovergang";
 
+"type.highway.footway.alpine_hiking" = "Sti";
+
 "type.highway.footway.area" = "Gangvei";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Bru";
 
+"type.highway.footway.demanding_alpine_hiking" = "Sti";
+
+"type.highway.footway.demanding_mountain_hiking" = "Sti";
+
+"type.highway.footway.difficult_alpine_hiking" = "Sti";
+
+"type.highway.footway.hiking" = "Sti";
+
+"type.highway.footway.mountain_hiking" = "Sti";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Tunnel";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Sti";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Sti";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Sti";
+"type.highway.path.alpine_hiking" = "Sti";
 
 "type.highway.path.bicycle" = "Sti";
 
-"type.highway.footway.bicycle" = "Sti";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Bru";
 
+"type.highway.path.demanding_alpine_hiking" = "Sti";
+
+"type.highway.path.demanding_mountain_hiking" = "Sti";
+
+"type.highway.path.difficult_alpine_hiking" = "Sti";
+
+"type.highway.path.hiking" = "Sti";
+
 "type.highway.path.horse" = "Sti";
 
+"type.highway.path.mountain_hiking" = "Sti";
+
+"type.highway.path.permissive" = "Sti";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunnel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Traktor/Skogsbilvei";
 
+"type.highway.track.grade2" = "Traktor/Skogsbilvei";
+
+"type.highway.track.grade3" = "Traktor/Skogsbilvei";
+
+"type.highway.track.grade4" = "Traktor/Skogsbilvei";
+
+"type.highway.track.grade5" = "Traktor/Skogsbilvei";
+
 "type.highway.track.no.access" = "Traktor/Skogsbilvei";
 
+"type.highway.track.permissive" = "Traktor/Skogsbilvei";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunnel";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Fjellstue";
 
-"type.tourism.apartment" = "Ferieleilighet";
+"type.tourism.apartment" = "Leiligheter";
 
 "type.tourism.artwork" = "Kunstverk";
 
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index 647b44af8a..74fd602fc5 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Naam van de plaats";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Zoals het in de plaatselijke taal geschreven staat";
+
 "editor_edit_place_category_title" = "Categorie";
 
 "whatsnew_editor_message_1" = "Voeg nieuwe plaatsen toe aan de kaart en bewerk de bestaande rechtstreeks vanuit de app.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Voetgangersoversteekplaats";
 
+"type.highway.footway.alpine_hiking" = "Alpine wandelpad";
+
 "type.highway.footway.area" = "Voetgangerszone";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Voetgangersbrug";
 
+"type.highway.footway.demanding_alpine_hiking" = "Uitdagend alpine bergklimpad";
+
+"type.highway.footway.demanding_mountain_hiking" = "Uitdagend bergwandelpad";
+
+"type.highway.footway.difficult_alpine_hiking" = "Moeilijk alpine bergklimpad";
+
+"type.highway.footway.hiking" = "Wandelpad";
+
+"type.highway.footway.mountain_hiking" = "Bergpad";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Voetgangerstunnel";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Pad";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Pad";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Pad";
+"type.highway.path.alpine_hiking" = "Alpine wandelpad";
 
 "type.highway.path.bicycle" = "Fietspad";
 
-"type.highway.footway.bicycle" = "Fietspad";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Brug";
 
+"type.highway.path.demanding_alpine_hiking" = "Pad";
+
+"type.highway.path.demanding_mountain_hiking" = "Pad";
+
+"type.highway.path.difficult_alpine_hiking" = "Pad";
+
+"type.highway.path.hiking" = "Wandelpad";
+
 "type.highway.path.horse" = "Ruiterpad";
 
+"type.highway.path.mountain_hiking" = "Bergpad";
+
+"type.highway.path.permissive" = "Pad";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunnel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Straat";
 
+"type.highway.track.grade2" = "Straat";
+
+"type.highway.track.grade3" = "Straat";
+
+"type.highway.track.grade4" = "Straat";
+
+"type.highway.track.grade5" = "Straat";
+
 "type.highway.track.no.access" = "Straat";
 
+"type.highway.track.permissive" = "Straat";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunnel";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Berghut";
 
-"type.tourism.apartment" = "Appartement";
+"type.tourism.apartment" = "Appartementen";
 
 "type.tourism.artwork" = "Kunstwerk";
 
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index ca4a676c66..a564f51aa3 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Nazwa miejsca";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Jak napisano w lokalnym języku";
+
 "editor_edit_place_category_title" = "Kategoria";
 
 "whatsnew_editor_message_1" = "Dodawaj nowe miejsca do mapy i edytuj już istniejące bezpośrednio z poziomu aplikacji.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Przejście dla pieszych";
 
+"type.highway.footway.alpine_hiking" = "Ścieżka wspinaczkowa";
+
 "type.highway.footway.area" = "Obszar chodnika";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Most dla pieszych";
 
+"type.highway.footway.demanding_alpine_hiking" = "Ścieżka";
+
+"type.highway.footway.demanding_mountain_hiking" = "Ścieżka";
+
+"type.highway.footway.difficult_alpine_hiking" = "Ścieżka";
+
+"type.highway.footway.hiking" = "Ścieżka";
+
+"type.highway.footway.mountain_hiking" = "Ścieżka";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Tunel dla pieszych";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Ścieżka";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Ścieżka";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Ścieżka";
+"type.highway.path.alpine_hiking" = "Ścieżka wspinaczkowa";
 
 "type.highway.path.bicycle" = "Ścieżka dla rowerów";
 
-"type.highway.footway.bicycle" = "Ścieżka dla rowerów";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Most";
 
+"type.highway.path.demanding_alpine_hiking" = "Ścieżka";
+
+"type.highway.path.demanding_mountain_hiking" = "Ścieżka";
+
+"type.highway.path.difficult_alpine_hiking" = "Ścieżka";
+
+"type.highway.path.hiking" = "Ścieżka";
+
 "type.highway.path.horse" = "Ścieżka";
 
+"type.highway.path.mountain_hiking" = "Ścieżka";
+
+"type.highway.path.permissive" = "Ścieżka";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Droga na pola lub do lasu";
 
+"type.highway.track.grade2" = "Droga na pola lub do lasu";
+
+"type.highway.track.grade3" = "Droga na pola lub do lasu";
+
+"type.highway.track.grade4" = "Droga na pola lub do lasu";
+
+"type.highway.track.grade5" = "Droga na pola lub do lasu";
+
 "type.highway.track.no.access" = "Droga na pola lub do lasu";
 
+"type.highway.track.permissive" = "Droga na pola lub do lasu";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunel drogowy";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Domek górski";
 
-"type.tourism.apartment" = "Apartament wakacyjny";
+"type.tourism.apartment" = "Apartamenty";
 
 "type.tourism.artwork" = "Dzieło sztuki";
 
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index c78eefba80..c77bf71afb 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Nome do lugar";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Como escrito na língua local";
+
 "editor_edit_place_category_title" = "Categoria";
 
 "whatsnew_editor_message_1" = "Adicione novos lugares ao mapa e edite os já existentes diretamente no aplicativo.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Travessia de pedestres";
 
+"type.highway.footway.alpine_hiking" = "Caminho pedonal";
+
 "type.highway.footway.area" = "Área de pedestres";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Ponte para pedestres";
 
+"type.highway.footway.demanding_alpine_hiking" = "Caminho pedonal difícil";
+
+"type.highway.footway.demanding_mountain_hiking" = "Caminho pedonal difícil";
+
+"type.highway.footway.difficult_alpine_hiking" = "Caminho pedonal difícil";
+
+"type.highway.footway.hiking" = "Caminho pedonal";
+
+"type.highway.footway.mountain_hiking" = "Caminho pedonal";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Túnel para pedestres";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Caminho";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Caminho";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Caminho";
+"type.highway.path.alpine_hiking" = "Caminho pedonal";
 
 "type.highway.path.bicycle" = "Caminho para ciclistas";
 
-"type.highway.footway.bicycle" = "Caminho para ciclistas";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Ponte";
 
+"type.highway.path.demanding_alpine_hiking" = "Caminho pedonal difícil";
+
+"type.highway.path.demanding_mountain_hiking" = "Caminho pedonal difícil";
+
+"type.highway.path.difficult_alpine_hiking" = "Caminho pedonal difícil";
+
+"type.highway.path.hiking" = "Caminho pedonal";
+
 "type.highway.path.horse" = "Caminho para cavaleiros";
 
+"type.highway.path.mountain_hiking" = "Caminho pedonal";
+
+"type.highway.path.permissive" = "Caminho";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Túnel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Estrada rústica";
 
+"type.highway.track.grade2" = "Estrada rústica";
+
+"type.highway.track.grade3" = "Estrada rústica";
+
+"type.highway.track.grade4" = "Estrada rústica";
+
+"type.highway.track.grade5" = "Estrada rústica";
+
 "type.highway.track.no.access" = "Estrada rústica";
 
+"type.highway.track.permissive" = "Estrada rústica";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Túnel rodoviário";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Alojamento na montanha";
 
-"type.tourism.apartment" = "Apartamento de férias";
+"type.tourism.apartment" = "Apartamentos";
 
 "type.tourism.artwork" = "Obra de arte";
 
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index 8ade10ce0a..068328d265 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Nome do lugar";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Como escrito na língua local";
+
 "editor_edit_place_category_title" = "Categoria";
 
 "whatsnew_editor_message_1" = "Adicione novos lugares ao mapa e edite os já existentes diretamente a partir da aplicação.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Passagem de peões";
 
+"type.highway.footway.alpine_hiking" = "Caminho pedonal";
+
 "type.highway.footway.area" = "Caminho pedonal";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Ponte";
 
+"type.highway.footway.demanding_alpine_hiking" = "Caminho pedonal";
+
+"type.highway.footway.demanding_mountain_hiking" = "Caminho pedonal";
+
+"type.highway.footway.difficult_alpine_hiking" = "Caminho pedonal";
+
+"type.highway.footway.hiking" = "Caminho pedonal";
+
+"type.highway.footway.mountain_hiking" = "Caminho pedonal";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Túnel";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Caminho";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Caminho";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Caminho";
+"type.highway.path.alpine_hiking" = "Caminho";
 
 "type.highway.path.bicycle" = "Caminho";
 
-"type.highway.footway.bicycle" = "Caminho";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Ponte";
 
+"type.highway.path.demanding_alpine_hiking" = "Caminho";
+
+"type.highway.path.demanding_mountain_hiking" = "Caminho";
+
+"type.highway.path.difficult_alpine_hiking" = "Caminho";
+
+"type.highway.path.hiking" = "Caminho";
+
 "type.highway.path.horse" = "Caminho";
 
+"type.highway.path.mountain_hiking" = "Caminho";
+
+"type.highway.path.permissive" = "Caminho";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Túnel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Carreiro florestal ou agrícola";
 
+"type.highway.track.grade2" = "Carreiro florestal ou agrícola";
+
+"type.highway.track.grade3" = "Carreiro florestal ou agrícola";
+
+"type.highway.track.grade4" = "Carreiro florestal ou agrícola";
+
+"type.highway.track.grade5" = "Carreiro florestal ou agrícola";
+
 "type.highway.track.no.access" = "Carreiro florestal ou agrícola";
 
+"type.highway.track.permissive" = "Carreiro florestal ou agrícola";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Túnel";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Alojamento de montanha";
 
-"type.tourism.apartment" = "Apartamento de férias";
+"type.tourism.apartment" = "Apartamentos";
 
 "type.tourism.artwork" = "Obra de arte";
 
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 6f1aeec87e..8b90f6ce2c 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Numele locului";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Așa cum este scris în limba locală";
+
 "editor_edit_place_category_title" = "Categorie";
 
 "whatsnew_editor_message_1" = "Adaugă locuri noi pe hartă și modifică-le pe cele existente direct din aplicație.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Trecere de pietoni";
 
+"type.highway.footway.alpine_hiking" = "Cale";
+
 "type.highway.footway.area" = "Cale";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Pod";
 
+"type.highway.footway.demanding_alpine_hiking" = "Cale";
+
+"type.highway.footway.demanding_mountain_hiking" = "Cale";
+
+"type.highway.footway.difficult_alpine_hiking" = "Cale";
+
+"type.highway.footway.hiking" = "Cale";
+
+"type.highway.footway.mountain_hiking" = "Cale";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Tunel";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Cale";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Cale";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Cale";
+"type.highway.path.alpine_hiking" = "Cale";
 
 "type.highway.path.bicycle" = "Cale";
 
-"type.highway.footway.bicycle" = "Cale";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Pod";
 
+"type.highway.path.demanding_alpine_hiking" = "Cale";
+
+"type.highway.path.demanding_mountain_hiking" = "Cale";
+
+"type.highway.path.difficult_alpine_hiking" = "Cale";
+
+"type.highway.path.hiking" = "Cale";
+
 "type.highway.path.horse" = "Cale";
 
+"type.highway.path.mountain_hiking" = "Cale";
+
+"type.highway.path.permissive" = "Cale";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Stradă";
 
+"type.highway.track.grade2" = "Stradă";
+
+"type.highway.track.grade3" = "Stradă";
+
+"type.highway.track.grade4" = "Stradă";
+
+"type.highway.track.grade5" = "Stradă";
+
 "type.highway.track.no.access" = "Stradă";
 
+"type.highway.track.permissive" = "Stradă";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunel";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Cabana de munte";
 
-"type.tourism.apartment" = "Apartament de vacanță";
+"type.tourism.apartment" = "Apartamente";
 
 "type.tourism.artwork" = "Turism";
 
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 7d9e51407d..196f3e62d5 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Название места";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "На местном языке";
+
 "editor_edit_place_category_title" = "Категория";
 
 "whatsnew_editor_message_1" = "Добавляйте новые объекты и редактируйте старые прямо из приложения.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Пешеходный переход";
 
+"type.highway.footway.alpine_hiking" = "Тропа";
+
 "type.highway.footway.area" = "Пешеходная зона";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Пешеходный мост";
 
+"type.highway.footway.demanding_alpine_hiking" = "Тропа";
+
+"type.highway.footway.demanding_mountain_hiking" = "Тропа";
+
+"type.highway.footway.difficult_alpine_hiking" = "Тропа";
+
+"type.highway.footway.hiking" = "Тропа";
+
+"type.highway.footway.mountain_hiking" = "Тропа";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Пешеходный тоннель";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Тропа";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Сложная или плохо видимая тропа";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Очень сложная или неразличимая тропа";
+"type.highway.path.alpine_hiking" = "Тропа";
 
 "type.highway.path.bicycle" = "Велопешеходная дорожка";
 
-"type.highway.footway.bicycle" = "Велопешеходная дорожка";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Мост";
 
+"type.highway.path.demanding_alpine_hiking" = "Тропа";
+
+"type.highway.path.demanding_mountain_hiking" = "Тропа";
+
+"type.highway.path.difficult_alpine_hiking" = "Тропа";
+
+"type.highway.path.hiking" = "Тропа";
+
 "type.highway.path.horse" = "Конная тропа";
 
+"type.highway.path.mountain_hiking" = "Тропа";
+
+"type.highway.path.permissive" = "Тропа";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Тоннель";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Грунтовка";
 
+"type.highway.track.grade2" = "Грунтовка";
+
+"type.highway.track.grade3" = "Грунтовка";
+
+"type.highway.track.grade4" = "Грунтовка";
+
+"type.highway.track.grade5" = "Грунтовка";
+
 "type.highway.track.no.access" = "Грунтовка";
 
+"type.highway.track.permissive" = "Грунтовка";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Тоннель";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Горный приют с обслуживанием";
 
-"type.tourism.apartment" = "Квартира для отдыха";
+"type.tourism.apartment" = "Апартаменты";
 
 "type.tourism.artwork" = "Произведение искусства";
 
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index 700d8b27d2..15a56505e4 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Názov miesta";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Tak, ako sa píše v miestnom jazyku";
+
 "editor_edit_place_category_title" = "Kategória";
 
 "whatsnew_editor_message_1" = "Na mapu môžete pridávať nové miesta a upravovať tie, ktoré sú už pridané.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Priechod pre chodcov";
 
+"type.highway.footway.alpine_hiking" = "Turistický chodník";
+
 "type.highway.footway.area" = "Pešia zóna";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Most pre chodcov";
 
+"type.highway.footway.demanding_alpine_hiking" = "Cesta";
+
+"type.highway.footway.demanding_mountain_hiking" = "Náročný horský chodník";
+
+"type.highway.footway.difficult_alpine_hiking" = "Náročný turistický chodník";
+
+"type.highway.footway.hiking" = "Turistický chodník";
+
+"type.highway.footway.mountain_hiking" = "Horský turistický chodník";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Tunel pre chodcov";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Cesta";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Cesta";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Cesta";
+"type.highway.path.alpine_hiking" = "Turistický chodník";
 
 "type.highway.path.bicycle" = "Cesta pre cyklistov a chodcov";
 
-"type.highway.footway.bicycle" = "Cesta pre cyklistov a chodcov";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Most";
 
+"type.highway.path.demanding_alpine_hiking" = "Náročný turistický chodník";
+
+"type.highway.path.demanding_mountain_hiking" = "Náročný horský chodník";
+
+"type.highway.path.difficult_alpine_hiking" = "Obtiažny turistický chodník";
+
+"type.highway.path.hiking" = "Turistický chodník";
+
 "type.highway.path.horse" = "Cesta pre jazdca na zvierati";
 
+"type.highway.path.mountain_hiking" = "Horský turistický chodník";
+
+"type.highway.path.permissive" = "Cesta";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Poľná cesta";
 
+"type.highway.track.grade2" = "Poľná cesta";
+
+"type.highway.track.grade3" = "Poľná cesta";
+
+"type.highway.track.grade4" = "Poľná cesta";
+
+"type.highway.track.grade5" = "Poľná cesta";
+
 "type.highway.track.no.access" = "Poľná cesta";
 
+"type.highway.track.permissive" = "Poľná cesta";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunel";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Horská chata";
 
-"type.tourism.apartment" = "Prázdninový apartmán";
+"type.tourism.apartment" = "Apartmány";
 
 "type.tourism.artwork" = "Umelecké dielo";
 
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 70f63d73b4..a0bb171e94 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Namn på platsen";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Som det står skrivet på det lokala språket";
+
 "editor_edit_place_category_title" = "Kategori";
 
 "whatsnew_editor_message_1" = "Lägg till nya platser till kartan och redigera de befintliga direkt från appen.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Övergångsställe för fotgängare";
 
+"type.highway.footway.alpine_hiking" = "Gångväg";
+
 "type.highway.footway.area" = "Gångväg";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Bro";
 
+"type.highway.footway.demanding_alpine_hiking" = "Gångväg";
+
+"type.highway.footway.demanding_mountain_hiking" = "Gångväg";
+
+"type.highway.footway.difficult_alpine_hiking" = "Gångväg";
+
+"type.highway.footway.hiking" = "Gångväg";
+
+"type.highway.footway.mountain_hiking" = "Gångväg";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Tunnel";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Gångväg";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Gångväg";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Gångväg";
+"type.highway.path.alpine_hiking" = "Gångväg";
 
 "type.highway.path.bicycle" = "Gångväg";
 
-"type.highway.footway.bicycle" = "Gångväg";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Bro";
 
+"type.highway.path.demanding_alpine_hiking" = "Gångväg";
+
+"type.highway.path.demanding_mountain_hiking" = "Gångväg";
+
+"type.highway.path.difficult_alpine_hiking" = "Gångväg";
+
+"type.highway.path.hiking" = "Gångväg";
+
 "type.highway.path.horse" = "Gångväg";
 
+"type.highway.path.mountain_hiking" = "Gångväg";
+
+"type.highway.path.permissive" = "Gångväg";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tunnel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Gata";
 
+"type.highway.track.grade2" = "Gata";
+
+"type.highway.track.grade3" = "Gata";
+
+"type.highway.track.grade4" = "Gata";
+
+"type.highway.track.grade5" = "Gata";
+
 "type.highway.track.no.access" = "Gata";
 
+"type.highway.track.permissive" = "Gata";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunnel";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Fjällstuga";
 
-"type.tourism.apartment" = "Semesterlägenhet";
+"type.tourism.apartment" = "Lägenheter";
 
 "type.tourism.artwork" = "Konstverk";
 
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index 11913157f6..e0c3da6775 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Name of the place";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Kama ilivyoandikwa katika lugha ya kienyeji";
+
 "editor_edit_place_category_title" = "Category";
 
 "whatsnew_editor_message_1" = "Add new places to the map, and edit existing ones directly from the app.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Kivuko cha Watembea kwa miguu";
 
+"type.highway.footway.alpine_hiking" = "Path";
+
 "type.highway.footway.area" = "Foot Path";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Daraja";
 
+"type.highway.footway.demanding_alpine_hiking" = "Path";
+
+"type.highway.footway.demanding_mountain_hiking" = "Path";
+
+"type.highway.footway.difficult_alpine_hiking" = "Path";
+
+"type.highway.footway.hiking" = "Path";
+
+"type.highway.footway.mountain_hiking" = "Path";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Mtaro";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Path";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Path";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Path";
+"type.highway.path.alpine_hiking" = "Path";
 
 "type.highway.path.bicycle" = "Path";
 
-"type.highway.footway.bicycle" = "Path";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Daraja";
 
+"type.highway.path.demanding_alpine_hiking" = "Path";
+
+"type.highway.path.demanding_mountain_hiking" = "Path";
+
+"type.highway.path.difficult_alpine_hiking" = "Path";
+
+"type.highway.path.hiking" = "Path";
+
 "type.highway.path.horse" = "Path";
 
+"type.highway.path.mountain_hiking" = "Path";
+
+"type.highway.path.permissive" = "Path";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Mtaro";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Track";
 
+"type.highway.track.grade2" = "Track";
+
+"type.highway.track.grade3" = "Track";
+
+"type.highway.track.grade4" = "Track";
+
+"type.highway.track.grade5" = "Track";
+
 "type.highway.track.no.access" = "Track";
 
+"type.highway.track.permissive" = "Track";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Mtaro";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Mlima lodge";
 
-"type.tourism.apartment" = "Ghorofa ya Likizo";
+"type.tourism.apartment" = "Holiday Apartment";
 
 "type.tourism.artwork" = "Artwork";
 
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index 467ac4c831..1a4ab709d7 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "ชื่อสถานที่";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "ตามที่เขียนเป็นภาษาท้องถิ่น";
+
 "editor_edit_place_category_title" = "หมวดหมู่";
 
 "whatsnew_editor_message_1" = "เพิ่มสถานที่ใหม่ ๆ ไปยังแผนที่ และแก้ไขสถานที่ที่มีอยู่เดิมจากแอปโดยตรง";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "ทางม้าลาย";
 
+"type.highway.footway.alpine_hiking" = "เส้นทาง";
+
 "type.highway.footway.area" = "เส้นทาง";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "สะพาน";
 
+"type.highway.footway.demanding_alpine_hiking" = "เส้นทาง";
+
+"type.highway.footway.demanding_mountain_hiking" = "เส้นทาง";
+
+"type.highway.footway.difficult_alpine_hiking" = "เส้นทาง";
+
+"type.highway.footway.hiking" = "เส้นทาง";
+
+"type.highway.footway.mountain_hiking" = "เส้นทาง";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "อุโมงค์";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "เส้นทาง";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "เส้นทาง";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "เส้นทาง";
+"type.highway.path.alpine_hiking" = "เส้นทาง";
 
 "type.highway.path.bicycle" = "เส้นทาง";
 
-"type.highway.footway.bicycle" = "เส้นทาง";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "สะพาน";
 
+"type.highway.path.demanding_alpine_hiking" = "เส้นทาง";
+
+"type.highway.path.demanding_mountain_hiking" = "เส้นทาง";
+
+"type.highway.path.difficult_alpine_hiking" = "เส้นทาง";
+
+"type.highway.path.hiking" = "เส้นทาง";
+
 "type.highway.path.horse" = "เส้นทาง";
 
+"type.highway.path.mountain_hiking" = "เส้นทาง";
+
+"type.highway.path.permissive" = "เส้นทาง";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "อุโมงค์";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "ถนน";
 
+"type.highway.track.grade2" = "ถนน";
+
+"type.highway.track.grade3" = "ถนน";
+
+"type.highway.track.grade4" = "ถนน";
+
+"type.highway.track.grade5" = "ถนน";
+
 "type.highway.track.no.access" = "ถนน";
 
+"type.highway.track.permissive" = "ถนน";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "อุโมงค์";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "บ้านพักบนภูเขา";
 
-"type.tourism.apartment" = "ฮอลิเดย์ อพาร์ตเมนต์";
+"type.tourism.apartment" = "อพาร์ตเมนต์";
 
 "type.tourism.artwork" = "งานศิลปะ";
 
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index d07feeb1a5..ac298af8a2 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Yerin adı";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Yerel dilde yazıldığı gibi";
+
 "editor_edit_place_category_title" = "Kategori";
 
 "whatsnew_editor_message_1" = "Doğrudan uygulamadan haritaya yeni yerler ekleyin ve mevcut yerleri düzenleyin.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Yaya Geçidi";
 
+"type.highway.footway.alpine_hiking" = "Yol";
+
 "type.highway.footway.area" = "Yaya Alanı";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Köprü";
 
+"type.highway.footway.demanding_alpine_hiking" = "Yol";
+
+"type.highway.footway.demanding_mountain_hiking" = "Yol";
+
+"type.highway.footway.difficult_alpine_hiking" = "Yol";
+
+"type.highway.footway.hiking" = "Yol";
+
+"type.highway.footway.mountain_hiking" = "Yol";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Tünel";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Yol";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Yol";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Yol";
+"type.highway.path.alpine_hiking" = "Yol";
 
 "type.highway.path.bicycle" = "Bisiklet ve Yürüyüş Yolu";
 
-"type.highway.footway.bicycle" = "Bisiklet ve Yürüyüş Yolu";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Köprü";
 
+"type.highway.path.demanding_alpine_hiking" = "Yol";
+
+"type.highway.path.demanding_mountain_hiking" = "Yol";
+
+"type.highway.path.difficult_alpine_hiking" = "Yol";
+
+"type.highway.path.hiking" = "Yol";
+
 "type.highway.path.horse" = "Atlı Yolu";
 
+"type.highway.path.mountain_hiking" = "Yol";
+
+"type.highway.path.permissive" = "Yol";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Tünel";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Pist";
 
+"type.highway.track.grade2" = "Pist";
+
+"type.highway.track.grade3" = "Pist";
+
+"type.highway.track.grade4" = "Pist";
+
+"type.highway.track.grade5" = "Pist";
+
 "type.highway.track.no.access" = "Pist";
 
+"type.highway.track.permissive" = "Pist";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tünel";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Dağ Köşkü";
 
-"type.tourism.apartment" = "Tatil Apartmanı";
+"type.tourism.apartment" = "Apart Otel";
 
 "type.tourism.artwork" = "Sanat";
 
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 9cfdc7ebd9..9ffb70ac7c 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Назва місця";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Місцевою мовою";
+
 "editor_edit_place_category_title" = "Категорія";
 
 "whatsnew_editor_message_1" = "Додати нові місця до мапи і редагувати існуючі місця прямо з програми.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Пішохідний перехід";
 
+"type.highway.footway.alpine_hiking" = "Стежка";
+
 "type.highway.footway.area" = "Пішохідна зона";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Міст";
 
+"type.highway.footway.demanding_alpine_hiking" = "Стежка";
+
+"type.highway.footway.demanding_mountain_hiking" = "Стежка";
+
+"type.highway.footway.difficult_alpine_hiking" = "Стежка";
+
+"type.highway.footway.hiking" = "Стежка";
+
+"type.highway.footway.mountain_hiking" = "Стежка";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Тунель";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Стежка";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Стежка";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Стежка";
+"type.highway.path.alpine_hiking" = "Стежка";
 
 "type.highway.path.bicycle" = "Велопішохідна доріжка";
 
-"type.highway.footway.bicycle" = "Велопішохідна доріжка";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Міст";
 
+"type.highway.path.demanding_alpine_hiking" = "Стежка";
+
+"type.highway.path.demanding_mountain_hiking" = "Стежка";
+
+"type.highway.path.difficult_alpine_hiking" = "Стежка";
+
+"type.highway.path.hiking" = "Стежка";
+
 "type.highway.path.horse" = "Кінна стежка";
 
+"type.highway.path.mountain_hiking" = "Стежка";
+
+"type.highway.path.permissive" = "Стежка";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Тунель";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Ґрунтівка";
 
+"type.highway.track.grade2" = "Ґрунтівка";
+
+"type.highway.track.grade3" = "Ґрунтівка";
+
+"type.highway.track.grade4" = "Ґрунтівка";
+
+"type.highway.track.grade5" = "Ґрунтівка";
+
 "type.highway.track.no.access" = "Ґрунтівка";
 
+"type.highway.track.permissive" = "Ґрунтівка";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Тунель";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Гірський притулок з обслуговуванням";
 
-"type.tourism.apartment" = "Апартаменти для відпочинку";
+"type.tourism.apartment" = "Апартаменти";
 
 "type.tourism.artwork" = "Витвір мистецтва";
 
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 0ea237fe68..43ca4a4fb6 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "Tên địa điểm";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "Vì nó được viết bằng ngôn ngữ địa phương";
+
 "editor_edit_place_category_title" = "Thể loại";
 
 "whatsnew_editor_message_1" = "Nhập các địa điểm mới vào bản đồ, và trực tiếp chỉnh sửa những địa điểm hiện có trên ứng dụng.";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "Vạch qua đường";
 
+"type.highway.footway.alpine_hiking" = "Đường";
+
 "type.highway.footway.area" = "Đường";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "Cầu";
 
+"type.highway.footway.demanding_alpine_hiking" = "Đường";
+
+"type.highway.footway.demanding_mountain_hiking" = "Đường";
+
+"type.highway.footway.difficult_alpine_hiking" = "Đường";
+
+"type.highway.footway.hiking" = "Đường";
+
+"type.highway.footway.mountain_hiking" = "Đường";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "Đường hầm";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "Đường";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "Đường";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "Đường";
+"type.highway.path.alpine_hiking" = "Đường";
 
 "type.highway.path.bicycle" = "Đường";
 
-"type.highway.footway.bicycle" = "Đường";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "Cầu";
 
+"type.highway.path.demanding_alpine_hiking" = "Đường";
+
+"type.highway.path.demanding_mountain_hiking" = "Đường";
+
+"type.highway.path.difficult_alpine_hiking" = "Đường";
+
+"type.highway.path.hiking" = "Đường";
+
 "type.highway.path.horse" = "Đường";
 
+"type.highway.path.mountain_hiking" = "Đường";
+
+"type.highway.path.permissive" = "Đường";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "Đường hầm";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "Phố";
 
+"type.highway.track.grade2" = "Phố";
+
+"type.highway.track.grade3" = "Phố";
+
+"type.highway.track.grade4" = "Phố";
+
+"type.highway.track.grade5" = "Phố";
+
 "type.highway.track.no.access" = "Phố";
 
+"type.highway.track.permissive" = "Phố";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Đường hầm";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "Nhà nghỉ trên núi";
 
-"type.tourism.apartment" = "Căn hộ nghỉ dưỡng";
+"type.tourism.apartment" = "Căn hộ";
 
 "type.tourism.artwork" = "Du lịch";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index fa51d1ea15..3ffa147df1 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "该地点的名称";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "当地语言写道";
+
 "editor_edit_place_category_title" = "类别";
 
 "whatsnew_editor_message_1" = "添加新地点到该地图，并直接通过此应用编辑已存在的地点。";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "行人过街天桥";
 
+"type.highway.footway.alpine_hiking" = "步行道路";
+
 "type.highway.footway.area" = "步行道路";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "桥";
 
+"type.highway.footway.demanding_alpine_hiking" = "步行道路";
+
+"type.highway.footway.demanding_mountain_hiking" = "步行道路";
+
+"type.highway.footway.difficult_alpine_hiking" = "步行道路";
+
+"type.highway.footway.hiking" = "步行道路";
+
+"type.highway.footway.mountain_hiking" = "步行道路";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "隧道";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "小道";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "小道";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "小道";
+"type.highway.path.alpine_hiking" = "小道";
 
 "type.highway.path.bicycle" = "小道";
 
-"type.highway.footway.bicycle" = "小道";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "桥";
 
+"type.highway.path.demanding_alpine_hiking" = "小道";
+
+"type.highway.path.demanding_mountain_hiking" = "小道";
+
+"type.highway.path.difficult_alpine_hiking" = "小道";
+
+"type.highway.path.hiking" = "小道";
+
 "type.highway.path.horse" = "小道";
 
+"type.highway.path.mountain_hiking" = "小道";
+
+"type.highway.path.permissive" = "小道";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "隧道";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "土路";
 
+"type.highway.track.grade2" = "土路";
+
+"type.highway.track.grade3" = "土路";
+
+"type.highway.track.grade4" = "土路";
+
+"type.highway.track.grade5" = "土路";
+
 "type.highway.track.no.access" = "土路";
 
+"type.highway.track.permissive" = "土路";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "隧道";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "山间小屋";
 
-"type.tourism.apartment" = "度假公寓";
+"type.tourism.apartment" = "公寓";
 
 "type.tourism.artwork" = "艺术品";
 
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 7b5eed208d..dedbb78161 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -705,6 +705,9 @@
 
 "editor_edit_place_name_hint" = "該地點的名稱";
 
+/* The second part of the editor_edit_place_name_hint to explain that name should be entered in a local language, see https://wiki.openstreetmap.org/wiki/Key:name */
+"editor_default_language_hint" = "因為它是用當地語言寫的";
+
 "editor_edit_place_category_title" = "類別";
 
 "whatsnew_editor_message_1" = "新增新地點到該地圖，並直接通過此應用程式編輯已存在的地點。";
@@ -2038,11 +2041,23 @@
 
 "type.highway.footway.crossing" = "行人穿越道";
 
+"type.highway.footway.alpine_hiking" = "人行步道";
+
 "type.highway.footway.area" = "人行步道";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.footway.bridge" = "橋";
 
+"type.highway.footway.demanding_alpine_hiking" = "人行步道";
+
+"type.highway.footway.demanding_mountain_hiking" = "人行步道";
+
+"type.highway.footway.difficult_alpine_hiking" = "人行步道";
+
+"type.highway.footway.hiking" = "人行步道";
+
+"type.highway.footway.mountain_hiking" = "人行步道";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.footway.tunnel" = "隧道";
 
@@ -2076,21 +2091,27 @@
 
 "type.highway.path" = "人行步道";
 
-/* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */
-"type.highway.path.difficult" = "人行步道";
-
-/* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */
-"type.highway.path.expert" = "人行步道";
+"type.highway.path.alpine_hiking" = "人行步道";
 
 "type.highway.path.bicycle" = "人行步道";
 
-"type.highway.footway.bicycle" = "人行步道";
-
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.path.bridge" = "橋";
 
+"type.highway.path.demanding_alpine_hiking" = "人行步道";
+
+"type.highway.path.demanding_mountain_hiking" = "人行步道";
+
+"type.highway.path.difficult_alpine_hiking" = "人行步道";
+
+"type.highway.path.hiking" = "人行步道";
+
 "type.highway.path.horse" = "人行步道";
 
+"type.highway.path.mountain_hiking" = "人行步道";
+
+"type.highway.path.permissive" = "人行步道";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.path.tunnel" = "隧道";
 
@@ -2212,8 +2233,18 @@
 
 "type.highway.track.grade1" = "土路";
 
+"type.highway.track.grade2" = "土路";
+
+"type.highway.track.grade3" = "土路";
+
+"type.highway.track.grade4" = "土路";
+
+"type.highway.track.grade5" = "土路";
+
 "type.highway.track.no.access" = "土路";
 
+"type.highway.track.permissive" = "土路";
+
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "隧道";
 
@@ -3711,7 +3742,7 @@
 /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */
 "type.tourism.alpine_hut" = "山間小屋";
 
-"type.tourism.apartment" = "假日公寓";
+"type.tourism.apartment" = "公寓";
 
 "type.tourism.artwork" = "藝術品";
 
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 955e3741f4..957179625b 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -468,8 +468,6 @@
 		ED1263AB2B6F99F900AD99F3 /* UIView+AddSeparator.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED1263AA2B6F99F900AD99F3 /* UIView+AddSeparator.swift */; };
 		ED1ADA332BC6B1B40029209F /* CarPlayServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED1ADA322BC6B1B40029209F /* CarPlayServiceTests.swift */; };
 		ED3EAC202B03C88100220A4A /* BottomTabBarButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED3EAC1F2B03C88100220A4A /* BottomTabBarButton.swift */; };
-		ED79A5AB2BD7AA9C00952D1F /* LoadingOverlayViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED79A5AA2BD7AA9C00952D1F /* LoadingOverlayViewController.swift */; };
-		ED79A5AD2BD7BA0F00952D1F /* UIApplication+LoadingOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED79A5AC2BD7BA0F00952D1F /* UIApplication+LoadingOverlay.swift */; };
 		ED9966802B94FBC20083CE55 /* ColorPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED99667D2B94FBC20083CE55 /* ColorPicker.swift */; };
 		EDBD68072B625724005DD151 /* LocationServicesDisabledAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = EDBD68062B625724005DD151 /* LocationServicesDisabledAlert.xib */; };
 		EDBD680B2B62572E005DD151 /* LocationServicesDisabledAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDBD680A2B62572E005DD151 /* LocationServicesDisabledAlert.swift */; };
@@ -1360,8 +1358,6 @@
 		ED3EAC1F2B03C88100220A4A /* BottomTabBarButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomTabBarButton.swift; sourceTree = "<group>"; };
 		ED48BBB817C2B1E2003E7E92 /* CircleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircleView.h; sourceTree = "<group>"; };
 		ED48BBB917C2B1E2003E7E92 /* CircleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CircleView.m; sourceTree = "<group>"; };
-		ED79A5AA2BD7AA9C00952D1F /* LoadingOverlayViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingOverlayViewController.swift; sourceTree = "<group>"; };
-		ED79A5AC2BD7BA0F00952D1F /* UIApplication+LoadingOverlay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIApplication+LoadingOverlay.swift"; sourceTree = "<group>"; };
 		ED99667D2B94FBC20083CE55 /* ColorPicker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColorPicker.swift; sourceTree = "<group>"; };
 		EDBD68062B625724005DD151 /* LocationServicesDisabledAlert.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LocationServicesDisabledAlert.xib; sourceTree = "<group>"; };
 		EDBD680A2B62572E005DD151 /* LocationServicesDisabledAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationServicesDisabledAlert.swift; sourceTree = "<group>"; };
@@ -1745,7 +1741,6 @@
 		080E96DDFE201D6D7F000001 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
-				ED79A5A92BD7AA7500952D1F /* LoadingOverlay */,
 				CDB4D4E2222E8F8200104869 /* CarPlay */,
 				346EDAD81B9F0E15004F8DB5 /* Components */,
 				97B4E9271851DAB300BEC5D7 /* Custom Views */,
@@ -2145,7 +2140,6 @@
 				9957FAE0237AE04900855F48 /* MWMMapViewControlsManager+AddPlace.h */,
 				471A7BB7247FE3C300A0D4C1 /* URL+Query.swift */,
 				EDC3573A2B7B5029001AE9CA /* CALayer+SetCorner.swift */,
-				ED79A5AC2BD7BA0F00952D1F /* UIApplication+LoadingOverlay.swift */,
 			);
 			path = Categories;
 			sourceTree = "<group>";
@@ -2984,14 +2978,6 @@
 			path = Tests;
 			sourceTree = "<group>";
 		};
-		ED79A5A92BD7AA7500952D1F /* LoadingOverlay */ = {
-			isa = PBXGroup;
-			children = (
-				ED79A5AA2BD7AA9C00952D1F /* LoadingOverlayViewController.swift */,
-			);
-			path = LoadingOverlay;
-			sourceTree = "<group>";
-		};
 		ED99667C2B94FBC20083CE55 /* ColorPicker */ = {
 			isa = PBXGroup;
 			children = (
@@ -4246,7 +4232,6 @@
 				993DF11723F6BDB100AC231A /* UINavigationBarRenderer.swift in Sources */,
 				6741A9E71BF340DE002C974C /* MWMCircularProgressView.m in Sources */,
 				34AC8FDB1EFC07FE00E7F910 /* UILabel+NumberOfVisibleLines.swift in Sources */,
-				ED79A5AD2BD7BA0F00952D1F /* UIApplication+LoadingOverlay.swift in Sources */,
 				9959C75C24599CCD008FD4FD /* DirectionView.swift in Sources */,
 				47CA68D62500448D00671019 /* BookmarksListInteractor.swift in Sources */,
 				4767CD9F20AAD48A00BD8166 /* Checkmark.swift in Sources */,
@@ -4282,7 +4267,6 @@
 				F660DEE51EAF4F59004DC056 /* MWMLocationManager+SpeedAndAltitude.swift in Sources */,
 				F6E2FDF21E097BA00083EBEC /* MWMOpeningHoursAddScheduleTableViewCell.mm in Sources */,
 				3304306D21D4EAFB00317CA3 /* SearchCategoryCell.swift in Sources */,
-				ED79A5AB2BD7AA9C00952D1F /* LoadingOverlayViewController.swift in Sources */,
 				34AB66111FC5AA320078E451 /* NavigationTurnsView.swift in Sources */,
 				475ED78624C7C7300063ADC7 /* ValueStepperViewRenderer.swift in Sources */,
 				3490D2E11CE9DD2500D0B838 /* MWMSideButtonsView.mm in Sources */,
diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.xib b/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.xib
index cbfefb54fa..706f679c41 100644
--- a/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.xib
+++ b/iphone/Maps/UI/Editor/Cells/MWMEditorAdditionalNameTableViewCell.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -16,33 +16,34 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="zh-classical" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="efb-nS-cjm">
-                        <rect key="frame" x="16" y="13.5" width="80" height="17"/>
-                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="17" id="8qF-WG-0JP"/>
-                            <constraint firstAttribute="width" constant="80" id="RUn-7a-x8R"/>
-                        </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <nil key="highlightedColor"/>
-                        <userDefinedRuntimeAttributes>
-                            <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/>
-                        </userDefinedRuntimeAttributes>
-                    </label>
-                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalCompressionResistancePriority="499" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="9BY-PA-dlA">
-                        <rect key="frame" x="100" y="16" width="204" height="12"/>
-                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                        <textInputTraits key="textInputTraits"/>
-                        <userDefinedRuntimeAttributes>
-                            <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackPrimaryText"/>
-                            <userDefinedRuntimeAttribute type="string" keyPath="localizedPlaceholder" value="editor_edit_place_name_hint"/>
-                        </userDefinedRuntimeAttributes>
-                        <connections>
-                            <outlet property="delegate" destination="hfo-cP-AGX" id="jkD-0x-Ods"/>
-                        </connections>
-                    </textField>
+                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" alignment="top" spacing="3" translatesAutoresizingMaskIntoConstraints="NO" id="eca-XW-QZR">
+                        <rect key="frame" x="16" y="16" width="288" height="12"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="zh-classical" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="efb-nS-cjm">
+                                <rect key="frame" x="0.0" y="0.0" width="77" height="5"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/>
+                                </userDefinedRuntimeAttributes>
+                            </label>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalCompressionResistancePriority="499" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="9BY-PA-dlA">
+                                <rect key="frame" x="0.0" y="8" width="5" height="4"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <textInputTraits key="textInputTraits"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular17:blackPrimaryText"/>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="localizedPlaceholder" value="editor_edit_place_name_hint"/>
+                                </userDefinedRuntimeAttributes>
+                                <connections>
+                                    <outlet property="delegate" destination="hfo-cP-AGX" id="jkD-0x-Ods"/>
+                                </connections>
+                            </textField>
+                        </subviews>
+                    </stackView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="252" translatesAutoresizingMaskIntoConstraints="NO" id="SZa-Bj-se1">
                         <rect key="frame" x="60" y="32" width="252" height="0.0"/>
                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
@@ -60,14 +61,11 @@
                 <constraints>
                     <constraint firstItem="SZa-Bj-se1" firstAttribute="leading" secondItem="JQH-ks-NoC" secondAttribute="leading" constant="60" id="BcS-gb-9vl"/>
                     <constraint firstAttribute="trailing" secondItem="SZa-Bj-se1" secondAttribute="trailing" constant="8" id="EBU-G3-tgp"/>
-                    <constraint firstAttribute="trailing" secondItem="9BY-PA-dlA" secondAttribute="trailing" constant="16" id="EPW-QQ-h4A"/>
-                    <constraint firstItem="efb-nS-cjm" firstAttribute="centerY" secondItem="9BY-PA-dlA" secondAttribute="centerY" id="KMC-QU-FKv"/>
+                    <constraint firstItem="eca-XW-QZR" firstAttribute="top" secondItem="JQH-ks-NoC" secondAttribute="top" constant="16" id="FJ5-Zj-wLR"/>
+                    <constraint firstAttribute="trailing" secondItem="eca-XW-QZR" secondAttribute="trailing" constant="16" id="NZO-C9-ZCS"/>
+                    <constraint firstItem="SZa-Bj-se1" firstAttribute="top" secondItem="eca-XW-QZR" secondAttribute="bottom" constant="4" id="T9Z-G5-LVc"/>
                     <constraint firstAttribute="bottom" secondItem="SZa-Bj-se1" secondAttribute="bottom" constant="12" id="TdX-jx-CpD"/>
-                    <constraint firstItem="efb-nS-cjm" firstAttribute="leading" secondItem="JQH-ks-NoC" secondAttribute="leading" constant="16" id="aeA-g6-24D"/>
-                    <constraint firstItem="9BY-PA-dlA" firstAttribute="leading" secondItem="efb-nS-cjm" secondAttribute="trailing" constant="4" id="bE7-50-JFQ"/>
-                    <constraint firstAttribute="bottom" secondItem="efb-nS-cjm" secondAttribute="bottom" priority="750" constant="12" id="fZC-8Q-bPw"/>
-                    <constraint firstItem="SZa-Bj-se1" firstAttribute="top" secondItem="9BY-PA-dlA" secondAttribute="bottom" constant="4" id="gPQ-Bf-Pgf"/>
-                    <constraint firstItem="9BY-PA-dlA" firstAttribute="top" secondItem="JQH-ks-NoC" secondAttribute="top" constant="16" id="qga-k9-pOr"/>
+                    <constraint firstItem="eca-XW-QZR" firstAttribute="leading" secondItem="JQH-ks-NoC" secondAttribute="leading" constant="16" id="dbb-bG-8uT"/>
                 </constraints>
                 <userDefinedRuntimeAttributes>
                     <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
@@ -82,7 +80,7 @@
                 <outlet property="languageLabel" destination="efb-nS-cjm" id="13M-9D-Qbf"/>
                 <outlet property="textField" destination="9BY-PA-dlA" id="SCv-JL-5TL"/>
             </connections>
-            <point key="canvasLocation" x="342" y="257"/>
+            <point key="canvasLocation" x="340.57971014492756" y="256.47321428571428"/>
         </tableViewCell>
     </objects>
 </document>
diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
index a52d0beeb7..a51ff014a4 100644
--- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm
+++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
@@ -93,6 +93,14 @@ void cleanupAdditionalLanguages(std::vector<osm::LocalizedName> const & names,
                 });
 }
 
+std::vector<NSInteger> extractLanguageCodes(const std::vector<osm::LocalizedName>& names) 
+{
+  std::vector<NSInteger> languageCodes;
+  for (const auto& name : names)
+    languageCodes.push_back(static_cast<NSInteger>(name.m_code));
+  return languageCodes;
+}
+
 std::vector<MWMEditorCellID> cellsForAdditionalNames(osm::NamesDataSource const & ds,
                                                   std::vector<NSInteger> const & newAdditionalLanguages,
                                                   BOOL showAdditionalNames)
@@ -513,19 +521,14 @@ void registerCellsForTableView(std::vector<MWMEditorCellID> const & cells, UITab
   {
     MWMEditorAdditionalNameTableViewCell * tCell =
         static_cast<MWMEditorAdditionalNameTableViewCell *>(cell);
-
-    // When default name is added - remove fake names from datasource.
-    auto const it = std::find(m_newAdditionalLanguages.begin(), m_newAdditionalLanguages.end(),
-                              StringUtf8Multilang::kDefaultCode);
-    auto const needFakes = it == m_newAdditionalLanguages.end();
-    auto const & localizedNames = m_mapObject.GetNamesDataSource(needFakes).names;
-
+    auto const & localizedNames = m_mapObject.GetNamesDataSource().names;
     if (indexPath.row < localizedNames.size())
     {
       osm::LocalizedName const & name = localizedNames[indexPath.row];
+      NSString * langName = indexPath.row == StringUtf8Multilang::kDefaultCode ? L(@"editor_default_language_hint") : ToNSString(name.m_langName);
       [tCell configWithDelegate:self
                        langCode:name.m_code
-                       langName:ToNSString(name.m_langName)
+                       langName:langName
                            name:@(name.m_name.c_str())
                    errorMessage:L(@"error_enter_correct_name")
                         isValid:isValid
@@ -541,7 +544,6 @@ void registerCellsForTableView(std::vector<MWMEditorCellID> const & cells, UITab
       if (langCode == StringUtf8Multilang::kDefaultCode)
       {
         name = m_mapObject.GetDefaultName();
-        m_mapObject.EnableNamesAdvancedMode();
       }
 
       [tCell configWithDelegate:self
@@ -1105,7 +1107,7 @@ void registerCellsForTableView(std::vector<MWMEditorCellID> const & cells, UITab
     MWMEditorAdditionalNamesTableViewController * dvc = segue.destinationViewController;
     [dvc configWithDelegate:self
                                name:m_mapObject.GetNameMultilang()
-        additionalSkipLanguageCodes:m_newAdditionalLanguages];
+        additionalSkipLanguageCodes:extractLanguageCodes(m_mapObject.GetNamesDataSource().names)];
   }
 }
 
diff --git a/iphone/Maps/UI/Help/AboutController/AboutController.swift b/iphone/Maps/UI/Help/AboutController/AboutController.swift
index db1ca8263f..6ab0665ec3 100644
--- a/iphone/Maps/UI/Help/AboutController/AboutController.swift
+++ b/iphone/Maps/UI/Help/AboutController/AboutController.swift
@@ -481,20 +481,6 @@ private extension AboutController {
       }
       return false
     }
-    
-    func openDefaultMailApp(subject: String, body: String, recipients: [String]) -> Bool {
-      var components = URLComponents(string: "mailto:\(recipients.joined(separator: ";"))")
-      components?.queryItems = [
-        URLQueryItem(name: "subject", value: subject),
-        URLQueryItem(name: "body", value: body.replacingOccurrences(of: "\n", with: "\r\n")),
-      ]
-
-      if let url = components?.url, UIApplication.shared.canOpenURL(url) {
-        UIApplication.shared.open(url)
-        return true
-      }
-      return false
-    }
 
     let subject = emailSubject(subject: header)
     let body = emailBody()
@@ -505,10 +491,15 @@ private extension AboutController {
                                  openOutlook(subject: subject, body: body, recipients: toRecipients))) {
       return
     }
-    
     // From iOS 14, it is possible to change the default mail app, and mailto should open a default mail app.
-    if openDefaultMailApp(subject: subject, body: body, recipients: toRecipients) {
-      return
+    if MWMMailViewController.canSendMail() {
+      let vc = MWMMailViewController()
+      vc.mailComposeDelegate = self
+      vc.setSubject(subject)
+      vc.setMessageBody(body, isHTML:false)
+      vc.setToRecipients(toRecipients)
+      vc.navigationBar.tintColor = UIColor.whitePrimaryText()
+      self.present(vc, animated: true, completion:nil)
     } else {
       let text = String(format:L("email_error_body"), toRecipients.joined(separator: ";"))
       let alert = UIAlertController(title: L("email_error_title"), message: text, preferredStyle: .alert)
@@ -519,6 +510,13 @@ private extension AboutController {
   }
 }
 
+// MARK: - MFMailComposeViewControllerDelegate
+extension AboutController: MFMailComposeViewControllerDelegate {
+  func mailComposeController(_ controller: MFMailComposeViewController, didFinishWith result: MFMailComposeResult, error: Error?) {
+    self.dismiss(animated: true, completion: nil)
+  }
+}
+
 // MARK: - UIStackView + AddArrangedSubviewWithSeparator
 private extension UIStackView {
   func addArrangedSubviewWithSeparator(_ view: UIView) {
diff --git a/platform/CMakeLists.txt b/platform/CMakeLists.txt
index 1f6482e547..44ef48e9fa 100644
--- a/platform/CMakeLists.txt
+++ b/platform/CMakeLists.txt
@@ -180,7 +180,7 @@ if (QT_POSITIONING)
 endif()
 
 if (APPLE)
-  target_compile_options(${PROJECT_NAME} PRIVATE -fobjc-arc -Wno-nullability-completeness)
+  target_compile_options(${PROJECT_NAME} PRIVATE "-fobjc-arc")
 endif()
 
 if (PLATFORM_LINUX OR PLATFORM_WIN)
diff --git a/routing_common/routing_common_tests/vehicle_model_test.cpp b/routing_common/routing_common_tests/vehicle_model_test.cpp
index abed20e76c..06b28bac53 100644
--- a/routing_common/routing_common_tests/vehicle_model_test.cpp
+++ b/routing_common/routing_common_tests/vehicle_model_test.cpp
@@ -70,12 +70,6 @@ public:
     secondaryTunnel = c.GetTypeByPath({"highway", "secondary", "tunnel"});
     residential = c.GetTypeByPath({"highway", "residential"});
 
-    path = c.GetTypeByPath({"highway", "path"});
-    footway = c.GetTypeByPath({"highway", "footway"});
-    cycleway = c.GetTypeByPath({"highway", "cycleway"});
-    yesBicycle = c.GetTypeByPath({"hwtag", "yesbicycle"});
-    yesFoot = c.GetTypeByPath({"hwtag", "yesfoot"});
-
     oneway = c.GetTypeByPath({"hwtag", "oneway"});
     pavedGood = c.GetTypeByPath({"psurface", "paved_good"});
     pavedBad = c.GetTypeByPath({"psurface", "paved_bad"});
@@ -84,7 +78,6 @@ public:
   }
 
   uint32_t primary, secondary, secondaryTunnel, secondaryBridge, residential;
-  uint32_t path, footway, cycleway, yesBicycle, yesFoot;
   uint32_t oneway, pavedGood, pavedBad, unpavedGood, unpavedBad;
 
   static SpeedParams DefaultParams() { return {{}, kInvalidSpeed, false /* inCity */}; }
@@ -258,14 +251,6 @@ bool LessSpeed(SpeedKMpH const & l, SpeedKMpH const & r)
 }
 
 #define TEST_LESS_SPEED(l, r) TEST(LessSpeed(l, r), (l, r))
-
-bool LessOrEqualSpeed(SpeedKMpH const & l, SpeedKMpH const & r)
-{
-  TEST(l.IsValid() && r.IsValid(), (l, r));
-  return l.m_weight <= r.m_weight;
-}
-
-#define TEST_LESS_OR_EQUAL_SPEED(l, r) TEST(LessOrEqualSpeed(l, r), (l, r))
 } // namespace
 
 UNIT_CLASS_TEST(VehicleModelTest, CarModel_TrackVsGravelTertiary)
@@ -321,15 +306,15 @@ UNIT_CLASS_TEST(VehicleModelTest, BicycleModel_Smoke)
   auto const p = DefaultParams();
 
   feature::TypesHolder h1;
-  h1.Add(cycleway);
-  h1.Add(yesBicycle);
+  h1.Add(c.GetTypeByPath({"highway", "cycleway"}));
+  h1.Add(c.GetTypeByPath({"hwtag", "yesbicycle"}));
 
   feature::TypesHolder h2;
-  h2.Add(cycleway);
+  h2.Add(c.GetTypeByPath({"highway", "cycleway"}));
 
   feature::TypesHolder h3;
   h3.Add(secondary);
-  h3.Add(yesBicycle);
+  h3.Add(c.GetTypeByPath({"hwtag", "yesbicycle"}));
 
   feature::TypesHolder h4;
   h4.Add(secondary);
@@ -344,44 +329,6 @@ UNIT_CLASS_TEST(VehicleModelTest, BicycleModel_Smoke)
   TEST_LESS_SPEED(model.GetSpeed(h5, p), model.GetSpeed(h4, p));
 }
 
-UNIT_CLASS_TEST(VehicleModelTest, BicycleModel_Speeds)
-{
-  auto const & model = BicycleModel::AllLimitsInstance();
-  auto const & c = classif();
-  auto const p = DefaultParams();
-
-  std::vector<std::vector<uint32_t>> const highways = {
-    {cycleway, pavedGood}, // TODO: should be higher than next, but is equal
-    {cycleway},
-    {cycleway, unpavedGood}, // TODO: should be lower than previous, but is equal
-    {footway, yesBicycle, pavedGood}, // TODO: should be higher than next, but is equal
-    {footway, yesBicycle},
-    {path, yesBicycle}, // TODO: unpaved by default, so should be lower than shared footways or cycleways, but is equal
-    {cycleway, pavedBad},
-    {footway, yesBicycle, pavedBad},
-    {cycleway, unpavedBad},
-    {path, yesBicycle, unpavedBad},
-    {path, unpavedGood}, // TODO: should be faster than bad surface cycleway (mtb?), but weight is less while eta is faster
-    {footway},
-    {footway, c.GetTypeByPath({"hwtag", "nobicycle"})}, // TODO: should be lower than previous, but is equal
-    // {path, c.GetTypeByPath({"hwtag", "nobicycle"})}, //TODO: should be lower than previous, but is higher
-    {path, unpavedBad},
-  };
-
-  feature::TypesHolder hprev;
-  for (size_t i = 0; i < highways.size(); ++i)
-  {
-    feature::TypesHolder h;
-    for (uint32_t t : highways[i])
-      h.Add(t);
-    LOG(LINFO, (h, model.GetSpeed(h, p)));
-
-    if (i > 0)
-      TEST_LESS_OR_EQUAL_SPEED(model.GetSpeed(h, p), model.GetSpeed(hprev, p));
-    hprev = h;
-  }
-}
-
 UNIT_CLASS_TEST(VehicleModelTest, PedestrianModel_Smoke)
 {
   auto const & model = PedestrianModel::AllLimitsInstance();
@@ -403,43 +350,7 @@ UNIT_CLASS_TEST(VehicleModelTest, PedestrianModel_Smoke)
   TEST_LESS_SPEED(model.GetSpeed(h3, p), model.GetSpeed(h2, p));
 }
 
-UNIT_CLASS_TEST(VehicleModelTest, PedestrianModel_Speeds)
-{
-  auto const & model = PedestrianModel::AllLimitsInstance();
-  // auto const & c = classif();
-  auto const p = DefaultParams();
-
-  std::vector<std::vector<uint32_t>> const highways = {
-    {footway, pavedGood}, // TODO: should be higher than next, but is equal
-    {footway},
-    {footway, pavedBad}, // TODO: should be lower than previous, but is equal
-    {footway, yesBicycle}, // TODO: should be lower than previous, but is equal
-    {path, yesFoot}, // TODO: should be higher than previous, but is equal
-    {path, unpavedGood}, // TODO: should be lower than previous, but is equal
-    {path, yesBicycle}, // TODO: should be lower than previous, but is equal
-    {cycleway},
-    {path, unpavedBad},
-    {cycleway, unpavedBad},
-    // {path, c.GetTypeByPath({"hwtag", "nofoot"})}, // TODO: should be forbidden, but has no effect ATM
-    // {cycleway, c.GetTypeByPath({"hwtag", "nofoot"})}, // TODO: should be forbidden, but has no effect ATM
-  };
-
-  feature::TypesHolder hprev;
-  for (size_t i = 0; i < highways.size(); ++i)
-  {
-    feature::TypesHolder h;
-    for (uint32_t t : highways[i])
-      h.Add(t);
-    LOG(LINFO, (h, model.GetSpeed(h, p)));
-
-    if (i > 0)
-      TEST_LESS_OR_EQUAL_SPEED(model.GetSpeed(h, p), model.GetSpeed(hprev, p));
-    hprev = h;
-  }
-}
-
 #undef TEST_LESS_SPEED
-#undef TEST_LESS_OR_EQUAL_SPEED
 
 UNIT_TEST(VehicleModel_MultiplicationOperatorTest)
 {
diff --git a/shaders/CMakeLists.txt b/shaders/CMakeLists.txt
index 22fd0ef9b5..11da795e91 100644
--- a/shaders/CMakeLists.txt
+++ b/shaders/CMakeLists.txt
@@ -56,6 +56,7 @@ set(shader_files
     GL/text.fsh.glsl
     GL/text.vsh.glsl
     GL/text_billboard.vsh.glsl
+    GL/text_fixed.fsh.glsl
     GL/text_outlined.vsh.glsl
     GL/text_outlined_billboard.vsh.glsl
     GL/text_outlined_gui.vsh.glsl
diff --git a/shaders/GL/shader_index.txt b/shaders/GL/shader_index.txt
index c0e18219f4..a3cb58d8fb 100644
--- a/shaders/GL/shader_index.txt
+++ b/shaders/GL/shader_index.txt
@@ -5,6 +5,7 @@ Bookmark user_mark.vsh.glsl user_mark.fsh.glsl
 BookmarkAnim user_mark.vsh.glsl user_mark.fsh.glsl
 TextOutlined text_outlined.vsh.glsl text.fsh.glsl
 Text text.vsh.glsl text.fsh.glsl
+TextFixed text.vsh.glsl text_fixed.fsh.glsl
 TextStaticOutlinedGui text_outlined_gui.vsh.glsl text.fsh.glsl
 TextOutlinedGui text_outlined_gui.vsh.glsl text.fsh.glsl
 Area area.vsh.glsl solid_color.fsh.glsl
@@ -46,6 +47,7 @@ BookmarkAboveTextBillboard user_mark_billboard.vsh.glsl user_mark.fsh.glsl
 BookmarkAnimAboveTextBillboard user_mark_billboard.vsh.glsl user_mark.fsh.glsl
 TextOutlinedBillboard text_outlined_billboard.vsh.glsl text.fsh.glsl
 TextBillboard text_billboard.vsh.glsl text.fsh.glsl
+TextFixedBillboard text_billboard.vsh.glsl text_fixed.fsh.glsl
 Traffic traffic.vsh.glsl traffic.fsh.glsl
 TrafficLine traffic_line.vsh.glsl traffic_line.fsh.glsl
 TrafficCircle traffic_circle.vsh.glsl traffic_circle.fsh.glsl
diff --git a/shaders/GL/text_fixed.fsh.glsl b/shaders/GL/text_fixed.fsh.glsl
new file mode 100644
index 0000000000..af835b43b5
--- /dev/null
+++ b/shaders/GL/text_fixed.fsh.glsl
@@ -0,0 +1,28 @@
+#ifdef ENABLE_VTF
+varying LOW_P vec4 v_color;
+#else
+varying vec2 v_colorTexCoord;
+uniform sampler2D u_colorTex;
+#endif
+
+varying vec2 v_maskTexCoord;
+
+uniform sampler2D u_maskTex;
+uniform float u_opacity;
+uniform vec2 u_contrastGamma;
+
+void main()
+{
+#ifdef ENABLE_VTF
+  LOW_P vec4 glyphColor = v_color;
+#else
+  LOW_P vec4 glyphColor = texture2D(u_colorTex, v_colorTexCoord);
+#endif
+#ifdef GLES3
+  float alpha = texture2D(u_maskTex, v_maskTexCoord).r;
+#else
+  float alpha = texture2D(u_maskTex, v_maskTexCoord).a;
+#endif
+  glyphColor.a *= u_opacity * alpha;
+  gl_FragColor = glyphColor;
+}
diff --git a/shaders/Metal/map.metal b/shaders/Metal/map.metal
index ec5698d697..cbff4dc4df 100644
--- a/shaders/Metal/map.metal
+++ b/shaders/Metal/map.metal
@@ -561,7 +561,7 @@ vertex TextFragment_T vsTextOutlinedBillboard(const TextOutlinedVertex_T in [[st
 }
 
 // TextFixed
-/*
+
 fragment float4 fsTextFixed(const TextFragment_T in [[stage_in]],
                             constant Uniforms_T & uniforms [[buffer(0)]],
                             texture2d<float> u_maskTex [[texture(0)]],
@@ -572,7 +572,7 @@ fragment float4 fsTextFixed(const TextFragment_T in [[stage_in]],
   glyphColor.a *= alpha * uniforms.u_opacity;
   return glyphColor;
 }
-*/
+
 // ColoredSymbol
 
 typedef struct
diff --git a/shaders/metal_program_pool.mm b/shaders/metal_program_pool.mm
index ed2c3906c1..b8aa36db7b 100644
--- a/shaders/metal_program_pool.mm
+++ b/shaders/metal_program_pool.mm
@@ -54,6 +54,7 @@ std::array<ProgramInfo, static_cast<size_t>(Program::ProgramsCount)> const kMeta
   ProgramInfo("vsUserMark", "fsUserMark", {{0, 3}}),                               // BookmarkAnim
   ProgramInfo("vsTextOutlined", "fsText", {{0, 2}, {3, 4}}),                       // TextOutlined
   ProgramInfo("vsText", "fsText", {{0, 1}, {2, 3}}),                               // Text
+  ProgramInfo("vsText", "fsTextFixed", {{0, 1}, {2, 3}}),                          // TextFixed
   ProgramInfo("vsTextStaticOutlinedGui", "fsTextOutlinedGui", {{0, 4}}),           // TextStaticOutlinedGui
   ProgramInfo("vsTextOutlinedGui", "fsTextOutlinedGui", {{0, 2}, {3, 4}}),         // TextOutlinedGui
   ProgramInfo("vsArea", "fsArea", {{0, 1}}),                                       // Area
@@ -95,6 +96,7 @@ std::array<ProgramInfo, static_cast<size_t>(Program::ProgramsCount)> const kMeta
   ProgramInfo("vsUserMarkBillboard", "fsUserMark", {{0, 3}}),                      // BookmarkAnimAboveTextBillboard
   ProgramInfo("vsTextOutlinedBillboard", "fsText", {{0, 2}, {3, 4}}),              // TextOutlinedBillboard
   ProgramInfo("vsTextBillboard", "fsText", {{0, 1}, {2, 3}}),                      // TextBillboard
+  ProgramInfo("vsTextBollboard", "fsTextFixed", {{0, 1}, {2, 3}}),                 // TextFixedBillboard
   ProgramInfo("vsTraffic", "fsTraffic", {{0, 2}}),                                 // Traffic
   ProgramInfo("vsTrafficLine", "fsTrafficLine", {{0, 1}}),                         // TrafficLine
   ProgramInfo("vsTrafficCircle", "fsTrafficCircle", {{0, 2}}),                     // TrafficCircle
diff --git a/shaders/program_params.hpp b/shaders/program_params.hpp
index b0a9cac2e1..1108b124de 100644
--- a/shaders/program_params.hpp
+++ b/shaders/program_params.hpp
@@ -80,6 +80,8 @@ struct ALIGNMENT MapProgramParams
     Program::PathSymbol,
     Program::Text,
     Program::TextBillboard,
+    Program::TextFixed,
+    Program::TextFixedBillboard,
     Program::TextOutlined,
     Program::TextOutlinedBillboard,
     Program::Texturing,
diff --git a/shaders/programs.hpp b/shaders/programs.hpp
index 6fdb8ec1e1..f9b9ce9c2a 100644
--- a/shaders/programs.hpp
+++ b/shaders/programs.hpp
@@ -16,6 +16,7 @@ enum class Program
   BookmarkAnim,
   TextOutlined,
   Text,
+  TextFixed,
   TextStaticOutlinedGui,
   TextOutlinedGui,
   Area,
@@ -57,6 +58,7 @@ enum class Program
   BookmarkAnimAboveTextBillboard,
   TextOutlinedBillboard,
   TextBillboard,
+  TextFixedBillboard,
   Traffic,
   TrafficLine,
   TrafficCircle,
@@ -78,6 +80,7 @@ inline std::string DebugPrint(Program p)
   case Program::BookmarkAnim: return "BookmarkAnim";
   case Program::TextOutlined: return "TextOutlined";
   case Program::Text: return "Text";
+  case Program::TextFixed: return "TextFixed";
   case Program::TextStaticOutlinedGui: return "TextStaticOutlinedGui";
   case Program::TextOutlinedGui: return "TextOutlinedGui";
   case Program::Area: return "Area";
@@ -119,6 +122,7 @@ inline std::string DebugPrint(Program p)
   case Program::BookmarkAnimAboveTextBillboard: return "BookmarkAnimAboveTextBillboard";
   case Program::TextOutlinedBillboard: return "TextOutlinedBillboard";
   case Program::TextBillboard: return "TextBillboard";
+  case Program::TextFixedBillboard: return "TextFixedBillboard";
   case Program::Traffic: return "Traffic";
   case Program::TrafficLine: return "TrafficLine";
   case Program::TrafficCircle: return "TrafficCircle";
diff --git a/xcode/shaders/shaders.xcodeproj/project.pbxproj b/xcode/shaders/shaders.xcodeproj/project.pbxproj
index 1496f4e25b..72f61c1b1e 100644
--- a/xcode/shaders/shaders.xcodeproj/project.pbxproj
+++ b/xcode/shaders/shaders.xcodeproj/project.pbxproj
@@ -97,6 +97,7 @@
 		4566609C20E256480085E8C1 /* arrow3d_shadow.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = arrow3d_shadow.vsh.glsl; path = ../GL/arrow3d_shadow.vsh.glsl; sourceTree = "<group>"; };
 		4566609D20E256480085E8C1 /* arrow3d.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = arrow3d.fsh.glsl; path = ../GL/arrow3d.fsh.glsl; sourceTree = "<group>"; };
 		4566609E20E256480085E8C1 /* ruler.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ruler.vsh.glsl; path = ../GL/ruler.vsh.glsl; sourceTree = "<group>"; };
+		4566609F20E256490085E8C1 /* text_fixed.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = text_fixed.fsh.glsl; path = ../GL/text_fixed.fsh.glsl; sourceTree = "<group>"; };
 		456660A020E256490085E8C1 /* transit_marker.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = transit_marker.vsh.glsl; path = ../GL/transit_marker.vsh.glsl; sourceTree = "<group>"; };
 		456660A120E256490085E8C1 /* position_accuracy3d.vsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = position_accuracy3d.vsh.glsl; path = ../GL/position_accuracy3d.vsh.glsl; sourceTree = "<group>"; };
 		456660A220E256490085E8C1 /* solid_color.fsh.glsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = solid_color.fsh.glsl; path = ../GL/solid_color.fsh.glsl; sourceTree = "<group>"; };
@@ -320,6 +321,7 @@
 				456660BD20E2564E0085E8C1 /* smaa_final.vsh.glsl */,
 				456660A220E256490085E8C1 /* solid_color.fsh.glsl */,
 				4566609420E256470085E8C1 /* text_billboard.vsh.glsl */,
+				4566609F20E256490085E8C1 /* text_fixed.fsh.glsl */,
 				456660C920E256510085E8C1 /* text_outlined_billboard.vsh.glsl */,
 				456660CA20E256510085E8C1 /* text_outlined_gui.vsh.glsl */,
 				456660B320E2564C0085E8C1 /* text_outlined.vsh.glsl */,
@@ -570,6 +572,7 @@
 				"${SRCROOT}/../../shaders/GL/text.fsh.glsl",
 				"${SRCROOT}/../../shaders/GL/text.vsh.glsl",
 				"${SRCROOT}/../../shaders/GL/text_billboard.vsh.glsl",
+				"${SRCROOT}/../../shaders/GL/text_fixed.fsh.glsl",
 				"${SRCROOT}/../../shaders/GL/text_outlined.vsh.glsl",
 				"${SRCROOT}/../../shaders/GL/text_outlined_billboard.vsh.glsl",
 				"${SRCROOT}/../../shaders/GL/text_outlined_gui.vsh.glsl",