diff --git a/OsmAnd-java/src/main/java/net/osmand/osm/MapRenderingTypes.java b/OsmAnd-java/src/main/java/net/osmand/osm/MapRenderingTypes.java
index 34e5048930..d996678e44 100644
--- a/OsmAnd-java/src/main/java/net/osmand/osm/MapRenderingTypes.java
+++ b/OsmAnd-java/src/main/java/net/osmand/osm/MapRenderingTypes.java
@@ -27,7 +27,7 @@ public abstract class MapRenderingTypes {
 
 	private static final Log log = PlatformUtil.getLog(MapRenderingTypes.class);
 	public static final String[] langs = new String[] { "af", "als", "ar", "az", "be", "bg", "bn", "bpy", "br", "bs", "ca", "ceb", "cs", "cy", "da", "de", "el", "eo", "es", "et", "eu", "fa", "fi", "fr", "fy", "ga", "gl", "he", "hi", "hsb",
-		"hr", "ht", "hu", "hy", "id", "is", "it", "ja", "ka", "ko", "ku", "la", "lb", "lo", "lt", "lv", "mk", "ml", "mr", "ms", "nds", "new", "nl", "nn", "no", "nv", "os", "pl", "pms", "pt", "ro", "ru", "sc", "sh", "sk", "sl", "sq", "sr", "sv", "sw", "ta", "te", "th", "tl", "tr", "uk", "vi", "vo", "zh", "zh-hans", "zh-hant",  };
+		"hr", "ht", "hu", "hy", "id", "is", "it", "ja", "ka", "kn", "ko", "ku", "la", "lb", "lo", "lt", "lv", "mk", "ml", "mr", "ms", "nds", "new", "nl", "nn", "no", "nv", "os", "pl", "pms", "pt", "ro", "ru", "sc", "sh", "sk", "sl", "sq", "sr", "sv", "sw", "ta", "te", "th", "tl", "tr", "uk", "vi", "vo", "zh", "zh-hans", "zh-hant",  };
 	
 	
 	public final static byte RESTRICTION_NO_RIGHT_TURN = 1;
diff --git a/OsmAnd-telegram/res/values-ar/strings.xml b/OsmAnd-telegram/res/values-ar/strings.xml
index 1fb4149e0b..45b5d99ce7 100644
--- a/OsmAnd-telegram/res/values-ar/strings.xml
+++ b/OsmAnd-telegram/res/values-ar/strings.xml
@@ -267,4 +267,8 @@
     <string name="status_widget_title">تتبع حالة أوسماند</string>
     <string name="back_to_osmand">العودة إلى OsmAnd</string>
     <string name="duration_ago">%1$s منذ</string>
+    <string name="send_report">إرسال التقرير</string>
+    <string name="shared_string_export">تصدير</string>
+    <string name="logcat_buffer">سجل الاستخدام</string>
+    <string name="logcat_buffer_descr">التحقق من السجلات التفصيلية للتطبيق ومشاركتها</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-es-rUS/strings.xml b/OsmAnd-telegram/res/values-es-rUS/strings.xml
index 86bfb79310..259192e6a8 100644
--- a/OsmAnd-telegram/res/values-es-rUS/strings.xml
+++ b/OsmAnd-telegram/res/values-es-rUS/strings.xml
@@ -268,4 +268,8 @@
     <string name="last_response_duration">Última respuesta: Hace %1$s</string>
     <string name="duration_ago">Hace %1$s</string>
     <string name="shared_string_error_short">ERR</string>
+    <string name="shared_string_export">Exportar</string>
+    <string name="logcat_buffer">Búfer de Logcat</string>
+    <string name="logcat_buffer_descr">Comprueba y comparte los registros detallados de la aplicación</string>
+    <string name="send_report">Enviar informe</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-pt/strings.xml b/OsmAnd-telegram/res/values-pt/strings.xml
index 21dfc6b4e9..9a516699e2 100644
--- a/OsmAnd-telegram/res/values-pt/strings.xml
+++ b/OsmAnd-telegram/res/values-pt/strings.xml
@@ -267,4 +267,8 @@
     <string name="last_response_date">Última resposta: %1$s</string>
     <string name="last_update_from_telegram_date">Última atualização do Telegram: %1$s</string>
     <string name="shared_string_error_short">ERR</string>
+    <string name="send_report">Enviar o relatório</string>
+    <string name="shared_string_export">Exportar</string>
+    <string name="logcat_buffer">Buffer de logcat</string>
+    <string name="logcat_buffer_descr">Verifique e compartilhe registos detalhados da app</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/ic_action_route_part.xml b/OsmAnd/res/drawable/ic_action_route_part.xml
new file mode 100644
index 0000000000..e06263ef8e
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_route_part.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M7,13C5.8954,13 5,13.8954 5,15C5,16.1046 5.8954,17 7,17H20C20.5523,17 21,17.4477 21,18C21,18.5523 20.5523,19 20,19H7C4.7909,19 3,17.2091 3,15C3,12.7909 4.7909,11 7,11H16.5C17.0523,11 17.5,11.4477 17.5,12C17.5,12.5523 17.0523,13 16.5,13H7Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M21,18C21,19.1046 20.1046,20 19,20C17.8954,20 17,19.1046 17,18C17,16.8954 17.8954,16 19,16C20.1046,16 21,16.8954 21,18Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M3,6C3,4.3432 4.3432,3 6,3C7.3062,3 8.4175,3.8348 8.8293,5H17C19.2091,5 21,6.7909 21,9C21,11.2091 19.2091,13 17,13H16.5C15.9477,13 15.5,12.5523 15.5,12C15.5,11.4477 15.9477,11 16.5,11H17C18.1046,11 19,10.1046 19,9C19,7.8954 18.1046,7 17,7H8.8293C8.4175,8.1652 7.3062,9 6,9C4.3432,9 3,7.6568 3,6ZM7,6C7,5.4477 6.5523,5 6,5C5.4477,5 5,5.4477 5,6C5,6.5523 5.4477,7 6,7C6.5523,7 7,6.5523 7,6Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7,6C7,6.5523 6.5523,7 6,7C5.4477,7 5,6.5523 5,6C5,5.4477 5.4477,5 6,5C6.5523,5 7,5.4477 7,6Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
diff --git a/OsmAnd/res/drawable/ic_logo_openplacereview.xml b/OsmAnd/res/drawable/ic_logo_openplacereview.xml
new file mode 100644
index 0000000000..fc5b26cbf3
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_logo_openplacereview.xml
@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M16,16m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M23,22L21,22A1,1 0,0 0,20 23L20,23A1,1 0,0 0,21 24L23,24A1,1 0,0 0,24 23L24,23A1,1 0,0 0,23 22z"
+      android:fillColor="#8AC826"/>
+  <path
+      android:pathData="M9,10L11,10A1,1 0,0 1,12 11L12,11A1,1 0,0 1,11 12L9,12A1,1 0,0 1,8 11L8,11A1,1 0,0 1,9 10z"
+      android:fillColor="#140579"/>
+  <path
+      android:pathData="M14,10L16,10A1,1 0,0 1,17 11L17,11A1,1 0,0 1,16 12L14,12A1,1 0,0 1,13 11L13,11A1,1 0,0 1,14 10z"
+      android:fillColor="#FFC93A"/>
+  <path
+      android:pathData="M19,10L23,10A1,1 0,0 1,24 11L24,11A1,1 0,0 1,23 12L19,12A1,1 0,0 1,18 11L18,11A1,1 0,0 1,19 10z"
+      android:fillColor="#8AC826"/>
+  <path
+      android:pathData="M23,14L20,14A1,1 0,0 0,19 15L19,15A1,1 0,0 0,20 16L23,16A1,1 0,0 0,24 15L24,15A1,1 0,0 0,23 14z"
+      android:fillColor="#8AC826"/>
+  <path
+      android:pathData="M17,14L15,14A1,1 0,0 0,14 15L14,15A1,1 0,0 0,15 16L17,16A1,1 0,0 0,18 15L18,15A1,1 0,0 0,17 14z"
+      android:fillColor="#FFC93A"/>
+  <path
+      android:pathData="M12,14L9,14A1,1 0,0 0,8 15L8,15A1,1 0,0 0,9 16L12,16A1,1 0,0 0,13 15L13,15A1,1 0,0 0,12 14z"
+      android:fillColor="#140579"/>
+  <path
+      android:pathData="M23,18L18,18A1,1 0,0 0,17 19L17,19A1,1 0,0 0,18 20L23,20A1,1 0,0 0,24 19L24,19A1,1 0,0 0,23 18z"
+      android:fillColor="#8AC826"/>
+  <path
+      android:pathData="M15,18L12,18A1,1 0,0 0,11 19L11,19A1,1 0,0 0,12 20L15,20A1,1 0,0 0,16 19L16,19A1,1 0,0 0,15 18z"
+      android:fillColor="#FFC93A"/>
+  <path
+      android:pathData="M9,18L9,18A1,1 0,0 0,8 19L8,19A1,1 0,0 0,9 20L9,20A1,1 0,0 0,10 19L10,19A1,1 0,0 0,9 18z"
+      android:fillColor="#140579"/>
+</vector>
diff --git a/OsmAnd/res/layout/bottom_sheet_item_slider_with_two_text.xml b/OsmAnd/res/layout/bottom_sheet_item_slider_with_two_text.xml
index b5cb11cf49..f386e8c59f 100644
--- a/OsmAnd/res/layout/bottom_sheet_item_slider_with_two_text.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_slider_with_two_text.xml
@@ -6,33 +6,37 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <FrameLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:gravity="center_vertical"
         android:paddingLeft="@dimen/content_padding"
         android:paddingRight="@dimen/content_padding">
 
         <net.osmand.plus.widgets.TextViewEx
             android:id="@android:id/title"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_gravity="start"
-            osmand:typeface="@string/font_roboto_regular"
+            android:layout_weight="1"
             android:textColor="?android:textColorPrimary"
             android:textSize="@dimen/default_list_text_size"
-            tools:text="title"/>
+            osmand:typeface="@string/font_roboto_regular"
+            tools:text="Some very long title to check overlapped texts" />
+
+        <Space
+            android:layout_width="@dimen/content_padding"
+            android:layout_height="match_parent" />
 
         <net.osmand.plus.widgets.TextViewEx
             android:id="@android:id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            osmand:typeface="@string/font_roboto_medium"
             android:textColor="?attr/active_color_basic"
             android:textSize="@dimen/default_list_text_size"
-            tools:text="summary"/>
+            osmand:typeface="@string/font_roboto_medium"
+            tools:text="summary" />
 
-    </FrameLayout>
+    </LinearLayout>
 
     <com.google.android.material.slider.Slider
         android:id="@+id/slider"
diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index c1426b8483..c695a1c813 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -1074,7 +1074,7 @@
     <string name="rendering_category_routes">المسارات الرياضية</string>
     <string name="rendering_category_transport">وسائل المواصلات</string>
     <string name="rendering_category_others">سمات أخرى للخريطة</string>
-    <string name="map_widget_appearance_rem">العناصر الاخرى</string>
+    <string name="map_widget_appearance_rem">العناصر الأخرى</string>
     <string name="map_widget_top">شريط المعلومات</string>
     <string name="map_widget_right">العدادات على اليمين</string>
     <string name="map_widget_left">العدادات على اليسار</string>
@@ -3413,7 +3413,7 @@
     <string name="select_nav_icon_descr">سترى الأيقونة فقط أثناء الملاحة أو أثناء التحرك.</string>
     <string name="button_rate">قيم</string>
     <string name="select_map_icon_descr">تظهر أيقونة الخريطة فقط على الخريطة ، وتتغير أثناء التنقل إلى أيقونة التنقل.</string>
-    <string name="logcat_buffer_descr">تحقق وتبادل سجلات مفصلة من التطبيق</string>
+    <string name="logcat_buffer_descr">التحقق من السجلات التفصيلية للتطبيق ومشاركتها</string>
     <string name="search_offline_geo_error">تعذر تحليل الهدف الجغرافي \'%s\'.</string>
     <string name="permission_is_required">الإذن مطلوب لاستخدام هذا الخيار.</string>
     <string name="monitoring_min_speed_descr_side_effect">اعراض جانبية: سيفقد المسار الخاص بك جميع الأقسام التي لم يتحقق فيها معيار الحد الأدنى للسرعة (على سبيل المثال ، حيث تدفع دراجتك أعلى تل شديد الانحدار). أيضا ، لن تكون هناك معلومات حول فترات الراحة ، مثل الاستراحات. هذا له تأثيرات على أي تحليل أو مرحلة ما بعد المعالجة ، مثل عند محاولة تحديد المدة الإجمالية لرحلتك ، أو وقت الحركة ، أو متوسط سرعتك.</string>
@@ -3893,4 +3893,12 @@
     <string name="sort_name_ascending">الاسم: أ – ي</string>
     <string name="start_finish_icons">رموز البدء/الانتهاء</string>
     <string name="contour_lines_thanks">شكرا لشرائك \"خطوط الكنتور\"</string>
+    <string name="osm_live_payment_desc_hw">رسوم الاشتراك ستفرض كل شهر. يمكنك إلغاء اشتراكك متى أردت عبر Google play.</string>
+    <string name="osm_live_payment_subscription_management_hw">سيتم تحصيل المبلغ على حساب AppGallery الخاص بك عند تأكيد الشراء.
+\n
+\nيتم تجديد الاشتراك تلقائيًا ما لم يتم إلغاؤه قبل تاريخ التجديد. سيتم خصم حسابك على فترة التجديد (شهر/ثلاثة أشهر/سنة) فقط في تاريخ التجديد.
+\n
+\nيمكنك إدارة وإلغاء الاشتراكات الخاصة بك عن طريق الانتقال إلى إعدادات AppGallery.</string>
+    <string name="routing_attr_avoid_footways_description">تجنب الممرات</string>
+    <string name="routing_attr_avoid_footways_name">تجنب الممرات</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 1fcf32f445..fcfcca7c77 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -3826,7 +3826,7 @@
     <string name="plan_route_select_track_file_for_open">Wählen Sie eine Trackdatei zum Öffnen aus.</string>
     <string name="shared_string_done">Fertig</string>
     <string name="overwrite_track">Track überschreiben</string>
-    <string name="threshold_distance">Schwellenwert-Distanz</string>
+    <string name="threshold_distance">Maximaler Abstand</string>
     <string name="save_as_new_track">Als neuen Track speichern</string>
     <string name="reverse_route">Route umkehren</string>
     <string name="route_between_points_whole_track_button_desc">Der gesamte Track wird mit dem ausgewählten Profil neu berechnet.</string>
@@ -3910,4 +3910,12 @@
     <string name="sort_name_ascending">Name: A – Z</string>
     <string name="start_finish_icons">Start-/Ziel-Symbole</string>
     <string name="contour_lines_thanks">Vielen Dank für den Kauf von \'Höhenlinien\'</string>
+    <string name="osm_live_payment_desc_hw">Das Abonnement wird pro ausgewähltem Zeitraum berechnet. Sie können das Abonnement jederzeit über die AppGallery kündigen.</string>
+    <string name="osm_live_payment_subscription_management_hw">Die Bezahlung wird Ihrem AppGallery-Konto bei der Bestätigung des Kaufs belastet.
+\n
+\n Das Abonnement verlängert sich automatisch, sofern es nicht vor dem Verlängerungsdatum gekündigt wird. Ihr Konto wird für den Verlängerungszeitraum (Monat / drei Monate / Jahr) nur am Verlängerungsdatum belastet.
+\n
+\n Sie können Ihre Abonnements verwalten und kündigen, indem Sie zu Ihren AppGallery-Einstellungen gehen.</string>
+    <string name="routing_attr_avoid_footways_description">Vermeidet Fußwege</string>
+    <string name="routing_attr_avoid_footways_name">Keine Fußwege</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index fcdccf360a..c6f59f41ea 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -3909,4 +3909,12 @@
     <string name="sort_name_ascending">Nombre: A – Z</string>
     <string name="start_finish_icons">Iconos de inicio/fin</string>
     <string name="contour_lines_thanks">Gracias por comprar las «Curvas de nivel»</string>
+    <string name="osm_live_payment_desc_hw">La suscripción se cobra por el período elegido. Puedes cancelarlo en cualquier momento en AppGallery.</string>
+    <string name="osm_live_payment_subscription_management_hw">El pago será cargado a la cuenta de AppGallery al confirmar la compra.
+\n
+\nLa suscripción se renueva automáticamente a menos que se cancele antes de la fecha de renovación. La cuenta será cargada por el período de renovación (mes/trimestre/año) sólo en la fecha de renovación.
+\n
+\nPuedes administrar y cancelar las suscripciones accediendo a los ajustes de AppGallery.</string>
+    <string name="routing_attr_avoid_footways_description">Evita pasar por las veredas o aceras</string>
+    <string name="routing_attr_avoid_footways_name">Evitar veredas/aceras</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml
index 6ba4dcc29e..c42f0e0c5b 100644
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@@ -3905,4 +3905,13 @@
     <string name="sort_name_ascending">Nombre: A – Z</string>
     <string name="sort_last_modified">Último modificado</string>
     <string name="start_finish_icons">Iconos de inicio/fin</string>
+    <string name="contour_lines_thanks">Gracias por comprar las «Curvas de nivel»</string>
+    <string name="osm_live_payment_desc_hw">La suscripción se cobra por el período elegido. Puedes cancelarlo en cualquier momento en AppGallery.</string>
+    <string name="osm_live_payment_subscription_management_hw">El pago será cargado a la cuenta de AppGallery al confirmar la compra.
+\n
+\nLa suscripción se renueva automáticamente a menos que se cancele antes de la fecha de renovación. La cuenta será cargada por el período de renovación (mes/trimestre/año) sólo en la fecha de renovación.
+\n
+\nPuedes administrar y cancelar las suscripciones accediendo a los ajustes de AppGallery.</string>
+    <string name="routing_attr_avoid_footways_description">Evita pasar por aceras o veredas</string>
+    <string name="routing_attr_avoid_footways_name">Evitar aceras</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-et/strings.xml b/OsmAnd/res/values-et/strings.xml
index 8e58fdad52..fe5cbbfa20 100644
--- a/OsmAnd/res/values-et/strings.xml
+++ b/OsmAnd/res/values-et/strings.xml
@@ -3764,4 +3764,13 @@
     <string name="sort_name_ascending">Nimi: A – Z</string>
     <string name="screen_timeout">Ekraani väljalülitamine</string>
     <string name="app_mode_wheelchair_forward">Ratastool edasi</string>
+    <string name="routing_attr_avoid_footways_description">Väldi jalgteid</string>
+    <string name="routing_attr_avoid_footways_name">Väldi jalgteid</string>
+    <string name="contour_lines_thanks">Täname „Kõrgusjoonte“ ostu eest</string>
+    <string name="osm_live_payment_subscription_management_hw">Ostukinnituse saabumisel arveldame tellimuse eest sinu AppGallery konto alusel.
+\n
+\nKui sa ei tühista tellimust enne uue perioodi algust, siis tellimus pikeneb automaatselt ning arveldame järgmise ajavahemiku eest (kuu/kvartal/aasta) selle alguses.
+\n
+\nTellimust saad hallata ja tühistada AppGallery seadistustest.</string>
+    <string name="osm_live_payment_desc_hw">Arveldame tellimuse eest valitud ajavahemiku alusel. Seda saad sa vabalt valitud ajal tühistada AppGallery\'s.</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 41007cc7eb..401664b66e 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -3885,4 +3885,7 @@
     <string name="sort_name_ascending">Nom : A – Z</string>
     <string name="start_finish_icons">Icônes de départ / arrivée</string>
     <string name="contour_lines_thanks">Merci pour votre achat de \'Courbes de niveaux\'</string>
+    <string name="osm_live_payment_desc_hw">Abonnement facturé pour chaque période sélectionnée. Annulation possible à tout moment sur AppGallery.</string>
+    <string name="routing_attr_avoid_footways_description">Éviter les trottoirs</string>
+    <string name="routing_attr_avoid_footways_name">Éviter les trottoirs</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-iw/strings.xml b/OsmAnd/res/values-iw/strings.xml
index 42a840fa87..6b405f881a 100644
--- a/OsmAnd/res/values-iw/strings.xml
+++ b/OsmAnd/res/values-iw/strings.xml
@@ -3911,4 +3911,12 @@
     <string name="sort_name_ascending">שם: א – ת</string>
     <string name="start_finish_icons">סמלי התחלה/סיום</string>
     <string name="contour_lines_thanks">תודה לך על רכישת ‚קווי מתאר’</string>
+    <string name="routing_attr_avoid_footways_description">הימנעות משבילי הולכי רגל</string>
+    <string name="routing_attr_avoid_footways_name">הימנעות משבילי הולכי רגל</string>
+    <string name="osm_live_payment_desc_hw">המינוי חויב לתקופה הנבחרת. ניתן לבטל דרך ה־AppGallery בכל עת.</string>
+    <string name="osm_live_payment_subscription_management_hw">התשלום יחויב דרך חשבון ה־AppGallery שלך עם אישור הרכישה.
+\n
+\nהמינוי מתחדש אוטומטי אלא אם כן בוטל בטרם תאריך החידוש. החשבון שלך יחויב על תקופת החידוש (חודש/שלושה חודשים/שנה) רק בתאריך החידוש.
+\n
+\nניתן לנהל ולבטל את המינויים שלך דרך ההגדרות ב־AppGallery שלך.</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index 1358007216..457106d81c 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -3901,4 +3901,12 @@
     <string name="sort_name_ascending">Nome: A – Z</string>
     <string name="start_finish_icons">Ícones de início/término</string>
     <string name="contour_lines_thanks">Obrigado por adquirir \'curvas de nível\'</string>
+    <string name="osm_live_payment_desc_hw">Assinatura cobrada por período selecionado. Cancele no AppGallery a qualquer momento.</string>
+    <string name="osm_live_payment_subscription_management_hw">O pagamento será cobrado em sua conta AppGallery na confirmação da compra.
+\n
+\nA assinatura é renovada automaticamente, a menos que seja cancelada antes da data de renovação. Sua conta será cobrada pelo período de renovação (mês/três meses/ano) apenas na data de renovação.
+\n
+\nVocê pode gerenciar e cancelar suas assinaturas acessando as configurações do AppGallery.</string>
+    <string name="routing_attr_avoid_footways_description">Evite passarelas</string>
+    <string name="routing_attr_avoid_footways_name">Evite passarelas</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index 08c39f206e..cae1cc8c1e 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -3908,4 +3908,12 @@
     <string name="sort_name_ascending">Nome: A – Z</string>
     <string name="start_finish_icons">Ícones de início/fim</string>
     <string name="contour_lines_thanks">Obrigado por comprar \'Curvas de nível\'</string>
+    <string name="osm_live_payment_desc_hw">Assinatura cobrada por período selecionado. Cancele-a na AppGallery a qualquer momento.</string>
+    <string name="osm_live_payment_subscription_management_hw">O pagamento será debitado na sua conta AppGallery no momento da confirmação da compra.
+\n
+\nA assinatura é renovada automaticamente, a menos que seja cancelada antes da data de renovação. A sua conta será cobrada pelo período de renovação (mês/três meses/ano) apenas na data de renovação.
+\n
+\nPode gerir e cancelar as suas subscrições a ir às definições da sua AppGallery.</string>
+    <string name="routing_attr_avoid_footways_description">Evitar passeios</string>
+    <string name="routing_attr_avoid_footways_name">Evitar passeios</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index b6dd46c4e9..968f4e898e 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -73,7 +73,7 @@
     <string name="select_postcode">Поиск почтового индекса</string>
     <string name="quick_action_take_audio_note">Запись аудио⁣</string>
     <string name="quick_action_take_video_note">Записать видео</string>
-    <string name="quick_action_take_photo_note">Фотозаметка</string>
+    <string name="quick_action_take_photo_note">Сделать фото</string>
     <string name="quick_action_add_osm_bug">OSM-заметка</string>
     <string name="parking_options">Функции парковки</string>
     <string name="full_version_thanks">Благодарим вас за покупку платной версии OsmAnd.</string>
@@ -531,10 +531,10 @@
     <string name="overlay_transparency">Прозрачность наложения</string>
     <string name="map_transparency_descr">Отрегулируйте прозрачность основной карты.</string>
     <string name="map_transparency">Прозрачность основной карты</string>
-    <string name="layer_underlay">Карта подложки</string>
+    <string name="layer_underlay">Карта подложки…</string>
     <string name="map_underlay">Карта подложки</string>
     <string name="map_underlay_descr">Выберите карту подложки</string>
-    <string name="layer_overlay">Карта наложения</string>
+    <string name="layer_overlay">Карта наложения…</string>
     <string name="map_overlay">Карта наложения</string>
     <string name="map_overlay_descr">Выберите слой наложения поверх основной карты</string>
     <string name="tile_source_already_installed">Карта уже установлена, настройки будут обновлены.</string>
@@ -689,7 +689,7 @@
     <string name="layer_route">Маршрут</string>
     <string name="layer_osm_bugs">OSM-заметки (онлайн)</string>
     <string name="layer_poi">POI…</string>
-    <string name="layer_map">Источник карты</string>
+    <string name="layer_map">Источник карты…</string>
     <string name="menu_layers">Слои</string>
     <string name="context_menu_item_search_poi">Поиск POI</string>
     <string name="use_trackball_descr">Использовать трекбол для перемещения по карте.</string>
@@ -1179,7 +1179,7 @@
     <string name="context_menu_item_last_intermediate_point">Последний промежуточный пункт</string>
     <string name="context_menu_item_first_intermediate_point">Сделать начальной остановкой</string>
     <string name="add_as_last_destination_point">Сделать последней остановкой</string>
-    <string name="add_as_first_destination_point">Сделать начальной остановкой</string>
+    <string name="add_as_first_destination_point">Первый промежуточный пункт</string>
     <string name="replace_destination_point">Заменить пункт назначения</string>
     <string name="new_destination_point_dialog">Пункт назначения уже задан</string>
     <string name="target_point">Пункт %1$s</string>
@@ -3580,8 +3580,7 @@
     <string name="monitoring_min_speed_descr_remark">Примечание: проверка скорости &gt; 0: большинство модулей GPS сообщают значение скорости только в том случае, если алгоритм определяет, что вы движетесь, и ничего, если вы не перемещаетесь. Следовательно, использование параметра &gt; 0 в этом фильтре в некотором смысле приводит к обнаружению факта перемещения модуля GPS. Но даже если мы не производим данную фильтрацию во время записи, то всё равно эта функция используется при анализе GPX для определения скорректированного расстояния, то есть значение, отображаемое в этом поле, является расстоянием, записанным во время движения.</string>
     <string name="multimedia_rec_split_title">Разделение записи</string>
     <string name="live_monitoring_adress_descr">Укажите веб-адрес со следующими параметрами: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}.</string>
-    <string name="monitoring_min_accuracy_descr">"Будут записываться только точки, отвечающие
-\n в минимальной точностью (в метрах/футах —зависит от настроек системы).  Точность — это близость измерений к истинному положению, и она не связана напрямую с точностью, которая представляет собой разброс повторных измерений."</string>
+    <string name="monitoring_min_accuracy_descr">"Будут записываться только точки, отвечающие по показателю минимальной точности (в метрах или футах — зависит от настроек системы).  Точность — это близость измерений к истинному положению, и она не связана напрямую с точностью, которая представляет собой разброс повторных измерений."</string>
     <string name="monitoring_min_speed_descr_recommendation">Рекомендация: попробуйте сначала воспользоваться детектором движения через фильтр минимального смещения (B), что может дать лучшие результаты и вы потеряете меньше данных. Если треки остаются шумными на низких скоростях, попробуйте использовать ненулевые значения. Обратите внимание, что некоторые измерения могут вообще не указывать значения скорости (некоторые сетевые методы), и в этом случае ничего не будет записываться.</string>
     <string name="slope_description">Для визуализации крутизны рельефа используются цвета.</string>
     <string name="slope_read_more">Подробнее об уклонах можно прочитать в %1$s.</string>
@@ -3904,4 +3903,12 @@
     <string name="sort_name_ascending">Имя: А - Я</string>
     <string name="start_finish_icons">Значки старта и финиша</string>
     <string name="contour_lines_thanks">Спасибо за покупку \'Контурных линий\'</string>
+    <string name="routing_attr_avoid_footways_description">Избегать пешеходных дорожек</string>
+    <string name="routing_attr_avoid_footways_name">Избегать пешеходных дорожек</string>
+    <string name="osm_live_payment_desc_hw">Подписка взимается за выбранный период. Отмените её в AppGallery в любое время.</string>
+    <string name="osm_live_payment_subscription_management_hw">Оплата будет снята с вашей учетной записи AppGallery при подтверждении покупки.
+\n
+\nПодписка продлевается автоматически, если она не будет отменена до даты продления. С вашего счета будет взиматься плата за период продления (месяц/три месяца/год) только в дату продления.
+\n
+\nВы можете управлять своими подписками и отменять их, перейдя в настройки AppGallery.</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 57221ff561..ac6f4f667a 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -3887,7 +3887,7 @@
     <string name="shared_string_redo">Torra a fàghere</string>
     <string name="release_3_8">• Funtzionalidade de pranificatione de un\'àndala agiornada: permitit de impreare castas diferentes de navigatzione pro segmentu e s\'inclusione de rastas
 \n
-\n • New Appearance menu for tracks: select color, thickness, display direction arrows, start/finish icons
+\n • Menù de Aparèntzia nou pro sas rastas: ischerta su colore, grussària, visulaizatzione de sas fritzas de diretzione, iconas de incumintzu/fine
 \n
 \n • Visibilidade megiorada de sos nodos pro sas bitzicletas.
 \n
@@ -3905,4 +3905,12 @@
     <string name="sort_name_ascending">Nùmene: A – Z</string>
     <string name="start_finish_icons">Iconas de incumintzu/fine</string>
     <string name="contour_lines_thanks">Gràtzias pro àere comporadu \'Curvas de livellu\'</string>
+    <string name="osm_live_payment_desc_hw">Costu periòdicu de s\'abbonamentu. Lu podes anullare in AppGallery cando boles.</string>
+    <string name="osm_live_payment_subscription_management_hw">Su pagamentu at a èssere addebitadu a su contu tuo de AppGallery cando sa còmpora at a èssere cunfirmada. 
+\n 
+\nS\'abbonamentu si rinnovat a sa sola automaticamente, francu chi siat istadu annulladu in antis de sa die de su rinnovu. Su contu tuo at a bènnere addebitadu pro su perìodu de rinnovu (mese/tres meses/annu) in sa die de rinnovu ebbia. 
+\n 
+\nPodes amministrare e annullare sos abbonamentos tuos intrende in sas impostatziones de AppGallery tuas.</string>
+    <string name="routing_attr_avoid_footways_description">Èvita sos martzapiedis</string>
+    <string name="routing_attr_avoid_footways_name">Èvita sos martzapiedis</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-sk/phrases.xml b/OsmAnd/res/values-sk/phrases.xml
index 28ac2c4297..db5f8d31a6 100644
--- a/OsmAnd/res/values-sk/phrases.xml
+++ b/OsmAnd/res/values-sk/phrases.xml
@@ -509,7 +509,7 @@
     <string name="poi_register_office">Matričný úrad</string>
     <string name="poi_pension_fund">Dôchodkový fond</string>
     <string name="poi_migration">Imigračný úrad</string>
-    <string name="poi_tax_inspection">Daňová kontrola</string>
+    <string name="poi_tax_inspection">Daňový úrad</string>
     <string name="poi_quarter">Štvrť</string>
     <string name="poi_attraction_summer_toboggan">Suchá bobová dráha</string>
     <string name="poi_attraction_swing_carousel">Kolotoč s hojdačkami</string>
@@ -3652,4 +3652,5 @@
     <string name="poi_covered_booth">Búdka</string>
     <string name="poi_sms_no">Nie</string>
     <string name="poi_sms_yes">Áno</string>
+    <string name="poi_taxi_office">Kancelária taxislužby</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 6ce4134d80..f9b8f23366 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -3654,8 +3654,8 @@
     <string name="lang_lmo">Lombardsky</string>
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
     <string name="osm_live_payment_subscription_management">Platba bude stiahnutá z vášho účtu Google Play po potvrdení nákupu.
-\n 
-\n Predplatné sa automaticky obnovuje ak nie je zrušené pred dátumom jeho obnovenia. Ďalšia platba za obdobie predplatného (mesiac/štvrťrok/rok) bude stiahnutá v deň obnovenia.
+\n
+\n Predplatné sa automaticky obnovuje, ak nie je zrušené pred dátumom jeho obnovenia. Ďalšia platba za obdobie predplatného (mesiac/štvrťrok/rok) bude stiahnutá v deň obnovenia.
 \n
 \n Vaše predplatné môžete spravovať a zrušiť v nastaveniach Google Play.</string>
     <string name="search_poi_types">Hľadať typy bodov záujmu</string>
@@ -3906,4 +3906,12 @@
     <string name="sort_name_ascending">Názov: A – Z</string>
     <string name="start_finish_icons">Ikony štartu/cieľa</string>
     <string name="contour_lines_thanks">Ďakujeme za zakúpenie modulu \'Vrstevnice\'</string>
+    <string name="osm_live_payment_desc_hw">Predplatné bude spoplatnené v zvolenom intervale. Predplatné zrušte kedykoľvek na AppGallery.</string>
+    <string name="osm_live_payment_subscription_management_hw">Platba bude stiahnutá z vášho účtu AppGallery po potvrdení nákupu.
+\n
+\nPredplatné sa automaticky obnovuje, ak nie je zrušené pred dátumom jeho obnovenia. Ďalšia platba za obdobie predplatného (mesiac/štvrťrok/rok) bude stiahnutá v deň obnovenia.
+\n
+\n Vaše predplatné môžete spravovať a zrušiť v nastaveniach AppGallery.</string>
+    <string name="routing_attr_avoid_footways_description">Vyhnúť sa chodníkom pre chodcov</string>
+    <string name="routing_attr_avoid_footways_name">Vyhnúť sa chodníkom</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index 50a41c8562..071ecab230 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -3861,4 +3861,12 @@
     <string name="sort_name_ascending">İsim: A – Z</string>
     <string name="start_finish_icons">Başlangıç/bitiş simgeleri</string>
     <string name="contour_lines_thanks">\'Eş yükselti eğrileri\'ni satın aldığınız için teşekkürler</string>
+    <string name="osm_live_payment_desc_hw">Abonelik seçilen dönem başına ücretlendirilir. İstediğiniz zaman AppGallery\'den iptal edin.</string>
+    <string name="osm_live_payment_subscription_management_hw">Ödeme, satın alma onaylandığında AppGallery hesabınızdan alınacaktır.
+\n
+\nYenileme tarihinden önce iptal edilmedikçe abonelik otomatik olarak yenilenir. Hesabınızdan yenileme süresi (ay/üç ay/yıl) için yalnızca yenileme tarihinde ücret alınacaktır.
+\n
+\n AppGallery ayarlarınıza giderek aboneliklerinizi yönetebilir ve iptal edebilirsiniz.</string>
+    <string name="routing_attr_avoid_footways_description">Yaya yollarından kaçın</string>
+    <string name="routing_attr_avoid_footways_name">Yaya yollarından kaçın</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index cf0cc3fd99..1d6615754e 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -3901,4 +3901,12 @@
     <string name="sort_name_ascending">名稱：A – Z</string>
     <string name="start_finish_icons">開始／結束圖示</string>
     <string name="contour_lines_thanks">感謝您購買 \'Contour lines\'</string>
+    <string name="osm_live_payment_desc_hw">按選定週期收取訂閱費用。隨時在 AppGallery 上取消。</string>
+    <string name="osm_live_payment_subscription_management_hw">確認購買後將會從您的 AppGallery 帳號中付款。
+\n
+\n除非在續訂日期前取消，否則就會自動續訂。您的帳號將只會在續訂日期收取訂閱週期（一個月／三個月／一年）的費用。
+\n
+\n您可以在您的 AppGallery 設定中管理與取消您的訂閱。</string>
+    <string name="routing_attr_avoid_footways_description">避免人行道</string>
+    <string name="routing_attr_avoid_footways_name">避免人行道</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 6093d106d4..95d20ec85b 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -15,6 +15,14 @@
     <string name="clear_osm_token">Clear OpenStreetMap OAuth token</string>
     <string name="perform_oauth_authorization">Log in via OAuth</string>
     <string name="perform_oauth_authorization_description">Perform an OAuth Login to use osmedit features</string>
+    <string name="use_native_pt_desc">Switch to Java (safe) Public Transport routing calculation</string>
+    <string name="use_native_pt">Native Public Transport development</string>
+    <string name="use_fast_recalculation_desc">Recalculates only the initial part of the route. Can be used for long trips.</string>
+    <string name="complex_routing_descr">Two-phase routing for car navigation.</string>
+    <string name="use_complex_routing">Complex routing</string>
+    <string name="use_live_routing">OsmAnd Live data</string>
+    <string name="use_live_public_transport">OsmAnd Live data</string>
+    <string name="development">Development</string>
     <string name="routing_attr_avoid_footways_name">Avoid footways</string>
     <string name="routing_attr_avoid_footways_description">Avoid footways</string>
     <string name="osm_live_payment_subscription_management_hw">Payment will be charged to your AppGallery account at the confirmation of purchase.\n\nSubscription automatically renews unless it is canceled before the renewal date. Your account will be charged for renewal period(month/three month/year) only on the renewal date.\n\nYou can manage and cancel your subscriptions by going to your AppGallery settings.</string>
@@ -3666,7 +3674,6 @@
     <string name="plugin_install_needs_network">You need to be online to install this plugin.</string>
     <string name="get_plugin">Get</string>
     <string name="use_fast_recalculation">Smart route recalculation</string>
-    <string name="use_fast_recalculation_desc">For long trips, only recalculate the initial part of the route.</string>
     <string name="do_you_like_osmand">Do you like OsmAnd?</string>
     <string name="we_really_care_about_your_opinion">Your opinion and feedback is valued.</string>
     <string name="rate_this_app">Rate this app</string>
diff --git a/OsmAnd/res/xml/development_settings.xml b/OsmAnd/res/xml/development_settings.xml
index d01a1f169d..231bd469bc 100644
--- a/OsmAnd/res/xml/development_settings.xml
+++ b/OsmAnd/res/xml/development_settings.xml
@@ -25,46 +25,11 @@
 		android:summaryOn="@string/shared_string_enabled"
 		android:title="@string/safe_mode" />
 
-    <net.osmand.plus.settings.preferences.SwitchPreferenceEx
-        android:key="pt_safe_mode"
-        android:layout="@layout/preference_with_descr_dialog_and_switch"
-        android:summaryOff="@string/shared_string_disabled"
-        android:summaryOn="@string/shared_string_enabled"
-        android:title="Native PT development" />
-
 	<PreferenceCategory
 		android:key="routing"
 		android:layout="@layout/preference_category_with_descr"
 		android:title="@string/routing_settings" />
 
-	<net.osmand.plus.settings.preferences.SwitchPreferenceEx
-		android:key="disable_complex_routing"
-		android:layout="@layout/preference_with_descr_dialog_and_switch"
-		android:summaryOff="@string/shared_string_disabled"
-		android:summaryOn="@string/shared_string_enabled"
-		android:title="@string/disable_complex_routing" />
-
-	<net.osmand.plus.settings.preferences.SwitchPreferenceEx
-		android:key="use_fast_recalculation"
-		android:layout="@layout/preference_with_descr_dialog_and_switch"
-		android:summaryOff="@string/shared_string_disabled"
-		android:summaryOn="@string/shared_string_enabled"
-		android:title="@string/use_fast_recalculation" />
-
-	<net.osmand.plus.settings.preferences.SwitchPreferenceEx
-		android:key="enable_osmc_routing"
-		android:layout="@layout/preference_with_descr_dialog_and_switch"
-		android:summaryOff="@string/shared_string_disabled"
-		android:summaryOn="@string/shared_string_enabled"
-		android:title="@string/use_osm_live_routing" />
-
-	<net.osmand.plus.settings.preferences.SwitchPreferenceEx
-		android:key="enable_osmc_public_transport"
-		android:layout="@layout/preference_with_descr_dialog_and_switch"
-		android:summaryOff="@string/shared_string_disabled"
-		android:summaryOn="@string/shared_string_enabled"
-		android:title="@string/use_osm_live_public_transport" />
-
 	<Preference
 		android:key="simulate_your_location"
 		android:layout="@layout/preference_with_descr"
diff --git a/OsmAnd/res/xml/settings_main_screen.xml b/OsmAnd/res/xml/settings_main_screen.xml
index e2a2a5be80..888a082ec2 100644
--- a/OsmAnd/res/xml/settings_main_screen.xml
+++ b/OsmAnd/res/xml/settings_main_screen.xml
@@ -58,7 +58,7 @@
 		android:layout="@layout/preference_button"
 		android:persistent="false"
 		android:title="@string/reorder_profiles"
-		app:fragment="net.osmand.plus.profiles.EditProfilesFragment"
+		app:fragment="net.osmand.plus.profiles.fragments.EditProfilesFragment"
 		tools:icon="@drawable/ic_action_edit_dark" />
 
 	<Preference
diff --git a/OsmAnd/src-google/net/osmand/plus/inapp/InAppPurchaseHelperImpl.java b/OsmAnd/src-google/net/osmand/plus/inapp/InAppPurchaseHelperImpl.java
index c6925a5e63..5bd9f2cb23 100644
--- a/OsmAnd/src-google/net/osmand/plus/inapp/InAppPurchaseHelperImpl.java
+++ b/OsmAnd/src-google/net/osmand/plus/inapp/InAppPurchaseHelperImpl.java
@@ -23,6 +23,7 @@ import net.osmand.plus.inapp.InAppPurchases.InAppPurchase;
 import net.osmand.plus.inapp.InAppPurchases.InAppSubscription;
 import net.osmand.plus.inapp.InAppPurchasesImpl.InAppPurchaseLiveUpdatesOldSubscription;
 import net.osmand.plus.inapp.util.BillingManager;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.srtmplugin.SRTMPlugin;
 import net.osmand.util.Algorithms;
@@ -407,7 +408,7 @@ public class InAppPurchaseHelperImpl extends InAppPurchaseHelper {
 					}
 				}
 			}
-			OsmandSettings.OsmandPreference<Long> subscriptionCancelledTime = ctx.getSettings().LIVE_UPDATES_PURCHASE_CANCELLED_TIME;
+			OsmandPreference<Long> subscriptionCancelledTime = ctx.getSettings().LIVE_UPDATES_PURCHASE_CANCELLED_TIME;
 			if (!subscribedToLiveUpdates && ctx.getSettings().LIVE_UPDATES_PURCHASED.get()) {
 				if (subscriptionCancelledTime.get() == 0) {
 					subscriptionCancelledTime.set(System.currentTimeMillis());
diff --git a/OsmAnd/src-huawei/net/osmand/plus/inapp/InAppPurchaseHelperImpl.java b/OsmAnd/src-huawei/net/osmand/plus/inapp/InAppPurchaseHelperImpl.java
index c3d6fc193c..0f3536e5d0 100644
--- a/OsmAnd/src-huawei/net/osmand/plus/inapp/InAppPurchaseHelperImpl.java
+++ b/OsmAnd/src-huawei/net/osmand/plus/inapp/InAppPurchaseHelperImpl.java
@@ -31,7 +31,7 @@ import net.osmand.plus.inapp.InAppPurchases.InAppSubscription;
 import net.osmand.plus.inapp.InAppPurchases.InAppSubscriptionIntroductoryInfo;
 import net.osmand.plus.inapp.InAppPurchasesImpl.InAppPurchaseLiveUpdatesOldSubscription;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.util.Algorithms;
 
 import java.lang.ref.WeakReference;
diff --git a/OsmAnd/src/net/osmand/FileUtils.java b/OsmAnd/src/net/osmand/FileUtils.java
index 65ea676356..1f9a755be5 100644
--- a/OsmAnd/src/net/osmand/FileUtils.java
+++ b/OsmAnd/src/net/osmand/FileUtils.java
@@ -223,6 +223,19 @@ public class FileUtils {
 		return tempDir;
 	}
 
+	public static boolean isWritable(File dirToTest) {
+		boolean isWriteable;
+		try {
+			dirToTest.mkdirs();
+			File writeTestFile = File.createTempFile("osmand_", ".tmp", dirToTest);
+			isWriteable = writeTestFile.exists();
+			writeTestFile.delete();
+		} catch (IOException e) {
+			isWriteable = false;
+		}
+		return isWriteable;
+	}
+
 	public interface RenameCallback {
 		void renamedTo(File file);
 	}
diff --git a/OsmAnd/src/net/osmand/aidl/ConnectedApp.java b/OsmAnd/src/net/osmand/aidl/ConnectedApp.java
index 02f412887e..be25ab931d 100644
--- a/OsmAnd/src/net/osmand/aidl/ConnectedApp.java
+++ b/OsmAnd/src/net/osmand/aidl/ConnectedApp.java
@@ -18,10 +18,10 @@ import net.osmand.AndroidUtils;
 import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuItem;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.settings.backend.ApplicationMode;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
 import net.osmand.plus.views.OsmandMapLayer;
 import net.osmand.plus.views.layers.AidlMapLayer;
 import net.osmand.plus.views.layers.MapInfoLayer;
diff --git a/OsmAnd/src/net/osmand/core/android/MapRendererContext.java b/OsmAnd/src/net/osmand/core/android/MapRendererContext.java
index 03d88fa11c..d65880877c 100644
--- a/OsmAnd/src/net/osmand/core/android/MapRendererContext.java
+++ b/OsmAnd/src/net/osmand/core/android/MapRendererContext.java
@@ -25,7 +25,7 @@ import net.osmand.core.jni.ResolvedMapStyle;
 import net.osmand.core.jni.SwigUtilities;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.render.RendererRegistry;
 import net.osmand.render.RenderingRuleProperty;
 import net.osmand.render.RenderingRuleStorageProperties;
diff --git a/OsmAnd/src/net/osmand/data/FavouritePoint.java b/OsmAnd/src/net/osmand/data/FavouritePoint.java
index e5f4f6c8ea..7205b4a422 100644
--- a/OsmAnd/src/net/osmand/data/FavouritePoint.java
+++ b/OsmAnd/src/net/osmand/data/FavouritePoint.java
@@ -13,8 +13,8 @@ import androidx.annotation.StringRes;
 import net.osmand.GPXUtilities.WptPt;
 import net.osmand.plus.FavouritesDbHelper;
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.settings.backend.OsmandSettings.BooleanPreference;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
+import net.osmand.plus.settings.backend.BooleanPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.parkingpoint.ParkingPositionPlugin;
 import net.osmand.util.Algorithms;
diff --git a/OsmAnd/src/net/osmand/plus/AppInitializer.java b/OsmAnd/src/net/osmand/plus/AppInitializer.java
index 0ae24b7c5f..78364460a7 100644
--- a/OsmAnd/src/net/osmand/plus/AppInitializer.java
+++ b/OsmAnd/src/net/osmand/plus/AppInitializer.java
@@ -28,7 +28,7 @@ import net.osmand.map.OsmandRegions.RegionTranslation;
 import net.osmand.map.WorldRegion;
 import net.osmand.osm.AbstractPoiType;
 import net.osmand.osm.MapPoiTypes;
-import net.osmand.plus.activities.DayNightHelper;
+import net.osmand.plus.helpers.DayNightHelper;
 import net.osmand.plus.activities.LocalIndexHelper;
 import net.osmand.plus.activities.LocalIndexInfo;
 import net.osmand.plus.activities.SavingTrackHelper;
diff --git a/OsmAnd/src/net/osmand/plus/AppVersionUpgradeOnInit.java b/OsmAnd/src/net/osmand/plus/AppVersionUpgradeOnInit.java
index c49f0a12a2..9eeec4542b 100644
--- a/OsmAnd/src/net/osmand/plus/AppVersionUpgradeOnInit.java
+++ b/OsmAnd/src/net/osmand/plus/AppVersionUpgradeOnInit.java
@@ -3,7 +3,30 @@ package net.osmand.plus;
 import android.annotation.SuppressLint;
 import android.content.SharedPreferences;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+
+import net.osmand.data.FavouritePoint.SpecialPointType;
+import net.osmand.data.LatLon;
+import net.osmand.plus.AppInitializer.AppInitializeListener;
+import net.osmand.plus.AppInitializer.InitEvents;
+import net.osmand.plus.api.SettingsAPI;
+import net.osmand.plus.settings.backend.ApplicationMode;
+import net.osmand.plus.settings.backend.CommonPreference;
+import net.osmand.plus.settings.backend.EnumStringPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
+import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.util.Algorithms;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 class AppVersionUpgradeOnInit {
+
 	public static final String FIRST_TIME_APP_RUN = "FIRST_TIME_APP_RUN"; //$NON-NLS-1$
 	public static final String VERSION_INSTALLED_NUMBER = "VERSION_INSTALLED_NUMBER"; //$NON-NLS-1$
 	public static final String NUMBER_OF_STARTS = "NUMBER_OF_STARTS"; //$NON-NLS-1$
@@ -43,7 +66,7 @@ class AppVersionUpgradeOnInit {
 
 	@SuppressLint("ApplySharedPref")
 	void upgradeVersion(SharedPreferences startPrefs, int lastVersion) {
-		if(!startPrefs.contains(NUMBER_OF_STARTS)) {
+		if (!startPrefs.contains(NUMBER_OF_STARTS)) {
 			startPrefs.edit().putInt(NUMBER_OF_STARTS, 1).commit();
 		} else {
 			startPrefs.edit().putInt(NUMBER_OF_STARTS, startPrefs.getInt(NUMBER_OF_STARTS, 0) + 1).commit();
@@ -59,27 +82,28 @@ class AppVersionUpgradeOnInit {
 		} else {
 			prevAppVersion = startPrefs.getInt(VERSION_INSTALLED_NUMBER, 0);
 			if (needsUpgrade(startPrefs, lastVersion)) {
+				OsmandSettings settings = app.getSettings();
 				if (prevAppVersion < VERSION_2_2) {
-					app.getSettings().SHOW_DASHBOARD_ON_START.set(true);
-					app.getSettings().SHOW_DASHBOARD_ON_MAP_SCREEN.set(true);
-					app.getSettings().SHOW_CARD_TO_CHOOSE_DRAWER.set(true);
+					settings.SHOW_DASHBOARD_ON_START.set(true);
+					settings.SHOW_DASHBOARD_ON_MAP_SCREEN.set(true);
+					settings.SHOW_CARD_TO_CHOOSE_DRAWER.set(true);
 					startPrefs.edit().putInt(VERSION_INSTALLED_NUMBER, VERSION_2_2).commit();
 				}
 				if (prevAppVersion < VERSION_2_3) {
 					startPrefs.edit().putInt(VERSION_INSTALLED_NUMBER, VERSION_2_3).commit();
 				}
 				if (prevAppVersion < VERSION_3_2) {
-					app.getSettings().BILLING_PURCHASE_TOKENS_SENT.set("");
+					settings.BILLING_PURCHASE_TOKENS_SENT.set("");
 					startPrefs.edit().putInt(VERSION_INSTALLED_NUMBER, VERSION_3_2).commit();
 				}
 				if (prevAppVersion < VERSION_3_5 || Version.getAppVersion(app).equals("3.5.3")
 						|| Version.getAppVersion(app).equals("3.5.4")) {
-					app.getSettings().migratePreferences();
+					migratePreferences();
 					app.getAppInitializer().addListener(new AppInitializer.AppInitializeListener() {
 						@Override
 						public void onProgress(AppInitializer init, AppInitializer.InitEvents event) {
 							if (event.equals(AppInitializer.InitEvents.FAVORITES_INITIALIZED)) {
-								app.getSettings().migrateHomeWorkParkingToFavorites();
+								migrateHomeWorkParkingToFavorites();
 							}
 						}
 
@@ -90,21 +114,22 @@ class AppVersionUpgradeOnInit {
 					startPrefs.edit().putInt(VERSION_INSTALLED_NUMBER, VERSION_3_5).commit();
 				}
 				if (prevAppVersion < VERSION_3_6) {
-					app.getSettings().migratePreferences();
+					migratePreferences();
 					startPrefs.edit().putInt(VERSION_INSTALLED_NUMBER, VERSION_3_6).commit();
 				}
 				if (prevAppVersion < VERSION_3_7) {
-					app.getSettings().migrateEnumPreferences();
+					migrateEnumPreferences();
 					startPrefs.edit().putInt(VERSION_INSTALLED_NUMBER, VERSION_3_7).commit();
 				}
 				if (prevAppVersion < VERSION_3_7_01) {
-					app.getAppInitializer().addListener(new AppInitializer.AppInitializeListener() {
+					app.getAppInitializer().addListener(new AppInitializeListener() {
 						@Override
 						public void onProgress(AppInitializer init, AppInitializer.InitEvents event) {
-							if (event.equals(AppInitializer.InitEvents.FAVORITES_INITIALIZED)) {
+							if (event.equals(InitEvents.FAVORITES_INITIALIZED)) {
 								app.getFavorites().fixBlackBackground();
 							}
 						}
+
 						@Override
 						public void onFinish(AppInitializer init) {
 						}
@@ -112,7 +137,7 @@ class AppVersionUpgradeOnInit {
 					startPrefs.edit().putInt(VERSION_INSTALLED_NUMBER, VERSION_3_7_01).commit();
 				}
 				if (prevAppVersion < VERSION_3_8_00) {
-					app.getSettings().migrateQuickActionStates();
+					migrateQuickActionStates();
 					startPrefs.edit().putInt(VERSION_INSTALLED_NUMBER, VERSION_3_8_00).commit();
 				}
 				startPrefs.edit().putInt(VERSION_INSTALLED_NUMBER, lastVersion).commit();
@@ -135,20 +160,20 @@ class AppVersionUpgradeOnInit {
 	}
 
 	public void resetFirstTimeRun(SharedPreferences startPrefs) {
-		if(startPrefs != null) {
+		if (startPrefs != null) {
 			startPrefs.edit().remove(FIRST_TIME_APP_RUN).commit();
 		}
 	}
 
 	public int getNumberOfStarts(SharedPreferences startPrefs) {
-		if(startPrefs == null) {
+		if (startPrefs == null) {
 			return 0;
 		}
 		return startPrefs.getInt(NUMBER_OF_STARTS, 1);
 	}
 
 	public long getFirstInstalledDays(SharedPreferences startPrefs) {
-		if(startPrefs == null) {
+		if (startPrefs == null) {
 			return 0;
 		}
 		long nd = startPrefs.getLong(FIRST_INSTALLED, 0);
@@ -159,4 +184,165 @@ class AppVersionUpgradeOnInit {
 	public boolean isFirstTime() {
 		return firstTime;
 	}
-}
+
+	public void migratePreferences() {
+		OsmandSettings settings = app.getSettings();
+		migrateEnumPreferences();
+		SharedPreferences globalSharedPreferences = (SharedPreferences) settings.getGlobalPreferences();
+		Map<String, ?> globalPrefsMap = globalSharedPreferences.getAll();
+		for (String key : globalPrefsMap.keySet()) {
+			OsmandPreference<?> pref = settings.getPreference(key);
+			if (pref instanceof CommonPreference) {
+				CommonPreference<?> commonPreference = (CommonPreference<?>) pref;
+				if (!commonPreference.isGlobal()) {
+					for (ApplicationMode mode : ApplicationMode.allPossibleValues()) {
+						if (!commonPreference.isSetForMode(mode) && !commonPreference.hasDefaultValueForMode(mode)) {
+							settings.setPreference(key, globalPrefsMap.get(key), mode);
+						}
+					}
+				}
+			}
+		}
+		SharedPreferences defaultProfilePreferences = (SharedPreferences) settings.getProfilePreferences(ApplicationMode.DEFAULT);
+		Map<String, ?> defaultPrefsMap = defaultProfilePreferences.getAll();
+		for (String key : defaultPrefsMap.keySet()) {
+			OsmandPreference<?> pref = settings.getPreference(key);
+			if (pref instanceof CommonPreference) {
+				CommonPreference<?> commonPreference = (CommonPreference<?>) pref;
+				if (commonPreference.isGlobal() && !commonPreference.isSet()) {
+					settings.setPreference(key, defaultPrefsMap.get(key));
+				}
+			}
+		}
+		for (OsmandPreference<?> pref : getGeneralPrefs()) {
+			if (pref instanceof CommonPreference) {
+				CommonPreference<?> commonPref = (CommonPreference<?>) pref;
+				Object defaultVal = commonPref.getModeValue(ApplicationMode.DEFAULT);
+				for (ApplicationMode mode : ApplicationMode.allPossibleValues()) {
+					if (!commonPref.isSetForMode(mode) && !commonPref.hasDefaultValueForMode(mode)) {
+						settings.setPreference(commonPref.getId(), defaultVal, mode);
+					}
+				}
+			}
+		}
+		String json = settings.getSettingsAPI().getString(settings.getGlobalPreferences(), "custom_app_profiles", "");
+		if (!Algorithms.isEmpty(json)) {
+			Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+			Type t = new TypeToken<ArrayList<ApplicationMode.ApplicationModeBean>>() {
+			}.getType();
+			List<ApplicationMode.ApplicationModeBean> customProfiles = gson.fromJson(json, t);
+			if (!Algorithms.isEmpty(customProfiles)) {
+				for (ApplicationMode.ApplicationModeBean modeBean : customProfiles) {
+					ApplicationMode.ApplicationModeBuilder builder = ApplicationMode.fromModeBean(app, modeBean);
+					ApplicationMode.saveProfile(builder, app);
+				}
+			}
+		}
+	}
+
+	public void migrateEnumPreferences() {
+		OsmandSettings settings = app.getSettings();
+		for (OsmandPreference<?> pref : settings.getRegisteredPreferences().values()) {
+			if (pref instanceof EnumStringPreference) {
+				EnumStringPreference<?> enumPref = (EnumStringPreference<?>) pref;
+				if (enumPref.isGlobal()) {
+					migrateEnumPref(enumPref, (SharedPreferences) settings.getGlobalPreferences());
+				} else {
+					for (ApplicationMode mode : ApplicationMode.allPossibleValues()) {
+						migrateEnumPref(enumPref, (SharedPreferences) settings.getProfilePreferences(mode));
+					}
+				}
+			}
+		}
+	}
+
+	public void migrateQuickActionStates() {
+		OsmandSettings settings = app.getSettings();
+		String quickActionsJson = settings.getSettingsAPI().getString(settings.getGlobalPreferences(), "quick_action_new", "");
+		if (!Algorithms.isEmpty(quickActionsJson)) {
+			Gson gson = new GsonBuilder().create();
+			Type type = new TypeToken<HashMap<String, Boolean>>() {
+			}.getType();
+			HashMap<String, Boolean> quickActions = gson.fromJson(quickActionsJson, type);
+			if (!Algorithms.isEmpty(quickActions)) {
+				for (ApplicationMode mode : ApplicationMode.allPossibleValues()) {
+					settings.setQuickActions(quickActions, mode);
+				}
+			}
+		}
+	}
+
+	private void migrateEnumPref(EnumStringPreference enumPref, SharedPreferences sharedPreferences) {
+		Object value = sharedPreferences.getAll().get(enumPref.getId());
+		if (value instanceof Integer) {
+			int enumIndex = (int) value;
+			if (enumIndex >= 0 && enumIndex < enumPref.getValues().length) {
+				Enum savedValue = enumPref.getValues()[enumIndex];
+				enumPref.setValue(sharedPreferences, savedValue);
+			}
+		}
+	}
+
+	public void migrateHomeWorkParkingToFavorites() {
+		OsmandSettings settings = app.getSettings();
+		FavouritesDbHelper favorites = app.getFavorites();
+		SettingsAPI settingsAPI = settings.getSettingsAPI();
+		Object globalPreferences = settings.getGlobalPreferences();
+
+		LatLon homePoint = null;
+		float lat = settingsAPI.getFloat(globalPreferences, "home_point_lat", 0);
+		float lon = settingsAPI.getFloat(globalPreferences, "home_point_lon", 0);
+		if (lat != 0 || lon != 0) {
+			homePoint = new LatLon(lat, lon);
+		}
+		LatLon workPoint = null;
+		lat = settingsAPI.getFloat(globalPreferences, "work_point_lat", 0);
+		lon = settingsAPI.getFloat(globalPreferences, "work_point_lon", 0);
+		if (lat != 0 || lon != 0) {
+			workPoint = new LatLon(lat, lon);
+		}
+		if (homePoint != null) {
+			favorites.setSpecialPoint(homePoint, SpecialPointType.HOME, null);
+		}
+		if (workPoint != null) {
+			favorites.setSpecialPoint(workPoint, SpecialPointType.WORK, null);
+		}
+	}
+
+
+	public OsmandPreference<?>[] getGeneralPrefs() {
+		OsmandSettings settings = app.getSettings();
+		return new OsmandPreference[] {
+				settings.EXTERNAL_INPUT_DEVICE,
+				settings.CENTER_POSITION_ON_MAP,
+				settings.ROTATE_MAP,
+				settings.MAP_SCREEN_ORIENTATION,
+				settings.LIVE_MONITORING_URL,
+				settings.LIVE_MONITORING_MAX_INTERVAL_TO_SEND,
+				settings.LIVE_MONITORING_INTERVAL,
+				settings.LIVE_MONITORING,
+				settings.SHOW_TRIP_REC_NOTIFICATION,
+				settings.AUTO_SPLIT_RECORDING,
+				settings.SAVE_TRACK_MIN_SPEED,
+				settings.SAVE_TRACK_PRECISION,
+				settings.SAVE_TRACK_MIN_DISTANCE,
+				settings.SAVE_TRACK_INTERVAL,
+				settings.TRACK_STORAGE_DIRECTORY,
+				settings.SAVE_HEADING_TO_GPX,
+				settings.DISABLE_RECORDING_ONCE_APP_KILLED,
+				settings.SAVE_TRACK_TO_GPX,
+				settings.SAVE_GLOBAL_TRACK_REMEMBER,
+				settings.SAVE_GLOBAL_TRACK_INTERVAL,
+				settings.MAP_EMPTY_STATE_ALLOWED,
+				settings.DO_NOT_USE_ANIMATIONS,
+				settings.USE_KALMAN_FILTER_FOR_COMPASS,
+				settings.USE_MAGNETIC_FIELD_SENSOR_COMPASS,
+				settings.USE_TRACKBALL_FOR_MOVEMENTS,
+				settings.SPEED_SYSTEM,
+				settings.ANGULAR_UNITS,
+				settings.METRIC_SYSTEM,
+				settings.DRIVING_REGION,
+				settings.DRIVING_REGION_AUTOMATIC
+		};
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
index 26e173d568..d85d6ddd68 100644
--- a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
@@ -38,9 +38,8 @@ import net.osmand.plus.dialogs.HelpArticleDialogFragment;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.settings.backend.OsmAndAppCustomization;
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.ContextMenuItemsPreference;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
+import net.osmand.plus.settings.backend.ContextMenuItemsPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.util.Algorithms;
 
 import org.apache.commons.logging.Log;
@@ -137,14 +136,18 @@ public class ContextMenuAdapter {
 		Collections.sort(items, new Comparator<ContextMenuItem>() {
 			@Override
 			public int compare(ContextMenuItem item1, ContextMenuItem item2) {
-				if (DRAWER_SWITCH_PROFILE_ID.equals(item1.getId())) {
-					return -1;
-				}
-				if (DRAWER_CONFIGURE_PROFILE_ID.equals(item1.getId()) && DRAWER_SWITCH_PROFILE_ID.equals(item2.getId())) {
+				if (DRAWER_CONFIGURE_PROFILE_ID.equals(item1.getId())
+						&& DRAWER_SWITCH_PROFILE_ID.equals(item2.getId())) {
 					return 1;
-				}
-				if (DRAWER_CONFIGURE_PROFILE_ID.equals(item1.getId())) {
+				} else if (DRAWER_SWITCH_PROFILE_ID.equals(item1.getId())
+						&& DRAWER_CONFIGURE_PROFILE_ID.equals(item2.getId())) {
 					return -1;
+				} else if (DRAWER_SWITCH_PROFILE_ID.equals(item1.getId())
+						|| DRAWER_CONFIGURE_PROFILE_ID.equals(item1.getId())) {
+					return -1;
+				} else if (DRAWER_SWITCH_PROFILE_ID.equals(item2.getId())
+						|| DRAWER_CONFIGURE_PROFILE_ID.equals(item2.getId())) {
+					return 1;
 				}
 				int order1 = item1.getOrder();
 				int order2 = item2.getOrder();
@@ -643,7 +646,7 @@ public class ContextMenuAdapter {
 		return makeDeleteAction(prefs.toArray(new OsmandPreference[prefs.size()]));
 	}
 
-	private static void resetSetting(ApplicationMode appMode, OsmandSettings.OsmandPreference preference, boolean profileOnly) {
+	private static void resetSetting(ApplicationMode appMode, OsmandPreference preference, boolean profileOnly) {
 		if (profileOnly) {
 			preference.resetModeToDefault(appMode);
 		} else {
diff --git a/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java b/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
index 7217e8af5f..923bbe646a 100644
--- a/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
+++ b/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
@@ -29,7 +29,7 @@ import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.helpers.GpxUiHelper.GPXDataSetAxisType;
 import net.osmand.plus.helpers.GpxUiHelper.GPXDataSetType;
 import net.osmand.plus.routing.RouteProvider;
-import net.osmand.plus.settings.backend.OsmandSettings.MetricsConstants;
+import net.osmand.plus.helpers.enums.MetricsConstants;
 import net.osmand.plus.track.GpxSplitType;
 import net.osmand.plus.track.GradientScaleType;
 import net.osmand.util.Algorithms;
diff --git a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
index 2ac142d06a..b58b3eba5e 100644
--- a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
+++ b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
@@ -15,9 +15,9 @@ import net.osmand.osm.PoiCategory;
 import net.osmand.osm.PoiType;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.AngularConstants;
-import net.osmand.plus.settings.backend.OsmandSettings.MetricsConstants;
-import net.osmand.plus.settings.backend.OsmandSettings.SpeedConstants;
+import net.osmand.plus.helpers.enums.AngularConstants;
+import net.osmand.plus.helpers.enums.MetricsConstants;
+import net.osmand.plus.helpers.enums.SpeedConstants;
 import net.osmand.util.Algorithms;
 
 import java.text.DateFormatSymbols;
diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
index 43c3a17f09..1a48650a4d 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
@@ -30,6 +30,7 @@ import androidx.multidex.MultiDex;
 import androidx.multidex.MultiDexApplication;
 
 import net.osmand.AndroidUtils;
+import net.osmand.FileUtils;
 import net.osmand.IndexConstants;
 import net.osmand.PlatformUtil;
 import net.osmand.access.AccessibilityPlugin;
@@ -42,7 +43,7 @@ import net.osmand.osm.MapPoiTypes;
 import net.osmand.osm.io.NetworkUtils;
 import net.osmand.plus.AppInitializer.AppInitializeListener;
 import net.osmand.plus.access.AccessibilityMode;
-import net.osmand.plus.activities.DayNightHelper;
+import net.osmand.plus.helpers.DayNightHelper;
 import net.osmand.plus.activities.ExitActivity;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.SavingTrackHelper;
@@ -56,7 +57,9 @@ import net.osmand.plus.download.DownloadIndexesThread;
 import net.osmand.plus.download.DownloadService;
 import net.osmand.plus.download.IndexItem;
 import net.osmand.plus.helpers.AvoidSpecificRoads;
+import net.osmand.plus.helpers.enums.DrivingRegion;
 import net.osmand.plus.helpers.LockHelper;
+import net.osmand.plus.helpers.enums.MetricsConstants;
 import net.osmand.plus.helpers.WaypointHelper;
 import net.osmand.plus.inapp.InAppPurchaseHelper;
 import net.osmand.plus.mapmarkers.MapMarkersDbHelper;
@@ -189,7 +192,7 @@ public class OsmandApplication extends MultiDexApplication {
 			osmandSettings.initExternalStorageDirectory();
 		}
 		externalStorageDirectory = osmandSettings.getExternalStorageDirectory();
-		if (!OsmandSettings.isWritable(externalStorageDirectory)) {
+		if (!FileUtils.isWritable(externalStorageDirectory)) {
 			externalStorageDirectoryReadOnly = true;
 			externalStorageDirectory = osmandSettings.getInternalAppPath();
 		}
@@ -983,15 +986,15 @@ public class OsmandApplication extends MultiDexApplication {
 	}
 
 	public void setupDrivingRegion(WorldRegion reg) {
-		OsmandSettings.DrivingRegion drg = null;
+		DrivingRegion drg = null;
 		WorldRegion.RegionParams params = reg.getParams();
 //		boolean americanSigns = "american".equals(params.getRegionRoadSigns());
 		boolean leftHand = "yes".equals(params.getRegionLeftHandDriving());
-		OsmandSettings.MetricsConstants mc1 = "miles".equals(params.getRegionMetric()) ?
-				OsmandSettings.MetricsConstants.MILES_AND_FEET : OsmandSettings.MetricsConstants.KILOMETERS_AND_METERS;
-		OsmandSettings.MetricsConstants mc2 = "miles".equals(params.getRegionMetric()) ?
-				OsmandSettings.MetricsConstants.MILES_AND_METERS : OsmandSettings.MetricsConstants.KILOMETERS_AND_METERS;
-		for (OsmandSettings.DrivingRegion r : OsmandSettings.DrivingRegion.values()) {
+		MetricsConstants mc1 = "miles".equals(params.getRegionMetric()) ?
+				MetricsConstants.MILES_AND_FEET : MetricsConstants.KILOMETERS_AND_METERS;
+		MetricsConstants mc2 = "miles".equals(params.getRegionMetric()) ?
+				MetricsConstants.MILES_AND_METERS : MetricsConstants.KILOMETERS_AND_METERS;
+		for (DrivingRegion r : DrivingRegion.values()) {
 			if (r.leftHandDriving == leftHand && (r.defMetrics == mc1 || r.defMetrics == mc2)) {
 				drg = r;
 				break;
diff --git a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java
index 0d887bc47f..4e9ca3d420 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java
@@ -47,6 +47,8 @@ import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
 import net.osmand.plus.search.QuickSearchDialogFragment;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.backend.CommonPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 import net.osmand.plus.skimapsplugin.SkiMapsPlugin;
 import net.osmand.plus.srtmplugin.SRTMPlugin;
@@ -80,7 +82,7 @@ public abstract class OsmandPlugin {
 
 	protected OsmandApplication app;
 
-	protected List<OsmandSettings.OsmandPreference> pluginPreferences = new ArrayList<>();
+	protected List<OsmandPreference> pluginPreferences = new ArrayList<>();
 
 	private boolean active;
 	private String installURL = null;
@@ -118,7 +120,7 @@ public abstract class OsmandPlugin {
 		return null;
 	}
 
-	public List<OsmandSettings.OsmandPreference> getPreferences() {
+	public List<OsmandPreference> getPreferences() {
 		return pluginPreferences;
 	}
 
@@ -919,44 +921,44 @@ public abstract class OsmandPlugin {
 		}
 	}
 
-	protected OsmandSettings.CommonPreference<Boolean> registerBooleanPreference(OsmandApplication app, String prefId, boolean defValue) {
-		OsmandSettings.CommonPreference<Boolean> preference = app.getSettings().registerBooleanPreference(prefId, defValue);
+	protected CommonPreference<Boolean> registerBooleanPreference(OsmandApplication app, String prefId, boolean defValue) {
+		CommonPreference<Boolean> preference = app.getSettings().registerBooleanPreference(prefId, defValue);
 		pluginPreferences.add(preference);
 		return preference;
 	}
 
-	private OsmandSettings.CommonPreference<Boolean> registerBooleanAccessibilityPreference(OsmandApplication app, String prefId, boolean defValue) {
-		OsmandSettings.CommonPreference<Boolean> preference = app.getSettings().registerBooleanAccessibilityPreference(prefId, defValue);
+	private CommonPreference<Boolean> registerBooleanAccessibilityPreference(OsmandApplication app, String prefId, boolean defValue) {
+		CommonPreference<Boolean> preference = app.getSettings().registerBooleanAccessibilityPreference(prefId, defValue);
 		pluginPreferences.add(preference);
 		return preference;
 	}
 
-	protected OsmandSettings.CommonPreference<String> registerStringPreference(OsmandApplication app, String prefId, String defValue) {
-		OsmandSettings.CommonPreference<String> preference = app.getSettings().registerStringPreference(prefId, defValue);
+	protected CommonPreference<String> registerStringPreference(OsmandApplication app, String prefId, String defValue) {
+		CommonPreference<String> preference = app.getSettings().registerStringPreference(prefId, defValue);
 		pluginPreferences.add(preference);
 		return preference;
 	}
 
-	protected OsmandSettings.CommonPreference<Integer> registerIntPreference(OsmandApplication app, String prefId, int defValue) {
-		OsmandSettings.CommonPreference<Integer> preference = app.getSettings().registerIntPreference(prefId, defValue);
+	protected CommonPreference<Integer> registerIntPreference(OsmandApplication app, String prefId, int defValue) {
+		CommonPreference<Integer> preference = app.getSettings().registerIntPreference(prefId, defValue);
 		pluginPreferences.add(preference);
 		return preference;
 	}
 
-	protected OsmandSettings.CommonPreference<Long> registerLongPreference(OsmandApplication app, String prefId, long defValue) {
-		OsmandSettings.CommonPreference<Long> preference = app.getSettings().registerLongPreference(prefId, defValue);
+	protected CommonPreference<Long> registerLongPreference(OsmandApplication app, String prefId, long defValue) {
+		CommonPreference<Long> preference = app.getSettings().registerLongPreference(prefId, defValue);
 		pluginPreferences.add(preference);
 		return preference;
 	}
 
-	protected OsmandSettings.CommonPreference<Float> registerFloatPreference(OsmandApplication app, String prefId, float defValue) {
-		OsmandSettings.CommonPreference<Float> preference = app.getSettings().registerFloatPreference(prefId, defValue);
+	protected CommonPreference<Float> registerFloatPreference(OsmandApplication app, String prefId, float defValue) {
+		CommonPreference<Float> preference = app.getSettings().registerFloatPreference(prefId, defValue);
 		pluginPreferences.add(preference);
 		return preference;
 	}
 
-	protected <T extends Enum> OsmandSettings.CommonPreference<T> registerEnumIntPreference(OsmandApplication app, String prefId, Enum defaultValue, Enum[] values, Class<T> clz) {
-		OsmandSettings.CommonPreference<T> preference = app.getSettings().registerEnumIntPreference(prefId, defaultValue, values, clz);
+	protected <T extends Enum> CommonPreference<T> registerEnumIntPreference(OsmandApplication app, String prefId, Enum defaultValue, Enum[] values, Class<T> clz) {
+		CommonPreference<T> preference = app.getSettings().registerEnumIntPreference(prefId, defaultValue, values, clz);
 		pluginPreferences.add(preference);
 		return preference;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/Version.java b/OsmAnd/src/net/osmand/plus/Version.java
index 86d26ec954..48dd9b1feb 100644
--- a/OsmAnd/src/net/osmand/plus/Version.java
+++ b/OsmAnd/src/net/osmand/plus/Version.java
@@ -1,13 +1,15 @@
 package net.osmand.plus;
 
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 import android.content.pm.PackageInfo;
-import 	android.content.pm.PackageManager;
+import android.content.pm.PackageManager;
 
 import net.osmand.plus.inapp.InAppPurchaseHelper;
 
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
 public class Version {
 	
 	private final String appVersion; 
@@ -149,4 +151,21 @@ public class Version {
 		return v;
 	}
 
-}
+	public static boolean isOpenGlAvailable(OsmandApplication app) {
+		if ("qnx".equals(System.getProperty("os.name"))) {
+			return false;
+		}
+		File nativeLibraryDir = new File(app.getApplicationInfo().nativeLibraryDir);
+		if (nativeLibraryDir.exists() && nativeLibraryDir.canRead()) {
+			File[] files = nativeLibraryDir.listFiles();
+			if (files != null) {
+				for (File file : files) {
+					if ("libOsmAndCoreWithJNI.so".equals(file.getName())) {
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
index 91bf4ffbf9..b1a625d27e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
@@ -43,6 +43,7 @@ import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
 import net.osmand.plus.FavouritesDbHelper.FavoritesListener;
 import net.osmand.plus.MapMarkersHelper;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
@@ -96,7 +97,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 	private Set<FavoriteGroup> groupsToDelete = new LinkedHashSet<>();
 	private ActionMode actionMode;
 	private Drawable arrowImageDisabled;
-	private HashMap<String, OsmandSettings.OsmandPreference<Boolean>> preferenceCache = new HashMap<>();
+	private HashMap<String, OsmandPreference<Boolean>> preferenceCache = new HashMap<>();
 	private View footerView;
 	private Location lastLocation;
 	private float lastHeading;
@@ -763,8 +764,8 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 		}
 	}
 
-	private OsmandSettings.OsmandPreference<Boolean> getGroupExpandedPreference(String groupName) {
-		OsmandSettings.OsmandPreference<Boolean> preference = preferenceCache.get(groupName);
+	private OsmandPreference<Boolean> getGroupExpandedPreference(String groupName) {
+		OsmandPreference<Boolean> preference = preferenceCache.get(groupName);
 		if (preference == null) {
 			String groupKey = groupName + GROUP_EXPANDED_POSTFIX;
 			preference = getSettings().registerBooleanPreference(groupKey, false);
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 3baa33cb32..083c95d279 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -74,6 +74,9 @@ import net.osmand.plus.OsmAndConstants;
 import net.osmand.plus.OsmAndLocationSimulation;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.helpers.DayNightHelper;
+import net.osmand.plus.settings.backend.CommonPreference;
+import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.TargetPointsHelper.TargetPoint;
@@ -130,7 +133,6 @@ import net.osmand.plus.search.QuickSearchDialogFragment.QuickSearchTab;
 import net.osmand.plus.search.QuickSearchDialogFragment.QuickSearchType;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.settings.backend.OsmAndAppCustomization.OsmAndAppCustomizationListener;
-import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 import net.osmand.plus.settings.fragments.BaseSettingsFragment.SettingsScreenType;
 import net.osmand.plus.settings.fragments.ConfigureProfileFragment;
@@ -533,7 +535,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 			@Override
 			public void requestPrivateAccessRouting() {
 				if (!settings.FORCE_PRIVATE_ACCESS_ROUTING_ASKED.getModeValue(getRoutingHelper().getAppMode())) {
-					final OsmandSettings.CommonPreference<Boolean> allowPrivate
+					final CommonPreference<Boolean> allowPrivate
 							= settings.getCustomRoutingBooleanProperty(GeneralRouter.ALLOW_PRIVATE, false);
 					final List<ApplicationMode> modes = ApplicationMode.values(app);
 					for (ApplicationMode mode : modes) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
index 64f3ad8b9f..442e2f41a1 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
@@ -29,7 +29,7 @@ import net.osmand.plus.DialogListItemAdapter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.SQLiteTileSource;
 import net.osmand.plus.activities.MapActivity.ShowQuickSearchMode;
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
index 2187e801a2..316de777b0 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsBaseActivity.java
@@ -25,13 +25,13 @@ import net.osmand.AndroidUtils;
 import net.osmand.PlatformUtil;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.backend.CommonPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.profiles.AppProfileArrayAdapter;
 import net.osmand.plus.profiles.ProfileDataObject;
 import net.osmand.plus.settings.backend.ApplicationMode;
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
 
 import org.apache.commons.logging.Log;
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
index aaf206ca06..225384349c 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
@@ -42,9 +42,9 @@ import net.osmand.osm.io.NetworkUtils;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.AngularConstants;
-import net.osmand.plus.settings.backend.OsmandSettings.DrivingRegion;
-import net.osmand.plus.settings.backend.OsmandSettings.MetricsConstants;
+import net.osmand.plus.helpers.enums.AngularConstants;
+import net.osmand.plus.helpers.enums.DrivingRegion;
+import net.osmand.plus.helpers.enums.MetricsConstants;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
 import net.osmand.plus.base.MapViewTrackingUtilities;
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
index 260fd63719..a0a5c74992 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
@@ -34,6 +34,12 @@ import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuItem;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.helpers.enums.MetricsConstants;
+import net.osmand.plus.settings.backend.CommonPreference;
+import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.helpers.enums.AutoZoomMap;
+import net.osmand.plus.settings.backend.OsmandPreference;
+import net.osmand.plus.helpers.enums.SpeedConstants;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.Version;
@@ -44,10 +50,6 @@ import net.osmand.plus.routepreparationmenu.RoutingOptionsHelper;
 import net.osmand.plus.routing.RouteProvider.RouteService;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.settings.backend.ApplicationMode;
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.AutoZoomMap;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
-import net.osmand.plus.settings.backend.OsmandSettings.SpeedConstants;
 import net.osmand.plus.voice.CommandPlayer;
 import net.osmand.router.GeneralRouter;
 import net.osmand.router.GeneralRouter.GeneralRouterProfile;
@@ -171,7 +173,7 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
 		//array size must be equal!
 		Float[] speedLimitsKmhPos = new Float[]{0f, 5f, 7f, 10f, 15f, 20f};
 		Float[] speedLimitsMphPos = new Float[]{0f, 3f, 5f, 7f, 10f, 15f};
-		if (settings.METRIC_SYSTEM.get() == OsmandSettings.MetricsConstants.KILOMETERS_AND_METERS) {
+		if (settings.METRIC_SYSTEM.get() == MetricsConstants.KILOMETERS_AND_METERS) {
 			String[] speedNames = new String[speedLimitsKmh.length];
 			String[] speedNamesPos = new String[speedLimitsKmhPos.length];
 			for (int i = 0; i < speedLimitsKmh.length; i++) {
@@ -407,7 +409,7 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
 	}
 
 	public static boolean isRoutingParameterSelected(OsmandSettings settings, ApplicationMode am, RoutingParameter routingParameter) {
-		final OsmandSettings.CommonPreference<Boolean> property =
+		final CommonPreference<Boolean> property =
 				settings.getCustomRoutingBooleanProperty(routingParameter.getId(), routingParameter.getDefaultBoolean());
 		if(am != null) {
 			return property.getModeValue(am);
@@ -417,7 +419,7 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
 	}
 
 	public static void setRoutingParameterSelected(OsmandSettings settings, ApplicationMode am, String routingParameterId, boolean defaultBoolean, boolean isChecked) {
-		final OsmandSettings.CommonPreference<Boolean> property = settings.getCustomRoutingBooleanProperty(routingParameterId, defaultBoolean);
+		final CommonPreference<Boolean> property = settings.getCustomRoutingBooleanProperty(routingParameterId, defaultBoolean);
 		if (am != null) {
 			property.setModeValue(am, isChecked);
 		} else {
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
index de3453550f..a68a8bc749 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
@@ -53,8 +53,8 @@ import net.osmand.plus.ContextMenuAdapter.ItemClickListener;
 import net.osmand.plus.ContextMenuItem;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
+import net.osmand.plus.settings.backend.CommonPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
index 09acdca8d8..8e911b04fc 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
@@ -38,7 +38,6 @@ import net.osmand.PlatformUtil;
 import net.osmand.data.PointDescription;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
-import net.osmand.plus.settings.backend.OsmandSettings.NotesSortByMode;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
 import net.osmand.plus.activities.ActionBarProgressActivity;
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/NotesSortByMode.java b/OsmAnd/src/net/osmand/plus/audionotes/NotesSortByMode.java
new file mode 100644
index 0000000000..cf791dbf26
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/audionotes/NotesSortByMode.java
@@ -0,0 +1,14 @@
+package net.osmand.plus.audionotes;
+
+public enum NotesSortByMode {
+	BY_TYPE,
+	BY_DATE;
+
+	public boolean isByType() {
+		return this == BY_TYPE;
+	}
+
+	public boolean isByDate() {
+		return this == BY_DATE;
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/SortByMenuBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/SortByMenuBottomSheetDialogFragment.java
index de1208a735..06fa83f6ca 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/SortByMenuBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/SortByMenuBottomSheetDialogFragment.java
@@ -3,8 +3,7 @@ package net.osmand.plus.audionotes;
 import android.os.Bundle;
 import android.view.View;
 
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.NotesSortByMode;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.base.MenuBottomSheetDialogFragment;
 import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
@@ -53,7 +52,7 @@ public class SortByMenuBottomSheetDialogFragment extends MenuBottomSheetDialogFr
 	}
 
 	private void selectSortByMode(NotesSortByMode mode) {
-		final OsmandSettings.CommonPreference<NotesSortByMode> sortByMode = getMyApplication().getSettings().NOTES_SORT_BY_MODE;
+		final CommonPreference<NotesSortByMode> sortByMode = getMyApplication().getSettings().NOTES_SORT_BY_MODE;
 		if (sortByMode.get() != mode) {
 			sortByMode.set(mode);
 			if (listener != null) {
diff --git a/OsmAnd/src/net/osmand/plus/chooseplan/OsmLiveCancelledDialog.java b/OsmAnd/src/net/osmand/plus/chooseplan/OsmLiveCancelledDialog.java
index 43d95c266c..a62ffcd296 100644
--- a/OsmAnd/src/net/osmand/plus/chooseplan/OsmLiveCancelledDialog.java
+++ b/OsmAnd/src/net/osmand/plus/chooseplan/OsmLiveCancelledDialog.java
@@ -25,7 +25,7 @@ import net.osmand.PlatformUtil;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.Version;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.BaseOsmAndDialogFragment;
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashChooseAppDirFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashChooseAppDirFragment.java
index 9f37cd1b41..883010ea46 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashChooseAppDirFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashChooseAppDirFragment.java
@@ -30,6 +30,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
 import net.osmand.AndroidUtils;
+import net.osmand.FileUtils;
 import net.osmand.ValueHolder;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.settings.backend.OsmandSettings;
@@ -113,7 +114,7 @@ public class DashChooseAppDirFragment {
 			boolean copyFiles = !currentAppFile.getAbsolutePath().equals(selectedFile.getAbsolutePath()) && !mapsCopied;
 			warningReadonly.setVisibility(copyFiles ? View.VISIBLE : View.GONE);
 			if (copyFiles) {
-				if (!OsmandSettings.isWritable(currentAppFile)) {
+				if (!FileUtils.isWritable(currentAppFile)) {
 					warningReadonly.setText(activity.getString(R.string.android_19_location_disabled,
 							currentAppFile.getAbsolutePath()));
 				} else {
@@ -385,7 +386,7 @@ public class DashChooseAppDirFragment {
 
 				@Override
 				public void onClick(View v) {
-					boolean wr = OsmandSettings.isWritable(selectedFile);
+					boolean wr = FileUtils.isWritable(selectedFile);
 					if (wr) {
 						boolean changed = !currentAppFile.getAbsolutePath().equals(selectedFile.getAbsolutePath());
 						getMyApplication().setExternalStorageDirectory(type, selectedFile.getAbsolutePath());
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/tools/DashboardSettingsDialogFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/tools/DashboardSettingsDialogFragment.java
index 1689a4e298..725a8fefc6 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/tools/DashboardSettingsDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/tools/DashboardSettingsDialogFragment.java
@@ -24,7 +24,7 @@ import net.osmand.PlatformUtil;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
diff --git a/OsmAnd/src/net/osmand/plus/development/DevelopmentSettingsFragment.java b/OsmAnd/src/net/osmand/plus/development/DevelopmentSettingsFragment.java
index 7a3503e004..bad57f326b 100644
--- a/OsmAnd/src/net/osmand/plus/development/DevelopmentSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/development/DevelopmentSettingsFragment.java
@@ -35,12 +35,7 @@ public class DevelopmentSettingsFragment extends BaseSettingsFragment {
 
 		setupOpenglRenderPref();
 		setupSafeModePref();
-		setupPTSafeMode();
 
-		setupDisableComplexRoutingPref();
-		setupFastRecalculationPref();
-		setupOsmLiveForRoutingPref();
-		setupOsmLiveForPublicTransportPref();
 		setupSimulateYourLocationPref();
 
 		Preference debuggingAndDevelopment = findPreference("debugging_and_development");
@@ -62,13 +57,17 @@ public class DevelopmentSettingsFragment extends BaseSettingsFragment {
 	}
 
 	private void setupOpenglRenderPref() {
-		SwitchPreferenceEx useOpenglRender = (SwitchPreferenceEx) findPreference(settings.USE_OPENGL_RENDER.getId());
-		useOpenglRender.setDescription(getString(R.string.use_opengl_render_descr));
-		useOpenglRender.setIconSpaceReserved(false);
+		SwitchPreferenceEx useOpenglRender = findPreference(settings.USE_OPENGL_RENDER.getId());
+		if (Version.isOpenGlAvailable(app)) {
+			useOpenglRender.setDescription(getString(R.string.use_opengl_render_descr));
+			useOpenglRender.setIconSpaceReserved(false);
+		} else {
+			useOpenglRender.setVisible(false);
+		}
 	}
 
 	private void setupSafeModePref() {
-		SwitchPreferenceEx safeMode = (SwitchPreferenceEx) findPreference(settings.SAFE_MODE.getId());
+		SwitchPreferenceEx safeMode = findPreference(settings.SAFE_MODE.getId());
 		if (!Version.isBlackberry(app)) {
 			safeMode.setDescription(getString(R.string.safe_mode_description));
 			safeMode.setIconSpaceReserved(false);
@@ -82,40 +81,6 @@ public class DevelopmentSettingsFragment extends BaseSettingsFragment {
 		}
 	}
 
-	private void setupPTSafeMode() {
-		SwitchPreferenceEx ptSafeMode = (SwitchPreferenceEx) findPreference(settings.PT_SAFE_MODE.getId());
-		if (!Version.isBlackberry(app)) {
-			ptSafeMode.setDescription("Switch to Java (safe) Public Transport routing calculation");
-			ptSafeMode.setIconSpaceReserved(false);
-		} else {
-			ptSafeMode.setVisible(false);
-		}
-	}
-
-	private void setupDisableComplexRoutingPref() {
-		SwitchPreferenceEx disableComplexRouting = (SwitchPreferenceEx) findPreference(settings.DISABLE_COMPLEX_ROUTING.getId());
-		disableComplexRouting.setDescription(getString(R.string.disable_complex_routing_descr));
-		disableComplexRouting.setIconSpaceReserved(false);
-	}
-
-	private void setupFastRecalculationPref() {
-		SwitchPreferenceEx useFastRecalculation = (SwitchPreferenceEx) findPreference(settings.USE_FAST_RECALCULATION.getId());
-		useFastRecalculation.setDescription(getString(R.string.use_fast_recalculation_desc));
-		useFastRecalculation.setIconSpaceReserved(false);
-	}
-
-	private void setupOsmLiveForRoutingPref() {
-		SwitchPreferenceEx useOsmLiveForRouting = (SwitchPreferenceEx) findPreference(settings.USE_OSM_LIVE_FOR_ROUTING.getId());
-		useOsmLiveForRouting.setDescription(getString(R.string.use_osm_live_routing_description));
-		useOsmLiveForRouting.setIconSpaceReserved(false);
-	}
-
-	private void setupOsmLiveForPublicTransportPref() {
-		SwitchPreferenceEx useOsmLiveForPublicTransport = (SwitchPreferenceEx) findPreference(settings.USE_OSM_LIVE_FOR_PUBLIC_TRANSPORT.getId());
-		useOsmLiveForPublicTransport.setDescription(getString(R.string.use_osm_live_public_transport_description));
-		useOsmLiveForPublicTransport.setIconSpaceReserved(false);
-	}
-
 	private void setupSimulateYourLocationPref() {
 		final Preference simulateYourLocation = findPreference(SIMULATE_YOUR_LOCATION);
 		simulateYourLocation.setIconSpaceReserved(false);
diff --git a/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java b/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
index b5ea815bed..c500a28254 100644
--- a/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
+++ b/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
@@ -14,11 +14,11 @@ import android.preference.PreferenceScreen;
 
 import net.osmand.plus.OsmAndLocationSimulation;
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
 import net.osmand.plus.activities.SettingsBaseActivity;
 import net.osmand.plus.render.NativeOsmandLibrary;
+import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.util.SunriseSunset;
 
 import java.text.SimpleDateFormat;
@@ -34,41 +34,27 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
 		app.applyTheme(this);
 		super.onCreate(savedInstanceState);
 		getToolbar().setTitle(R.string.debugging_and_development);
-		PreferenceScreen cat = getPreferenceScreen();
+		PreferenceScreen category = getPreferenceScreen();
 		Preference pref;
 
-		cat.addPreference(createCheckBoxPreference(settings.USE_OPENGL_RENDER,
-				R.string.use_opengl_render, R.string.use_opengl_render_descr));
+		if (Version.isOpenGlAvailable(app)) {
+			category.addPreference(createCheckBoxPreference(settings.USE_OPENGL_RENDER,
+					R.string.use_opengl_render, R.string.use_opengl_render_descr));
+		}
 
 		if (!Version.isBlackberry(app)) {
 			CheckBoxPreference nativeCheckbox = createCheckBoxPreference(settings.SAFE_MODE, R.string.safe_mode, R.string.safe_mode_description);
-			CheckBoxPreference nativePTCheckbox = createCheckBoxPreference(settings.PT_SAFE_MODE, "Native PT routing development", "Switch to Java (safe) Public Transport routing calculation");
 			// disable the checkbox if the library cannot be used
 			if ((NativeOsmandLibrary.isLoaded() && !NativeOsmandLibrary.isSupported()) || settings.NATIVE_RENDERING_FAILED.get()) {
 				nativeCheckbox.setEnabled(false);
 				nativeCheckbox.setChecked(true);
 			}
-			cat.addPreference(nativeCheckbox);
-			cat.addPreference(nativePTCheckbox);
+			category.addPreference(nativeCheckbox);
 		}
 
 		PreferenceCategory navigation = new PreferenceCategory(this);
 		navigation.setTitle(R.string.routing_settings);
-		cat.addPreference(navigation);
-		navigation.addPreference(createCheckBoxPreference(settings.DISABLE_COMPLEX_ROUTING,
-				R.string.disable_complex_routing, R.string.disable_complex_routing_descr));
-
-		navigation.addPreference(createCheckBoxPreference(settings.USE_FAST_RECALCULATION,
-				R.string.use_fast_recalculation, R.string.use_fast_recalculation_desc));
-
-		navigation.addPreference(createCheckBoxPreference(settings.USE_OSM_LIVE_FOR_ROUTING,
-				R.string.use_osm_live_routing,
-				R.string.use_osm_live_routing_description));
-
-		navigation.addPreference(createCheckBoxPreference(settings.USE_OSM_LIVE_FOR_PUBLIC_TRANSPORT,
-				R.string.use_osm_live_public_transport,
-				R.string.use_osm_live_public_transport_description));
-
+		category.addPreference(navigation);
 		pref = new Preference(this);
 		final Preference simulate = pref;
 		final OsmAndLocationSimulation sim = getMyApplication().getLocationProvider().getLocationSimulation();
@@ -95,7 +81,7 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
 
 		PreferenceCategory debug = new PreferenceCategory(this);
 		debug.setTitle(R.string.debugging_and_development);
-		cat.addPreference(debug);
+		category.addPreference(debug);
 
 		CheckBoxPreference dbg = createCheckBoxPreference(settings.DEBUG_RENDERING_INFO,
 				R.string.trace_rendering, R.string.trace_rendering_descr);
@@ -125,10 +111,6 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
 		debug.addPreference(createCheckBoxPreference(settings.SHOULD_SHOW_FREE_VERSION_BANNER,
 				R.string.show_free_version_banner,
 				R.string.show_free_version_banner_description));
-		
-
-		
-
 
 		pref = new Preference(this);
 		pref.setTitle(R.string.test_voice_prompts);
@@ -141,7 +123,7 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
 				return true;
 			}
 		});
-		cat.addPreference(pref);
+		category.addPreference(pref);
 
 		pref = new Preference(this);
 		pref.setTitle(R.string.logcat_buffer);
@@ -154,11 +136,11 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
 				return true;
 			}
 		});
-		cat.addPreference(pref);
+		category.addPreference(pref);
 
 		PreferenceCategory info = new PreferenceCategory(this);
 		info.setTitle(R.string.info_button);
-		cat.addPreference(info);
+		category.addPreference(info);
 
 		pref = new Preference(this);
 		pref.setTitle(R.string.global_app_allocated_memory);
diff --git a/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java b/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java
index f1cddde833..a9a0ba563e 100644
--- a/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java
+++ b/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java
@@ -19,7 +19,7 @@ import android.widget.Toast;
 import androidx.appcompat.app.AlertDialog;
 
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.OsmandActionBarActivity;
 import net.osmand.plus.routing.data.StreetName;
@@ -151,7 +151,7 @@ public class TestVoiceActivity extends OsmandActionBarActivity {
 			v += "\n \u25CF BT SCO: The current app profile is not set to use 'Phone call audio'.";
 		}
 
-		//OsmandSettings.OsmandPreference<Integer> pref = ((OsmandApplication) getApplication()).getSettings().VOICE_PROMPT_DELAY[stream];
+		//OsmandPreference<Integer> pref = ((OsmandApplication) getApplication()).getSettings().VOICE_PROMPT_DELAY[stream];
 		//if(pref != null) {
 		//	v += "\n \u25CF Voice prompt delay for selected output: " + pref.get() + "\u00A0ms";
 		//}
@@ -299,7 +299,7 @@ public class TestVoiceActivity extends OsmandActionBarActivity {
 				}
 				if (description.startsWith("\u25BA (11.2)")) {
 					int ams = ((OsmandApplication) getApplication()).getSettings().AUDIO_MANAGER_STREAM.get();
-					OsmandSettings.OsmandPreference<Integer> pref = ((OsmandApplication) getApplication()).getSettings().VOICE_PROMPT_DELAY[ams];
+					OsmandPreference<Integer> pref = ((OsmandApplication) getApplication()).getSettings().VOICE_PROMPT_DELAY[ams];
 					if (pref != null) {
 						if (pref.get() >= 3000) {
 							pref.set(0);
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
index 83c4e1942d..1c01808be8 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
@@ -33,6 +33,11 @@ import net.osmand.plus.ContextMenuItem;
 import net.osmand.plus.DialogListItemAdapter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.helpers.enums.DayNightMode;
+import net.osmand.plus.settings.backend.OsmandPreference;
+import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.backend.CommonPreference;
+import net.osmand.plus.settings.backend.ListStringPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
@@ -40,9 +45,6 @@ import net.osmand.plus.activities.SettingsActivity;
 import net.osmand.plus.inapp.InAppPurchaseHelper;
 import net.osmand.plus.poi.PoiUIFilter;
 import net.osmand.plus.render.RendererRegistry;
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
-import net.osmand.plus.settings.backend.OsmandSettings.ListStringPreference;
 import net.osmand.plus.srtmplugin.SRTMPlugin;
 import net.osmand.plus.transport.TransportLinesMenu;
 import net.osmand.plus.views.OsmandMapTileView;
@@ -307,7 +309,7 @@ public class ConfigureMapMenu {
 			DateFormat dateFormat = DateFormat.getTimeInstance(DateFormat.SHORT);
 			String sunriseTime = dateFormat.format(sunriseSunset.getSunrise());
 			String sunsetTime = dateFormat.format(sunriseSunset.getSunset());
-			OsmandSettings.DayNightMode dayNightMode = activity.getMyApplication().getSettings().DAYNIGHT_MODE.get();
+			DayNightMode dayNightMode = activity.getMyApplication().getSettings().DAYNIGHT_MODE.get();
 			if (dayNightMode.isDay() || dayNightMode.isNight()) {
 				if (sunriseSunset.isDaytime()) {
 					description = String.format(app.getString(R.string.sunset_at), sunsetTime);
@@ -334,9 +336,9 @@ public class ConfigureMapMenu {
 						final OsmandMapTileView view = activity.getMapView();
 						AlertDialog.Builder bld = new AlertDialog.Builder(new ContextThemeWrapper(view.getContext(), themeRes));
 						bld.setTitle(R.string.daynight);
-						final String[] items = new String[OsmandSettings.DayNightMode.values().length];
+						final String[] items = new String[DayNightMode.values().length];
 						for (int i = 0; i < items.length; i++) {
-							items[i] = OsmandSettings.DayNightMode.values()[i].toHumanString(app);
+							items[i] = DayNightMode.values()[i].toHumanString(app);
 						}
 						int i = view.getSettings().DAYNIGHT_MODE.get().ordinal();
 						bld.setNegativeButton(R.string.shared_string_dismiss, null);
@@ -345,7 +347,7 @@ public class ConfigureMapMenu {
 									@Override
 									public void onClick(View v) {
 										int which = (int) v.getTag();
-										view.getSettings().DAYNIGHT_MODE.set(OsmandSettings.DayNightMode.values()[which]);
+										view.getSettings().DAYNIGHT_MODE.set(DayNightMode.values()[which]);
 										refreshMapComplete(activity);
 										activity.getDashboard().refreshContent(true);
 										// adapter.getItem(pos).setDescription(s, getDayNightDescr(activity));
@@ -376,7 +378,7 @@ public class ConfigureMapMenu {
 							return false;
 						}
 						final OsmandMapTileView view = activity.getMapView();
-						final OsmandSettings.OsmandPreference<Float> mapDensity = view.getSettings().MAP_DENSITY;
+						final OsmandPreference<Float> mapDensity = view.getSettings().MAP_DENSITY;
 						AlertDialog.Builder bld = new AlertDialog.Builder(new ContextThemeWrapper(view.getContext(), themeRes));
 						int p = (int) (mapDensity.get() * 100);
 						final TIntArrayList tlist = new TIntArrayList(new int[]{25, 33, 50, 75, 100, 125, 150, 200, 300, 400});
@@ -669,25 +671,25 @@ public class ConfigureMapMenu {
 											 @ColorInt final int selectedProfileColor) {
 
 		final List<RenderingRuleProperty> ps = new ArrayList<>();
-		final List<OsmandSettings.CommonPreference<Boolean>> prefs = new ArrayList<>();
+		final List<CommonPreference<Boolean>> prefs = new ArrayList<>();
 		Iterator<RenderingRuleProperty> it = customRules.iterator();
 
 		while (it.hasNext()) {
 			RenderingRuleProperty p = it.next();
 			if (category.equals(p.getCategory()) && p.isBoolean()) {
 				ps.add(p);
-				final OsmandSettings.CommonPreference<Boolean> pref = activity.getMyApplication().getSettings()
+				final CommonPreference<Boolean> pref = activity.getMyApplication().getSettings()
 						.getCustomRenderBooleanProperty(p.getAttrName());
 				prefs.add(pref);
 				it.remove();
 			}
 		}
 		if (prefs.size() > 0) {
-			final List<OsmandSettings.CommonPreference<String>> includedPrefs = new ArrayList<>();
+			final List<CommonPreference<String>> includedPrefs = new ArrayList<>();
 			if (customRulesIncluded != null) {
 				for (RenderingRuleProperty p : customRulesIncluded) {
 					if (!p.isBoolean()) {
-						final OsmandSettings.CommonPreference<String> pref = activity.getMyApplication().getSettings()
+						final CommonPreference<String> pref = activity.getMyApplication().getSettings()
 								.getCustomRenderProperty(p.getAttrName());
 						includedPrefs.add(pref);
 					}
@@ -729,14 +731,14 @@ public class ConfigureMapMenu {
 					.setId(id)
 					.setIcon(icon).setListener(clickListener);
 			boolean selected = false;
-			for (OsmandSettings.CommonPreference<Boolean> p : prefs) {
+			for (CommonPreference<Boolean> p : prefs) {
 				if (p.get()) {
 					selected = true;
 					break;
 				}
 			}
 			if (!selected &&  includedPrefs.size() > 0) {
-				for (OsmandSettings.CommonPreference<String> p : includedPrefs) {
+				for (CommonPreference<String> p : includedPrefs) {
 					if (!Algorithms.isEmpty(p.get())) {
 						selected = true;
 						break;
@@ -773,17 +775,17 @@ public class ConfigureMapMenu {
 		return null;
 	}
 
-	protected String getDescription(final List<OsmandSettings.CommonPreference<Boolean>> prefs,
-									final List<OsmandSettings.CommonPreference<String>> includedPrefs) {
+	protected String getDescription(final List<CommonPreference<Boolean>> prefs,
+									final List<CommonPreference<String>> includedPrefs) {
 		int count = 0;
 		int enabled = 0;
-		for (OsmandSettings.CommonPreference<Boolean> p : prefs) {
+		for (CommonPreference<Boolean> p : prefs) {
 			count++;
 			if (p.get()) {
 				enabled++;
 			}
 		}
-		for (OsmandSettings.CommonPreference<String> p : includedPrefs) {
+		for (CommonPreference<String> p : includedPrefs) {
 			count++;
 			if (!Algorithms.isEmpty(p.get())) {
 				enabled++;
@@ -856,11 +858,11 @@ public class ConfigureMapMenu {
 					prefs.get(i).set(tempPrefs[i]);
 					selected |= tempPrefs[i];
 				}
-				final List<OsmandSettings.CommonPreference<String>> includedPrefs = new ArrayList<>();
+				final List<CommonPreference<String>> includedPrefs = new ArrayList<>();
 				if (customRulesIncluded != null) {
 					for (RenderingRuleProperty p : customRulesIncluded) {
 						if (p.getAttrName().equals(HIKING_ROUTES_OSMC_ATTR)) {
-							final OsmandSettings.CommonPreference<String> pref = activity.getMyApplication().getSettings()
+							final CommonPreference<String> pref = activity.getMyApplication().getSettings()
 									.getCustomRenderProperty(p.getAttrName());
 							includedPrefs.add(pref);
 							if (hikingRouteOSMCValue == 0) {
@@ -894,7 +896,7 @@ public class ConfigureMapMenu {
 		if (customRulesIncluded != null) {
 			for (RenderingRuleProperty p : customRulesIncluded) {
 				if (!p.isBoolean()) {
-					final OsmandSettings.CommonPreference<String> pref = activity.getMyApplication().getSettings()
+					final CommonPreference<String> pref = activity.getMyApplication().getSettings()
 							.getCustomRenderProperty(p.getAttrName());
 
 					View spinnerView = View.inflate(new ContextThemeWrapper(activity, themeRes), R.layout.spinner_rule_layout, null);
@@ -1031,7 +1033,7 @@ public class ConfigureMapMenu {
 		final String propertyDescr = SettingsActivity.getStringPropertyDescription(view.getContext(),
 				p.getAttrName(), p.getName());
 		if (p.isBoolean()) {
-			final OsmandSettings.CommonPreference<Boolean> pref = view.getApplication().getSettings()
+			final CommonPreference<Boolean> pref = view.getApplication().getSettings()
 					.getCustomRenderBooleanProperty(p.getAttrName());
 			return ContextMenuItem.createBuilder(propertyName)
 					.setId(id)
@@ -1047,7 +1049,7 @@ public class ConfigureMapMenu {
 					.setSelected(pref.get())
 					.createItem();
 		} else {
-			final OsmandSettings.CommonPreference<String> pref = view.getApplication().getSettings()
+			final CommonPreference<String> pref = view.getApplication().getSettings()
 					.getCustomRenderProperty(p.getAttrName());
 			final String descr;
 			if (!Algorithms.isEmpty(pref.get())) {
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/DetailsBottomSheet.java b/OsmAnd/src/net/osmand/plus/dialogs/DetailsBottomSheet.java
index 4e8febb56e..ecb8f04b86 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/DetailsBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/DetailsBottomSheet.java
@@ -27,7 +27,7 @@ import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemTwoChoicesButton.OnBo
 import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerItem;
 import net.osmand.plus.helpers.FontCache;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.settings.bottomsheets.BasePreferenceBottomSheet;
 import net.osmand.render.RenderingRuleProperty;
 import net.osmand.render.RenderingRuleStorageProperties;
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/RasterMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/RasterMapMenu.java
index 534c334aec..8219cc5a23 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/RasterMapMenu.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/RasterMapMenu.java
@@ -10,8 +10,9 @@ import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuItem;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.LayerTransparencySeekbarMode;
+import net.osmand.plus.rastermaps.LayerTransparencySeekbarMode;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.MapActivityLayers;
@@ -39,9 +40,9 @@ public class RasterMapMenu {
 		final OsmandSettings settings = app.getSettings();
 		final OsmandRasterMapsPlugin plugin = OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class);
 		assert plugin != null;
-		final OsmandSettings.CommonPreference<Integer> mapTransparencyPreference;
-		final OsmandSettings.CommonPreference<String> mapTypePreference;
-		final OsmandSettings.CommonPreference<String> exMapTypePreference;
+		final CommonPreference<Integer> mapTransparencyPreference;
+		final CommonPreference<String> mapTypePreference;
+		final CommonPreference<String> exMapTypePreference;
 		final LayerTransparencySeekbarMode currentMapTypeSeekbarMode =
 				type == RasterMapType.OVERLAY ? LayerTransparencySeekbarMode.OVERLAY : LayerTransparencySeekbarMode.UNDERLAY;
 		@StringRes final int mapTypeString;
@@ -62,7 +63,7 @@ public class RasterMapMenu {
 			throw new RuntimeException("Unexpected raster map type");
 		}
 
-		final OsmandSettings.CommonPreference<Boolean> hidePolygonsPref =
+		final CommonPreference<Boolean> hidePolygonsPref =
 				mapActivity.getMyApplication().getSettings().getCustomRenderBooleanProperty("noPolygons");
 
 		String mapTypeDescr = mapTypePreference.get();
@@ -181,8 +182,8 @@ public class RasterMapMenu {
 
 	@NonNull
 	public static Boolean isSeekbarVisible(OsmandApplication app, RasterMapType type) {
-		final OsmandSettings.LayerTransparencySeekbarMode currentMapTypeSeekbarMode =
-				type == RasterMapType.OVERLAY ? OsmandSettings.LayerTransparencySeekbarMode.OVERLAY : OsmandSettings.LayerTransparencySeekbarMode.UNDERLAY;
+		final LayerTransparencySeekbarMode currentMapTypeSeekbarMode =
+				type == RasterMapType.OVERLAY ? LayerTransparencySeekbarMode.OVERLAY : LayerTransparencySeekbarMode.UNDERLAY;
 		LayerTransparencySeekbarMode seekbarMode = app.getSettings().LAYER_TRANSPARENCY_SEEKBAR_MODE.get();
 		return seekbarMode == LayerTransparencySeekbarMode.UNDEFINED || seekbarMode == currentMapTypeSeekbarMode;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/SendAnalyticsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/dialogs/SendAnalyticsBottomSheetDialogFragment.java
index f84ac5239e..983315c503 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/SendAnalyticsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/SendAnalyticsBottomSheetDialogFragment.java
@@ -19,7 +19,7 @@ import androidx.fragment.app.FragmentManager;
 import net.osmand.PlatformUtil;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.base.MenuBottomSheetDialogFragment;
 import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton;
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
index 450d7e4b0d..7e0aadfa3b 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
@@ -23,7 +23,7 @@ import net.osmand.map.WorldRegion;
 import net.osmand.map.WorldRegion.RegionParams;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
 import net.osmand.plus.base.BasicProgressAsyncTask;
diff --git a/OsmAnd/src/net/osmand/plus/download/ui/DataStoragePlaceDialogFragment.java b/OsmAnd/src/net/osmand/plus/download/ui/DataStoragePlaceDialogFragment.java
index dceeac1862..f97784cb36 100644
--- a/OsmAnd/src/net/osmand/plus/download/ui/DataStoragePlaceDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/ui/DataStoragePlaceDialogFragment.java
@@ -21,6 +21,7 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.FragmentManager;
 
 import net.osmand.AndroidUtils;
+import net.osmand.FileUtils;
 import net.osmand.IProgress;
 import net.osmand.plus.OnDismissDialogFragmentListener;
 import net.osmand.plus.OsmandApplication;
@@ -71,7 +72,7 @@ public class DataStoragePlaceDialogFragment extends BottomSheetDialogFragment {
 
 		File internalStorage = getInternalStorageDirectory(activity);
 		File external1Storage = getExternal1StorageDirectory(activity);
-		if (external1Storage != null && external1Storage.exists() && OsmandSettings.isWritable(external1Storage)) {
+		if (external1Storage != null && external1Storage.exists() && FileUtils.isWritable(external1Storage)) {
 			deviceStorage = external1Storage;
 			deviceStorageType = OsmandSettings.EXTERNAL_STORAGE_TYPE_EXTERNAL_FILE;
 			deviceStorageName = getString(R.string.storage_directory_external);
@@ -246,7 +247,7 @@ public class DataStoragePlaceDialogFragment extends BottomSheetDialogFragment {
 			};
 
 	public boolean saveFilesLocation(int type, File selectedFile, Activity context) {
-		boolean wr = OsmandSettings.isWritable(selectedFile);
+		boolean wr = FileUtils.isWritable(selectedFile);
 		if (wr) {
 			((OsmandApplication) context.getApplication())
 					.setExternalStorageDirectory(type, selectedFile.getAbsolutePath());
diff --git a/OsmAnd/src/net/osmand/plus/activities/DayNightHelper.java b/OsmAnd/src/net/osmand/plus/helpers/DayNightHelper.java
similarity index 98%
rename from OsmAnd/src/net/osmand/plus/activities/DayNightHelper.java
rename to OsmAnd/src/net/osmand/plus/helpers/DayNightHelper.java
index f9ca2afca4..d3ebe9d6ae 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DayNightHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/DayNightHelper.java
@@ -1,20 +1,6 @@
-package net.osmand.plus.activities;
+package net.osmand.plus.helpers;
 
 
-import java.util.Date;
-import java.util.List;
-import java.util.TimeZone;
-
-import net.osmand.Location;
-import net.osmand.PlatformUtil;
-import net.osmand.StateChangedListener;
-import net.osmand.plus.settings.backend.ApplicationMode;
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.settings.backend.OsmandSettings.DayNightMode;
-import net.osmand.util.SunriseSunset;
-
-import org.apache.commons.logging.Log;
-
 import android.content.Context;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
@@ -22,6 +8,20 @@ import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.location.LocationManager;
 
+import net.osmand.Location;
+import net.osmand.PlatformUtil;
+import net.osmand.StateChangedListener;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.helpers.enums.DayNightMode;
+import net.osmand.plus.settings.backend.ApplicationMode;
+import net.osmand.util.SunriseSunset;
+
+import org.apache.commons.logging.Log;
+
+import java.util.Date;
+import java.util.List;
+import java.util.TimeZone;
+
 /**
  * Class to help determine if we want to render day or night map - it uses the
  * DayNightMode enumeration for its behavior<BR> 
diff --git a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
index 989bbaa0f8..47650dc2ec 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
@@ -80,6 +80,10 @@ import net.osmand.plus.OsmAndConstants;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.helpers.enums.MetricsConstants;
+import net.osmand.plus.helpers.enums.SpeedConstants;
+import net.osmand.plus.settings.backend.CommonPreference;
+import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.Version;
@@ -93,7 +97,6 @@ import net.osmand.plus.dialogs.GpxAppearanceAdapter;
 import net.osmand.plus.dialogs.GpxAppearanceAdapter.AppearanceListItem;
 import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
 import net.osmand.plus.routing.RouteCalculationResult;
-import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.render.RenderingRuleProperty;
 import net.osmand.render.RenderingRulesStorage;
 import net.osmand.router.RouteStatisticsHelper;
@@ -514,9 +517,9 @@ public class GpxUiHelper {
 				} else {
 					final View apprTitleView = View.inflate(new ContextThemeWrapper(activity, themeRes), R.layout.select_gpx_appearance_title, null);
 
-					final OsmandSettings.CommonPreference<String> prefWidth
+					final CommonPreference<String> prefWidth
 							= app.getSettings().getCustomRenderProperty(CURRENT_TRACK_WIDTH_ATTR);
-					final OsmandSettings.CommonPreference<String> prefColor
+					final CommonPreference<String> prefColor
 							= app.getSettings().getCustomRenderProperty(CURRENT_TRACK_COLOR_ATTR);
 
 					updateAppearanceTitle(activity, app, trackWidthProp, renderer, apprTitleView, prefWidth.get(), prefColor.get());
@@ -574,7 +577,7 @@ public class GpxUiHelper {
 							if (SHOW_START_FINISH_ATTR.equals(entry.getKey())) {
 								app.getSettings().SHOW_START_FINISH_ICONS.set("true".equals(entry.getValue()));
 							} else {
-								final OsmandSettings.CommonPreference<String> pref
+								final CommonPreference<String> pref
 										= app.getSettings().getCustomRenderProperty(entry.getKey());
 								pref.set(entry.getValue());
 							}
@@ -1039,7 +1042,7 @@ public class GpxUiHelper {
 
 	private static float setupAxisDistance(OsmandApplication ctx, AxisBase axisBase, float meters) {
 		OsmandSettings settings = ctx.getSettings();
-		OsmandSettings.MetricsConstants mc = settings.METRIC_SYSTEM.get();
+		MetricsConstants mc = settings.METRIC_SYSTEM.get();
 		float divX;
 
 		String format1 = "{0,number,0.#} ";
@@ -1048,10 +1051,10 @@ public class GpxUiHelper {
 		float granularity = 1f;
 		int mainUnitStr;
 		float mainUnitInMeters;
-		if (mc == OsmandSettings.MetricsConstants.KILOMETERS_AND_METERS) {
+		if (mc == MetricsConstants.KILOMETERS_AND_METERS) {
 			mainUnitStr = R.string.km;
 			mainUnitInMeters = METERS_IN_KILOMETER;
-		} else if (mc == OsmandSettings.MetricsConstants.NAUTICAL_MILES) {
+		} else if (mc == MetricsConstants.NAUTICAL_MILES) {
 			mainUnitStr = R.string.nm;
 			mainUnitInMeters = METERS_IN_ONE_NAUTICALMILE;
 		} else {
@@ -1065,10 +1068,10 @@ public class GpxUiHelper {
 		if (meters >= 100 * mainUnitInMeters ||
 				meters > 9.99f * mainUnitInMeters ||
 				meters > 0.999f * mainUnitInMeters ||
-				mc == OsmandSettings.MetricsConstants.MILES_AND_FEET && meters > 0.249f * mainUnitInMeters ||
-				mc == OsmandSettings.MetricsConstants.MILES_AND_METERS && meters > 0.249f * mainUnitInMeters ||
-				mc == OsmandSettings.MetricsConstants.MILES_AND_YARDS && meters > 0.249f * mainUnitInMeters ||
-				mc == OsmandSettings.MetricsConstants.NAUTICAL_MILES && meters > 0.99f * mainUnitInMeters) {
+				mc == MetricsConstants.MILES_AND_FEET && meters > 0.249f * mainUnitInMeters ||
+				mc == MetricsConstants.MILES_AND_METERS && meters > 0.249f * mainUnitInMeters ||
+				mc == MetricsConstants.MILES_AND_YARDS && meters > 0.249f * mainUnitInMeters ||
+				mc == MetricsConstants.NAUTICAL_MILES && meters > 0.99f * mainUnitInMeters) {
 
 			divX = mainUnitInMeters;
 			if (fmt == null) {
@@ -1078,13 +1081,13 @@ public class GpxUiHelper {
 		} else {
 			fmt = null;
 			granularity = 1f;
-			if (mc == OsmandSettings.MetricsConstants.KILOMETERS_AND_METERS || mc == OsmandSettings.MetricsConstants.MILES_AND_METERS) {
+			if (mc == MetricsConstants.KILOMETERS_AND_METERS || mc == MetricsConstants.MILES_AND_METERS) {
 				divX = 1f;
 				mainUnitStr = R.string.m;
-			} else if (mc == OsmandSettings.MetricsConstants.MILES_AND_FEET) {
+			} else if (mc == MetricsConstants.MILES_AND_FEET) {
 				divX = 1f / FEET_IN_ONE_METER;
 				mainUnitStr = R.string.foot;
-			} else if (mc == OsmandSettings.MetricsConstants.MILES_AND_YARDS) {
+			} else if (mc == MetricsConstants.MILES_AND_YARDS) {
 				divX = 1f / YARDS_IN_ONE_METER;
 				mainUnitStr = R.string.yard;
 			} else {
@@ -1306,8 +1309,8 @@ public class GpxUiHelper {
 															   boolean drawFilled,
 															   boolean calcWithoutGaps) {
 		OsmandSettings settings = ctx.getSettings();
-		OsmandSettings.MetricsConstants mc = settings.METRIC_SYSTEM.get();
-		boolean useFeet = (mc == OsmandSettings.MetricsConstants.MILES_AND_FEET) || (mc == OsmandSettings.MetricsConstants.MILES_AND_YARDS);
+		MetricsConstants mc = settings.METRIC_SYSTEM.get();
+		boolean useFeet = (mc == MetricsConstants.MILES_AND_FEET) || (mc == MetricsConstants.MILES_AND_YARDS);
 		boolean light = settings.isLightContent();
 		final float convEle = useFeet ? 3.28084f : 1.0f;
 
@@ -1408,19 +1411,19 @@ public class GpxUiHelper {
 			divX = setupAxisDistance(ctx, xAxis, calcWithoutGaps ? analysis.totalDistanceWithoutGaps : analysis.totalDistance);
 		}
 
-		OsmandSettings.SpeedConstants sps = settings.SPEED_SYSTEM.get();
+		SpeedConstants sps = settings.SPEED_SYSTEM.get();
 		float mulSpeed = Float.NaN;
 		float divSpeed = Float.NaN;
 		final String mainUnitY = sps.toShortString(ctx);
-		if (sps == OsmandSettings.SpeedConstants.KILOMETERS_PER_HOUR) {
+		if (sps == SpeedConstants.KILOMETERS_PER_HOUR) {
 			mulSpeed = 3.6f;
-		} else if (sps == OsmandSettings.SpeedConstants.MILES_PER_HOUR) {
+		} else if (sps == SpeedConstants.MILES_PER_HOUR) {
 			mulSpeed = 3.6f * METERS_IN_KILOMETER / METERS_IN_ONE_MILE;
-		} else if (sps == OsmandSettings.SpeedConstants.NAUTICALMILES_PER_HOUR) {
+		} else if (sps == SpeedConstants.NAUTICALMILES_PER_HOUR) {
 			mulSpeed = 3.6f * METERS_IN_KILOMETER / METERS_IN_ONE_NAUTICALMILE;
-		} else if (sps == OsmandSettings.SpeedConstants.MINUTES_PER_KILOMETER) {
+		} else if (sps == SpeedConstants.MINUTES_PER_KILOMETER) {
 			divSpeed = METERS_IN_KILOMETER / 60;
-		} else if (sps == OsmandSettings.SpeedConstants.MINUTES_PER_MILE) {
+		} else if (sps == SpeedConstants.MINUTES_PER_MILE) {
 			divSpeed = METERS_IN_ONE_MILE / 60;
 		} else {
 			mulSpeed = 1f;
@@ -1571,8 +1574,8 @@ public class GpxUiHelper {
 		}
 		OsmandSettings settings = ctx.getSettings();
 		boolean light = settings.isLightContent();
-		OsmandSettings.MetricsConstants mc = settings.METRIC_SYSTEM.get();
-		boolean useFeet = (mc == OsmandSettings.MetricsConstants.MILES_AND_FEET) || (mc == OsmandSettings.MetricsConstants.MILES_AND_YARDS);
+		MetricsConstants mc = settings.METRIC_SYSTEM.get();
+		boolean useFeet = (mc == MetricsConstants.MILES_AND_FEET) || (mc == MetricsConstants.MILES_AND_YARDS);
 		final float convEle = useFeet ? 3.28084f : 1.0f;
 		final float totalDistance = calcWithoutGaps ? analysis.totalDistanceWithoutGaps : analysis.totalDistance;
 
diff --git a/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java b/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java
index b0f34058d3..ddbb06f2be 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/LockHelper.java
@@ -20,7 +20,8 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.routing.VoiceRouter.VoiceMessageListener;
 import net.osmand.plus.settings.backend.OsmAndAppCustomization.OsmAndAppCustomizationListener;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
+import net.osmand.plus.settings.backend.CommonPreference;
+import net.osmand.plus.routing.VoiceRouter.VoiceMessageListener;
 
 import org.apache.commons.logging.Log;
 
diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
index b143653754..7f20de3e60 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
@@ -24,6 +24,9 @@ import net.osmand.plus.TargetPointsHelper.TargetPoint;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.IntermediatePointsDialog;
 import net.osmand.plus.base.PointImageDrawable;
+import net.osmand.plus.helpers.enums.DrivingRegion;
+import net.osmand.plus.helpers.enums.MetricsConstants;
+import net.osmand.plus.helpers.enums.SpeedConstants;
 import net.osmand.plus.poi.PoiUIFilter;
 import net.osmand.plus.render.RenderingIcons;
 import net.osmand.plus.routing.AlarmInfo;
@@ -31,8 +34,6 @@ import net.osmand.plus.routing.AlarmInfo.AlarmInfoType;
 import net.osmand.plus.routing.RouteCalculationResult;
 import net.osmand.plus.routing.VoiceRouter;
 import net.osmand.plus.settings.backend.ApplicationMode;
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.MetricsConstants;
 import net.osmand.util.MapUtils;
 
 import java.util.ArrayList;
@@ -193,7 +194,7 @@ public class WaypointHelper {
 		return found;
 	}
 
-	public AlarmInfo getMostImportantAlarm(OsmandSettings.SpeedConstants sc, boolean showCameras) {
+	public AlarmInfo getMostImportantAlarm(SpeedConstants sc, boolean showCameras) {
 		Location lastProjection = app.getRoutingHelper().getLastProjection();
 		float mxspeed = route.getCurrentMaxSpeed();
 		float delta = app.getSettings().SPEED_LIMIT_EXCEED_KMH.get() / 3.6f;
@@ -291,7 +292,7 @@ public class WaypointHelper {
 	}
 
 	public AlarmInfo calculateMostImportantAlarm(RouteDataObject ro, Location loc, MetricsConstants mc,
-												 OsmandSettings.SpeedConstants sc, boolean showCameras) {
+	                                             SpeedConstants sc, boolean showCameras) {
 		float mxspeed = ro.getMaximumSpeed(ro.bearingVsRouteDirection(loc));
 		float delta = app.getSettings().SPEED_LIMIT_EXCEED_KMH.get() / 3.6f;
 		AlarmInfo speedAlarm = createSpeedAlarm(sc, mxspeed, loc, delta);
@@ -331,7 +332,7 @@ public class WaypointHelper {
 		return null;
 	}
 
-	private static AlarmInfo createSpeedAlarm(OsmandSettings.SpeedConstants sc, float mxspeed, Location loc, float delta) {
+	private static AlarmInfo createSpeedAlarm(SpeedConstants sc, float mxspeed, Location loc, float delta) {
 		AlarmInfo speedAlarm = null;
 		if (mxspeed != 0 && loc != null && loc.hasSpeed() && mxspeed != RouteDataObject.NONE_MAX_SPEED) {
 			if (loc.getSpeed() > mxspeed + delta) {
@@ -790,7 +791,7 @@ public class WaypointHelper {
 			} else if (type == ALARMS) {
 				//assign alarm list icons manually for now
 				String typeString = ((AlarmInfo) point).getType().toString();
-				OsmandSettings.DrivingRegion region = app.getSettings().DRIVING_REGION.get();
+				DrivingRegion region = app.getSettings().DRIVING_REGION.get();
 				if (typeString.equals("SPEED_CAMERA")) {
 					return AppCompatResources.getDrawable(uiCtx, R.drawable.mx_highway_speed_camera);
 				} else if (typeString.equals("BORDER_CONTROL")) {
diff --git a/OsmAnd/src/net/osmand/plus/helpers/enums/AngularConstants.java b/OsmAnd/src/net/osmand/plus/helpers/enums/AngularConstants.java
new file mode 100644
index 0000000000..4041380fe1
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/helpers/enums/AngularConstants.java
@@ -0,0 +1,27 @@
+package net.osmand.plus.helpers.enums;
+
+import android.content.Context;
+
+import net.osmand.plus.R;
+
+public enum AngularConstants {
+	DEGREES(R.string.shared_string_degrees, "°"),
+	DEGREES360(R.string.shared_string_degrees, "°"),
+	MILLIRADS(R.string.shared_string_milliradians, "mil");
+
+	private final int key;
+	private final String unit;
+
+	AngularConstants(int key, String unit) {
+		this.key = key;
+		this.unit = unit;
+	}
+
+	public String toHumanString(Context ctx) {
+		return ctx.getString(key);
+	}
+
+	public String getUnitSymbol() {
+		return unit;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/helpers/enums/AutoZoomMap.java b/OsmAnd/src/net/osmand/plus/helpers/enums/AutoZoomMap.java
new file mode 100644
index 0000000000..ad09424924
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/helpers/enums/AutoZoomMap.java
@@ -0,0 +1,19 @@
+package net.osmand.plus.helpers.enums;
+
+import net.osmand.plus.R;
+
+public enum AutoZoomMap {
+	FARTHEST(R.string.auto_zoom_farthest, 1f, 15.5f),
+	FAR(R.string.auto_zoom_far, 1.4f, 17f),
+	CLOSE(R.string.auto_zoom_close, 2f, 19f);
+
+	public final float coefficient;
+	public final int name;
+	public final float maxZoom;
+
+	AutoZoomMap(int name, float coefficient, float maxZoom) {
+		this.name = name;
+		this.coefficient = coefficient;
+		this.maxZoom = maxZoom;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/helpers/enums/DayNightMode.java b/OsmAnd/src/net/osmand/plus/helpers/enums/DayNightMode.java
new file mode 100644
index 0000000000..77f0eb8876
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/helpers/enums/DayNightMode.java
@@ -0,0 +1,62 @@
+package net.osmand.plus.helpers.enums;
+
+import android.content.Context;
+import android.hardware.Sensor;
+import android.hardware.SensorManager;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
+
+import net.osmand.plus.R;
+
+public enum DayNightMode {
+	AUTO(R.string.daynight_mode_auto, R.drawable.ic_action_map_sunset),
+	DAY(R.string.daynight_mode_day, R.drawable.ic_action_map_day),
+	NIGHT(R.string.daynight_mode_night, R.drawable.ic_action_map_night),
+	SENSOR(R.string.daynight_mode_sensor, R.drawable.ic_action_map_light_sensor);
+
+	private final int key;
+	@DrawableRes
+	private final int drawableRes;
+
+	DayNightMode(@StringRes int key, @DrawableRes int drawableRes) {
+		this.key = key;
+		this.drawableRes = drawableRes;
+	}
+
+	public String toHumanString(Context ctx) {
+		return ctx.getString(key);
+	}
+
+	@DrawableRes
+	public int getIconRes() {
+		return drawableRes;
+	}
+
+	public boolean isSensor() {
+		return this == SENSOR;
+	}
+
+	public boolean isAuto() {
+		return this == AUTO;
+	}
+
+	public boolean isDay() {
+		return this == DAY;
+	}
+
+	public boolean isNight() {
+		return this == NIGHT;
+	}
+
+	public static DayNightMode[] possibleValues(Context context) {
+		SensorManager mSensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
+		Sensor mLight = mSensorManager.getDefaultSensor(Sensor.TYPE_LIGHT);
+		boolean isLightSensorEnabled = mLight != null;
+		if (isLightSensorEnabled) {
+			return DayNightMode.values();
+		} else {
+			return new DayNightMode[]{AUTO, DAY, NIGHT};
+		}
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/helpers/enums/DrivingRegion.java b/OsmAnd/src/net/osmand/plus/helpers/enums/DrivingRegion.java
new file mode 100644
index 0000000000..60902c46b5
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/helpers/enums/DrivingRegion.java
@@ -0,0 +1,62 @@
+package net.osmand.plus.helpers.enums;
+
+import android.content.Context;
+
+import net.osmand.plus.R;
+
+import java.util.Locale;
+
+/**
+ * Class represents specific for driving region
+ * Signs, leftHandDriving
+ */
+public enum DrivingRegion {
+
+	EUROPE_ASIA(R.string.driving_region_europe_asia, MetricsConstants.KILOMETERS_AND_METERS, false),
+	US(R.string.driving_region_us, MetricsConstants.MILES_AND_FEET, false),
+	CANADA(R.string.driving_region_canada, MetricsConstants.KILOMETERS_AND_METERS, false),
+	UK_AND_OTHERS(R.string.driving_region_uk, MetricsConstants.MILES_AND_METERS, true),
+	JAPAN(R.string.driving_region_japan, MetricsConstants.KILOMETERS_AND_METERS, true),
+	AUSTRALIA(R.string.driving_region_australia, MetricsConstants.KILOMETERS_AND_METERS, true);
+
+	public final boolean leftHandDriving;
+	public final MetricsConstants defMetrics;
+	public final int name;
+
+	DrivingRegion(int name, MetricsConstants def, boolean leftHandDriving) {
+		this.name = name;
+		defMetrics = def;
+		this.leftHandDriving = leftHandDriving;
+	}
+
+	public boolean isAmericanTypeSigns() {
+		return this == DrivingRegion.AUSTRALIA ||
+				this == DrivingRegion.US ||
+				this == DrivingRegion.CANADA;
+	}
+
+	public String getDescription(Context ctx) {
+		return ctx.getString(leftHandDriving ? R.string.left_side_navigation : R.string.right_side_navigation) +
+				", " +
+				defMetrics.toHumanString(ctx).toLowerCase();
+	}
+
+	public static DrivingRegion getDrivingRegionByLocale() {
+		Locale df = Locale.getDefault();
+		if (df == null) {
+			return DrivingRegion.EUROPE_ASIA;
+		}
+		if (df.getCountry().equalsIgnoreCase(Locale.US.getCountry())) {
+			return DrivingRegion.US;
+		} else if (df.getCountry().equalsIgnoreCase(Locale.CANADA.getCountry())) {
+			return DrivingRegion.CANADA;
+		} else if (df.getCountry().equalsIgnoreCase(Locale.JAPAN.getCountry())) {
+			return DrivingRegion.JAPAN;
+		} else if (df.getCountry().equalsIgnoreCase("au")) {
+			return DrivingRegion.AUSTRALIA;
+		} else if (df.getCountry().equalsIgnoreCase(Locale.UK.getCountry())) {
+			return DrivingRegion.UK_AND_OTHERS;
+		}
+		return DrivingRegion.EUROPE_ASIA;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/helpers/enums/MetricsConstants.java b/OsmAnd/src/net/osmand/plus/helpers/enums/MetricsConstants.java
new file mode 100644
index 0000000000..20f3804a6a
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/helpers/enums/MetricsConstants.java
@@ -0,0 +1,29 @@
+package net.osmand.plus.helpers.enums;
+
+import android.content.Context;
+
+import net.osmand.plus.R;
+
+public enum MetricsConstants {
+	KILOMETERS_AND_METERS(R.string.si_km_m, "km-m"),
+	MILES_AND_FEET(R.string.si_mi_feet, "mi-f"),
+	MILES_AND_METERS(R.string.si_mi_meters, "mi-m"),
+	MILES_AND_YARDS(R.string.si_mi_yard, "mi-y"),
+	NAUTICAL_MILES(R.string.si_nm, "nm");
+
+	private final int key;
+	private final String ttsString;
+
+	MetricsConstants(int key, String ttsString) {
+		this.key = key;
+		this.ttsString = ttsString;
+	}
+
+	public String toHumanString(Context ctx) {
+		return ctx.getString(key);
+	}
+
+	public String toTTSString() {
+		return ttsString;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/helpers/enums/SpeedConstants.java b/OsmAnd/src/net/osmand/plus/helpers/enums/SpeedConstants.java
new file mode 100644
index 0000000000..1a4c512b8c
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/helpers/enums/SpeedConstants.java
@@ -0,0 +1,32 @@
+package net.osmand.plus.helpers.enums;
+
+import android.content.Context;
+
+import net.osmand.plus.R;
+
+public enum SpeedConstants {
+	KILOMETERS_PER_HOUR(R.string.km_h, R.string.si_kmh, false),
+	MILES_PER_HOUR(R.string.mile_per_hour, R.string.si_mph, true),
+	METERS_PER_SECOND(R.string.m_s, R.string.si_m_s, false),
+	MINUTES_PER_MILE(R.string.min_mile, R.string.si_min_m, true),
+	MINUTES_PER_KILOMETER(R.string.min_km, R.string.si_min_km, false),
+	NAUTICALMILES_PER_HOUR(R.string.nm_h, R.string.si_nm_h, true);
+
+	public final int key;
+	public final int descr;
+	public final boolean imperial;
+
+	SpeedConstants(int key, int descr, boolean imperial) {
+		this.key = key;
+		this.descr = descr;
+		this.imperial = imperial;
+	}
+
+	public String toHumanString(Context ctx) {
+		return ctx.getString(descr);
+	}
+
+	public String toShortString(Context ctx) {
+		return ctx.getString(key);
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/helpers/enums/TracksSortByMode.java b/OsmAnd/src/net/osmand/plus/helpers/enums/TracksSortByMode.java
new file mode 100644
index 0000000000..6b4177c701
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/helpers/enums/TracksSortByMode.java
@@ -0,0 +1,38 @@
+package net.osmand.plus.helpers.enums;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
+
+import net.osmand.plus.R;
+
+public enum TracksSortByMode {
+	BY_DATE(R.string.sort_last_modified, R.drawable.ic_action_time_start),
+	BY_NAME_ASCENDING(R.string.sort_name_ascending, R.drawable.ic_action_sort_by_name_ascending),
+	BY_NAME_DESCENDING(R.string.sort_name_descending, R.drawable.ic_action_sort_by_name_descending);
+
+	private final int iconId;
+	private final int nameId;
+
+	TracksSortByMode(int nameId, int iconId) {
+		this.nameId = nameId;
+		this.iconId = iconId;
+	}
+
+	public boolean isByName() {
+		return this == BY_NAME_ASCENDING || this == BY_NAME_DESCENDING;
+	}
+
+	public boolean isByDate() {
+		return this == BY_DATE;
+	}
+
+	@StringRes
+	public int getNameId() {
+		return nameId;
+	}
+
+	@DrawableRes
+	public int getIconId() {
+		return iconId;
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/inapp/InAppPurchaseHelper.java b/OsmAnd/src/net/osmand/plus/inapp/InAppPurchaseHelper.java
index 1364d7b154..543c3a819d 100644
--- a/OsmAnd/src/net/osmand/plus/inapp/InAppPurchaseHelper.java
+++ b/OsmAnd/src/net/osmand/plus/inapp/InAppPurchaseHelper.java
@@ -17,6 +17,8 @@ import net.osmand.AndroidNetworkUtils.OnRequestsResultListener;
 import net.osmand.AndroidNetworkUtils.RequestResponse;
 import net.osmand.PlatformUtil;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
 import net.osmand.plus.inapp.InAppPurchases.InAppPurchase;
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
index d9824cce8f..c503162910 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
@@ -35,6 +35,8 @@ import androidx.fragment.app.FragmentManager;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.settings.backend.CommonPreference;
+import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
 import net.osmand.plus.activities.LocalIndexHelper;
@@ -49,7 +51,6 @@ import net.osmand.plus.inapp.InAppPurchaseHelper.InAppPurchaseListener;
 import net.osmand.plus.inapp.InAppPurchaseHelper.InAppPurchaseTaskType;
 import net.osmand.plus.inapp.InAppPurchases.InAppSubscription;
 import net.osmand.plus.resources.IncrementalChangesManager;
-import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.util.Algorithms;
 
 import java.io.File;
@@ -312,7 +313,7 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment implements InAppPurc
 		}
 
 		public void add(LocalIndexInfo info) {
-			OsmandSettings.CommonPreference<Boolean> preference = preferenceLiveUpdatesOn(
+			CommonPreference<Boolean> preference = preferenceLiveUpdatesOn(
 					info.getFileName(), app.getSettings());
 			if (preference.get()) {
 				dataShouldUpdate.add(info);
@@ -324,8 +325,8 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment implements InAppPurc
 		public void notifyLiveUpdatesChanged() {
 			Set<LocalIndexInfo> changedSet = new HashSet<>();
 			for (LocalIndexInfo localIndexInfo : dataShouldUpdate) {
-				OsmandSettings.CommonPreference<Boolean> preference =
-						preferenceLiveUpdatesOn(localIndexInfo.getFileName(), app.getSettings());
+				CommonPreference<Boolean> preference =
+						preferenceLiveUpdatesOn(localIndexInfo.getFileName(), getSettings());
 				if (!preference.get()) {
 					changedSet.add(localIndexInfo);
 				}
@@ -334,8 +335,8 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment implements InAppPurc
 			dataShouldNotUpdate.addAll(changedSet);
 			changedSet.clear();
 			for (LocalIndexInfo localIndexInfo : dataShouldNotUpdate) {
-				OsmandSettings.CommonPreference<Boolean> preference =
-						preferenceLiveUpdatesOn(localIndexInfo.getFileName(), app.getSettings());
+				CommonPreference<Boolean> preference =
+						preferenceLiveUpdatesOn(localIndexInfo.getFileName(), getSettings());
 				if (preference.get()) {
 					changedSet.add(localIndexInfo);
 				}
@@ -473,10 +474,10 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment implements InAppPurc
 				String fileName = li.getFileName();
 				PendingIntent alarmIntent = getPendingIntent(ctx, fileName);
 				if (enable) {
-					final OsmandSettings.CommonPreference<Integer> updateFrequencyPreference =
-							preferenceUpdateFrequency(fileName, app.getSettings());
-					final OsmandSettings.CommonPreference<Integer> timeOfDayPreference =
-							preferenceTimeOfDayToUpdate(fileName, app.getSettings());
+					final CommonPreference<Integer> updateFrequencyPreference =
+							preferenceUpdateFrequency(fileName, getSettings());
+					final CommonPreference<Integer> timeOfDayPreference =
+							preferenceTimeOfDayToUpdate(fileName, getSettings());
 					UpdateFrequency updateFrequency = UpdateFrequency.values()[updateFrequencyPreference.get()];
 					TimeOfDay timeOfDayToUpdate = TimeOfDay.values()[timeOfDayPreference.get()];
 					setAlarmForPendingIntent(alarmIntent, alarmMgr, updateFrequency, timeOfDayToUpdate);
@@ -570,7 +571,7 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment implements InAppPurc
 
 		public void bindLocalIndexInfo(@NonNull final String item, boolean isLastChild) {
 			OsmandApplication context = fragment.getMyActivity().getMyApplication();
-			final OsmandSettings.CommonPreference<Boolean> shouldUpdatePreference =
+			final CommonPreference<Boolean> shouldUpdatePreference =
 					preferenceLiveUpdatesOn(item, fragment.getSettings());
 			IncrementalChangesManager changesManager = context.getResourceManager().getChangesManager();
 
@@ -600,7 +601,7 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment implements InAppPurc
 					Algorithms.getFileNameWithoutExtension(new File(item));
 			final long timestamp = changesManager.getTimestamp(fileNameWithoutExtension);
 			final long lastCheck = preferenceLastCheck(item, fragment.getSettings()).get();
-			OsmandSettings.CommonPreference<Boolean> liveUpdateOn = preferenceLiveUpdatesOn(item, fragment.getSettings());
+			CommonPreference<Boolean> liveUpdateOn = preferenceLiveUpdatesOn(item, fragment.getSettings());
 			if(liveUpdateOn.get() && lastCheck != DEFAULT_LAST_CHECK) {
 				String lastCheckString = formatDateTime(fragment.getActivity(), lastCheck );
 				descriptionTextView.setText(context.getString(R.string.last_update, lastCheckString));
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesHelper.java b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesHelper.java
index ec4afd6861..ce9d3d9c5b 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesHelper.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesHelper.java
@@ -8,6 +8,7 @@ import android.os.AsyncTask;
 
 import androidx.annotation.NonNull;
 
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.OsmandActionBarActivity;
@@ -32,7 +33,7 @@ public class LiveUpdatesHelper {
 
 	public static final int DEFAULT_LAST_CHECK = -1;
 
-	private static <T> OsmandSettings.CommonPreference<T> checkPref(OsmandSettings.CommonPreference<T> p) {
+	private static <T> CommonPreference<T> checkPref(CommonPreference<T> p) {
 		if (p.isSet()) {
 			T vl = p.get();
 			p = p.makeGlobal();
@@ -44,37 +45,37 @@ public class LiveUpdatesHelper {
 		}
 		return p;
 	}
-	public static OsmandSettings.CommonPreference<Boolean> preferenceForLocalIndex(
+	public static CommonPreference<Boolean> preferenceForLocalIndex(
 			String fileName, OsmandSettings settings) {
 		final String settingId = fileName + LIVE_UPDATES_ON_POSTFIX;
 		return checkPref(settings.registerBooleanPreference(settingId, false));
 	}
 
-	public static OsmandSettings.CommonPreference<Boolean> preferenceLiveUpdatesOn(
+	public static CommonPreference<Boolean> preferenceLiveUpdatesOn(
 			String fileName, OsmandSettings settings) {
 		final String settingId = fileName + LIVE_UPDATES_ON_POSTFIX;
 		return checkPref(settings.registerBooleanPreference(settingId, false));
 	}
 
-	public static OsmandSettings.CommonPreference<Boolean> preferenceDownloadViaWiFi(
+	public static CommonPreference<Boolean> preferenceDownloadViaWiFi(
 			String fileName, OsmandSettings settings) {
 		final String settingId = fileName + DOWNLOAD_VIA_WIFI_POSTFIX;
 		return checkPref(settings.registerBooleanPreference(settingId, false));
 	}
 
-	public static OsmandSettings.CommonPreference<Integer> preferenceUpdateFrequency(
+	public static CommonPreference<Integer> preferenceUpdateFrequency(
 			String fileName, OsmandSettings settings) {
 		final String settingId = fileName + UPDATE_TIMES_POSTFIX;
 		return checkPref(settings.registerIntPreference(settingId, UpdateFrequency.HOURLY.ordinal()));
 	}
 
-	public static OsmandSettings.CommonPreference<Integer> preferenceTimeOfDayToUpdate(
+	public static CommonPreference<Integer> preferenceTimeOfDayToUpdate(
 			String fileName, OsmandSettings settings) {
 		final String settingId = fileName + TIME_OF_DAY_TO_UPDATE_POSTFIX;
 		return checkPref(settings.registerIntPreference(settingId, TimeOfDay.NIGHT.ordinal()));
 	}
 
-	public static OsmandSettings.CommonPreference<Long> preferenceLastCheck(
+	public static CommonPreference<Long> preferenceLastCheck(
 			String fileName, OsmandSettings settings) {
 		final String settingId = fileName + LAST_UPDATE_ATTEMPT_ON_POSTFIX;
 		return checkPref(settings.registerLongPreference(settingId, DEFAULT_LAST_CHECK));
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesSettingsDialogFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesSettingsDialogFragment.java
index d3f8f2ed4e..d27e733d7a 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesSettingsDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesSettingsDialogFragment.java
@@ -23,6 +23,7 @@ import androidx.fragment.app.DialogFragment;
 import net.osmand.AndroidUtils;
 import net.osmand.PlatformUtil;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.download.AbstractDownloadActivity;
@@ -85,7 +86,7 @@ public class LiveUpdatesSettingsDialogFragment extends DialogFragment {
 		final long lastCheck = preferenceLastCheck(fileName, getSettings()).get();
 
 
-		OsmandSettings.CommonPreference<Boolean> preference = preferenceLiveUpdatesOn(fileName,
+		CommonPreference<Boolean> preference = preferenceLiveUpdatesOn(fileName,
 				getSettings());
 		if (preference.get() && lastCheck != DEFAULT_LAST_CHECK) {
 			String lastCheckString = formatDateTime(getActivity(), lastCheck);
@@ -94,13 +95,13 @@ public class LiveUpdatesSettingsDialogFragment extends DialogFragment {
 			lastUpdateTextView.setVisibility(View.GONE);
 		}
 
-		final OsmandSettings.CommonPreference<Boolean> liveUpdatePreference =
+		final CommonPreference<Boolean> liveUpdatePreference =
 				preferenceForLocalIndex(fileName, getSettings());
-		final OsmandSettings.CommonPreference<Boolean> downloadViaWiFiPreference =
+		final CommonPreference<Boolean> downloadViaWiFiPreference =
 				preferenceDownloadViaWiFi(fileName, getSettings());
-		final OsmandSettings.CommonPreference<Integer> updateFrequencyPreference =
+		final CommonPreference<Integer> updateFrequencyPreference =
 				preferenceUpdateFrequency(fileName, getSettings());
-		final OsmandSettings.CommonPreference<Integer> timeOfDayPreference =
+		final CommonPreference<Integer> timeOfDayPreference =
 				preferenceTimeOfDayToUpdate(fileName, getSettings());
 
 		downloadOverWiFiCheckBox.setChecked(!liveUpdatePreference.get() || downloadViaWiFiPreference.get());
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/PerformLiveUpdateAsyncTask.java b/OsmAnd/src/net/osmand/plus/liveupdates/PerformLiveUpdateAsyncTask.java
index c95ac1a2a6..4cebb245f9 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/PerformLiveUpdateAsyncTask.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/PerformLiveUpdateAsyncTask.java
@@ -9,6 +9,7 @@ import androidx.annotation.NonNull;
 
 import net.osmand.PlatformUtil;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.download.AbstractDownloadActivity;
@@ -50,7 +51,7 @@ public class PerformLiveUpdateAsyncTask
 			activity.setSupportProgressBarIndeterminateVisibility(true);
 		}
 		final OsmandApplication myApplication = getMyApplication();
-		OsmandSettings.CommonPreference<Long> lastCheckPreference =
+		CommonPreference<Long> lastCheckPreference =
 				LiveUpdatesHelper.preferenceLastCheck(localIndexFileName, myApplication.getSettings());
 		lastCheckPreference.set(System.currentTimeMillis());
 	}
@@ -148,7 +149,7 @@ public class PerformLiveUpdateAsyncTask
 	public static void tryRescheduleDownload(@NonNull Context context,
 											 @NonNull OsmandSettings settings,
 											 @NonNull String localIndexFileName) {
-		final OsmandSettings.CommonPreference<Integer> updateFrequencyPreference =
+		final CommonPreference<Integer> updateFrequencyPreference =
 				preferenceUpdateFrequency(localIndexFileName, settings);
 		final Integer frequencyOrdinal = updateFrequencyPreference.get();
 		if (LiveUpdatesHelper.UpdateFrequency.values()[frequencyOrdinal]
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/CollapsableView.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/CollapsableView.java
index 5daa14ba27..394547f570 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/CollapsableView.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/CollapsableView.java
@@ -4,7 +4,7 @@ import android.view.View;
 
 import androidx.annotation.NonNull;
 
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.mapcontextmenu.MenuBuilder.CollapseExpandListener;
 
 public class CollapsableView {
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
index 5f88a13607..7977a9ddc6 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
@@ -58,6 +58,8 @@ import net.osmand.plus.ContextMenuItem;
 import net.osmand.plus.LockableScrollView;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.settings.backend.MainContextMenuItemsSettings;
+import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.UiUtilities.DialogButtonType;
@@ -74,7 +76,6 @@ import net.osmand.plus.mapcontextmenu.MenuController.TitleProgressController;
 import net.osmand.plus.mapcontextmenu.controllers.TransportStopController;
 import net.osmand.plus.routepreparationmenu.ChooseRouteFragment;
 import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
-import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.transport.TransportStopRoute;
 import net.osmand.plus.views.AnimateDraggingMapThread;
 import net.osmand.plus.views.OsmandMapTileView;
@@ -642,7 +643,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 		// Action buttons
 		ContextMenuAdapter adapter = menu.getActionsContextMenuAdapter(false);
 		List<ContextMenuItem> items = adapter.getVisibleItems();
-		List<String> mainIds = ((OsmandSettings.MainContextMenuItemsSettings) mapActivity.getMyApplication()
+		List<String> mainIds = ((MainContextMenuItemsSettings) mapActivity.getMyApplication()
 				.getSettings().CONTEXT_MENU_ACTIONS_ITEMS.get()).getMainIds();
 		ContextMenuAdapter mainAdapter = new ContextMenuAdapter(requireMyApplication());
 		ContextMenuAdapter additionalAdapter = new ContextMenuAdapter(requireMyApplication());
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java
index 5a4618ca4f..f0d33b68dd 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java
@@ -36,8 +36,7 @@ import net.osmand.plus.mapcontextmenu.CollapsableView;
 import net.osmand.plus.mapcontextmenu.MenuBuilder;
 import net.osmand.plus.osmedit.OsmEditingPlugin;
 import net.osmand.plus.poi.PoiUIFilter;
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.MetricsConstants;
+import net.osmand.plus.helpers.enums.MetricsConstants;
 import net.osmand.plus.views.layers.POIMapLayer;
 import net.osmand.plus.widgets.TextViewEx;
 import net.osmand.plus.widgets.tools.ClickableSpanTouchListener;
@@ -70,7 +69,7 @@ public class AmenityMenuBuilder extends MenuBuilder {
 	private static final String WIKI_LINK = ".wikipedia.org/w";
 	public final static Log LOG = PlatformUtil.getLog(AmenityMenuBuilder.class);
 	private final static DecimalFormat DF = new DecimalFormat("#.##");
-	private OsmandSettings.MetricsConstants metricSystem;
+	private MetricsConstants metricSystem;
 	private final Amenity amenity;
 
 
@@ -714,10 +713,10 @@ public class AmenityMenuBuilder extends MenuBuilder {
 			case "seamark_height":
 				if (Algorithms.isFloat(value)) {
 					double valueAsDouble = Double.valueOf(value);
-					if (metricSystem == OsmandSettings.MetricsConstants.MILES_AND_FEET) {
+					if (metricSystem == MetricsConstants.MILES_AND_FEET) {
 						formattedValue = String.valueOf(DF.format(valueAsDouble * OsmAndFormatter.FEET_IN_ONE_METER))
 								+ " " + mapActivity.getResources().getString(R.string.foot);
-					} else if (metricSystem == OsmandSettings.MetricsConstants.MILES_AND_YARDS) {
+					} else if (metricSystem == MetricsConstants.MILES_AND_YARDS) {
 						formattedValue = String.valueOf(DF.format(valueAsDouble * OsmAndFormatter.YARDS_IN_ONE_METER))
 								+ " " + mapActivity.getResources().getString(R.string.yard);
 					} else {
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
index 3cdf3398a6..b8f5789d47 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
@@ -13,7 +13,7 @@ import androidx.core.content.ContextCompat;
 import net.osmand.data.PointDescription;
 import net.osmand.plus.MapMarkersHelper;
 import net.osmand.plus.MapMarkersHelper.MapMarker;
-import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.helpers.MapMarkerDialogHelper;
@@ -56,7 +56,7 @@ public class MapMarkerMenuController extends MenuController {
 				public void buttonPressed() {
 					MapActivity activity = getMapActivity();
 					if (activity != null) {
-						OsmandSettings.OsmandPreference<Boolean> indication
+						OsmandPreference<Boolean> indication
 								= activity.getMyApplication().getSettings().MARKERS_DISTANCE_INDICATION_ENABLED;
 						if (!indication.get()) {
 							indication.set(true);
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputBottomSheetDialogFragment.java
index cf769223f1..f3bf7cfb7a 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputBottomSheetDialogFragment.java
@@ -6,6 +6,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.View;
 
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.base.MenuBottomSheetDialogFragment;
@@ -83,7 +84,7 @@ public class CoordinateInputBottomSheetDialogFragment extends MenuBottomSheetDia
 					@Override
 					public void onClick(View v) {
 						if (listener != null) {
-							OsmandSettings.CommonPreference<Boolean> pref = settings.COORDS_INPUT_TWO_DIGITS_LONGTITUDE;
+							CommonPreference<Boolean> pref = settings.COORDS_INPUT_TWO_DIGITS_LONGTITUDE;
 							pref.set(!pref.get());
 							listener.onInputSettingsChanged();
 						}
@@ -108,7 +109,7 @@ public class CoordinateInputBottomSheetDialogFragment extends MenuBottomSheetDia
 						@Override
 						public void onClick(View v) {
 							if (listener != null) {
-								OsmandSettings.CommonPreference<Boolean> pref = settings.COORDS_INPUT_USE_RIGHT_SIDE;
+								CommonPreference<Boolean> pref = settings.COORDS_INPUT_USE_RIGHT_SIDE;
 								pref.set(!pref.get());
 								listener.onHandChanged();
 							}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
index a68bd4c714..aef217f347 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
@@ -67,6 +67,7 @@ import net.osmand.plus.MapMarkersHelper;
 import net.osmand.plus.OsmAndLocationProvider.OsmAndCompassListener;
 import net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.Version;
@@ -1023,7 +1024,7 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm
 	}
 
 	private void changeOsmandKeyboardSetting() {
-		OsmandSettings.OsmandPreference<Boolean> pref = getMyApplication().getSettings().COORDS_INPUT_USE_OSMAND_KEYBOARD;
+		OsmandPreference<Boolean> pref = getMyApplication().getSettings().COORDS_INPUT_USE_OSMAND_KEYBOARD;
 		pref.set(!pref.get());
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java
index 485f294c94..d624ec7947 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java
@@ -32,8 +32,7 @@ import com.github.ksoichiro.android.observablescrollview.ScrollState;
 import net.osmand.AndroidUtils;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.MapMarkersMode;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersMode.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersMode.java
new file mode 100644
index 0000000000..a9cf23ea75
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersMode.java
@@ -0,0 +1,37 @@
+package net.osmand.plus.mapmarkers;
+
+import android.content.Context;
+
+import net.osmand.plus.R;
+
+public enum MapMarkersMode {
+	TOOLBAR(R.string.shared_string_topbar),
+	WIDGETS(R.string.shared_string_widgets),
+	NONE(R.string.shared_string_none);
+
+	private final int key;
+
+	MapMarkersMode(int key) {
+		this.key = key;
+	}
+
+	public String toHumanString(Context ctx) {
+		return ctx.getString(key);
+	}
+
+	public boolean isToolbar() {
+		return this == TOOLBAR;
+	}
+
+	public boolean isWidgets() {
+		return this == WIDGETS;
+	}
+
+	public boolean isNone() {
+		return this == NONE;
+	}
+
+	public static MapMarkersMode[] possibleValues(Context context) {
+		return new MapMarkersMode[]{TOOLBAR, WIDGETS, NONE};
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java
index 487ee2073c..4627ed764b 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java
@@ -14,7 +14,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import net.osmand.AndroidUtils;
-import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.base.BottomSheetDialogFragment;
 import net.osmand.plus.helpers.AndroidUiHelper;
@@ -63,7 +62,7 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment
 		}
 
 		((ImageView) mainView.findViewById(R.id.sort_by_icon)).setImageDrawable(getContentIcon(R.drawable.ic_sort_waypoint_dark));
-		OsmandSettings.MapMarkersMode mode = getMyApplication().getSettings().MAP_MARKERS_MODE.get();
+		MapMarkersMode mode = getMyApplication().getSettings().MAP_MARKERS_MODE.get();
 		int displayedCount = getMyApplication().getSettings().DISPLAYED_MARKERS_WIDGETS_COUNT.get();
 		ImageView showDirectionIcon = (ImageView) mainView.findViewById(R.id.show_direction_icon);
 		int imageResId = 0;
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 83ef171fda..0cb1ae2f33 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -1,6 +1,5 @@
 package net.osmand.plus.measurementtool;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -61,6 +60,7 @@ import net.osmand.plus.measurementtool.OptionsBottomSheetDialogFragment.OptionsF
 import net.osmand.plus.measurementtool.RouteBetweenPointsBottomSheetDialogFragment.RouteBetweenPointsDialogMode;
 import net.osmand.plus.measurementtool.RouteBetweenPointsBottomSheetDialogFragment.RouteBetweenPointsDialogType;
 import net.osmand.plus.measurementtool.RouteBetweenPointsBottomSheetDialogFragment.RouteBetweenPointsFragmentListener;
+import net.osmand.plus.measurementtool.SaveGpxRouteAsyncTask.SaveGpxRouteListener;
 import net.osmand.plus.measurementtool.SelectedPointBottomSheetDialogFragment.SelectedPointFragmentListener;
 import net.osmand.plus.measurementtool.adapter.MeasurementToolAdapter;
 import net.osmand.plus.measurementtool.adapter.MeasurementToolAdapter.MeasurementAdapterListener;
@@ -83,6 +83,8 @@ import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarView;
 import net.osmand.router.RoutePlannerFrontEnd.GpxRouteApproximation;
 
 import java.io.File;
+import java.lang.ref.WeakReference;
+import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -145,9 +147,6 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 	private MeasurementEditingContext editingCtx = new MeasurementEditingContext();
 
 	private LatLon initialPoint;
-	private OsmandApplication app;
-	private MapActivity mapActivity;
-	private MeasurementToolLayer measurementToolLayer;
 
 	enum SaveType {
 		ROUTE_POINT,
@@ -160,6 +159,10 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		SHOW_IS_SAVED_FRAGMENT
 	}
 
+	protected MeasurementEditingContext getEditingCtx() {
+		return editingCtx;
+	}
+
 	private void setEditingCtx(MeasurementEditingContext editingCtx) {
 		this.editingCtx = editingCtx;
 	}
@@ -168,7 +171,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		this.initialPoint = initialPoint;
 	}
 
-	void setMode(int mode, boolean on) {
+	private void setMode(int mode, boolean on) {
 		int modes = this.modes;
 		if (on) {
 			modes |= mode;
@@ -207,7 +210,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 	@Nullable
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-	                         @Nullable Bundle savedInstanceState) {
+							 @Nullable Bundle savedInstanceState) {
 		final MapActivity mapActivity = (MapActivity) getActivity();
 		if (mapActivity == null) {
 			return null;
@@ -1059,7 +1062,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 	}
 
 	@Nullable
-	GpxData setupGpxData(@Nullable GPXFile gpxFile) {
+	private GpxData setupGpxData(@Nullable GPXFile gpxFile) {
 		GpxData gpxData = null;
 		if (gpxFile != null) {
 			QuadRect rect = gpxFile.getRect();
@@ -1524,25 +1527,118 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		return displayedName;
 	}
 
-	private void saveNewGpx(File dir, String fileName, boolean showOnMap, SaveType saveType, FinalSaveAction finalSaveAction) {
-		saveGpx(dir, fileName, showOnMap, null, null, saveType, finalSaveAction);
+	private void saveNewGpx(@NonNull File dir, @NonNull String fileName, boolean showOnMap, SaveType saveType, FinalSaveAction finalSaveAction) {
+		saveGpx(new File(dir, fileName), null, null, saveType, finalSaveAction, showOnMap);
 	}
 
-	private void saveExistingGpx(GPXFile gpx, boolean showOnMap, ActionType actionType, SaveType saveType,
-	                             FinalSaveAction finalSaveAction) {
-		saveGpx(null, null, showOnMap, gpx, actionType, saveType, finalSaveAction);
+	private void saveExistingGpx(@NonNull GPXFile gpx, boolean showOnMap, ActionType actionType,
+								 SaveType saveType, FinalSaveAction finalSaveAction) {
+		saveGpx(new File(gpx.path), gpx, actionType, saveType, finalSaveAction, showOnMap);
 	}
 
-	@SuppressLint("StaticFieldLeak")
-	private void saveGpx(final File dir,
-	                     final String fileName,
-	                     final boolean showOnMap,
-	                     final GPXFile gpxFile,
-	                     final ActionType actionType,
-	                     final SaveType saveType,
-	                     final FinalSaveAction finalSaveAction) {
+	private void saveGpx(@NonNull final File outFile, @Nullable GPXFile gpxFile, final ActionType actionType,
+						 SaveType saveType, final FinalSaveAction finalSaveAction, final boolean showOnMap) {
+		SaveGpxRouteListener saveGpxRouteListener = new SaveGpxRouteListener() {
+			@Override
+			public void gpxSavingFinished(Exception warning, GPXFile savedGpxFile, File backupFile) {
+				onGpxSaved(warning, savedGpxFile, outFile, backupFile, actionType, finalSaveAction, showOnMap);
+			}
+		};
 
-		new SaveGPX(this, gpxFile, dir, fileName, saveType, showOnMap, actionType, finalSaveAction, app, mapActivity, measurementToolLayer, nightMode).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+		SaveGpxRouteAsyncTask saveTask = new SaveGpxRouteAsyncTask(this, outFile, gpxFile, actionType, saveType, showOnMap, saveGpxRouteListener);
+		saveTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+	}
+
+	private void onGpxSaved(Exception warning, GPXFile savedGpxFile, final File outFile, final File backupFile,
+							final ActionType actionType, FinalSaveAction finalSaveAction, final boolean showOnMap) {
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity == null) {
+			return;
+		}
+		mapActivity.refreshMap();
+		if (warning == null) {
+			if (editingCtx.isNewData() && savedGpxFile != null) {
+				QuadRect rect = savedGpxFile.getRect();
+				TrkSegment segment = savedGpxFile.getNonEmptyTrkSegment();
+				GpxData gpxData = new GpxData(savedGpxFile, rect, ActionType.EDIT_SEGMENT, segment);
+				editingCtx.setGpxData(gpxData);
+				updateToolbar();
+			}
+			if (isInEditMode()) {
+				editingCtx.setChangesSaved();
+				dismiss(mapActivity);
+			} else {
+				switch (finalSaveAction) {
+					case SHOW_SNACK_BAR_AND_CLOSE:
+						final WeakReference<MapActivity> mapActivityRef = new WeakReference<>(mapActivity);
+						snackbar = Snackbar.make(mapActivity.getLayout(),
+								MessageFormat.format(getString(R.string.gpx_saved_sucessfully), outFile.getName()),
+								Snackbar.LENGTH_LONG)
+								.setAction(R.string.shared_string_undo, new OnClickListener() {
+									@Override
+									public void onClick(View view) {
+										MapActivity mapActivity = mapActivityRef.get();
+										if (mapActivity != null) {
+											OsmandApplication app = mapActivity.getMyApplication();
+											FileUtils.removeGpxFile(app, outFile);
+											if (backupFile != null) {
+												FileUtils.renameGpxFile(app, backupFile, outFile);
+												GPXFile gpx = GPXUtilities.loadGPXFile(outFile);
+												setupGpxData(gpx);
+												if (showOnMap) {
+													showGpxOnMap(app, gpx, actionType, false);
+												}
+											} else {
+												setupGpxData(null);
+											}
+											setMode(UNDO_MODE, true);
+											MeasurementToolFragment.showInstance(mapActivity.getSupportFragmentManager(),
+													editingCtx, modes);
+										}
+									}
+								})
+								.addCallback(new Snackbar.Callback() {
+									@Override
+									public void onDismissed(Snackbar transientBottomBar, int event) {
+										if (event != DISMISS_EVENT_ACTION) {
+											editingCtx.setChangesSaved();
+										}
+										super.onDismissed(transientBottomBar, event);
+									}
+								});
+						snackbar.getView().<TextView>findViewById(com.google.android.material.R.id.snackbar_action)
+								.setAllCaps(false);
+						UiUtilities.setupSnackbar(snackbar, nightMode);
+						snackbar.show();
+						dismiss(mapActivity, false);
+						break;
+					case SHOW_IS_SAVED_FRAGMENT:
+						editingCtx.setChangesSaved();
+						SavedTrackBottomSheetDialogFragment.showInstance(mapActivity.getSupportFragmentManager(),
+								outFile.getAbsolutePath());
+						dismiss(mapActivity);
+						break;
+					case SHOW_TOAST:
+						editingCtx.setChangesSaved();
+						if (savedGpxFile != null && !savedGpxFile.showCurrentTrack) {
+							Toast.makeText(mapActivity,
+									MessageFormat.format(getString(R.string.gpx_saved_sucessfully), outFile.getAbsolutePath()),
+									Toast.LENGTH_LONG).show();
+						}
+				}
+			}
+		} else {
+			Toast.makeText(mapActivity, warning.getMessage(), Toast.LENGTH_LONG).show();
+		}
+	}
+
+	protected static void showGpxOnMap(OsmandApplication app, GPXFile gpx, ActionType actionType, boolean isNewGpx) {
+		SelectedGpxFile sf = app.getSelectedGpxHelper().selectGpxFile(gpx, true, false);
+		if (sf != null && !isNewGpx) {
+			if (actionType == ActionType.ADD_SEGMENT || actionType == ActionType.EDIT_SEGMENT) {
+				sf.processPoints(app);
+			}
+		}
 	}
 
 	private void updateUndoRedoButton(boolean enable, View view) {
@@ -1575,7 +1671,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		updateToolbar();
 	}
 
-	void updateToolbar() {
+	private void updateToolbar() {
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity == null) {
 			return;
@@ -1706,7 +1802,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		}
 	}
 
-	void dismiss(@NonNull MapActivity mapActivity) {
+	private void dismiss(@NonNull MapActivity mapActivity) {
 		dismiss(mapActivity, true);
 	}
 
@@ -1928,5 +2024,4 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 	public boolean isNightModeForMapControls() {
 		return nightMode;
 	}
-
-}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SaveGPX.java b/OsmAnd/src/net/osmand/plus/measurementtool/SaveGPX.java
deleted file mode 100644
index de47191ab5..0000000000
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SaveGPX.java
+++ /dev/null
@@ -1,297 +0,0 @@
-package net.osmand.plus.measurementtool;
-
-import android.annotation.SuppressLint;
-import android.app.ProgressDialog;
-import android.os.AsyncTask;
-import android.view.View;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.google.android.material.snackbar.Snackbar;
-
-import net.osmand.FileUtils;
-import net.osmand.GPXUtilities;
-import net.osmand.data.QuadRect;
-import net.osmand.plus.GpxSelectionHelper;
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.R;
-import net.osmand.plus.UiUtilities;
-import net.osmand.plus.Version;
-import net.osmand.plus.activities.MapActivity;
-import net.osmand.util.Algorithms;
-
-import java.io.File;
-import java.lang.ref.WeakReference;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import static net.osmand.IndexConstants.GPX_FILE_EXT;
-
-class SaveGPX extends AsyncTask<Void, Void, Exception> {
-
-    private final MeasurementToolFragment measurementToolFragment;
-    private final GPXUtilities.GPXFile gpxFile;
-    private final File dir;
-    private final String fileName;
-    private final MeasurementToolFragment.SaveType saveType;
-    private final boolean showOnMap;
-    private final GpxData.ActionType actionType;
-    private final MeasurementToolFragment.FinalSaveAction finalSaveAction;
-    private final OsmandApplication app;
-    @SuppressLint("StaticFieldLeak")
-    private final MapActivity mapActivity;
-    private MeasurementToolLayer measurementToolLayer;
-    private boolean nightMode;
-    private ProgressDialog progressDialog;
-    private File backupFile;
-    private File outFile;
-    private GPXUtilities.GPXFile savedGpxFile;
-    public MeasurementEditingContext editingCtx = new MeasurementEditingContext();
-    private static final int UNDO_MODE = 0x8;
-
-    public SaveGPX(MeasurementToolFragment measurementToolFragment, GPXUtilities.GPXFile gpxFile, File dir, String fileName, MeasurementToolFragment.SaveType saveType, boolean showOnMap, GpxData.ActionType actionType, MeasurementToolFragment.FinalSaveAction finalSaveAction, OsmandApplication app, MapActivity mapActivity, MeasurementToolLayer measurementToolLayer, boolean nightMode) {
-        this.measurementToolFragment = measurementToolFragment;
-        this.gpxFile = gpxFile;
-        this.dir = dir;
-        this.fileName = fileName;
-        this.saveType = saveType;
-        this.showOnMap = showOnMap;
-        this.actionType = actionType;
-        this.finalSaveAction = finalSaveAction;
-        this.app = app;
-        this.mapActivity = mapActivity;
-        this.measurementToolLayer = measurementToolLayer;
-        this.nightMode = nightMode;
-    }
-
-    @Override
-    protected void onPreExecute() {
-        measurementToolFragment.cancelModes();
-        if (mapActivity != null) {
-            progressDialog = new ProgressDialog(mapActivity);
-            progressDialog.setMessage(measurementToolFragment.getString(R.string.saving_gpx_tracks));
-            progressDialog.show();
-        }
-    }
-
-    @Override
-    protected Exception doInBackground(Void... voids) {
-        if (app == null) {
-            return null;
-        }
-        List<GPXUtilities.WptPt> points = editingCtx.getPoints();
-        GPXUtilities.TrkSegment before = editingCtx.getBeforeTrkSegmentLine();
-        GPXUtilities.TrkSegment after = editingCtx.getAfterTrkSegmentLine();
-        if (gpxFile == null) {
-            outFile = new File(dir, fileName);
-            String trackName = fileName.substring(0, fileName.length() - GPX_FILE_EXT.length());
-            GPXUtilities.GPXFile gpx = new GPXUtilities.GPXFile(Version.getFullVersion(app));
-            if (measurementToolLayer != null) {
-                if (saveType == MeasurementToolFragment.SaveType.LINE) {
-                    GPXUtilities.TrkSegment segment = new GPXUtilities.TrkSegment();
-                    if (editingCtx.hasRoute()) {
-                        segment.points.addAll(editingCtx.getRoutePoints());
-                    } else {
-                        segment.points.addAll(before.points);
-                        segment.points.addAll(after.points);
-                    }
-                    GPXUtilities.Track track = new GPXUtilities.Track();
-                    track.name = trackName;
-                    track.segments.add(segment);
-                    gpx.tracks.add(track);
-                } else if (saveType == MeasurementToolFragment.SaveType.ROUTE_POINT) {
-                    if (editingCtx.hasRoute()) {
-                        GPXUtilities.GPXFile newGpx = editingCtx.exportRouteAsGpx(trackName);
-                        if (newGpx != null) {
-                            gpx = newGpx;
-                        }
-                    }
-                    gpx.addRoutePoints(points);
-                }
-            }
-            Exception res = GPXUtilities.writeGpxFile(outFile, gpx);
-            gpx.path = outFile.getAbsolutePath();
-            savedGpxFile = gpx;
-            if (showOnMap) {
-                showGpxOnMap(app, gpx, true);
-            }
-            return res;
-        } else {
-            GPXUtilities.GPXFile gpx = gpxFile;
-            outFile = new File(gpx.path);
-            backupFile = FileUtils.backupFile(app, outFile);
-            String trackName = Algorithms.getFileNameWithoutExtension(outFile);
-            if (measurementToolLayer != null) {
-                if (measurementToolFragment.isPlanRouteMode()) {
-                    if (saveType == MeasurementToolFragment.SaveType.LINE) {
-                        GPXUtilities.TrkSegment segment = new GPXUtilities.TrkSegment();
-                        if (editingCtx.hasRoute()) {
-                            segment.points.addAll(editingCtx.getRoutePoints());
-                        } else {
-                            segment.points.addAll(before.points);
-                            segment.points.addAll(after.points);
-                        }
-                        GPXUtilities.Track track = new GPXUtilities.Track();
-                        track.name = trackName;
-                        track.segments.add(segment);
-                        gpx.tracks.add(track);
-                    } else if (saveType == MeasurementToolFragment.SaveType.ROUTE_POINT) {
-                        if (editingCtx.hasRoute()) {
-                            GPXUtilities.GPXFile newGpx = editingCtx.exportRouteAsGpx(trackName);
-                            if (newGpx != null) {
-                                gpx = newGpx;
-                            }
-                        }
-                        gpx.addRoutePoints(points);
-                    }
-                } else if (actionType != null) {
-                    GpxData gpxData = editingCtx.getGpxData();
-                    switch (actionType) {
-                        case ADD_SEGMENT: {
-                            List<GPXUtilities.WptPt> snappedPoints = new ArrayList<>();
-                            snappedPoints.addAll(before.points);
-                            snappedPoints.addAll(after.points);
-                            gpx.addTrkSegment(snappedPoints);
-                            break;
-                        }
-                        case ADD_ROUTE_POINTS: {
-                            gpx.replaceRoutePoints(points);
-                            break;
-                        }
-                        case EDIT_SEGMENT: {
-                            if (gpxData != null) {
-                                GPXUtilities.TrkSegment segment = new GPXUtilities.TrkSegment();
-                                segment.points.addAll(points);
-                                gpx.replaceSegment(gpxData.getTrkSegment(), segment);
-                            }
-                            break;
-                        }
-                        case OVERWRITE_SEGMENT: {
-                            if (gpxData != null) {
-                                List<GPXUtilities.WptPt> snappedPoints = new ArrayList<>();
-                                snappedPoints.addAll(before.points);
-                                snappedPoints.addAll(after.points);
-                                GPXUtilities.TrkSegment segment = new GPXUtilities.TrkSegment();
-                                segment.points.addAll(snappedPoints);
-                                gpx.replaceSegment(gpxData.getTrkSegment(), segment);
-                            }
-                            break;
-                        }
-                    }
-                } else {
-                    gpx.addRoutePoints(points);
-                }
-            }
-            Exception res = null;
-            if (!gpx.showCurrentTrack) {
-                res = GPXUtilities.writeGpxFile(outFile, gpx);
-            }
-            savedGpxFile = gpx;
-            if (showOnMap) {
-                showGpxOnMap(app, gpx, false);
-            }
-            return res;
-        }
-    }
-
-    private void showGpxOnMap(OsmandApplication app, GPXUtilities.GPXFile gpx, boolean isNewGpx) {
-        GpxSelectionHelper.SelectedGpxFile sf = app.getSelectedGpxHelper().selectGpxFile(gpx, true, false);
-        if (sf != null && !isNewGpx) {
-            if (actionType == GpxData.ActionType.ADD_SEGMENT || actionType == GpxData.ActionType.EDIT_SEGMENT) {
-                sf.processPoints(app);
-            }
-        }
-    }
-
-    @Override
-    protected void onPostExecute(Exception warning) {
-        onGpxSaved(warning);
-    }
-
-    private void onGpxSaved(Exception warning) {
-        if (mapActivity == null) {
-            return;
-        }
-        if (progressDialog != null && progressDialog.isShowing()) {
-            progressDialog.dismiss();
-        }
-        mapActivity.refreshMap();
-        if (warning == null) {
-            if (editingCtx.isNewData() && savedGpxFile != null) {
-                QuadRect rect = savedGpxFile.getRect();
-                GPXUtilities.TrkSegment segment = savedGpxFile.getNonEmptyTrkSegment();
-                GpxData gpxData = new GpxData(savedGpxFile, rect, GpxData.ActionType.EDIT_SEGMENT, segment);
-                editingCtx.setGpxData(gpxData);
-                measurementToolFragment.updateToolbar();
-            }
-            if (measurementToolFragment.isInEditMode()) {
-                editingCtx.setChangesSaved();
-                measurementToolFragment.dismiss(mapActivity);
-            } else {
-                switch (finalSaveAction) {
-                    case SHOW_SNACK_BAR_AND_CLOSE:
-                        final WeakReference<MapActivity> mapActivityRef = new WeakReference<>(mapActivity);
-                        Snackbar snackbar = Snackbar.make(mapActivity.getLayout(),
-                                MessageFormat.format(measurementToolFragment.getString(R.string.gpx_saved_sucessfully), outFile.getName()),
-                                Snackbar.LENGTH_LONG)
-                                .setAction(R.string.shared_string_undo, new View.OnClickListener() {
-                                    @Override
-                                    public void onClick(View view) {
-                                        MapActivity mapActivity = mapActivityRef.get();
-                                        if (mapActivity != null) {
-                                            if (outFile != null) {
-                                                OsmandApplication app = mapActivity.getMyApplication();
-                                                FileUtils.removeGpxFile(app, outFile);
-                                                if (backupFile != null) {
-                                                    FileUtils.renameGpxFile(app, backupFile, outFile);
-                                                    GPXUtilities.GPXFile gpx = GPXUtilities.loadGPXFile(outFile);
-                                                    measurementToolFragment.setupGpxData(gpx);
-                                                    if (showOnMap) {
-                                                        showGpxOnMap(app, gpx, false);
-                                                    }
-                                                } else {
-                                                    measurementToolFragment.setupGpxData(null);
-                                                }
-                                            }
-                                            measurementToolFragment.setMode(UNDO_MODE, true);
-                                            MeasurementToolFragment.showInstance(mapActivity.getSupportFragmentManager()
-                                            );
-                                        }
-                                    }
-                                })
-                                .addCallback(new Snackbar.Callback() {
-                                    @Override
-                                    public void onDismissed(Snackbar transientBottomBar, int event) {
-                                        if (event != DISMISS_EVENT_ACTION) {
-                                            editingCtx.setChangesSaved();
-                                        }
-                                        super.onDismissed(transientBottomBar, event);
-                                    }
-                                });
-                        snackbar.getView().<TextView>findViewById(com.google.android.material.R.id.snackbar_action)
-                                .setAllCaps(false);
-                        UiUtilities.setupSnackbar(snackbar, nightMode);
-                        snackbar.show();
-                        measurementToolFragment.dismiss(mapActivity);
-                        break;
-                    case SHOW_IS_SAVED_FRAGMENT:
-                        editingCtx.setChangesSaved();
-                        SavedTrackBottomSheetDialogFragment.showInstance(mapActivity.getSupportFragmentManager(),
-                                outFile.getAbsolutePath());
-                        measurementToolFragment.dismiss(mapActivity);
-                        break;
-                    case SHOW_TOAST:
-                        editingCtx.setChangesSaved();
-                        if (!savedGpxFile.showCurrentTrack) {
-                            Toast.makeText(mapActivity,
-                                    MessageFormat.format(measurementToolFragment.getString(R.string.gpx_saved_sucessfully), outFile.getAbsolutePath()),
-                                    Toast.LENGTH_LONG).show();
-                        }
-                }
-            }
-        } else {
-            Toast.makeText(mapActivity, warning.getMessage(), Toast.LENGTH_LONG).show();
-        }
-    }
-}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SaveGpxRouteAsyncTask.java b/OsmAnd/src/net/osmand/plus/measurementtool/SaveGpxRouteAsyncTask.java
new file mode 100644
index 0000000000..ddae8ed26d
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SaveGpxRouteAsyncTask.java
@@ -0,0 +1,210 @@
+package net.osmand.plus.measurementtool;
+
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.os.AsyncTask;
+
+import net.osmand.AndroidUtils;
+import net.osmand.FileUtils;
+import net.osmand.GPXUtilities;
+import net.osmand.GPXUtilities.GPXFile;
+import net.osmand.GPXUtilities.Track;
+import net.osmand.GPXUtilities.TrkSegment;
+import net.osmand.GPXUtilities.WptPt;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.Version;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.plus.measurementtool.GpxData.ActionType;
+import net.osmand.plus.measurementtool.MeasurementToolFragment.SaveType;
+import net.osmand.util.Algorithms;
+
+import java.io.File;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.List;
+
+import static net.osmand.IndexConstants.GPX_FILE_EXT;
+
+class SaveGpxRouteAsyncTask extends AsyncTask<Void, Void, Exception> {
+
+    private WeakReference<MeasurementToolFragment> fragmentRef;
+    private ProgressDialog progressDialog;
+
+    private SaveType saveType;
+    private ActionType actionType;
+
+    private File outFile;
+    private File backupFile;
+    private GPXFile gpxFile;
+    private GPXFile savedGpxFile;
+    private boolean showOnMap;
+
+    private SaveGpxRouteListener saveGpxRouteListener;
+
+
+    public SaveGpxRouteAsyncTask(MeasurementToolFragment fragment, File outFile, GPXFile gpxFile,
+                                 ActionType actionType, SaveType saveType, boolean showOnMap, SaveGpxRouteListener saveGpxRouteListener) {
+        fragmentRef = new WeakReference<>(fragment);
+        this.outFile = outFile;
+        this.showOnMap = showOnMap;
+        this.gpxFile = gpxFile;
+        this.actionType = actionType;
+        this.saveType = saveType;
+        this.saveGpxRouteListener = saveGpxRouteListener;
+    }
+
+    @Override
+    protected void onPreExecute() {
+        MeasurementToolFragment fragment = fragmentRef.get();
+        if (fragment != null && fragment.getContext() != null) {
+            fragment.cancelModes();
+
+            Context ctx = fragment.getContext();
+            progressDialog = new ProgressDialog(ctx);
+            progressDialog.setMessage(ctx.getString(R.string.saving_gpx_tracks));
+            progressDialog.show();
+        }
+    }
+
+    @Override
+    protected Exception doInBackground(Void... voids) {
+        MeasurementToolFragment fragment = fragmentRef.get();
+        if (fragment == null || fragment.getActivity() == null) {
+            return null;
+        }
+        MapActivity mapActivity = (MapActivity) fragment.getActivity();
+        OsmandApplication app = mapActivity.getMyApplication();
+        MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
+        MeasurementEditingContext editingCtx = fragment.getEditingCtx();
+
+        List<WptPt> points = editingCtx.getPoints();
+        TrkSegment before = editingCtx.getBeforeTrkSegmentLine();
+        TrkSegment after = editingCtx.getAfterTrkSegmentLine();
+        if (gpxFile == null) {
+            String fileName = outFile.getName();
+            String trackName = fileName.substring(0, fileName.length() - GPX_FILE_EXT.length());
+            GPXFile gpx = new GPXFile(Version.getFullVersion(app));
+            if (measurementLayer != null) {
+                if (saveType == MeasurementToolFragment.SaveType.LINE) {
+                    TrkSegment segment = new TrkSegment();
+                    if (editingCtx.hasRoute()) {
+                        segment.points.addAll(editingCtx.getRoutePoints());
+                    } else {
+                        segment.points.addAll(before.points);
+                        segment.points.addAll(after.points);
+                    }
+                    Track track = new Track();
+                    track.name = trackName;
+                    track.segments.add(segment);
+                    gpx.tracks.add(track);
+                } else if (saveType == MeasurementToolFragment.SaveType.ROUTE_POINT) {
+                    if (editingCtx.hasRoute()) {
+                        GPXFile newGpx = editingCtx.exportRouteAsGpx(trackName);
+                        if (newGpx != null) {
+                            gpx = newGpx;
+                        }
+                    }
+                    gpx.addRoutePoints(points);
+                }
+            }
+            Exception res = GPXUtilities.writeGpxFile(outFile, gpx);
+            gpx.path = outFile.getAbsolutePath();
+            savedGpxFile = gpx;
+            if (showOnMap) {
+                MeasurementToolFragment.showGpxOnMap(app, gpx, actionType, true);
+            }
+            return res;
+        } else {
+            GPXFile gpx = gpxFile;
+            backupFile = FileUtils.backupFile(app, outFile);
+            String trackName = Algorithms.getFileNameWithoutExtension(outFile);
+            if (measurementLayer != null) {
+                if (fragment.isPlanRouteMode()) {
+                    if (saveType == MeasurementToolFragment.SaveType.LINE) {
+                        TrkSegment segment = new TrkSegment();
+                        if (editingCtx.hasRoute()) {
+                            segment.points.addAll(editingCtx.getRoutePoints());
+                        } else {
+                            segment.points.addAll(before.points);
+                            segment.points.addAll(after.points);
+                        }
+                        Track track = new Track();
+                        track.name = trackName;
+                        track.segments.add(segment);
+                        gpx.tracks.add(track);
+                    } else if (saveType == MeasurementToolFragment.SaveType.ROUTE_POINT) {
+                        if (editingCtx.hasRoute()) {
+                            GPXFile newGpx = editingCtx.exportRouteAsGpx(trackName);
+                            if (newGpx != null) {
+                                gpx = newGpx;
+                            }
+                        }
+                        gpx.addRoutePoints(points);
+                    }
+                } else if (actionType != null) {
+                    GpxData gpxData = editingCtx.getGpxData();
+                    switch (actionType) {
+                        case ADD_SEGMENT: {
+                            List<WptPt> snappedPoints = new ArrayList<>();
+                            snappedPoints.addAll(before.points);
+                            snappedPoints.addAll(after.points);
+                            gpx.addTrkSegment(snappedPoints);
+                            break;
+                        }
+                        case ADD_ROUTE_POINTS: {
+                            gpx.replaceRoutePoints(points);
+                            break;
+                        }
+                        case EDIT_SEGMENT: {
+                            if (gpxData != null) {
+                                TrkSegment segment = new TrkSegment();
+                                segment.points.addAll(points);
+                                gpx.replaceSegment(gpxData.getTrkSegment(), segment);
+                            }
+                            break;
+                        }
+                        case OVERWRITE_SEGMENT: {
+                            if (gpxData != null) {
+                                List<WptPt> snappedPoints = new ArrayList<>();
+                                snappedPoints.addAll(before.points);
+                                snappedPoints.addAll(after.points);
+                                TrkSegment segment = new TrkSegment();
+                                segment.points.addAll(snappedPoints);
+                                gpx.replaceSegment(gpxData.getTrkSegment(), segment);
+                            }
+                            break;
+                        }
+                    }
+                } else {
+                    gpx.addRoutePoints(points);
+                }
+            }
+            Exception res = null;
+            if (!gpx.showCurrentTrack) {
+                res = GPXUtilities.writeGpxFile(outFile, gpx);
+            }
+            savedGpxFile = gpx;
+            if (showOnMap) {
+                MeasurementToolFragment.showGpxOnMap(app, gpx, actionType, false);
+            }
+            return res;
+        }
+    }
+
+    @Override
+    protected void onPostExecute(Exception warning) {
+        MeasurementToolFragment fragment = fragmentRef.get();
+        if (fragment != null && progressDialog != null && AndroidUtils.isActivityNotDestroyed(fragment.getActivity())) {
+            progressDialog.dismiss();
+        }
+        if (saveGpxRouteListener != null) {
+            saveGpxRouteListener.gpxSavingFinished(warning, savedGpxFile, backupFile);
+        }
+    }
+
+    public interface SaveGpxRouteListener {
+
+        void gpxSavingFinished(Exception warning, GPXFile savedGpxFile, File backupFile);
+    }
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SelectFileBottomSheet.java b/OsmAnd/src/net/osmand/plus/measurementtool/SelectFileBottomSheet.java
index 24d3ec8282..c155ec493c 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SelectFileBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SelectFileBottomSheet.java
@@ -25,6 +25,7 @@ import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
 import net.osmand.plus.helpers.GpxTrackAdapter;
 import net.osmand.plus.helpers.GpxTrackAdapter.OnItemClickListener;
 import net.osmand.plus.helpers.GpxUiHelper.GPXInfo;
+import net.osmand.plus.helpers.enums.TracksSortByMode;
 import net.osmand.plus.mapcontextmenu.other.HorizontalSelectionAdapter;
 import net.osmand.plus.mapcontextmenu.other.HorizontalSelectionAdapter.HorizontalSelectionAdapterListener;
 
@@ -38,7 +39,6 @@ import java.util.Map;
 
 import static net.osmand.plus.SimplePopUpMenuItemAdapter.*;
 import static net.osmand.plus.helpers.GpxUiHelper.getSortedGPXFilesInfo;
-import static net.osmand.plus.settings.backend.OsmandSettings.*;
 import static net.osmand.util.Algorithms.collectDirs;
 
 public class SelectFileBottomSheet extends BottomSheetBehaviourDialogFragment {
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java
index eeaa98ff8c..901348a6d3 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java
@@ -13,7 +13,8 @@ import androidx.preference.Preference;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.settings.backend.OsmAndAppCustomization;
 import net.osmand.plus.OsmandPlugin;
-import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.backend.CommonPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.helpers.FontCache;
@@ -288,11 +289,11 @@ public class MonitoringSettingsFragment extends BaseSettingsFragment
 	@Override
 	public void onApplyPreferenceChange(String prefId, boolean applyToAllProfiles, Object newValue) {
 		if (SAVE_GLOBAL_TRACK_INTERVAL.equals(prefId)) {
-			OsmandSettings.OsmandPreference pref = settings.getPreference(prefId);
+			OsmandPreference pref = settings.getPreference(prefId);
 			if (newValue instanceof Boolean) {
 				applyPreference(settings.SAVE_GLOBAL_TRACK_REMEMBER.getId(), applyToAllProfiles, false);
-			} else if (pref instanceof OsmandSettings.CommonPreference
-					&& !((OsmandSettings.CommonPreference) pref).hasDefaultValueForMode(getSelectedAppMode())) {
+			} else if (pref instanceof CommonPreference
+					&& !((CommonPreference) pref).hasDefaultValueForMode(getSelectedAppMode())) {
 				applyPreference(SAVE_GLOBAL_TRACK_INTERVAL, applyToAllProfiles, newValue);
 				applyPreference(settings.SAVE_GLOBAL_TRACK_REMEMBER.getId(), applyToAllProfiles, true);
 			}
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
index fae190ea01..31cb5375fe 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
@@ -84,7 +84,7 @@ import net.osmand.plus.mapmarkers.CoordinateInputDialogFragment;
 import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
 import net.osmand.plus.osmedit.OsmEditingPlugin;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.TracksSortByMode;
+import net.osmand.plus.helpers.enums.TracksSortByMode;
 
 import java.io.File;
 import java.text.DateFormat;
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackActivityFragmentAdapter.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackActivityFragmentAdapter.java
index 3d9e065a5e..4451354fc8 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackActivityFragmentAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackActivityFragmentAdapter.java
@@ -50,14 +50,14 @@ import net.osmand.plus.GpxSelectionHelper.GpxDisplayItemType;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.settings.backend.CommonPreference;
+import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.TrackActivity;
 import net.osmand.plus.dialogs.GpxAppearanceAdapter;
 import net.osmand.plus.measurementtool.GpxData;
 import net.osmand.plus.myplaces.TrackBitmapDrawer.TrackBitmapDrawerListener;
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
 import net.osmand.plus.track.GpxSplitType;
 import net.osmand.plus.track.SplitTrackAsyncTask;
 import net.osmand.plus.track.SplitTrackAsyncTask.SplitTrackListener;
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
index f1b33b8f79..5030530f88 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
@@ -25,6 +25,12 @@ import net.osmand.osm.PoiType;
 import net.osmand.osm.edit.Entity;
 import net.osmand.plus.*;
 import net.osmand.plus.ContextMenuAdapter.ItemClickListener;
+import net.osmand.plus.ContextMenuItem;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.settings.backend.OsmandPreference;
+import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.R;
 import net.osmand.plus.activities.EnumAdapter;
 import net.osmand.plus.activities.EnumAdapter.IEnumWithResource;
 import net.osmand.plus.activities.MapActivity;
@@ -342,7 +348,7 @@ public class OsmEditingPlugin extends OsmandPlugin {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
 						if (itemId == R.string.layer_osm_bugs) {
-							OsmandSettings.OsmandPreference<Boolean> showOsmBugs = settings.SHOW_OSM_BUGS;
+							OsmandPreference<Boolean> showOsmBugs = settings.SHOW_OSM_BUGS;
 							showOsmBugs.set(isChecked);
 							adapter.getItem(pos).setColorRes(showOsmBugs.get() ?
 									R.color.osmand_orange : ContextMenuItem.INVALID_ID);
@@ -365,7 +371,7 @@ public class OsmEditingPlugin extends OsmandPlugin {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
 						if (itemId == R.string.layer_osm_edits) {
-							OsmandSettings.OsmandPreference<Boolean> showOsmEdits = settings.SHOW_OSM_EDITS;
+							OsmandPreference<Boolean> showOsmEdits = settings.SHOW_OSM_EDITS;
 							showOsmEdits.set(isChecked);
 							adapter.getItem(pos).setColorRes(showOsmEdits.get() ? R.color.osmand_orange : ContextMenuItem.INVALID_ID);
 							adapter.notifyDataSetChanged();
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmNotesMenu.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmNotesMenu.java
index 80fa80a7f0..3c7c387a36 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OsmNotesMenu.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmNotesMenu.java
@@ -14,8 +14,8 @@ import net.osmand.plus.DialogListItemAdapter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
+import net.osmand.plus.settings.backend.CommonPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 
diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
index 038f9c9830..d131721376 100644
--- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
@@ -7,7 +7,6 @@ import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.text.format.DateFormat;
-import android.text.format.Time;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
@@ -27,6 +26,8 @@ import net.osmand.plus.ContextMenuItem;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
@@ -34,20 +35,15 @@ import net.osmand.plus.dashboard.tools.DashFragmentData;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
 import net.osmand.plus.quickaction.QuickActionType;
 import net.osmand.plus.settings.backend.ApplicationMode;
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
 import net.osmand.plus.views.AnimateDraggingMapThread;
 import net.osmand.plus.views.layers.MapInfoLayer;
 import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.mapwidgets.widgets.TextInfoWidget;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.List;
-import java.util.Locale;
 
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MARK_AS_PARKING_LOC;
 
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/actions/DayNightModeAction.java b/OsmAnd/src/net/osmand/plus/quickaction/actions/DayNightModeAction.java
index 0be5c0f715..8314341371 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/actions/DayNightModeAction.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/actions/DayNightModeAction.java
@@ -6,8 +6,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.DayNightMode;
+import net.osmand.plus.helpers.enums.DayNightMode;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.quickaction.QuickAction;
@@ -27,9 +26,9 @@ public class DayNightModeAction extends QuickAction {
 	@Override
 	public void execute(MapActivity activity) {
 		if (activity.getMyApplication().getDaynightHelper().isNightMode()) {
-			activity.getMyApplication().getSettings().DAYNIGHT_MODE.set(OsmandSettings.DayNightMode.DAY);
+			activity.getMyApplication().getSettings().DAYNIGHT_MODE.set(DayNightMode.DAY);
 		} else {
-			activity.getMyApplication().getSettings().DAYNIGHT_MODE.set(OsmandSettings.DayNightMode.NIGHT);
+			activity.getMyApplication().getSettings().DAYNIGHT_MODE.set(DayNightMode.NIGHT);
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/LayerTransparencySeekbarMode.java b/OsmAnd/src/net/osmand/plus/rastermaps/LayerTransparencySeekbarMode.java
new file mode 100644
index 0000000000..1fd8b2f91d
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/rastermaps/LayerTransparencySeekbarMode.java
@@ -0,0 +1,22 @@
+package net.osmand.plus.rastermaps;
+
+import android.content.Context;
+
+import net.osmand.plus.R;
+
+public enum LayerTransparencySeekbarMode {
+	OVERLAY(R.string.overlay_transparency),
+	UNDERLAY(R.string.map_transparency),
+	OFF(R.string.shared_string_off),
+	UNDEFINED(R.string.shared_string_none);
+
+	private final int key;
+
+	LayerTransparencySeekbarMode(int key) {
+		this.key = key;
+	}
+
+	public String toHumanString(Context ctx) {
+		return ctx.getString(key);
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/MapOverlayAction.java b/OsmAnd/src/net/osmand/plus/rastermaps/MapOverlayAction.java
index 575196f8a2..7972b264aa 100644
--- a/OsmAnd/src/net/osmand/plus/rastermaps/MapOverlayAction.java
+++ b/OsmAnd/src/net/osmand/plus/rastermaps/MapOverlayAction.java
@@ -16,7 +16,6 @@ import com.google.gson.reflect.TypeToken;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.LayerTransparencySeekbarMode;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
@@ -137,7 +136,7 @@ public class MapOverlayAction extends SwitchableAction<Pair<String, String>> {
 				if (settings.LAYER_TRANSPARENCY_SEEKBAR_MODE.get() == LayerTransparencySeekbarMode.UNDEFINED) {
 					settings.LAYER_TRANSPARENCY_SEEKBAR_MODE.set(LayerTransparencySeekbarMode.OVERLAY);
 				}
-				if (settings.LAYER_TRANSPARENCY_SEEKBAR_MODE.get() == OsmandSettings.LayerTransparencySeekbarMode.OVERLAY) {
+				if (settings.LAYER_TRANSPARENCY_SEEKBAR_MODE.get() == LayerTransparencySeekbarMode.OVERLAY) {
 					activity.getMapLayers().getMapControlsLayer().showTransparencyBar(settings.MAP_OVERLAY_TRANSPARENCY, true);
 				}
 			} else {
diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/MapUnderlayAction.java b/OsmAnd/src/net/osmand/plus/rastermaps/MapUnderlayAction.java
index 12f6f909cf..ca79cb4895 100644
--- a/OsmAnd/src/net/osmand/plus/rastermaps/MapUnderlayAction.java
+++ b/OsmAnd/src/net/osmand/plus/rastermaps/MapUnderlayAction.java
@@ -15,8 +15,8 @@ import com.google.gson.reflect.TypeToken;
 
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.LayerTransparencySeekbarMode;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
@@ -144,7 +144,7 @@ public class MapUnderlayAction extends SwitchableAction<Pair<String, String>> {
 
 
 			}
-			final OsmandSettings.CommonPreference<Boolean> hidePolygonsPref =
+			final CommonPreference<Boolean> hidePolygonsPref =
 					activity.getMyApplication().getSettings().getCustomRenderBooleanProperty("noPolygons");
 			hidePolygonsPref.set(hasUnderlay);
 
diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
index da7a7882d3..942a34cbf1 100644
--- a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
@@ -29,6 +29,8 @@ import net.osmand.plus.ContextMenuItem;
 import net.osmand.plus.DialogListItemAdapter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
 import net.osmand.plus.activities.DownloadTilesDialog;
@@ -38,9 +40,6 @@ import net.osmand.plus.activities.MapActivityLayers;
 import net.osmand.plus.dashboard.DashboardOnMap.DashboardType;
 import net.osmand.plus.dialogs.RasterMapMenu;
 import net.osmand.plus.quickaction.QuickActionType;
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
-import net.osmand.plus.settings.backend.OsmandSettings.LayerTransparencySeekbarMode;
 import net.osmand.plus.views.MapTileLayer;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.util.Algorithms;
@@ -559,10 +558,10 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
 		}
 		MapActivityLayers mapLayers = mapActivity.getMapLayers();
 		ITileSource map = layer.getMap();
-		final OsmandSettings.LayerTransparencySeekbarMode currentMapTypeSeekbarMode = type ==
+		final LayerTransparencySeekbarMode currentMapTypeSeekbarMode = type ==
 			OsmandRasterMapsPlugin.RasterMapType.OVERLAY
-			? OsmandSettings.LayerTransparencySeekbarMode.OVERLAY
-			: OsmandSettings.LayerTransparencySeekbarMode.UNDERLAY;
+			? LayerTransparencySeekbarMode.OVERLAY
+			: LayerTransparencySeekbarMode.UNDERLAY;
 		if (map != null) {
 			mapTypePreference.set(null);
 			if (callback != null) {
diff --git a/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java b/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java
index 1f2750cff5..8bc8d1b51a 100644
--- a/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java
+++ b/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java
@@ -43,7 +43,7 @@ import net.osmand.plus.settings.backend.OsmAndAppCustomization.OsmAndAppCustomiz
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.development.OsmandDevelopmentPlugin;
 import net.osmand.plus.render.OsmandRenderer.RenderingContext;
diff --git a/OsmAnd/src/net/osmand/plus/resources/RegionAddressRepositoryBinary.java b/OsmAnd/src/net/osmand/plus/resources/RegionAddressRepositoryBinary.java
index 6da4f7ecab..702028d851 100644
--- a/OsmAnd/src/net/osmand/plus/resources/RegionAddressRepositoryBinary.java
+++ b/OsmAnd/src/net/osmand/plus/resources/RegionAddressRepositoryBinary.java
@@ -18,7 +18,7 @@ import net.osmand.data.MapObject;
 import net.osmand.data.QuadRect;
 import net.osmand.data.QuadTree;
 import net.osmand.data.Street;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.resources.ResourceManager.BinaryMapReaderResource;
 import net.osmand.plus.resources.ResourceManager.BinaryMapReaderResourceType;
 import net.osmand.util.MapUtils;
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/AvoidRoadsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/AvoidRoadsBottomSheetDialogFragment.java
index 9d7a8f3ab1..78773b5171 100644
--- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/AvoidRoadsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/AvoidRoadsBottomSheetDialogFragment.java
@@ -20,7 +20,7 @@ import androidx.fragment.app.Fragment;
 import net.osmand.AndroidUtils;
 import net.osmand.data.LatLon;
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
@@ -292,7 +292,7 @@ public class AvoidRoadsBottomSheetDialogFragment extends MenuBottomSheetDialogFr
 			GeneralRouter.RoutingParameter parameter = routingOptionsHelper.getRoutingPrefsForAppModeById(app.getRoutingHelper().getAppMode(), parameterId);
 			if (parameter != null) {
 				boolean checked = entry.getValue();
-				OsmandSettings.CommonPreference<Boolean> preference = app.getSettings().getCustomRoutingBooleanProperty(parameter.getId(), parameter.getDefaultBoolean());
+				CommonPreference<Boolean> preference = app.getSettings().getCustomRoutingBooleanProperty(parameter.getId(), parameter.getDefaultBoolean());
 				preference.setModeValue(app.getRoutingHelper().getAppMode(), checked);
 			}
 		}
@@ -318,7 +318,7 @@ public class AvoidRoadsBottomSheetDialogFragment extends MenuBottomSheetDialogFr
 		List<GeneralRouter.RoutingParameter> avoidParameters = routingOptionsHelper.getAvoidRoutingPrefsForAppMode(app.getRoutingHelper().getAppMode());
 
 		for (GeneralRouter.RoutingParameter parameter : avoidParameters) {
-			OsmandSettings.CommonPreference<Boolean> preference = app.getSettings().getCustomRoutingBooleanProperty(parameter.getId(), parameter.getDefaultBoolean());
+			CommonPreference<Boolean> preference = app.getSettings().getCustomRoutingBooleanProperty(parameter.getId(), parameter.getDefaultBoolean());
 			res.put(parameter.getId(), preference.getModeValue(app.getRoutingHelper().getAppMode()));
 		}
 
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
index 69bed394cc..927a085c8c 100644
--- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
@@ -54,6 +54,9 @@ import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.OsmAndLocationProvider;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.backend.CommonPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.TargetPointsHelper.TargetPoint;
@@ -102,9 +105,6 @@ import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.routing.TransportRoutingHelper;
 import net.osmand.plus.search.QuickSearchHelper;
 import net.osmand.plus.settings.backend.ApplicationMode;
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
 import net.osmand.plus.widgets.TextViewExProgress;
 import net.osmand.router.GeneralRouter;
 import net.osmand.router.GeneralRouter.RoutingParameter;
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java
index c2681b2f7b..f9f8f5ce7b 100644
--- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java
@@ -27,6 +27,9 @@ import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuItem;
 import net.osmand.plus.DialogListItemAdapter;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.settings.backend.CommonPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
+import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.TargetPointsHelper.TargetPoint;
@@ -192,7 +195,7 @@ public class RoutingOptionsHelper {
 	public void applyVoiceProvider(MapActivity mapActivity, String provider, boolean applyAllModes) {
 		OsmandApplication app = mapActivity.getMyApplication();
 		ApplicationMode selectedAppMode = app.getRoutingHelper().getAppMode();
-		OsmandSettings.OsmandPreference<String> VP = app.getSettings().VOICE_PROVIDER;
+		OsmandPreference<String> VP = app.getSettings().VOICE_PROVIDER;
 		if (applyAllModes) {
 			for (ApplicationMode mode : ApplicationMode.allPossibleValues()) {
 				VP.setModeValue(mode, provider);
@@ -668,7 +671,7 @@ public class RoutingOptionsHelper {
 		}
 
 		public boolean isSelected(OsmandSettings settings) {
-			final OsmandSettings.CommonPreference<Boolean> property =
+			final CommonPreference<Boolean> property =
 					settings.getCustomRoutingBooleanProperty(routingParameter.getId(), routingParameter.getDefaultBoolean());
 			if (am != null) {
 				return property.getModeValue(am);
@@ -678,7 +681,7 @@ public class RoutingOptionsHelper {
 		}
 
 		public void setSelected(OsmandSettings settings, boolean isChecked) {
-			final OsmandSettings.CommonPreference<Boolean> property =
+			final CommonPreference<Boolean> property =
 					settings.getCustomRoutingBooleanProperty(routingParameter.getId(), routingParameter.getDefaultBoolean());
 			if (am != null) {
 				property.setModeValue(am, isChecked);
diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
index eb7765e9af..a21b8898e6 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
@@ -22,19 +22,18 @@ import net.osmand.data.LocationPoint;
 import net.osmand.data.WptLocationPoint;
 import net.osmand.osm.io.NetworkUtils;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.TargetPointsHelper.TargetPoint;
 import net.osmand.plus.Version;
 import net.osmand.plus.render.NativeOsmandLibrary;
 import net.osmand.plus.settings.backend.ApplicationMode;
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
 import net.osmand.router.GeneralRouter;
 import net.osmand.router.GeneralRouter.RoutingParameter;
 import net.osmand.router.GeneralRouter.RoutingParameterType;
 import net.osmand.router.PrecalculatedRouteDirection;
-import net.osmand.router.RouteCalculationProgress;
 import net.osmand.router.RouteExporter;
 import net.osmand.router.RouteImporter;
 import net.osmand.router.RoutePlannerFrontEnd;
diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
index 4fd5b1dd65..e92c8c0504 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
@@ -21,6 +21,7 @@ import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.TargetPointsHelper.TargetPoint;
+import net.osmand.plus.helpers.enums.MetricsConstants;
 import net.osmand.plus.notifications.OsmandNotification.NotificationType;
 import net.osmand.plus.routing.RouteCalculationResult.NextDirectionInfo;
 import net.osmand.plus.routing.RouteProvider.GPXRouteParamsBuilder;
@@ -408,8 +409,8 @@ public class RoutingHelper {
 		} else if (mode.getRouteService() == RouteService.DIRECT_TO) {
 			return -1.0f;
 		} else if (mode.getRouteService() == RouteService.STRAIGHT) {
-			OsmandSettings.MetricsConstants mc = settings.METRIC_SYSTEM.getModeValue(mode);
-			if (mc == OsmandSettings.MetricsConstants.KILOMETERS_AND_METERS || mc == OsmandSettings.MetricsConstants.MILES_AND_METERS) {
+			MetricsConstants mc = settings.METRIC_SYSTEM.getModeValue(mode);
+			if (mc == MetricsConstants.KILOMETERS_AND_METERS || mc == MetricsConstants.MILES_AND_METERS) {
 				return 500.f;
 			} else {
 				// 1/4 mile
diff --git a/OsmAnd/src/net/osmand/plus/routing/TransportRoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/TransportRoutingHelper.java
index b883a56bd1..4fa70f4c9f 100644
--- a/OsmAnd/src/net/osmand/plus/routing/TransportRoutingHelper.java
+++ b/OsmAnd/src/net/osmand/plus/routing/TransportRoutingHelper.java
@@ -16,6 +16,7 @@ import net.osmand.osm.edit.Node;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.render.NativeOsmandLibrary;
@@ -478,7 +479,7 @@ public class TransportRoutingHelper {
 				GeneralRouter.RoutingParameter pr = e.getValue();
 				String vl;
 				if(pr.getType() == GeneralRouter.RoutingParameterType.BOOLEAN) {
-					OsmandSettings.CommonPreference<Boolean> pref = settings.getCustomRoutingBooleanProperty(key, pr.getDefaultBoolean());
+					CommonPreference<Boolean> pref = settings.getCustomRoutingBooleanProperty(key, pr.getDefaultBoolean());
 					Boolean bool = pref.getModeValue(params.mode);
 					vl = bool ? "true" : null;
 				} else {
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/BooleanAccessibilityPreference.java b/OsmAnd/src/net/osmand/plus/settings/backend/BooleanAccessibilityPreference.java
new file mode 100644
index 0000000000..145a566b77
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/BooleanAccessibilityPreference.java
@@ -0,0 +1,28 @@
+package net.osmand.plus.settings.backend;
+
+class BooleanAccessibilityPreference extends BooleanPreference {
+
+	BooleanAccessibilityPreference(OsmandSettings osmandSettings, String id, boolean defaultValue) {
+		super(osmandSettings, id, defaultValue);
+	}
+
+	@Override
+	public Boolean get() {
+		return getContext().accessibilityEnabled() ? super.get() : getDefaultValue();
+	}
+
+	@Override
+	public Boolean getModeValue(ApplicationMode mode) {
+		return getContext().accessibilityEnabledForMode(mode) ? super.getModeValue(mode) : getDefaultValue();
+	}
+
+	@Override
+	public boolean set(Boolean obj) {
+		return getContext().accessibilityEnabled() && super.set(obj);
+	}
+
+	@Override
+	public boolean setModeValue(ApplicationMode mode, Boolean obj) {
+		return getContext().accessibilityEnabledForMode(mode) && super.setModeValue(mode, obj);
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/BooleanPreference.java b/OsmAnd/src/net/osmand/plus/settings/backend/BooleanPreference.java
new file mode 100644
index 0000000000..9ff4d3069d
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/BooleanPreference.java
@@ -0,0 +1,23 @@
+package net.osmand.plus.settings.backend;
+
+public class BooleanPreference extends CommonPreference<Boolean> {
+
+	BooleanPreference(OsmandSettings settings, String id, boolean defaultValue) {
+		super(settings, id, defaultValue);
+	}
+
+	@Override
+	protected Boolean getValue(Object prefs, Boolean defaultValue) {
+		return getSettingsAPI().getBoolean(prefs, getId(), defaultValue);
+	}
+
+	@Override
+	protected boolean setValue(Object prefs, Boolean val) {
+		return getSettingsAPI().edit(prefs).putBoolean(getId(), val).commit();
+	}
+
+	@Override
+	public Boolean parseString(String s) {
+		return Boolean.parseBoolean(s);
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/BooleanStringPreference.java b/OsmAnd/src/net/osmand/plus/settings/backend/BooleanStringPreference.java
new file mode 100644
index 0000000000..1928fa60a7
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/BooleanStringPreference.java
@@ -0,0 +1,25 @@
+package net.osmand.plus.settings.backend;
+
+public class BooleanStringPreference extends BooleanPreference {
+
+	public BooleanStringPreference(OsmandSettings osmandSettings, String id, boolean defaultValue) {
+		super(osmandSettings, id, defaultValue);
+	}
+
+	@Override
+	protected Boolean getValue(Object prefs, Boolean defaultValue) {
+		Boolean value;
+		try {
+			value = parseString(getSettingsAPI().getString(prefs, getId(), defaultValue.toString()));
+		} catch (ClassCastException e) {
+			value = getSettingsAPI().getBoolean(prefs, getId(), defaultValue);
+			setValue(prefs, value);
+		}
+		return value;
+	}
+
+	@Override
+	protected boolean setValue(Object prefs, Boolean val) {
+		return getSettingsAPI().edit(prefs).putString(getId(), val != null ? val.toString() : null).commit();
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/CommonPreference.java b/OsmAnd/src/net/osmand/plus/settings/backend/CommonPreference.java
new file mode 100644
index 0000000000..62ce3a2450
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/CommonPreference.java
@@ -0,0 +1,249 @@
+package net.osmand.plus.settings.backend;
+
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.api.SettingsAPI;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public abstract class CommonPreference<T> extends PreferenceWithListener<T> {
+
+	private OsmandSettings settings;
+	private Object cachedPreference;
+
+	private final String id;
+
+	private T cachedValue;
+	private T defaultValue;
+	private Map<ApplicationMode, T> defaultValues;
+
+	private boolean cache;
+	private boolean global;
+
+
+	public CommonPreference(OsmandSettings settings, String id, T defaultValue) {
+		this.settings = settings;
+		this.id = id;
+		this.defaultValue = defaultValue;
+		settings.registerInternalPreference(id, this);
+	}
+
+	// Methods to possibly override
+	protected abstract T getValue(Object prefs, T defaultValue);
+
+	protected abstract boolean setValue(Object prefs, T val);
+
+	public abstract T parseString(String s);
+
+	protected String toString(T o) {
+		return o == null ? null : o.toString();
+	}
+
+	protected SettingsAPI getSettingsAPI() {
+		return settings.getSettingsAPI();
+	}
+
+	protected ApplicationMode getApplicationMode() {
+		return settings.getApplicationMode();
+	}
+
+	protected OsmandApplication getContext() {
+		return settings.getContext();
+	}
+
+	// common methods
+
+	public final CommonPreference<T> makeGlobal() {
+		global = true;
+		return this;
+	}
+
+	public final CommonPreference<T> cache() {
+		cache = true;
+		return this;
+	}
+
+	public final CommonPreference<T> makeProfile() {
+		global = false;
+		return this;
+	}
+
+	protected final Object getPreferences() {
+		return settings.getPreferences(global);
+
+	}
+
+	public final void setModeDefaultValue(ApplicationMode mode, T defValue) {
+		if (defaultValues == null) {
+			defaultValues = new LinkedHashMap<ApplicationMode, T>();
+		}
+		defaultValues.put(mode, defValue);
+	}
+
+	// TODO final
+	@Override
+	public boolean setModeValue(ApplicationMode mode, T obj) {
+		if (global) {
+			return set(obj);
+		}
+
+		Object profilePrefs = settings.getProfilePreferences(mode);
+		boolean valueSaved = setValue(profilePrefs, obj);
+		if (valueSaved && cache && cachedPreference == profilePrefs) {
+			cachedValue = obj;
+		}
+		fireEvent(obj);
+
+		return valueSaved;
+	}
+
+	// TODO final
+	public T getProfileDefaultValue(ApplicationMode mode) {
+		if (global) {
+			return defaultValue;
+		}
+		if (defaultValues != null && defaultValues.containsKey(mode)) {
+			return defaultValues.get(mode);
+		}
+		ApplicationMode pt = mode.getParent();
+		if (pt != null) {
+			return getProfileDefaultValue(pt);
+		}
+		return defaultValue;
+	}
+
+	public final boolean hasDefaultValues() {
+		return defaultValues != null && !defaultValues.isEmpty();
+	}
+
+	public final boolean hasDefaultValueForMode(ApplicationMode mode) {
+		return defaultValues != null && defaultValues.containsKey(mode);
+	}
+
+	// TODO final
+	protected T getDefaultValue() {
+		return getProfileDefaultValue(settings.APPLICATION_MODE.get());
+	}
+
+	@Override
+	public final void overrideDefaultValue(T newDefaultValue) {
+		this.defaultValue = newDefaultValue;
+	}
+
+	// TODO final
+	@Override
+	public T getModeValue(ApplicationMode mode) {
+		if (global) {
+			return get();
+		}
+		T defaultV = getProfileDefaultValue(mode);
+		return getValue(settings.getProfilePreferences(mode), defaultV);
+	}
+
+	// TODO final
+	@Override
+	public T get() {
+		if (cache && cachedValue != null && cachedPreference == getPreferences()) {
+			return cachedValue;
+		}
+		cachedPreference = getPreferences();
+		cachedValue = getValue(cachedPreference, getProfileDefaultValue(settings.APPLICATION_MODE.get()));
+		return cachedValue;
+	}
+
+	@Override
+	public final String getId() {
+		return id;
+	}
+
+	@Override
+	public final void resetToDefault() {
+		T o = getProfileDefaultValue(settings.APPLICATION_MODE.get());
+		set(o);
+	}
+
+	@Override
+	public final void resetModeToDefault(ApplicationMode mode) {
+		if (global) {
+			resetToDefault();
+		} else {
+			T o = getProfileDefaultValue(mode);
+			setModeValue(mode, o);
+		}
+	}
+
+	// TODO final
+	@Override
+	public boolean set(T obj) {
+		Object prefs = getPreferences();
+		if (setValue(prefs, obj)) {
+			cachedValue = obj;
+			cachedPreference = prefs;
+			fireEvent(obj);
+			return true;
+		}
+		return false;
+	}
+
+	public final boolean isSet() {
+		return settings.isSet(global, getId());
+	}
+
+	public boolean isSetForMode(ApplicationMode mode) {
+		return settings.isSet(mode, getId());
+	}
+
+	public final boolean isGlobal() {
+		return global;
+	}
+
+	// TODO final
+	@Override
+	public boolean writeToJson(JSONObject json, ApplicationMode appMode) throws JSONException {
+		if (appMode != null) {
+			if (!global) {
+				String value = asStringModeValue(appMode);
+				if (value != null) {
+					json.put(getId(), value);
+				}
+				return true;
+			}
+		} else if (global) {
+			String value = asString();
+			if (value != null) {
+				json.put(getId(), value);
+			}
+			return true;
+		}
+		return false;
+	}
+
+	// TODO final
+	@Override
+	public void readFromJson(JSONObject json, ApplicationMode appMode) throws JSONException {
+		if (appMode != null) {
+			if (!global) {
+				String modeValue = json.getString(getId());
+				setModeValue(appMode, parseString(modeValue));
+			}
+		} else if (global) {
+			String globalValue = json.getString(getId());
+			set(parseString(globalValue));
+		}
+	}
+
+	@Override
+	public final String asString() {
+		T o = get();
+		return toString(o);
+	}
+
+	@Override
+	public final String asStringModeValue(ApplicationMode m) {
+		T v = getModeValue(m);
+		return toString(v);
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/ContextMenuItemsPreference.java b/OsmAnd/src/net/osmand/plus/settings/backend/ContextMenuItemsPreference.java
new file mode 100644
index 0000000000..12a83ea229
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/ContextMenuItemsPreference.java
@@ -0,0 +1,46 @@
+package net.osmand.plus.settings.backend;
+
+import androidx.annotation.NonNull;
+
+public class ContextMenuItemsPreference extends CommonPreference<ContextMenuItemsSettings> {
+	@NonNull
+	private String idScheme;
+
+	ContextMenuItemsPreference(OsmandSettings settings, String id, @NonNull String idScheme, @NonNull ContextMenuItemsSettings defValue) {
+		super(settings, id, defValue);
+		this.idScheme = idScheme;
+	}
+
+	@Override
+	protected ContextMenuItemsSettings getValue(Object prefs, ContextMenuItemsSettings defaultValue) {
+		String s = getSettingsAPI().getString(prefs, getId(), "");
+		return readValue(s);
+	}
+
+	@Override
+	protected boolean setValue(Object prefs, ContextMenuItemsSettings val) {
+		return getSettingsAPI().edit(prefs).putString(getId(), val.writeToJsonString(idScheme)).commit();
+	}
+
+
+	@Override
+	protected String toString(ContextMenuItemsSettings o) {
+		return o.writeToJsonString(idScheme);
+	}
+
+	@Override
+	public ContextMenuItemsSettings parseString(String s) {
+		return readValue(s);
+	}
+
+	private ContextMenuItemsSettings readValue(String s) {
+		ContextMenuItemsSettings value = getDefaultValue().newInstance();
+		value.readFromJsonString(s, idScheme);
+		return value;
+	}
+
+	@NonNull
+	public String getIdScheme() {
+		return idScheme;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/ContextMenuItemsSettings.java b/OsmAnd/src/net/osmand/plus/settings/backend/ContextMenuItemsSettings.java
new file mode 100644
index 0000000000..2c51f2607d
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/ContextMenuItemsSettings.java
@@ -0,0 +1,102 @@
+package net.osmand.plus.settings.backend;
+
+import androidx.annotation.NonNull;
+
+import net.osmand.PlatformUtil;
+import net.osmand.util.Algorithms;
+
+import org.apache.commons.logging.Log;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class ContextMenuItemsSettings implements Serializable {
+
+	private static final Log LOG = PlatformUtil.getLog(ContextMenuItemsSettings.class.getName());
+
+	private static final String HIDDEN = "hidden";
+	private static final String ORDER = "order";
+
+	private List<String> hiddenIds = new ArrayList<>();
+	private List<String> orderIds = new ArrayList<>();
+
+	public ContextMenuItemsSettings() {
+
+	}
+
+	public ContextMenuItemsSettings(@NonNull List<String> hiddenIds, @NonNull List<String> orderIds) {
+		this.hiddenIds = hiddenIds;
+		this.orderIds = orderIds;
+	}
+
+	public ContextMenuItemsSettings newInstance() {
+		return new ContextMenuItemsSettings();
+	}
+
+	public void readFromJsonString(String jsonString, @NonNull String idScheme) {
+		if (Algorithms.isEmpty(jsonString)) {
+			return;
+		}
+		try {
+			JSONObject json = new JSONObject(jsonString);
+			readFromJson(json, idScheme);
+		} catch (JSONException e) {
+			LOG.error("Error converting to json string: " + e);
+		}
+	}
+
+	public void readFromJson(JSONObject json, String idScheme) {
+		hiddenIds = readIdsList(json.optJSONArray(HIDDEN), idScheme);
+		orderIds = readIdsList(json.optJSONArray(ORDER), idScheme);
+	}
+
+	protected List<String> readIdsList(JSONArray jsonArray, @NonNull String idScheme) {
+		List<String> list = new ArrayList<>();
+		if (jsonArray != null) {
+			for (int i = 0; i < jsonArray.length(); i++) {
+				String id = jsonArray.optString(i);
+				list.add(idScheme + id);
+			}
+		}
+		return list;
+	}
+
+	public String writeToJsonString(@NonNull String idScheme) {
+		try {
+			JSONObject json = new JSONObject();
+			writeToJson(json, idScheme);
+			return json.toString();
+		} catch (JSONException e) {
+			LOG.error("Error converting to json string: " + e);
+		}
+		return "";
+	}
+
+	public void writeToJson(JSONObject json, String idScheme) throws JSONException {
+		json.put(HIDDEN, getJsonArray(hiddenIds, idScheme));
+		json.put(ORDER, getJsonArray(orderIds, idScheme));
+	}
+
+	protected JSONArray getJsonArray(List<String> ids, @NonNull String idScheme) {
+		JSONArray jsonArray = new JSONArray();
+		if (ids != null && !ids.isEmpty()) {
+			for (String id : ids) {
+				jsonArray.put(id.replace(idScheme, ""));
+			}
+		}
+		return jsonArray;
+	}
+
+	public List<String> getHiddenIds() {
+		return Collections.unmodifiableList(hiddenIds);
+	}
+
+	public List<String> getOrderIds() {
+		return Collections.unmodifiableList(orderIds);
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/EnumStringPreference.java b/OsmAnd/src/net/osmand/plus/settings/backend/EnumStringPreference.java
new file mode 100644
index 0000000000..d51deca152
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/EnumStringPreference.java
@@ -0,0 +1,47 @@
+package net.osmand.plus.settings.backend;
+
+public class EnumStringPreference<E extends Enum<E>> extends CommonPreference<E> {
+
+	private final E[] values;
+
+	EnumStringPreference(OsmandSettings settings, String id, E defaultValue, E[] values) {
+		super(settings, id, defaultValue);
+		this.values = values;
+	}
+
+	@Override
+	protected E getValue(Object prefs, E defaultValue) {
+		try {
+			String name = getSettingsAPI().getString(prefs, getId(), defaultValue.name());
+			E value = parseString(name);
+			return value != null ? value : defaultValue;
+		} catch (ClassCastException ex) {
+			setValue(prefs, defaultValue);
+		}
+		return defaultValue;
+	}
+
+	@Override
+	public boolean setValue(Object prefs, E val) {
+		return getSettingsAPI().edit(prefs).putString(getId(), val.name()).commit();
+	}
+
+	@Override
+	protected String toString(E o) {
+		return o.name();
+	}
+
+	@Override
+	public E parseString(String s) {
+		for (E value : values) {
+			if (value.name().equals(s)) {
+				return value;
+			}
+		}
+		return null;
+	}
+
+	public E[] getValues() {
+		return values;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/FloatPreference.java b/OsmAnd/src/net/osmand/plus/settings/backend/FloatPreference.java
new file mode 100644
index 0000000000..d9a98f7a01
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/FloatPreference.java
@@ -0,0 +1,23 @@
+package net.osmand.plus.settings.backend;
+
+public class FloatPreference extends CommonPreference<Float> {
+
+	FloatPreference(OsmandSettings settings, String id, float defaultValue) {
+		super(settings, id, defaultValue);
+	}
+
+	@Override
+	protected Float getValue(Object prefs, Float defaultValue) {
+		return getSettingsAPI().getFloat(prefs, getId(), defaultValue);
+	}
+
+	@Override
+	protected boolean setValue(Object prefs, Float val) {
+		return getSettingsAPI().edit(prefs).putFloat(getId(), val).commit();
+	}
+
+	@Override
+	public Float parseString(String s) {
+		return Float.parseFloat(s);
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/ImpassableRoadsStorage.java b/OsmAnd/src/net/osmand/plus/settings/backend/ImpassableRoadsStorage.java
new file mode 100644
index 0000000000..80242478e5
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/ImpassableRoadsStorage.java
@@ -0,0 +1,193 @@
+package net.osmand.plus.settings.backend;
+
+import net.osmand.data.LatLon;
+import net.osmand.data.PointDescription;
+import net.osmand.plus.helpers.AvoidSpecificRoads.AvoidRoadInfo;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+
+class ImpassableRoadsStorage extends SettingsMapPointsStorage {
+
+	protected String roadsIdsKey;
+	protected String appModeKey;
+
+	public ImpassableRoadsStorage(OsmandSettings osmandSettings) {
+		super(osmandSettings);
+		pointsKey = OsmandSettings.IMPASSABLE_ROAD_POINTS;
+		descriptionsKey = OsmandSettings.IMPASSABLE_ROADS_DESCRIPTIONS;
+		roadsIdsKey = OsmandSettings.IMPASSABLE_ROADS_IDS;
+		appModeKey = OsmandSettings.IMPASSABLE_ROADS_APP_MODE_KEYS;
+	}
+
+	public List<Long> getRoadIds(int size) {
+		List<Long> list = new ArrayList<>();
+		String roadIds = getSettingsAPI().getString(getOsmandSettings().getGlobalPreferences(), roadsIdsKey, "");
+		if (roadIds.trim().length() > 0) {
+			StringTokenizer tok = new StringTokenizer(roadIds, ",");
+			while (tok.hasMoreTokens() && list.size() <= size) {
+				list.add(Long.parseLong(tok.nextToken()));
+			}
+		}
+		while (list.size() < size) {
+			list.add(0L);
+		}
+		return list;
+	}
+
+	public List<String> getAppModeKeys(int size) {
+		List<String> list = new ArrayList<>();
+		String roadIds = getSettingsAPI().getString(getOsmandSettings().getGlobalPreferences(), appModeKey, "");
+		if (roadIds.trim().length() > 0) {
+			StringTokenizer tok = new StringTokenizer(roadIds, ",");
+			while (tok.hasMoreTokens() && list.size() <= size) {
+				list.add(tok.nextToken());
+			}
+		}
+		while (list.size() < size) {
+			list.add("");
+		}
+		return list;
+	}
+
+	public List<AvoidRoadInfo> getImpassableRoadsInfo() {
+		List<LatLon> points = getPoints();
+		List<Long> roadIds = getRoadIds(points.size());
+		List<String> appModeKeys = getAppModeKeys(points.size());
+		List<String> descriptions = getPointDescriptions(points.size());
+
+		List<AvoidRoadInfo> avoidRoadsInfo = new ArrayList<>();
+
+		for (int i = 0; i < points.size(); i++) {
+			LatLon latLon = points.get(i);
+			PointDescription description = PointDescription.deserializeFromString(descriptions.get(i), null);
+
+			AvoidRoadInfo avoidRoadInfo = new AvoidRoadInfo();
+			avoidRoadInfo.id = roadIds.get(i);
+			avoidRoadInfo.latitude = latLon.getLatitude();
+			avoidRoadInfo.longitude = latLon.getLongitude();
+			avoidRoadInfo.name = description.getName();
+			avoidRoadInfo.appModeKey = appModeKeys.get(i);
+			avoidRoadsInfo.add(avoidRoadInfo);
+		}
+
+		return avoidRoadsInfo;
+	}
+
+	public boolean addImpassableRoadInfo(AvoidRoadInfo avoidRoadInfo) {
+		List<LatLon> points = getPoints();
+		List<Long> roadIds = getRoadIds(points.size());
+		List<String> appModeKeys = getAppModeKeys(points.size());
+		List<String> descriptions = getPointDescriptions(points.size());
+
+		roadIds.add(0, avoidRoadInfo.id);
+		points.add(0, new LatLon(avoidRoadInfo.latitude, avoidRoadInfo.longitude));
+		appModeKeys.add(0, avoidRoadInfo.appModeKey);
+		descriptions.add(0, PointDescription.serializeToString(new PointDescription("", avoidRoadInfo.name)));
+
+		return saveAvoidRoadData(points, descriptions, roadIds, appModeKeys);
+	}
+
+	public boolean updateImpassableRoadInfo(AvoidRoadInfo avoidRoadInfo) {
+		List<LatLon> points = getPoints();
+
+		int index = points.indexOf(new LatLon(avoidRoadInfo.latitude, avoidRoadInfo.longitude));
+		if (index != -1) {
+			List<Long> roadIds = getRoadIds(points.size());
+			List<String> appModeKeys = getAppModeKeys(points.size());
+			List<String> descriptions = getPointDescriptions(points.size());
+
+			roadIds.set(index, avoidRoadInfo.id);
+			appModeKeys.set(index, avoidRoadInfo.appModeKey);
+			descriptions.set(index, PointDescription.serializeToString(new PointDescription("", avoidRoadInfo.name)));
+			return saveAvoidRoadData(points, descriptions, roadIds, appModeKeys);
+		}
+		return false;
+	}
+
+	@Override
+	public boolean deletePoint(int index) {
+		List<LatLon> points = getPoints();
+		List<Long> roadIds = getRoadIds(points.size());
+		List<String> appModeKeys = getAppModeKeys(points.size());
+		List<String> descriptions = getPointDescriptions(points.size());
+
+		if (index < points.size()) {
+			points.remove(index);
+			roadIds.remove(index);
+			appModeKeys.remove(index);
+			descriptions.remove(index);
+			return saveAvoidRoadData(points, descriptions, roadIds, appModeKeys);
+		}
+		return false;
+	}
+
+	@Override
+	public boolean deletePoint(LatLon latLon) {
+		List<LatLon> points = getPoints();
+		List<Long> roadIds = getRoadIds(points.size());
+		List<String> appModeKeys = getAppModeKeys(points.size());
+		List<String> descriptions = getPointDescriptions(points.size());
+
+		int index = points.indexOf(latLon);
+		if (index != -1) {
+			points.remove(index);
+			roadIds.remove(index);
+			appModeKeys.remove(index);
+			descriptions.remove(index);
+			return saveAvoidRoadData(points, descriptions, roadIds, appModeKeys);
+		}
+		return false;
+	}
+
+	@Override
+	public boolean movePoint(LatLon latLonEx, LatLon latLonNew) {
+		List<LatLon> points = getPoints();
+		List<Long> roadIds = getRoadIds(points.size());
+		List<String> appModeKeys = getAppModeKeys(points.size());
+		List<String> descriptions = getPointDescriptions(points.size());
+
+		int i = points.indexOf(latLonEx);
+		if (i != -1) {
+			points.set(i, latLonNew);
+			return saveAvoidRoadData(points, descriptions, roadIds, appModeKeys);
+		} else {
+			return false;
+		}
+	}
+
+	public boolean saveAvoidRoadData(List<LatLon> points, List<String> descriptions,
+									 List<Long> roadIds, List<String> appModeKeys) {
+		return savePoints(points, descriptions) && saveRoadIds(roadIds) && saveAppModeKeys(appModeKeys);
+	}
+
+	public boolean saveRoadIds(List<Long> roadIds) {
+		StringBuilder stringBuilder = new StringBuilder();
+		Iterator<Long> iterator = roadIds.iterator();
+		while (iterator.hasNext()) {
+			stringBuilder.append(iterator.next());
+			if (iterator.hasNext()) {
+				stringBuilder.append(",");
+			}
+		}
+		return getSettingsAPI().edit(getOsmandSettings().getGlobalPreferences())
+				.putString(roadsIdsKey, stringBuilder.toString())
+				.commit();
+	}
+
+	public boolean saveAppModeKeys(List<String> appModeKeys) {
+		StringBuilder stringBuilder = new StringBuilder();
+		Iterator<String> iterator = appModeKeys.iterator();
+		while (iterator.hasNext()) {
+			stringBuilder.append(iterator.next());
+			if (iterator.hasNext()) {
+				stringBuilder.append(",");
+			}
+		}
+		return getSettingsAPI().edit(getOsmandSettings().getGlobalPreferences())
+				.putString(appModeKey, stringBuilder.toString())
+				.commit();
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/IntPreference.java b/OsmAnd/src/net/osmand/plus/settings/backend/IntPreference.java
new file mode 100644
index 0000000000..327a97e4da
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/IntPreference.java
@@ -0,0 +1,23 @@
+package net.osmand.plus.settings.backend;
+
+public class IntPreference extends CommonPreference<Integer> {
+
+	IntPreference(OsmandSettings settings, String id, int defaultValue) {
+		super(settings, id, defaultValue);
+	}
+
+	@Override
+	protected Integer getValue(Object prefs, Integer defaultValue) {
+		return getSettingsAPI().getInt(prefs, getId(), defaultValue);
+	}
+
+	@Override
+	protected boolean setValue(Object prefs, Integer val) {
+		return getSettingsAPI().edit(prefs).putInt(getId(), val).commit();
+	}
+
+	@Override
+	public Integer parseString(String s) {
+		return Integer.parseInt(s);
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/IntermediatePointsStorage.java b/OsmAnd/src/net/osmand/plus/settings/backend/IntermediatePointsStorage.java
new file mode 100644
index 0000000000..e9dda9b8ea
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/IntermediatePointsStorage.java
@@ -0,0 +1,21 @@
+package net.osmand.plus.settings.backend;
+
+import net.osmand.data.LatLon;
+
+import java.util.List;
+
+class IntermediatePointsStorage extends SettingsMapPointsStorage {
+
+	public IntermediatePointsStorage(OsmandSettings osmandSettings) {
+		super(osmandSettings);
+		pointsKey = OsmandSettings.INTERMEDIATE_POINTS;
+		descriptionsKey = OsmandSettings.INTERMEDIATE_POINTS_DESCRIPTION;
+	}
+
+	@Override
+	public boolean savePoints(List<LatLon> ps, List<String> ds) {
+		boolean res = super.savePoints(ps, ds);
+		getOsmandSettings().backupTargetPoints();
+		return res;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/ListStringPreference.java b/OsmAnd/src/net/osmand/plus/settings/backend/ListStringPreference.java
new file mode 100644
index 0000000000..98f702746c
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/ListStringPreference.java
@@ -0,0 +1,123 @@
+package net.osmand.plus.settings.backend;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class ListStringPreference extends StringPreference {
+
+	private String delimiter;
+
+	ListStringPreference(OsmandSettings osmandSettings, String id, String defaultValue, String delimiter) {
+		super(osmandSettings, id, defaultValue);
+		this.delimiter = delimiter;
+	}
+
+	public boolean addValue(String res) {
+		return addModeValue(getApplicationMode(), res);
+	}
+
+	public boolean addModeValue(ApplicationMode appMode, String res) {
+		String vl = getModeValue(appMode);
+		if (vl == null || vl.isEmpty()) {
+			vl = res + delimiter;
+		} else {
+			vl = vl + res + delimiter;
+		}
+		setModeValue(appMode, vl);
+		return true;
+	}
+
+	public void clearAll() {
+		clearAllForProfile(getApplicationMode());
+	}
+
+	public void clearAllForProfile(ApplicationMode appMode) {
+		setModeValue(appMode, "");
+	}
+
+	public boolean containsValue(String res) {
+		return containsValue(getApplicationMode(), res);
+	}
+
+	public boolean containsValue(ApplicationMode appMode, String res) {
+		String vl = getModeValue(appMode);
+		String r = res + delimiter;
+		return vl.startsWith(r) || vl.contains(delimiter + r);
+	}
+
+	public boolean removeValue(String res) {
+		return removeValueForProfile(getApplicationMode(), res);
+	}
+
+	public boolean removeValueForProfile(ApplicationMode appMode, String res) {
+		String vl = getModeValue(appMode);
+		String r = res + delimiter;
+		if (vl != null) {
+			if (vl.startsWith(r)) {
+				vl = vl.substring(r.length());
+			} else {
+				int it = vl.indexOf(delimiter + r);
+				if (it >= 0) {
+					vl = vl.substring(0, it + delimiter.length()) + vl.substring(it + delimiter.length() + r.length());
+				}
+			}
+			setModeValue(appMode, vl);
+			return true;
+		}
+		return false;
+	}
+
+	public List<String> getStringsList() {
+		return getStringsListForProfile(getApplicationMode());
+	}
+
+	public List<String> getStringsListForProfile(ApplicationMode appMode) {
+		final String listAsString = getModeValue(appMode);
+		if (listAsString != null) {
+			if (listAsString.contains(delimiter)) {
+				return Arrays.asList(listAsString.split(delimiter));
+			} else {
+				return new ArrayList<String>() {
+					{
+						add(listAsString);
+					}
+				};
+			}
+		}
+		return null;
+	}
+
+	public void setStringsList(List<String> values) {
+		setStringsListForProfile(getApplicationMode(), values);
+	}
+
+	public void setStringsListForProfile(ApplicationMode appMode, List<String> values) {
+		if (values == null || values.size() == 0) {
+			setModeValue(appMode, null);
+			return;
+		}
+		clearAllForProfile(appMode);
+		for (String value : values) {
+			addModeValue(appMode, value);
+		}
+	}
+
+	public boolean setModeValues(ApplicationMode mode, List<String> values) {
+		if (values == null || values.size() == 0) {
+			setModeValue(mode, null);
+			return false;
+		}
+		clearAll();
+		String vl = get();
+		for (String value : values) {
+			addValue(value);
+			if (vl == null || vl.isEmpty()) {
+				vl = value + delimiter;
+			} else {
+				vl = vl + value + delimiter;
+			}
+		}
+		return setModeValue(mode, vl);
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/LongPreference.java b/OsmAnd/src/net/osmand/plus/settings/backend/LongPreference.java
new file mode 100644
index 0000000000..521e0ad942
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/LongPreference.java
@@ -0,0 +1,23 @@
+package net.osmand.plus.settings.backend;
+
+public class LongPreference extends CommonPreference<Long> {
+
+	LongPreference(OsmandSettings settings, String id, long defaultValue) {
+		super(settings, id, defaultValue);
+	}
+
+	@Override
+	protected Long getValue(Object prefs, Long defaultValue) {
+		return getSettingsAPI().getLong(prefs, getId(), defaultValue);
+	}
+
+	@Override
+	protected boolean setValue(Object prefs, Long val) {
+		return getSettingsAPI().edit(prefs).putLong(getId(), val).commit();
+	}
+
+	@Override
+	public Long parseString(String s) {
+		return Long.parseLong(s);
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/MainContextMenuItemsSettings.java b/OsmAnd/src/net/osmand/plus/settings/backend/MainContextMenuItemsSettings.java
new file mode 100644
index 0000000000..ddabb46508
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/MainContextMenuItemsSettings.java
@@ -0,0 +1,47 @@
+package net.osmand.plus.settings.backend;
+
+import androidx.annotation.NonNull;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class MainContextMenuItemsSettings extends ContextMenuItemsSettings {
+
+	private static final String MAIN = "main";
+
+	private List<String> mainIds = new ArrayList<>();
+
+	public MainContextMenuItemsSettings() {
+
+	}
+
+	public MainContextMenuItemsSettings(@NonNull List<String> mainIds, @NonNull List<String> hiddenIds, @NonNull List<String> orderIds) {
+		super(hiddenIds, orderIds);
+		this.mainIds = mainIds;
+	}
+
+	@Override
+	public ContextMenuItemsSettings newInstance() {
+		return new MainContextMenuItemsSettings();
+	}
+
+	@Override
+	public void readFromJson(JSONObject json, String idScheme) {
+		super.readFromJson(json, idScheme);
+		mainIds = readIdsList(json.optJSONArray(MAIN), idScheme);
+	}
+
+	@Override
+	public void writeToJson(JSONObject json, String idScheme) throws JSONException {
+		super.writeToJson(json, idScheme);
+		json.put(MAIN, getJsonArray(mainIds, idScheme));
+	}
+
+	public List<String> getMainIds() {
+		return Collections.unmodifiableList(mainIds);
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/OsmAndPreferencesDataStore.java b/OsmAnd/src/net/osmand/plus/settings/backend/OsmAndPreferencesDataStore.java
new file mode 100644
index 0000000000..6e493ad34f
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/OsmAndPreferencesDataStore.java
@@ -0,0 +1,126 @@
+package net.osmand.plus.settings.backend;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.PreferenceDataStore;
+
+import java.util.Set;
+
+public class OsmAndPreferencesDataStore extends PreferenceDataStore {
+
+	private OsmandSettings osmandSettings;
+	private ApplicationMode appMode;
+
+	public OsmAndPreferencesDataStore(OsmandSettings settings, @NonNull ApplicationMode appMode) {
+		this.osmandSettings = settings;
+		this.appMode = appMode;
+	}
+
+	@Override
+	public void putString(String key, @Nullable String value) {
+		osmandSettings.setPreference(key, value, appMode);
+	}
+
+	@Override
+	public void putStringSet(String key, @Nullable Set<String> values) {
+		osmandSettings.setPreference(key, values, appMode);
+	}
+
+	@Override
+	public void putInt(String key, int value) {
+		osmandSettings.setPreference(key, value, appMode);
+	}
+
+	@Override
+	public void putLong(String key, long value) {
+		osmandSettings.setPreference(key, value, appMode);
+	}
+
+	@Override
+	public void putFloat(String key, float value) {
+		osmandSettings.setPreference(key, value, appMode);
+	}
+
+	@Override
+	public void putBoolean(String key, boolean value) {
+		if (osmandSettings.DISABLE_COMPLEX_ROUTING.getId().equals(key)) {
+			osmandSettings.setPreference(key, !value, appMode);
+		} else {
+			osmandSettings.setPreference(key, value, appMode);
+		}
+	}
+
+	public void putValue(String key, Object value) {
+		osmandSettings.setPreference(key, value, appMode);
+	}
+
+	@Nullable
+	@Override
+	public String getString(String key, @Nullable String defValue) {
+		OsmandPreference<?> preference = osmandSettings.getPreference(key);
+		if (preference instanceof StringPreference) {
+			return ((StringPreference) preference).getModeValue(appMode);
+		} else {
+			Object value = preference.getModeValue(appMode);
+			if (value != null) {
+				return value.toString();
+			}
+		}
+		return defValue;
+	}
+
+	@Nullable
+	@Override
+	public Set<String> getStringSet(String key, @Nullable Set<String> defValues) {
+		return super.getStringSet(key, defValues);
+	}
+
+	@Override
+	public int getInt(String key, int defValue) {
+		OsmandPreference<?> preference = osmandSettings.getPreference(key);
+		if (preference instanceof IntPreference) {
+			return ((IntPreference) preference).getModeValue(appMode);
+		}
+		return defValue;
+	}
+
+	@Override
+	public long getLong(String key, long defValue) {
+		OsmandPreference<?> preference = osmandSettings.getPreference(key);
+		if (preference instanceof LongPreference) {
+			return ((LongPreference) preference).getModeValue(appMode);
+		}
+		return defValue;
+	}
+
+	@Override
+	public float getFloat(String key, float defValue) {
+		OsmandPreference<?> preference = osmandSettings.getPreference(key);
+		if (preference instanceof FloatPreference) {
+			return ((FloatPreference) preference).getModeValue(appMode);
+		}
+		return defValue;
+	}
+
+	@Override
+	public boolean getBoolean(String key, boolean defValue) {
+		OsmandPreference<?> preference = osmandSettings.getPreference(key);
+		if (preference instanceof BooleanPreference) {
+			BooleanPreference booleanPreference = (BooleanPreference) preference;
+			if (osmandSettings.DISABLE_COMPLEX_ROUTING.getId().equals(booleanPreference.getId())) {
+				return !booleanPreference.getModeValue(appMode);
+			}
+			return booleanPreference.getModeValue(appMode);
+		}
+		return defValue;
+	}
+
+	@Nullable
+	public Object getValue(String key, Object defValue) {
+		OsmandPreference<?> preference = osmandSettings.getPreference(key);
+		if (preference != null) {
+			return preference.getModeValue(appMode);
+		}
+		return defValue;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/OsmandPreference.java b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandPreference.java
new file mode 100644
index 0000000000..275d81129b
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandPreference.java
@@ -0,0 +1,42 @@
+package net.osmand.plus.settings.backend;
+
+import net.osmand.StateChangedListener;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public interface OsmandPreference<T> {
+	T get();
+
+	boolean set(T obj);
+
+	boolean setModeValue(ApplicationMode m, T obj);
+
+	T getModeValue(ApplicationMode m);
+
+	String getId();
+
+	void resetToDefault();
+
+	void resetModeToDefault(ApplicationMode m);
+
+	void overrideDefaultValue(T newDefaultValue);
+
+	void addListener(StateChangedListener<T> listener);
+
+	void removeListener(StateChangedListener<T> listener);
+
+	boolean isSet();
+
+	boolean isSetForMode(ApplicationMode m);
+
+	boolean writeToJson(JSONObject json, ApplicationMode appMode) throws JSONException;
+
+	void readFromJson(JSONObject json, ApplicationMode appMode) throws JSONException;
+
+	String asString();
+
+	String asStringModeValue(ApplicationMode m);
+
+	T parseString(String s);
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java
index 9635acaec0..1bb9d6e987 100644
--- a/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java
@@ -6,29 +6,19 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.hardware.Sensor;
-import android.hardware.SensorManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Build;
 import android.os.Environment;
 
-import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
 import androidx.core.util.Pair;
-import androidx.preference.PreferenceDataStore;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
 
+import net.osmand.FileUtils;
 import net.osmand.IndexConstants;
 import net.osmand.PlatformUtil;
-import net.osmand.StateChangedListener;
 import net.osmand.ValueHolder;
-import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.map.ITileSource;
@@ -36,7 +26,6 @@ import net.osmand.map.TileSourceManager;
 import net.osmand.map.TileSourceManager.TileSourceTemplate;
 import net.osmand.osm.MapPoiTypes;
 import net.osmand.osm.io.NetworkUtils;
-import net.osmand.plus.FavouritesDbHelper;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.SQLiteTileSource;
@@ -45,32 +34,39 @@ import net.osmand.plus.access.RelativeDirectionStyle;
 import net.osmand.plus.api.SettingsAPI;
 import net.osmand.plus.api.SettingsAPI.SettingsEditor;
 import net.osmand.plus.api.SettingsAPIImpl;
+import net.osmand.plus.audionotes.NotesSortByMode;
 import net.osmand.plus.dialogs.RateUsBottomSheetDialogFragment.RateUsState;
+import net.osmand.plus.helpers.enums.AngularConstants;
+import net.osmand.plus.helpers.enums.AutoZoomMap;
 import net.osmand.plus.helpers.AvoidSpecificRoads.AvoidRoadInfo;
+import net.osmand.plus.helpers.enums.DayNightMode;
+import net.osmand.plus.helpers.enums.DrivingRegion;
+import net.osmand.plus.helpers.enums.MetricsConstants;
 import net.osmand.plus.helpers.SearchHistoryHelper;
+import net.osmand.plus.helpers.enums.SpeedConstants;
+import net.osmand.plus.helpers.enums.TracksSortByMode;
 import net.osmand.plus.mapillary.MapillaryPlugin;
 import net.osmand.plus.mapmarkers.CoordinateInputFormats.Format;
+import net.osmand.plus.mapmarkers.MapMarkersMode;
 import net.osmand.plus.profiles.LocationIcon;
 import net.osmand.plus.profiles.NavigationIcon;
 import net.osmand.plus.profiles.ProfileIconColors;
+import net.osmand.plus.rastermaps.LayerTransparencySeekbarMode;
 import net.osmand.plus.render.RendererRegistry;
 import net.osmand.plus.routing.RouteProvider.RouteService;
-import net.osmand.plus.settings.backend.ApplicationMode.ApplicationModeBean;
-import net.osmand.plus.settings.backend.ApplicationMode.ApplicationModeBuilder;
+import net.osmand.plus.srtmplugin.TerrainMode;
+import net.osmand.plus.views.layers.RulerControlLayer.RulerMode;
 import net.osmand.plus.voice.CommandPlayer;
+import net.osmand.plus.wikipedia.WikiArticleShowImages;
 import net.osmand.render.RenderingRulesStorage;
 import net.osmand.util.Algorithms;
 
 import org.apache.commons.logging.Log;
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.Serializable;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -80,9 +76,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.StringTokenizer;
@@ -97,83 +91,6 @@ public class OsmandSettings {
 
 	public static final int VERSION = 1;
 
-	public interface OsmandPreference<T> {
-		T get();
-
-		boolean set(T obj);
-
-		boolean setModeValue(ApplicationMode m, T obj);
-
-		T getModeValue(ApplicationMode m);
-
-		String getId();
-
-		void resetToDefault();
-
-		void resetModeToDefault(ApplicationMode m);
-
-		void overrideDefaultValue(T newDefaultValue);
-
-		void addListener(StateChangedListener<T> listener);
-
-		void removeListener(StateChangedListener<T> listener);
-
-		boolean isSet();
-
-		boolean isSetForMode(ApplicationMode m);
-
-		boolean writeToJson(JSONObject json, ApplicationMode appMode) throws JSONException;
-
-		void readFromJson(JSONObject json, ApplicationMode appMode) throws JSONException;
-
-		String asString();
-
-		String asStringModeValue(ApplicationMode m);
-
-		T parseString(String s);
-	}
-
-	private abstract class PreferenceWithListener<T> implements OsmandPreference<T> {
-		private List<WeakReference<StateChangedListener<T>>> l = null;
-
-		@Override
-		public synchronized void addListener(StateChangedListener<T> listener) {
-			if (l == null) {
-				l = new LinkedList<WeakReference<StateChangedListener<T>>>();
-			}
-			if (!l.contains(new WeakReference<StateChangedListener<T>>(listener))) {
-				l.add(new WeakReference<StateChangedListener<T>>(listener));
-			}
-		}
-
-		public synchronized void fireEvent(T value) {
-			if (l != null) {
-				Iterator<WeakReference<StateChangedListener<T>>> it = l.iterator();
-				while (it.hasNext()) {
-					StateChangedListener<T> t = it.next().get();
-					if (t == null) {
-						it.remove();
-					} else {
-						t.stateChanged(value);
-					}
-				}
-			}
-		}
-
-		@Override
-		public synchronized void removeListener(StateChangedListener<T> listener) {
-			if (l != null) {
-				Iterator<WeakReference<StateChangedListener<T>>> it = l.iterator();
-				while (it.hasNext()) {
-					StateChangedListener<T> t = it.next().get();
-					if (t == listener) {
-						it.remove();
-					}
-				}
-			}
-		}
-	}
-
 	// These settings are stored in SharedPreferences
 	private static final String CUSTOM_SHARED_PREFERENCES_PREFIX = "net.osmand.customsettings.";
 	private static final String SHARED_PREFERENCES_NAME = "net.osmand.settings";
@@ -188,13 +105,24 @@ public class OsmandSettings {
 	private Object globalPreferences;
 	private Object profilePreferences;
 	private ApplicationMode currentMode;
-	private Map<String, OsmandPreference<?>> registeredPreferences =
-			new LinkedHashMap<String, OsmandSettings.OsmandPreference<?>>();
+	private Map<String, OsmandPreference<?>> registeredPreferences = new LinkedHashMap<>();
 
 	// cache variables
 	private long lastTimeInternetConnectionChecked = 0;
 	private boolean internetConnectionAvailable = true;
 
+	// TODO variable
+	private Map<String, CommonPreference<String>> customRoutingProps = new LinkedHashMap<String, CommonPreference<String>>();
+	private Map<String, CommonPreference<String>> customRendersProps = new LinkedHashMap<String, CommonPreference<String>>();
+	private Map<String, CommonPreference<Boolean>> customBooleanRoutingProps = new LinkedHashMap<String, CommonPreference<Boolean>>();
+	private Map<String, CommonPreference<Boolean>> customBooleanRendersProps = new LinkedHashMap<String, CommonPreference<Boolean>>();
+
+	private ImpassableRoadsStorage impassableRoadsStorage = new ImpassableRoadsStorage(this);
+	private IntermediatePointsStorage intermediatePointsStorage = new IntermediatePointsStorage(this);
+
+	private Object objectToShow;
+	private boolean editObjectToShow;
+	private String searchRequestToShow;
 
 	protected OsmandSettings(OsmandApplication clientContext, SettingsAPI settinsAPI) {
 		ctx = clientContext;
@@ -248,8 +176,8 @@ public class OsmandSettings {
 		return settingsAPI;
 	}
 
-	public PreferencesDataStore getDataStore(@Nullable ApplicationMode appMode) {
-		return new PreferencesDataStore(appMode != null ? appMode : APPLICATION_MODE.get());
+	public OsmAndPreferencesDataStore getDataStore(@Nullable ApplicationMode appMode) {
+		return new OsmAndPreferencesDataStore(this, appMode != null ? appMode : APPLICATION_MODE.get());
 	}
 
 	public static String getSharedPreferencesName(ApplicationMode mode) {
@@ -274,153 +202,33 @@ public class OsmandSettings {
 		return globalPreferences != null && globalPreferences.getBoolean(SETTING_CUSTOMIZED_ID, false);
 	}
 
-	public void migratePreferences() {
-		migrateEnumPreferences();
-		SharedPreferences globalSharedPreferences = (SharedPreferences) globalPreferences;
-		Map<String, ?> globalPrefsMap = globalSharedPreferences.getAll();
-		for (String key : globalPrefsMap.keySet()) {
-			OsmandPreference pref = getPreference(key);
-			if (pref instanceof CommonPreference) {
-				CommonPreference commonPreference = (CommonPreference) pref;
-				if (!commonPreference.global) {
-					for (ApplicationMode mode : ApplicationMode.allPossibleValues()) {
-						if (!commonPreference.isSetForMode(mode) && !commonPreference.hasDefaultValueForMode(mode)) {
-							setPreference(key, globalPrefsMap.get(key), mode);
-						}
-					}
-				}
-			}
-		}
-		SharedPreferences defaultProfilePreferences = (SharedPreferences) getProfilePreferences(ApplicationMode.DEFAULT);
-		Map<String, ?> defaultPrefsMap = defaultProfilePreferences.getAll();
-		for (String key : defaultPrefsMap.keySet()) {
-			OsmandPreference pref = getPreference(key);
-			if (pref instanceof CommonPreference) {
-				CommonPreference commonPreference = (CommonPreference) pref;
-				if (commonPreference.global && !commonPreference.isSet()) {
-					setPreference(key, defaultPrefsMap.get(key));
-				}
-			}
-		}
-		for (OsmandPreference pref : generalPrefs) {
-			if (pref instanceof CommonPreference) {
-				CommonPreference commonPref = (CommonPreference) pref;
-				Object defaultVal = commonPref.getModeValue(ApplicationMode.DEFAULT);
-				for (ApplicationMode mode : ApplicationMode.allPossibleValues()) {
-					if (!commonPref.isSetForMode(mode) && !commonPref.hasDefaultValueForMode(mode)) {
-						setPreference(commonPref.getId(), defaultVal, mode);
-					}
-				}
-			}
-		}
-
-		String json = settingsAPI.getString(globalPreferences, "custom_app_profiles", "");
-		if (!Algorithms.isEmpty(json)) {
-			Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
-			Type t = new TypeToken<ArrayList<ApplicationModeBean>>() {
-			}.getType();
-			List<ApplicationModeBean> customProfiles = gson.fromJson(json, t);
-			if (!Algorithms.isEmpty(customProfiles)) {
-				for (ApplicationModeBean modeBean : customProfiles) {
-					ApplicationModeBuilder builder = ApplicationMode.fromModeBean(ctx, modeBean);
-					ApplicationMode.saveProfile(builder, ctx);
-				}
-			}
-		}
-	}
-
-	public void migrateQuickActionStates() {
-		String quickActionsJson = settingsAPI.getString(globalPreferences, "quick_action_new", "");
-		if (!Algorithms.isEmpty(quickActionsJson)) {
-			Gson gson = new GsonBuilder().create();
-			Type type = new TypeToken<HashMap<String, Boolean>>() {
-			}.getType();
-			HashMap<String, Boolean> quickActions = gson.fromJson(quickActionsJson, type);
-			if (!Algorithms.isEmpty(quickActions)) {
-				for (ApplicationMode mode : ApplicationMode.allPossibleValues()) {
-					if (!QUICK_ACTION.isSetForMode(mode)) {
-						Boolean actionState = quickActions.get(mode.getStringKey());
-						if (actionState == null) {
-							actionState = QUICK_ACTION.getDefaultValue();
-						}
-						setPreference(QUICK_ACTION.getId(), actionState, mode);
-					}
-				}
-			}
-		}
-	}
-
-	public void migrateEnumPreferences() {
-		for (OsmandPreference pref : registeredPreferences.values()) {
-			if (pref instanceof EnumStringPreference) {
-				EnumStringPreference enumPref = (EnumStringPreference) pref;
-				if (enumPref.isGlobal()) {
-					migrateEnumPref(enumPref, (SharedPreferences) globalPreferences);
-				} else {
-					for (ApplicationMode mode : ApplicationMode.allPossibleValues()) {
-						migrateEnumPref(enumPref, (SharedPreferences) getProfilePreferences(mode));
-					}
-				}
-			}
-		}
-	}
-
-	private void migrateEnumPref(EnumStringPreference enumPref, SharedPreferences sharedPreferences) {
-		Object value = sharedPreferences.getAll().get(enumPref.getId());
-		if (value instanceof Integer) {
-			int enumIndex = (int) value;
-			if (enumIndex >= 0 && enumIndex < enumPref.values.length) {
-				Enum savedValue = enumPref.values[enumIndex];
-				enumPref.setValue(sharedPreferences, savedValue);
-			}
-		}
-	}
-
-	public void migrateHomeWorkParkingToFavorites() {
-		FavouritesDbHelper favorites = ctx.getFavorites();
-
-		LatLon homePoint = null;
-		float lat = settingsAPI.getFloat(globalPreferences, "home_point_lat", 0);
-		float lon = settingsAPI.getFloat(globalPreferences, "home_point_lon", 0);
-		if (lat != 0 || lon != 0) {
-			homePoint = new LatLon(lat, lon);
-		}
-		LatLon workPoint = null;
-		lat = settingsAPI.getFloat(globalPreferences, "work_point_lat", 0);
-		lon = settingsAPI.getFloat(globalPreferences, "work_point_lon", 0);
-		if (lat != 0 || lon != 0) {
-			workPoint = new LatLon(lat, lon);
-		}
-		if (homePoint != null) {
-			favorites.setSpecialPoint(homePoint, FavouritePoint.SpecialPointType.HOME, null);
-		}
-		if (workPoint != null) {
-			favorites.setSpecialPoint(workPoint, FavouritePoint.SpecialPointType.WORK, null);
-		}
-	}
-
+	// TODO doesn't look correct package visibility
 	public Object getProfilePreferences(ApplicationMode mode) {
 		return settingsAPI.getPreferenceObject(getSharedPreferencesName(mode));
 	}
 
-	public Object getProfilePreferences(String modeKey) {
+	// TODO doesn't look correct package visibility
+	Object getProfilePreferences(String modeKey) {
 		return settingsAPI.getPreferenceObject(getSharedPreferencesNameForKey(modeKey));
 	}
 
-	public OsmandPreference getPreference(String key) {
+	public OsmandPreference<?> getPreference(String key) {
 		return registeredPreferences.get(key);
 	}
 
+	// TODO doesn't look correct
 	public void setPreferenceForAllModes(String key, Object value) {
 		for (ApplicationMode mode : ApplicationMode.allPossibleValues()) {
 			setPreference(key, value, mode);
 		}
 	}
 
+	// TODO doesn't look correct
 	public boolean setPreference(String key, Object value) {
 		return setPreference(key, value, APPLICATION_MODE.get());
 	}
 
+	// TODO doesn't look correct
 	@SuppressWarnings("unchecked")
 	public boolean setPreference(String key, Object value, ApplicationMode mode) {
 		OsmandPreference<?> preference = registeredPreferences.get(key);
@@ -509,7 +317,7 @@ public class OsmandSettings {
 			} else if (preference instanceof EnumStringPreference) {
 				EnumStringPreference enumPref = (EnumStringPreference) preference;
 				if (value instanceof String) {
-					Enum enumValue = enumPref.parseString((String) value);
+					Enum<?> enumValue = enumPref.parseString((String) value);
 					if (enumValue != null) {
 						return enumPref.setModeValue(mode, enumValue);
 					}
@@ -518,8 +326,8 @@ public class OsmandSettings {
 					return enumPref.setModeValue(mode, value);
 				} else if (value instanceof Integer) {
 					int newVal = (Integer) value;
-					if (enumPref.values.length > newVal) {
-						Enum enumValue = enumPref.values[newVal];
+					if (enumPref.getValues().length > newVal) {
+						Enum<?> enumValue = enumPref.getValues()[newVal];
 						return enumPref.setModeValue(mode, enumValue);
 					}
 					return false;
@@ -566,7 +374,7 @@ public class OsmandSettings {
 	}
 
 	private boolean prefCanBeCopiedOrReset(OsmandPreference pref) {
-		return pref instanceof CommonPreference && !((CommonPreference) pref).global
+		return pref instanceof CommonPreference && !((CommonPreference) pref).isGlobal()
 				&& !APP_MODE_ORDER.getId().equals(pref.getId());
 	}
 
@@ -741,720 +549,99 @@ public class OsmandSettings {
 		}
 	}
 
-
-	/////////////// PREFERENCES classes ////////////////
-
-	public abstract class CommonPreference<T> extends PreferenceWithListener<T> {
-		private final String id;
-		private boolean global;
-		private T cachedValue;
-		private Object cachedPreference;
-		private boolean cache;
-		private Map<ApplicationMode, T> defaultValues;
-		private T defaultValue;
-
-
-		public CommonPreference(String id, T defaultValue) {
-			this.id = id;
-			this.defaultValue = defaultValue;
-			registeredPreferences.put(id, this);
-		}
-
-		// Methods to possibly override
-		protected abstract T getValue(Object prefs, T defaultValue);
-
-		protected abstract boolean setValue(Object prefs, T val);
-
-		public abstract T parseString(String s);
-
-		protected String toString(T o) {
-			return o == null ?  null : o.toString();
-		}
-
-
-		// common methods
-
-		public final CommonPreference<T> makeGlobal() {
-			global = true;
-			return this;
-		}
-
-		public final CommonPreference<T> cache() {
-			cache = true;
-			return this;
-		}
-
-		public final CommonPreference<T> makeProfile() {
-			global = false;
-			return this;
-		}
-
-		protected final Object getPreferences() {
-			return global ? globalPreferences : profilePreferences;
-		}
-
-		public final void setModeDefaultValue(ApplicationMode mode, T defValue) {
-			if (defaultValues == null) {
-				defaultValues = new LinkedHashMap<ApplicationMode, T>();
-			}
-			defaultValues.put(mode, defValue);
-		}
-
-		// TODO final
-		@Override
-		public boolean setModeValue(ApplicationMode mode, T obj) {
-			if (global) {
-				return set(obj);
-			}
-
-			Object profilePrefs = getProfilePreferences(mode);
-			boolean valueSaved = setValue(profilePrefs, obj);
-			if (valueSaved && cache && cachedPreference == profilePrefs) {
-				cachedValue = obj;
-			}
-			fireEvent(obj);
-
-			return valueSaved;
-		}
-
-		// TODO final
-		public T getProfileDefaultValue(ApplicationMode mode) {
-			if (global) {
-				return defaultValue;
-			}
-			if (defaultValues != null && defaultValues.containsKey(mode)) {
-				return defaultValues.get(mode);
-			}
-			ApplicationMode pt = mode.getParent();
-			if (pt != null) {
-				return getProfileDefaultValue(pt);
-			}
-			return defaultValue;
-		}
-
-		public final boolean hasDefaultValues() {
-			return defaultValues != null && !defaultValues.isEmpty();
-		}
-
-		public final boolean hasDefaultValueForMode(ApplicationMode mode) {
-			return defaultValues != null && defaultValues.containsKey(mode);
-		}
-
-		// TODO final
-		protected T getDefaultValue() {
-			return getProfileDefaultValue(currentMode);
-		}
-
-		@Override
-		public final void overrideDefaultValue(T newDefaultValue) {
-			this.defaultValue = newDefaultValue;
-		}
-
-
-
-		// TODO final
-		@Override
-		public T getModeValue(ApplicationMode mode) {
-			if (global) {
-				return get();
-			}
-			T defaultV = getProfileDefaultValue(mode);
-			return getValue(getProfilePreferences(mode), defaultV);
-		}
-
-		// TODO final
-		@Override
-		public T get() {
-			if (cache && cachedValue != null && cachedPreference == getPreferences()) {
-				return cachedValue;
-			}
-			cachedPreference = getPreferences();
-			cachedValue = getValue(cachedPreference, getProfileDefaultValue(currentMode));
-			return cachedValue;
-		}
-
-		@Override
-		public final String getId() {
-			return id;
-		}
-
-		@Override
-		public final void resetToDefault() {
-			T o = getProfileDefaultValue(currentMode);
-			set(o);
-		}
-
-		@Override
-		public final void resetModeToDefault(ApplicationMode mode) {
-			if (global) {
-				resetToDefault();
-			} else {
-				T o = getProfileDefaultValue(mode);
-				setModeValue(mode, o);
-			}
-		}
-
-		// TODO final
-		@Override
-		public boolean set(T obj) {
-			Object prefs = getPreferences();
-			if (setValue(prefs, obj)) {
-				cachedValue = obj;
-				cachedPreference = prefs;
-				fireEvent(obj);
-				return true;
-			}
-			return false;
-		}
-
-		public final  boolean isSet() {
-			return settingsAPI.contains(getPreferences(), getId());
-		}
-
-		public boolean isSetForMode(ApplicationMode mode) {
-			return settingsAPI.contains(getProfilePreferences(mode), getId());
-		}
-
-		public final boolean isGlobal() {
-			return global;
-		}
-
-		// TODO final
-		@Override
-		public boolean writeToJson(JSONObject json, ApplicationMode appMode) throws JSONException {
-			if (appMode != null) {
-				if (!global) {
-					String value = asStringModeValue(appMode);
-					if (value != null) {
-						json.put(getId(), value);
-					}
-					return true;
-				}
-			} else if (global) {
-				String value = asString();
-				if (value != null) {
-					json.put(getId(), value);
-				}
-				return true;
-			}
-			return false;
-		}
-		// TODO final
-		@Override
-		public void readFromJson(JSONObject json, ApplicationMode appMode) throws JSONException {
-			if (appMode != null) {
-				if (!global) {
-					String modeValue = json.getString(getId());
-					setModeValue(appMode, parseString(modeValue));
-				}
-			} else if (global) {
-				String globalValue = json.getString(getId());
-				set(parseString(globalValue));
-			}
-		}
-
-		@Override
-		public final String asString() {
-			T o = get();
-			return toString(o);
-		}
-
-		@Override
-		public final String asStringModeValue(ApplicationMode m) {
-			T v = getModeValue(m);
-			return toString(v);
-		}
+	<T> void registerInternalPreference(String id, CommonPreference<T> tCommonPreference) {
+		registeredPreferences.put(id, tCommonPreference);
 	}
 
-	public class BooleanPreference extends CommonPreference<Boolean> {
-
-		private BooleanPreference(String id, boolean defaultValue) {
-			super(id, defaultValue);
-		}
-
-		@Override
-		protected Boolean getValue(Object prefs, Boolean defaultValue) {
-			return settingsAPI.getBoolean(prefs, getId(), defaultValue);
-		}
-
-		@Override
-		protected boolean setValue(Object prefs, Boolean val) {
-			return settingsAPI.edit(prefs).putBoolean(getId(), val).commit();
-		}
-
-		@Override
-		public Boolean parseString(String s) {
-			return Boolean.parseBoolean(s);
-		}
+	boolean isSet(boolean global, String id) {
+		return settingsAPI.contains(getPreferences(global), id);
 	}
 
-	public class BooleanStringPreference extends BooleanPreference {
-
-		public BooleanStringPreference(String id, boolean defaultValue) {
-			super(id, defaultValue);
-		}
-
-		@Override
-		protected Boolean getValue(Object prefs, Boolean defaultValue) {
-			Boolean value;
-			try {
-				value = parseString(settingsAPI.getString(prefs, getId(), defaultValue.toString()));
-			} catch (ClassCastException e) {
-				value = settingsAPI.getBoolean(prefs, getId(), defaultValue);
-				setValue(prefs, value);
-			}
-			return value;
-		}
-
-		@Override
-		protected boolean setValue(Object prefs, Boolean val) {
-			return settingsAPI.edit(prefs).putString(getId(), val != null ? val.toString() : null).commit();
-		}
+	boolean isSet(ApplicationMode m, String id) {
+		return settingsAPI.contains(getProfilePreferences(m), id);
 	}
 
-	private class BooleanAccessibilityPreference extends BooleanPreference {
-
-		private BooleanAccessibilityPreference(String id, boolean defaultValue) {
-			super(id, defaultValue);
-		}
-
-		@Override
-		public Boolean get() {
-			return ctx.accessibilityEnabled() ? super.get() : getDefaultValue();
-		}
-
-		@Override
-		public Boolean getModeValue(ApplicationMode mode) {
-			return ctx.accessibilityEnabledForMode(mode) ? super.getModeValue(mode) : getDefaultValue();
-		}
-
-		@Override
-		public boolean set(Boolean obj) {
-			return ctx.accessibilityEnabled() && super.set(obj);
-		}
-
-		@Override
-		public boolean setModeValue(ApplicationMode mode, Boolean obj) {
-			return ctx.accessibilityEnabledForMode(mode) && super.setModeValue(mode, obj);
-		}
+	Object getPreferences(boolean global) {
+		return global ? globalPreferences : profilePreferences;
 	}
 
-	private class IntPreference extends CommonPreference<Integer> {
 
-
-		private IntPreference(String id, int defaultValue) {
-			super(id, defaultValue);
-		}
-
-		@Override
-		protected Integer getValue(Object prefs, Integer defaultValue) {
-			return settingsAPI.getInt(prefs, getId(), defaultValue);
-		}
-
-		@Override
-		protected boolean setValue(Object prefs, Integer val) {
-			return settingsAPI.edit(prefs).putInt(getId(), val).commit();
-		}
-
-		@Override
-		public Integer parseString(String s) {
-			return Integer.parseInt(s);
+	@SuppressWarnings("unchecked")
+	public CommonPreference<Boolean> registerBooleanPreference(String id, boolean defValue) {
+		if (registeredPreferences.containsKey(id)) {
+			return (CommonPreference<Boolean>) registeredPreferences.get(id);
 		}
+		BooleanPreference p = new BooleanPreference(this, id, defValue);
+		registeredPreferences.put(id, p);
+		return p;
 	}
 
-	private class LongPreference extends CommonPreference<Long> {
-
-
-		private LongPreference(String id, long defaultValue) {
-			super(id, defaultValue);
-		}
-
-		@Override
-		protected Long getValue(Object prefs, Long defaultValue) {
-			return settingsAPI.getLong(prefs, getId(), defaultValue);
-		}
-
-		@Override
-		protected boolean setValue(Object prefs, Long val) {
-			return settingsAPI.edit(prefs).putLong(getId(), val).commit();
-		}
-
-		@Override
-		public Long parseString(String s) {
-			return Long.parseLong(s);
+	@SuppressWarnings("unchecked")
+	public CommonPreference<Boolean> registerBooleanAccessibilityPreference(String id, boolean defValue) {
+		if (registeredPreferences.containsKey(id)) {
+			return (CommonPreference<Boolean>) registeredPreferences.get(id);
 		}
+		BooleanPreference p = new BooleanAccessibilityPreference(this, id, defValue);
+		registeredPreferences.put(id, p);
+		return p;
 	}
 
-	public class FloatPreference extends CommonPreference<Float> {
-
-
-		private FloatPreference(String id, float defaultValue) {
-			super(id, defaultValue);
-		}
-
-		@Override
-		protected Float getValue(Object prefs, Float defaultValue) {
-			return settingsAPI.getFloat(prefs, getId(), defaultValue);
-		}
-
-		@Override
-		protected boolean setValue(Object prefs, Float val) {
-			return settingsAPI.edit(prefs).putFloat(getId(), val).commit();
-		}
-
-		@Override
-		public Float parseString(String s) {
-			return Float.parseFloat(s);
+	@SuppressWarnings("unchecked")
+	public CommonPreference<String> registerStringPreference(String id, String defValue) {
+		if (registeredPreferences.containsKey(id)) {
+			return (CommonPreference<String>) registeredPreferences.get(id);
 		}
+		StringPreference p = new StringPreference(this, id, defValue);
+		registeredPreferences.put(id, p);
+		return p;
 	}
 
-	public class StringPreference extends CommonPreference<String> {
-
-		private StringPreference(String id, String defaultValue) {
-			super(id, defaultValue);
-		}
-
-		@Override
-		protected String getValue(Object prefs, String defaultValue) {
-			return settingsAPI.getString(prefs, getId(), defaultValue);
-		}
-
-		@Override
-		protected boolean setValue(Object prefs, String val) {
-			return settingsAPI.edit(prefs).putString(getId(), (val != null) ? val.trim() : val).commit();
-		}
-
-		@Override
-		public String parseString(String s) {
-			return s;
-		}
-	}
-	
-	public class ListStringPreference extends StringPreference {
-
-		private String delimiter;
-
-		private ListStringPreference(String id, String defaultValue, String delimiter) {
-			super(id, defaultValue);
-			this.delimiter = delimiter;
-		}
-
-		public boolean addValue(String res) {
-			return addModeValue(getApplicationMode(), res);
-		}
-
-		public boolean addModeValue(ApplicationMode appMode, String res) {
-			String vl = getModeValue(appMode);
-			if (vl == null || vl.isEmpty()) {
-				vl = res + delimiter;
-			} else {
-				vl = vl + res + delimiter;
-			}
-			setModeValue(appMode, vl);
-			return true;
-		}
-
-		public void clearAll() {
-			clearAllForProfile(getApplicationMode());
-		}
-
-		public void clearAllForProfile(ApplicationMode appMode) {
-			setModeValue(appMode, "");
-		}
-		
-		public boolean containsValue(String res) {
-			return containsValue(getApplicationMode(), res);
-		}
-
-		public boolean containsValue(ApplicationMode appMode, String res) {
-			String vl = getModeValue(appMode);
-			String r = res + delimiter;
-			return vl.startsWith(r) || vl.contains(delimiter + r);
-		}
-		
-		public boolean removeValue(String res) {
-			return removeValueForProfile(getApplicationMode(), res);
-		}
-
-		public boolean removeValueForProfile(ApplicationMode appMode, String res) {
-			String vl = getModeValue(appMode);
-			String r = res + delimiter;
-			if(vl != null) {
-				if(vl.startsWith(r)) {
-					vl = vl.substring(r.length());
-					setModeValue(appMode, vl);
-					return true;
-				} else {
-					int it = vl.indexOf(delimiter + r);
-					if(it >= 0) {
-						vl = vl.substring(0, it + delimiter.length()) + vl.substring(it + delimiter.length() + r.length());
-					}
-					setModeValue(appMode, vl);
-					return true;
-				}
-			}
-			return false;
-		}
-
-		public List<String> getStringsList() {
-			return getStringsListForProfile(getApplicationMode());
-		}
-
-		public List<String> getStringsListForProfile(ApplicationMode appMode) {
-			final String listAsString = getModeValue(appMode);
-			if (listAsString != null) {
-				if (listAsString.contains(delimiter)) {
-					return Arrays.asList(listAsString.split(delimiter));
-				} else {
-					return new ArrayList<String>() {
-						{add(listAsString);}
-					};
-				}
-			}
-			return null;
-		}
-
-		public void setStringsList(List<String> values) {
-			setStringsListForProfile(getApplicationMode(), values);
-		}
-
-		public void setStringsListForProfile(ApplicationMode appMode, List<String> values) {
-			if (values == null || values.size() == 0) {
-				setModeValue(appMode, null);
-				return;
-			}
-			clearAllForProfile(appMode);
-			for (String value : values) {
-				addModeValue(appMode, value);
-			}
-		}
-
-		public boolean setModeValues(ApplicationMode mode, List<String> values) {
-			if (values == null || values.size() == 0) {
-				setModeValue(mode,null);
-				return false;
-			}
-			clearAll();
-			String vl = get();
-			for (String value : values) {
-				addValue(value);
-				if (vl == null || vl.isEmpty()) {
-					vl = value + delimiter;
-				} else {
-					vl = vl + value + delimiter;
-				}
-			}
-			return setModeValue(mode, vl);
+	@SuppressWarnings("unchecked")
+	public CommonPreference<Integer> registerIntPreference(String id, int defValue) {
+		if (registeredPreferences.containsKey(id)) {
+			return (CommonPreference<Integer>) registeredPreferences.get(id);
 		}
+		IntPreference p = new IntPreference(this, id, defValue);
+		registeredPreferences.put(id, p);
+		return p;
 	}
 
-	public class ContextMenuItemsPreference extends CommonPreference<ContextMenuItemsSettings> {
-		@NonNull
-		private String idScheme;
-
-		private ContextMenuItemsPreference(String id, @NonNull String idScheme, @NonNull ContextMenuItemsSettings defValue) {
-			super(id, defValue);
-			this.idScheme = idScheme;
-		}
-
-		@Override
-		protected ContextMenuItemsSettings getValue(Object prefs, ContextMenuItemsSettings defaultValue) {
-			String s = settingsAPI.getString(prefs, getId(), "");
-			return readValue(s);
-		}
-
-		@Override
-		protected boolean setValue(Object prefs, ContextMenuItemsSettings val) {
-			return settingsAPI.edit(prefs).putString(getId(), val.writeToJsonString(idScheme)).commit();
-		}
-
-
-		@Override
-		protected String toString(ContextMenuItemsSettings o) {
-			return o.writeToJsonString(idScheme);
-		}
-
-		@Override
-		public ContextMenuItemsSettings parseString(String s) {
-			return readValue(s);
-		}
-
-		private ContextMenuItemsSettings readValue(String s) {
-			ContextMenuItemsSettings value = getDefaultValue().newInstance();
-			value.readFromJsonString(s, idScheme);
-			return value;
-		}
-
-		@NonNull
-		public String getIdScheme() {
-			return idScheme;
+	@SuppressWarnings("unchecked")
+	public CommonPreference<Long> registerLongPreference(String id, long defValue) {
+		if (registeredPreferences.containsKey(id)) {
+			return (CommonPreference<Long>) registeredPreferences.get(id);
 		}
+		LongPreference p = new LongPreference(this, id, defValue);
+		registeredPreferences.put(id, p);
+		return p;
 	}
 
-	public static class ContextMenuItemsSettings implements Serializable {
-		private static final String HIDDEN = "hidden";
-		private static final String ORDER = "order";
-		private List<String> hiddenIds = new ArrayList<>();
-		private List<String> orderIds = new ArrayList<>();
-
-		public ContextMenuItemsSettings() {
-
-		}
-
-		public ContextMenuItemsSettings(@NonNull List<String> hiddenIds, @NonNull List<String> orderIds) {
-			this.hiddenIds = hiddenIds;
-			this.orderIds = orderIds;
-		}
-
-		public ContextMenuItemsSettings newInstance() {
-			return new ContextMenuItemsSettings();
-		}
-
-		public void readFromJsonString(String jsonString, @NonNull String idScheme) {
-			if (Algorithms.isEmpty(jsonString)) {
-				return;
-			}
-			try {
-				JSONObject json = new JSONObject(jsonString);
-				readFromJson(json, idScheme);
-			} catch (JSONException e) {
-				LOG.error("Error converting to json string: " + e);
-			}
-		}
-
-		public void readFromJson(JSONObject json, String idScheme) {
-			hiddenIds = readIdsList(json.optJSONArray(HIDDEN), idScheme);
-			orderIds = readIdsList(json.optJSONArray(ORDER), idScheme);
-		}
-
-		protected List<String> readIdsList(JSONArray jsonArray, @NonNull String idScheme) {
-			List<String> list = new ArrayList<>();
-			if (jsonArray != null) {
-				for (int i = 0; i < jsonArray.length(); i++) {
-					String id = jsonArray.optString(i);
-					list.add(idScheme + id);
-				}
-			}
-			return list;
-		}
-
-		public String writeToJsonString(@NonNull String idScheme) {
-			try {
-				JSONObject json = new JSONObject();
-				writeToJson(json, idScheme);
-				return json.toString();
-			} catch (JSONException e) {
-				LOG.error("Error converting to json string: " + e);
-			}
-			return "";
-		}
-
-		public void writeToJson(JSONObject json, String idScheme) throws JSONException {
-			json.put(HIDDEN, getJsonArray(hiddenIds, idScheme));
-			json.put(ORDER, getJsonArray(orderIds, idScheme));
-		}
-
-		protected JSONArray getJsonArray(List<String> ids, @NonNull String idScheme) {
-			JSONArray jsonArray = new JSONArray();
-			if (ids != null && !ids.isEmpty()) {
-				for (String id : ids) {
-					jsonArray.put(id.replace(idScheme, ""));
-				}
-			}
-			return jsonArray;
-		}
-
-		public List<String> getHiddenIds() {
-			return Collections.unmodifiableList(hiddenIds);
-		}
-
-		public List<String> getOrderIds() {
-			return Collections.unmodifiableList(orderIds);
+	@SuppressWarnings("unchecked")
+	public CommonPreference<Float> registerFloatPreference(String id, float defValue) {
+		if (registeredPreferences.containsKey(id)) {
+			return (CommonPreference<Float>) registeredPreferences.get(id);
 		}
+		FloatPreference p = new FloatPreference(this, id, defValue);
+		registeredPreferences.put(id, p);
+		return p;
 	}
 
-	public static class MainContextMenuItemsSettings extends ContextMenuItemsSettings {
-		private static final String MAIN = "main";
-		private List<String> mainIds = new ArrayList<>();
-
-		public MainContextMenuItemsSettings() {
-
-		}
-
-		public MainContextMenuItemsSettings(@NonNull List<String> mainIds, @NonNull List<String> hiddenIds, @NonNull List<String> orderIds) {
-			super(hiddenIds, orderIds);
-			this.mainIds = mainIds;
-		}
-
-		@Override
-		public ContextMenuItemsSettings newInstance() {
-			return new MainContextMenuItemsSettings();
-		}
-
-		@Override
-		public void readFromJson(JSONObject json, String idScheme) {
-			super.readFromJson(json, idScheme);
-			mainIds = readIdsList(json.optJSONArray(MAIN), idScheme);
-		}
-
-		@Override
-		public void writeToJson(JSONObject json, String idScheme) throws JSONException {
-			super.writeToJson(json, idScheme);
-			json.put(MAIN, getJsonArray(mainIds, idScheme));
-		}
-
-		public List<String> getMainIds() {
-			return Collections.unmodifiableList(mainIds);
+	@SuppressWarnings("unchecked")
+	public <T extends Enum> CommonPreference<T> registerEnumIntPreference(String id, Enum defaultValue, Enum[] values, Class<T> clz) {
+		if (registeredPreferences.containsKey(id)) {
+			return (CommonPreference<T>) registeredPreferences.get(id);
 		}
+		EnumStringPreference p = new EnumStringPreference(this, id, defaultValue, values);
+		registeredPreferences.put(id, p);
+		return p;
 	}
 
-	public class EnumStringPreference<E extends Enum<E>> extends CommonPreference<E> {
-
-		private final E[] values;
-
-		private EnumStringPreference(String id, E defaultValue, E[] values) {
-			super(id, defaultValue);
-			this.values = values;
-		}
-
-		@Override
-		protected E getValue(Object prefs, E defaultValue) {
-			try {
-				String name = settingsAPI.getString(prefs, getId(), defaultValue.name());
-				E value = parseString(name);
-				return value != null ? value : defaultValue;
-			} catch (ClassCastException ex) {
-				setValue(prefs, defaultValue);
-			}
-			return defaultValue;
-		}
-
-		@Override
-		protected boolean setValue(Object prefs, E val) {
-			return settingsAPI.edit(prefs).putString(getId(), val.name()).commit();
-		}
-
-		@Override
-		protected String toString(E o) {
-			return o.name();
-		}
-
-		@Override
-		public E parseString(String s) {
-			for (E value : values) {
-				if (value.name().equals(s)) {
-					return value;
-				}
-			}
-			return null;
-		}
-	}
-	///////////// PREFERENCES classes ////////////////
+	///////////////////// PREFERENCES ////////////////
 
 	public static final String NUMBER_OF_FREE_DOWNLOADS_ID = "free_downloads_v3";
 
 	// this value string is synchronized with settings_pref.xml preference name
-	private final OsmandPreference<String> PLUGINS = new StringPreference("enabled_plugins", MapillaryPlugin.ID).makeGlobal();
+	private final OsmandPreference<String> PLUGINS = new StringPreference(this, "enabled_plugins", MapillaryPlugin.ID).makeGlobal();
 
 	public Set<String> getEnabledPlugins() {
 		String plugs = PLUGINS.get();
@@ -1502,124 +689,53 @@ public class OsmandSettings {
 		return false;
 	}
 
+	public final CommonPreference<RulerMode> RULER_MODE = new EnumStringPreference<>(this, "ruler_mode", RulerMode.FIRST, RulerMode.values()).makeGlobal();
 
-	@SuppressWarnings("unchecked")
-	public CommonPreference<Boolean> registerBooleanPreference(String id, boolean defValue) {
-		if (registeredPreferences.containsKey(id)) {
-			return (CommonPreference<Boolean>) registeredPreferences.get(id);
-		}
-		BooleanPreference p = new BooleanPreference(id, defValue);
-		registeredPreferences.put(id, p);
-		return p;
-	}
+	public final OsmandPreference<Boolean> SHOW_COMPASS_CONTROL_RULER = new BooleanPreference(this, "show_compass_ruler", true).makeGlobal();
 
-	@SuppressWarnings("unchecked")
-	public CommonPreference<Boolean> registerBooleanAccessibilityPreference(String id, boolean defValue) {
-		if (registeredPreferences.containsKey(id)) {
-			return (CommonPreference<Boolean>) registeredPreferences.get(id);
-		}
-		BooleanPreference p = new BooleanAccessibilityPreference(id, defValue);
-		registeredPreferences.put(id, p);
-		return p;
-	}
+	public final CommonPreference<Boolean> SHOW_LINES_TO_FIRST_MARKERS = new BooleanPreference(this, "show_lines_to_first_markers", false).makeProfile();
+	public final CommonPreference<Boolean> SHOW_ARROWS_TO_FIRST_MARKERS = new BooleanPreference(this, "show_arrows_to_first_markers", false).makeProfile();
 
-	@SuppressWarnings("unchecked")
-	public CommonPreference<String> registerStringPreference(String id, String defValue) {
-		if (registeredPreferences.containsKey(id)) {
-			return (CommonPreference<String>) registeredPreferences.get(id);
-		}
-		StringPreference p = new StringPreference(id, defValue);
-		registeredPreferences.put(id, p);
-		return p;
-	}
+	public final CommonPreference<Boolean> WIKI_ARTICLE_SHOW_IMAGES_ASKED = new BooleanPreference(this, "wikivoyage_show_images_asked", false).makeGlobal();
+	public final CommonPreference<WikiArticleShowImages> WIKI_ARTICLE_SHOW_IMAGES = new EnumStringPreference<>(this, "wikivoyage_show_imgs", WikiArticleShowImages.OFF, WikiArticleShowImages.values()).makeGlobal();
+	public final CommonPreference<Boolean> GLOBAL_WIKIPEDIA_POI_ENABLED = new BooleanPreference(this, "global_wikipedia_poi_enabled", false).makeProfile();
+	public final ListStringPreference WIKIPEDIA_POI_ENABLED_LANGUAGES = (ListStringPreference) new ListStringPreference(this, "wikipedia_poi_enabled_languages", null, ",").makeProfile().cache();
 
-	@SuppressWarnings("unchecked")
-	public CommonPreference<Integer> registerIntPreference(String id, int defValue) {
-		if (registeredPreferences.containsKey(id)) {
-			return (CommonPreference<Integer>) registeredPreferences.get(id);
-		}
-		IntPreference p = new IntPreference(id, defValue);
-		registeredPreferences.put(id, p);
-		return p;
-	}
+	public final CommonPreference<Boolean> SELECT_MARKER_ON_SINGLE_TAP = new BooleanPreference(this, "select_marker_on_single_tap", false).makeProfile();
+	public final CommonPreference<Boolean> KEEP_PASSED_MARKERS_ON_MAP = new BooleanPreference(this, "keep_passed_markers_on_map", true).makeProfile();
 
-	@SuppressWarnings("unchecked")
-	public CommonPreference<Long> registerLongPreference(String id, long defValue) {
-		if (registeredPreferences.containsKey(id)) {
-			return (CommonPreference<Long>) registeredPreferences.get(id);
-		}
-		LongPreference p = new LongPreference(id, defValue);
-		registeredPreferences.put(id, p);
-		return p;
-	}
+	public final CommonPreference<Boolean> COORDS_INPUT_USE_RIGHT_SIDE = new BooleanPreference(this, "coords_input_use_right_side", true).makeGlobal();
+	public final OsmandPreference<Format> COORDS_INPUT_FORMAT = new EnumStringPreference<>(this, "coords_input_format", Format.DD_MM_MMM, Format.values()).makeGlobal();
+	public final CommonPreference<Boolean> COORDS_INPUT_USE_OSMAND_KEYBOARD = new BooleanPreference(this, "coords_input_use_osmand_keyboard", Build.VERSION.SDK_INT >= 16).makeGlobal();
+	public final CommonPreference<Boolean> COORDS_INPUT_TWO_DIGITS_LONGTITUDE = new BooleanPreference(this, "coords_input_two_digits_longitude", false).makeGlobal();
 
-	@SuppressWarnings("unchecked")
-	public CommonPreference<Float> registerFloatPreference(String id, float defValue) {
-		if (registeredPreferences.containsKey(id)) {
-			return (CommonPreference<Float>) registeredPreferences.get(id);
-		}
-		FloatPreference p = new FloatPreference(id, defValue);
-		registeredPreferences.put(id, p);
-		return p;
-	}
+	public final CommonPreference<Boolean> USE_MAPILLARY_FILTER = new BooleanPreference(this, "use_mapillary_filters", false).makeGlobal();
+	public final CommonPreference<String> MAPILLARY_FILTER_USER_KEY = new StringPreference(this, "mapillary_filter_user_key", "").makeGlobal();
+	public final CommonPreference<String> MAPILLARY_FILTER_USERNAME = new StringPreference(this, "mapillary_filter_username", "").makeGlobal();
+	public final CommonPreference<Long> MAPILLARY_FILTER_FROM_DATE = new LongPreference(this, "mapillary_filter_from_date", 0).makeGlobal();
+	public final CommonPreference<Long> MAPILLARY_FILTER_TO_DATE = new LongPreference(this, "mapillary_filter_to_date", 0).makeGlobal();
+	public final CommonPreference<Boolean> MAPILLARY_FILTER_PANO = new BooleanPreference(this, "mapillary_filter_pano", false).makeGlobal();
 
-	@SuppressWarnings("unchecked")
-	public <T extends Enum> CommonPreference<T> registerEnumIntPreference(String id, Enum defaultValue, Enum[] values, Class<T> clz) {
-		if (registeredPreferences.containsKey(id)) {
-			return (CommonPreference<T>) registeredPreferences.get(id);
-		}
-		EnumStringPreference p = new EnumStringPreference(id, defaultValue, values);
-		registeredPreferences.put(id, p);
-		return p;
-	}
+	public final CommonPreference<Boolean> USE_FAST_RECALCULATION = new BooleanPreference(this, "use_fast_recalculation", true).makeProfile().cache();
+	public final CommonPreference<Boolean> FORCE_PRIVATE_ACCESS_ROUTING_ASKED = new BooleanPreference(this, "force_private_access_routing", false).makeProfile().cache();
 
-	public final CommonPreference<RulerMode> RULER_MODE = new EnumStringPreference<>("ruler_mode", RulerMode.FIRST, RulerMode.values()).makeGlobal();
+	public final CommonPreference<Boolean> SHOW_CARD_TO_CHOOSE_DRAWER = new BooleanPreference(this, "show_card_to_choose_drawer", false).makeGlobal();
+	public final CommonPreference<Boolean> SHOW_DASHBOARD_ON_START = new BooleanPreference(this, "should_show_dashboard_on_start", false).makeGlobal();
+	public final CommonPreference<Boolean> SHOW_DASHBOARD_ON_MAP_SCREEN = new BooleanPreference(this, "show_dashboard_on_map_screen", false).makeGlobal();
+	public final CommonPreference<Boolean> SHOW_OSMAND_WELCOME_SCREEN = new BooleanPreference(this, "show_osmand_welcome_screen", true).makeGlobal();
 
-	public final OsmandPreference<Boolean> SHOW_COMPASS_CONTROL_RULER = new BooleanPreference("show_compass_ruler", true).makeGlobal();
+	public final CommonPreference<String> API_NAV_DRAWER_ITEMS_JSON = new StringPreference(this, "api_nav_drawer_items_json", "{}").makeGlobal();
+	public final CommonPreference<String> API_CONNECTED_APPS_JSON = new StringPreference(this, "api_connected_apps_json", "[]").makeGlobal();
+	public final CommonPreference<String> NAV_DRAWER_LOGO = new StringPreference(this, "drawer_logo", "").makeProfile();
+	public final CommonPreference<String> NAV_DRAWER_URL = new StringPreference(this, "drawer_url", "").makeProfile();
 
-	public final CommonPreference<Boolean> SHOW_LINES_TO_FIRST_MARKERS = new BooleanPreference("show_lines_to_first_markers", false).makeProfile();
-	public final CommonPreference<Boolean> SHOW_ARROWS_TO_FIRST_MARKERS = new BooleanPreference("show_arrows_to_first_markers", false).makeProfile();
+	public final CommonPreference<Integer> NUMBER_OF_STARTS_FIRST_XMAS_SHOWN = new IntPreference(this, "number_of_starts_first_xmas_shown", 0).makeGlobal();
 
-	public final CommonPreference<Boolean> WIKI_ARTICLE_SHOW_IMAGES_ASKED = new BooleanPreference("wikivoyage_show_images_asked", false).makeGlobal();
-	public final CommonPreference<WikiArticleShowImages> WIKI_ARTICLE_SHOW_IMAGES = new EnumStringPreference<>("wikivoyage_show_imgs", WikiArticleShowImages.OFF, WikiArticleShowImages.values()).makeGlobal();
-	public final CommonPreference<Boolean> GLOBAL_WIKIPEDIA_POI_ENABLED = new BooleanPreference("global_wikipedia_poi_enabled", false).makeProfile();
-	public final ListStringPreference WIKIPEDIA_POI_ENABLED_LANGUAGES = (ListStringPreference) new ListStringPreference("wikipedia_poi_enabled_languages", null, ",").makeProfile().cache();
+	public final OsmandPreference<String> AVAILABLE_APP_MODES = new StringPreference(this, "available_application_modes", "car,bicycle,pedestrian,public_transport,").makeGlobal().cache();
 
-	public final CommonPreference<Boolean> SELECT_MARKER_ON_SINGLE_TAP = new BooleanPreference("select_marker_on_single_tap", false).makeProfile();
-	public final CommonPreference<Boolean> KEEP_PASSED_MARKERS_ON_MAP = new BooleanPreference("keep_passed_markers_on_map", true).makeProfile();
+	public final OsmandPreference<String> LAST_FAV_CATEGORY_ENTERED = new StringPreference(this, "last_fav_category", "").makeGlobal();
 
-	public final CommonPreference<Boolean> COORDS_INPUT_USE_RIGHT_SIDE = new BooleanPreference("coords_input_use_right_side", true).makeGlobal();
-	public final OsmandPreference<Format> COORDS_INPUT_FORMAT = new EnumStringPreference<>("coords_input_format", Format.DD_MM_MMM, Format.values()).makeGlobal();
-	public final CommonPreference<Boolean> COORDS_INPUT_USE_OSMAND_KEYBOARD = new BooleanPreference("coords_input_use_osmand_keyboard", Build.VERSION.SDK_INT >= 16).makeGlobal();
-	public final CommonPreference<Boolean> COORDS_INPUT_TWO_DIGITS_LONGTITUDE = new BooleanPreference("coords_input_two_digits_longitude", false).makeGlobal();
-
-	public final CommonPreference<Boolean> USE_MAPILLARY_FILTER = new BooleanPreference("use_mapillary_filters", false).makeGlobal();
-	public final CommonPreference<String> MAPILLARY_FILTER_USER_KEY = new StringPreference("mapillary_filter_user_key", "").makeGlobal();
-	public final CommonPreference<String> MAPILLARY_FILTER_USERNAME = new StringPreference("mapillary_filter_username", "").makeGlobal();
-	public final CommonPreference<Long> MAPILLARY_FILTER_FROM_DATE = new LongPreference("mapillary_filter_from_date", 0).makeGlobal();
-	public final CommonPreference<Long> MAPILLARY_FILTER_TO_DATE = new LongPreference("mapillary_filter_to_date", 0).makeGlobal();
-	public final CommonPreference<Boolean> MAPILLARY_FILTER_PANO = new BooleanPreference("mapillary_filter_pano", false).makeGlobal();
-
-	public final CommonPreference<Boolean> USE_FAST_RECALCULATION = new BooleanPreference("use_fast_recalculation", true).makeGlobal().cache();
-	public final CommonPreference<Boolean> FORCE_PRIVATE_ACCESS_ROUTING_ASKED = new BooleanPreference("force_private_access_routing", false).makeProfile().cache();
-
-	public final CommonPreference<Boolean> SHOW_CARD_TO_CHOOSE_DRAWER = new BooleanPreference("show_card_to_choose_drawer", false).makeGlobal();
-	public final CommonPreference<Boolean> SHOW_DASHBOARD_ON_START = new BooleanPreference("should_show_dashboard_on_start", false).makeGlobal();
-	public final CommonPreference<Boolean> SHOW_DASHBOARD_ON_MAP_SCREEN = new BooleanPreference("show_dashboard_on_map_screen", false).makeGlobal();
-	public final CommonPreference<Boolean> SHOW_OSMAND_WELCOME_SCREEN = new BooleanPreference("show_osmand_welcome_screen", true).makeGlobal();
-
-	public final CommonPreference<String> API_NAV_DRAWER_ITEMS_JSON = new StringPreference("api_nav_drawer_items_json", "{}").makeGlobal();
-	public final CommonPreference<String> API_CONNECTED_APPS_JSON = new StringPreference("api_connected_apps_json", "[]").makeGlobal();
-	public final CommonPreference<String> NAV_DRAWER_LOGO = new StringPreference("drawer_logo", "").makeProfile();
-	public final CommonPreference<String> NAV_DRAWER_URL = new StringPreference("drawer_url", "").makeProfile();
-
-	public final CommonPreference<Integer> NUMBER_OF_STARTS_FIRST_XMAS_SHOWN = new IntPreference("number_of_starts_first_xmas_shown", 0).makeGlobal();
-
-	public final OsmandPreference<String> AVAILABLE_APP_MODES = new StringPreference("available_application_modes", "car,bicycle,pedestrian,public_transport,").makeGlobal().cache();
-
-	public final OsmandPreference<String> LAST_FAV_CATEGORY_ENTERED = new StringPreference("last_fav_category", "").makeGlobal();
-
-	public final OsmandPreference<ApplicationMode> DEFAULT_APPLICATION_MODE = new CommonPreference<ApplicationMode>("default_application_mode_string", ApplicationMode.DEFAULT) {
+	public final OsmandPreference<ApplicationMode> DEFAULT_APPLICATION_MODE = new CommonPreference<ApplicationMode>(this, "default_application_mode_string", ApplicationMode.DEFAULT) {
 
 		@Override
 		protected ApplicationMode getValue(Object prefs, ApplicationMode defaultValue) {
@@ -1665,7 +781,7 @@ public class OsmandSettings {
 		}
 	}.makeGlobal();
 
-	public final OsmandPreference<ApplicationMode> LAST_ROUTE_APPLICATION_MODE = new CommonPreference<ApplicationMode>("last_route_application_mode_backup_string", ApplicationMode.DEFAULT) {
+	public final OsmandPreference<ApplicationMode> LAST_ROUTE_APPLICATION_MODE = new CommonPreference<ApplicationMode>(this, "last_route_application_mode_backup_string", ApplicationMode.DEFAULT) {
 
 		@Override
 		protected ApplicationMode getValue(Object prefs, ApplicationMode defaultValue) {
@@ -1706,13 +822,12 @@ public class OsmandSettings {
 		}
 	}.makeGlobal();
 
-	public final OsmandPreference<Boolean> FIRST_MAP_IS_DOWNLOADED = new BooleanPreference(
-			"first_map_is_downloaded", false);
+	public final OsmandPreference<Boolean> FIRST_MAP_IS_DOWNLOADED = new BooleanPreference(this, "first_map_is_downloaded", false);
 
-	public final CommonPreference<Boolean> DRIVING_REGION_AUTOMATIC = new BooleanPreference("driving_region_automatic", true).makeProfile().cache();
-	public final OsmandPreference<DrivingRegion> DRIVING_REGION = new EnumStringPreference<DrivingRegion>(
+	public final CommonPreference<Boolean> DRIVING_REGION_AUTOMATIC = new BooleanPreference(this, "driving_region_automatic", true).makeProfile().cache();
+	public final OsmandPreference<DrivingRegion> DRIVING_REGION = new EnumStringPreference<DrivingRegion>(this,
 			"default_driving_region", DrivingRegion.EUROPE_ASIA, DrivingRegion.values()) {
-		protected boolean setValue(Object prefs, DrivingRegion val) {
+		public boolean setValue(Object prefs, DrivingRegion val) {
 			if (val != null) {
 				METRIC_SYSTEM.set(val.defMetrics);
 			}
@@ -1720,29 +835,14 @@ public class OsmandSettings {
 		}
 
 		protected DrivingRegion getDefaultValue() {
-			Locale df = Locale.getDefault();
-			if (df == null) {
-				return DrivingRegion.EUROPE_ASIA;
-			}
-			if (df.getCountry().equalsIgnoreCase(Locale.US.getCountry())) {
-				return DrivingRegion.US;
-			} else if (df.getCountry().equalsIgnoreCase(Locale.CANADA.getCountry())) {
-				return DrivingRegion.CANADA;
-			} else if (df.getCountry().equalsIgnoreCase(Locale.JAPAN.getCountry())) {
-				return DrivingRegion.JAPAN;
-			} else if (df.getCountry().equalsIgnoreCase("au")) {
-				return DrivingRegion.AUSTRALIA;
-			} else if(df.getCountry().equalsIgnoreCase(Locale.UK.getCountry())) {
-				return DrivingRegion.UK_AND_OTHERS;
-			}
-			return DrivingRegion.EUROPE_ASIA;
+			return DrivingRegion.getDrivingRegionByLocale();
 		}
 
 	}.makeProfile().cache();
 
 	// this value string is synchronized with settings_pref.xml preference name
 	// cache of metrics constants as they are used very often
-	public final OsmandPreference<MetricsConstants> METRIC_SYSTEM = new EnumStringPreference<MetricsConstants>(
+	public final OsmandPreference<MetricsConstants> METRIC_SYSTEM = new EnumStringPreference<MetricsConstants>(this,
 			"default_metric_system", MetricsConstants.KILOMETERS_AND_METERS, MetricsConstants.values()) {
 		protected MetricsConstants getDefaultValue() {
 			return DRIVING_REGION.get().defMetrics;
@@ -1752,8 +852,8 @@ public class OsmandSettings {
 
 	//public final OsmandPreference<Integer> COORDINATES_FORMAT = new IntPreference("coordinates_format", PointDescription.FORMAT_DEGREES).makeGlobal();
 
-	public final OsmandPreference<AngularConstants> ANGULAR_UNITS = new EnumStringPreference<AngularConstants>(
-		"angular_measurement", AngularConstants.DEGREES, AngularConstants.values()).makeProfile();
+	public final OsmandPreference<AngularConstants> ANGULAR_UNITS = new EnumStringPreference<AngularConstants>(this,
+			"angular_measurement", AngularConstants.DEGREES, AngularConstants.values()).makeProfile();
 
 	public static final String LAST_START_LAT = "last_searched_lat"; //$NON-NLS-1$
 	public static final String LAST_START_LON = "last_searched_lon"; //$NON-NLS-1$
@@ -1779,7 +879,7 @@ public class OsmandSettings {
 				putFloat(LAST_START_LON, (float) lon).commit();
 	}
 
-	public final OsmandPreference<SpeedConstants> SPEED_SYSTEM = new EnumStringPreference<SpeedConstants>(
+	public final OsmandPreference<SpeedConstants> SPEED_SYSTEM = new EnumStringPreference<SpeedConstants>(this,
 			"default_speed_system", SpeedConstants.KILOMETERS_PER_HOUR, SpeedConstants.values()) {
 
 		@Override
@@ -1808,25 +908,25 @@ public class OsmandSettings {
 
 	// this value string is synchronized with settings_pref.xml preference name
 	// cache of metrics constants as they are used very often
-	public final OsmandPreference<RelativeDirectionStyle> DIRECTION_STYLE = new EnumStringPreference<RelativeDirectionStyle>(
+	public final OsmandPreference<RelativeDirectionStyle> DIRECTION_STYLE = new EnumStringPreference<RelativeDirectionStyle>(this,
 			"direction_style", RelativeDirectionStyle.SIDEWISE, RelativeDirectionStyle.values()).makeProfile().cache();
 
 	// this value string is synchronized with settings_pref.xml preference name
 	// cache of metrics constants as they are used very often
-	public final OsmandPreference<AccessibilityMode> ACCESSIBILITY_MODE = new EnumStringPreference<AccessibilityMode>(
+	public final OsmandPreference<AccessibilityMode> ACCESSIBILITY_MODE = new EnumStringPreference<AccessibilityMode>(this,
 			"accessibility_mode", AccessibilityMode.DEFAULT, AccessibilityMode.values()).makeProfile().cache();
 
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Float> SPEECH_RATE =
-			new FloatPreference("speech_rate", 1f).makeProfile();
+			new FloatPreference(this, "speech_rate", 1f).makeProfile();
 
 	public final OsmandPreference<Float> ARRIVAL_DISTANCE_FACTOR =
-			new FloatPreference("arrival_distance_factor", 1f).makeProfile();
+			new FloatPreference(this, "arrival_distance_factor", 1f).makeProfile();
 
 	public final OsmandPreference<Float> SPEED_LIMIT_EXCEED_KMH =
-			new FloatPreference("speed_limit_exceed", 5f).makeProfile();
+			new FloatPreference(this, "speed_limit_exceed", 5f).makeProfile();
 
-	public final CommonPreference<Float> DEFAULT_SPEED = new FloatPreference("default_speed", 10f).makeProfile().cache();
+	public final CommonPreference<Float> DEFAULT_SPEED = new FloatPreference(this, "default_speed", 10f).makeProfile().cache();
 
 	{
 		DEFAULT_SPEED.setModeDefaultValue(ApplicationMode.DEFAULT, 1.5f);
@@ -1838,13 +938,13 @@ public class OsmandSettings {
 		DEFAULT_SPEED.setModeDefaultValue(ApplicationMode.SKI, 1.38f);
 	}
 
-	public final OsmandPreference<Float> MIN_SPEED = new FloatPreference(
+	public final OsmandPreference<Float> MIN_SPEED = new FloatPreference(this,
 			"min_speed", 0f).makeProfile().cache();
 
-	public final OsmandPreference<Float> MAX_SPEED = new FloatPreference(
+	public final OsmandPreference<Float> MAX_SPEED = new FloatPreference(this,
 			"max_speed", 0f).makeProfile().cache();
 
-	public final CommonPreference<String> ICON_RES_NAME = new StringPreference("app_mode_icon_res_name", "ic_world_globe_dark").makeProfile().cache();
+	public final CommonPreference<String> ICON_RES_NAME = new StringPreference(this, "app_mode_icon_res_name", "ic_world_globe_dark").makeProfile().cache();
 
 	{
 		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.DEFAULT, "ic_world_globe_dark");
@@ -1857,13 +957,14 @@ public class OsmandSettings {
 		ICON_RES_NAME.setModeDefaultValue(ApplicationMode.SKI, "ic_action_skiing");
 	}
 
-	public final CommonPreference<ProfileIconColors> ICON_COLOR = new EnumStringPreference<>("app_mode_icon_color", ProfileIconColors.DEFAULT, ProfileIconColors.values()).makeProfile().cache();
+	public final CommonPreference<ProfileIconColors> ICON_COLOR = new EnumStringPreference<>(this,
+			"app_mode_icon_color", ProfileIconColors.DEFAULT, ProfileIconColors.values()).makeProfile().cache();
 
-	public final CommonPreference<String> USER_PROFILE_NAME = new StringPreference("user_profile_name", "").makeProfile().cache();
+	public final CommonPreference<String> USER_PROFILE_NAME = new StringPreference(this, "user_profile_name", "").makeProfile().cache();
 
-	public final CommonPreference<String> PARENT_APP_MODE = new StringPreference("parent_app_mode", null).makeProfile().cache();
+	public final CommonPreference<String> PARENT_APP_MODE = new StringPreference(this, "parent_app_mode", null).makeProfile().cache();
 
-	public final CommonPreference<String> ROUTING_PROFILE = new StringPreference("routing_profile", "").makeProfile().cache();
+	public final CommonPreference<String> ROUTING_PROFILE = new StringPreference(this, "routing_profile", "").makeProfile().cache();
 
 	{
 		ROUTING_PROFILE.setModeDefaultValue(ApplicationMode.CAR, "car");
@@ -1875,14 +976,14 @@ public class OsmandSettings {
 		ROUTING_PROFILE.setModeDefaultValue(ApplicationMode.SKI, "ski");
 	}
 
-	public final CommonPreference<RouteService> ROUTE_SERVICE = new EnumStringPreference<>("route_service", RouteService.OSMAND, RouteService.values()).makeProfile().cache();
+	public final CommonPreference<RouteService> ROUTE_SERVICE = new EnumStringPreference<>(this, "route_service", RouteService.OSMAND, RouteService.values()).makeProfile().cache();
 
 	{
 		ROUTE_SERVICE.setModeDefaultValue(ApplicationMode.DEFAULT, RouteService.STRAIGHT);
 		ROUTE_SERVICE.setModeDefaultValue(ApplicationMode.AIRCRAFT, RouteService.STRAIGHT);
 	}
 
-	public final CommonPreference<NavigationIcon> NAVIGATION_ICON = new EnumStringPreference<>("navigation_icon", NavigationIcon.DEFAULT, NavigationIcon.values()).makeProfile().cache();
+	public final CommonPreference<NavigationIcon> NAVIGATION_ICON = new EnumStringPreference<>(this, "navigation_icon", NavigationIcon.DEFAULT, NavigationIcon.values()).makeProfile().cache();
 
 	{
 		NAVIGATION_ICON.setModeDefaultValue(ApplicationMode.DEFAULT, NavigationIcon.DEFAULT);
@@ -1893,7 +994,7 @@ public class OsmandSettings {
 		NAVIGATION_ICON.setModeDefaultValue(ApplicationMode.SKI, NavigationIcon.DEFAULT);
 	}
 
-	public final CommonPreference<LocationIcon> LOCATION_ICON = new EnumStringPreference<>("location_icon", LocationIcon.DEFAULT, LocationIcon.values()).makeProfile().cache();
+	public final CommonPreference<LocationIcon> LOCATION_ICON = new EnumStringPreference<>(this, "location_icon", LocationIcon.DEFAULT, LocationIcon.values()).makeProfile().cache();
 
 	{
 		LOCATION_ICON.setModeDefaultValue(ApplicationMode.DEFAULT, LocationIcon.DEFAULT);
@@ -1904,125 +1005,125 @@ public class OsmandSettings {
 		LOCATION_ICON.setModeDefaultValue(ApplicationMode.SKI, LocationIcon.BICYCLE);
 	}
 
-	public final CommonPreference<Integer> APP_MODE_ORDER = new IntPreference("app_mode_order", 0).makeProfile().cache();
+	public final CommonPreference<Integer> APP_MODE_ORDER = new IntPreference(this, "app_mode_order", 0).makeProfile().cache();
 
 	public final OsmandPreference<Float> SWITCH_MAP_DIRECTION_TO_COMPASS_KMH =
-			new FloatPreference("speed_for_map_to_direction_of_movement", 0f).makeProfile();
+			new FloatPreference(this, "speed_for_map_to_direction_of_movement", 0f).makeProfile();
 
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> USE_TRACKBALL_FOR_MOVEMENTS =
-			new BooleanPreference("use_trackball_for_movements", true).makeProfile();
+			new BooleanPreference(this, "use_trackball_for_movements", true).makeProfile();
 
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> ACCESSIBILITY_SMART_AUTOANNOUNCE =
-		new BooleanAccessibilityPreference("accessibility_smart_autoannounce", true).makeProfile();
-	
+		new BooleanAccessibilityPreference(this, "accessibility_smart_autoannounce", true).makeProfile();
+
 	// this value string is synchronized with settings_pref.xml preference name
 	// cache of metrics constants as they are used very often
-	public final OsmandPreference<Integer> ACCESSIBILITY_AUTOANNOUNCE_PERIOD = new IntPreference("accessibility_autoannounce_period", 10000).makeProfile().cache();
+	public final OsmandPreference<Integer> ACCESSIBILITY_AUTOANNOUNCE_PERIOD = new IntPreference(this, "accessibility_autoannounce_period", 10000).makeProfile().cache();
 
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> DISABLE_OFFROUTE_RECALC =
-		new BooleanPreference("disable_offroute_recalc", false).makeProfile();
+			new BooleanPreference(this, "disable_offroute_recalc", false).makeProfile();
 
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> DISABLE_WRONG_DIRECTION_RECALC =
-		new BooleanPreference("disable_wrong_direction_recalc", false).makeProfile();
-	
+			new BooleanPreference(this, "disable_wrong_direction_recalc", false).makeProfile();
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> DIRECTION_AUDIO_FEEDBACK =
-		new BooleanAccessibilityPreference("direction_audio_feedback", false).makeProfile();
-	
+			new BooleanAccessibilityPreference(this, "direction_audio_feedback", false).makeProfile();
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> DIRECTION_HAPTIC_FEEDBACK =
-		new BooleanAccessibilityPreference("direction_haptic_feedback", false).makeProfile();
+			new BooleanAccessibilityPreference(this, "direction_haptic_feedback", false).makeProfile();
 
 	// magnetic field doesn'torkmost of the time on some phones
-	public final OsmandPreference<Boolean> USE_MAGNETIC_FIELD_SENSOR_COMPASS = new BooleanPreference("use_magnetic_field_sensor_compass", false).makeProfile().cache();
-	public final OsmandPreference<Boolean> USE_KALMAN_FILTER_FOR_COMPASS = new BooleanPreference("use_kalman_filter_compass", true).makeProfile().cache();
-	public final OsmandPreference<Boolean> USE_VOLUME_BUTTONS_AS_ZOOM = new BooleanPreference("use_volume_buttons_as_zoom", false).makeProfile().cache();
+	public final OsmandPreference<Boolean> USE_MAGNETIC_FIELD_SENSOR_COMPASS = new BooleanPreference(this, "use_magnetic_field_sensor_compass", false).makeProfile().cache();
+	public final OsmandPreference<Boolean> USE_KALMAN_FILTER_FOR_COMPASS = new BooleanPreference(this, "use_kalman_filter_compass", true).makeProfile().cache();
+	public final OsmandPreference<Boolean> USE_VOLUME_BUTTONS_AS_ZOOM = new BooleanPreference(this, "use_volume_buttons_as_zoom", false).makeProfile().cache();
 
-	public final OsmandPreference<Boolean> DO_NOT_SHOW_STARTUP_MESSAGES = new BooleanPreference("do_not_show_startup_messages", false).makeGlobal().cache();
-	public final OsmandPreference<Boolean> SHOW_DOWNLOAD_MAP_DIALOG = new BooleanPreference("show_download_map_dialog", true).makeGlobal().cache();
-	public final OsmandPreference<Boolean> DO_NOT_USE_ANIMATIONS = new BooleanPreference("do_not_use_animations", false).makeProfile().cache();
+	public final OsmandPreference<Boolean> DO_NOT_SHOW_STARTUP_MESSAGES = new BooleanPreference(this, "do_not_show_startup_messages", false).makeGlobal().cache();
+	public final OsmandPreference<Boolean> SHOW_DOWNLOAD_MAP_DIALOG = new BooleanPreference(this, "show_download_map_dialog", true).makeGlobal().cache();
+	public final OsmandPreference<Boolean> DO_NOT_USE_ANIMATIONS = new BooleanPreference(this, "do_not_use_animations", false).makeProfile().cache();
 
-	public final OsmandPreference<Boolean> SEND_ANONYMOUS_MAP_DOWNLOADS_DATA = new BooleanPreference("send_anonymous_map_downloads_data", false).makeGlobal().cache();
-	public final OsmandPreference<Boolean> SEND_ANONYMOUS_APP_USAGE_DATA = new BooleanPreference("send_anonymous_app_usage_data", false).makeGlobal().cache();
-	public final OsmandPreference<Boolean> SEND_ANONYMOUS_DATA_REQUEST_PROCESSED = new BooleanPreference("send_anonymous_data_request_processed", false).makeGlobal().cache();
-	public final OsmandPreference<Integer> SEND_ANONYMOUS_DATA_REQUESTS_COUNT = new IntPreference("send_anonymous_data_requests_count", 0).makeGlobal().cache();
-	public final OsmandPreference<Integer> SEND_ANONYMOUS_DATA_LAST_REQUEST_NS = new IntPreference("send_anonymous_data_last_request_ns", -1).makeGlobal().cache();
+	public final OsmandPreference<Boolean> SEND_ANONYMOUS_MAP_DOWNLOADS_DATA = new BooleanPreference(this, "send_anonymous_map_downloads_data", false).makeGlobal().cache();
+	public final OsmandPreference<Boolean> SEND_ANONYMOUS_APP_USAGE_DATA = new BooleanPreference(this, "send_anonymous_app_usage_data", false).makeGlobal().cache();
+	public final OsmandPreference<Boolean> SEND_ANONYMOUS_DATA_REQUEST_PROCESSED = new BooleanPreference(this, "send_anonymous_data_request_processed", false).makeGlobal().cache();
+	public final OsmandPreference<Integer> SEND_ANONYMOUS_DATA_REQUESTS_COUNT = new IntPreference(this, "send_anonymous_data_requests_count", 0).makeGlobal().cache();
+	public final OsmandPreference<Integer> SEND_ANONYMOUS_DATA_LAST_REQUEST_NS = new IntPreference(this, "send_anonymous_data_last_request_ns", -1).makeGlobal().cache();
 
-	public final OsmandPreference<Boolean> MAP_EMPTY_STATE_ALLOWED = new BooleanPreference("map_empty_state_allowed", false).makeProfile().cache();
+	public final OsmandPreference<Boolean> MAP_EMPTY_STATE_ALLOWED = new BooleanPreference(this, "map_empty_state_allowed", false).makeProfile().cache();
 
 
-	public final CommonPreference<Float> TEXT_SCALE = new FloatPreference("text_scale", 1f).makeProfile().cache();
+	public final CommonPreference<Float> TEXT_SCALE = new FloatPreference(this, "text_scale", 1f).makeProfile().cache();
 
 	{
 		TEXT_SCALE.setModeDefaultValue(ApplicationMode.CAR, 1.25f);
 	}
 
-	public final CommonPreference<Float> MAP_DENSITY = new FloatPreference("map_density_n", 1f).makeProfile().cache();
+	public final CommonPreference<Float> MAP_DENSITY = new FloatPreference(this, "map_density_n", 1f).makeProfile().cache();
 
 	{
 		MAP_DENSITY.setModeDefaultValue(ApplicationMode.CAR, 1.5f);
 	}
 
 
-	public final OsmandPreference<Boolean> SHOW_POI_LABEL = new BooleanPreference("show_poi_label", false).makeProfile();
+	public final OsmandPreference<Boolean> SHOW_POI_LABEL = new BooleanPreference(this, "show_poi_label", false).makeProfile();
 
-	public final OsmandPreference<Boolean> SHOW_MAPILLARY = new BooleanPreference("show_mapillary", false).makeProfile();
-	public final OsmandPreference<Boolean> MAPILLARY_FIRST_DIALOG_SHOWN = new BooleanPreference("mapillary_first_dialog_shown", false).makeGlobal();
-	public final OsmandPreference<Boolean> ONLINE_PHOTOS_ROW_COLLAPSED = new BooleanPreference("mapillary_menu_collapsed", true).makeGlobal();
-	public final OsmandPreference<Boolean> WEBGL_SUPPORTED = new BooleanPreference("webgl_supported", true).makeGlobal();
+	public final OsmandPreference<Boolean> SHOW_MAPILLARY = new BooleanPreference(this, "show_mapillary", false).makeProfile();
+	public final OsmandPreference<Boolean> MAPILLARY_FIRST_DIALOG_SHOWN = new BooleanPreference(this, "mapillary_first_dialog_shown", false).makeGlobal();
+	public final OsmandPreference<Boolean> ONLINE_PHOTOS_ROW_COLLAPSED = new BooleanPreference(this, "mapillary_menu_collapsed", true).makeGlobal();
+	public final OsmandPreference<Boolean> WEBGL_SUPPORTED = new BooleanPreference(this, "webgl_supported", true).makeGlobal();
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final OsmandPreference<String> PREFERRED_LOCALE = new StringPreference("preferred_locale", "").makeGlobal();
+	public final OsmandPreference<String> PREFERRED_LOCALE = new StringPreference(this, "preferred_locale", "").makeGlobal();
 
-	public final OsmandPreference<String> MAP_PREFERRED_LOCALE = new StringPreference("map_preferred_locale", "").makeGlobal().cache();
-	public final OsmandPreference<Boolean> MAP_TRANSLITERATE_NAMES = new BooleanPreference("map_transliterate_names", false).makeGlobal().cache();
+	public final OsmandPreference<String> MAP_PREFERRED_LOCALE = new StringPreference(this, "map_preferred_locale", "").makeGlobal().cache();
+	public final OsmandPreference<Boolean> MAP_TRANSLITERATE_NAMES = new BooleanPreference(this, "map_transliterate_names", false).makeGlobal().cache();
 
 	public boolean usingEnglishNames() {
 		return MAP_PREFERRED_LOCALE.get().equals("en");
 	}
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final OsmandPreference<String> USER_NAME = new StringPreference("user_name", "").makeGlobal();
+	public final OsmandPreference<String> USER_NAME = new StringPreference(this, "user_name", "").makeGlobal();
 
 	public static final String BILLING_USER_DONATION_WORLD_PARAMETER = "";
 	public static final String BILLING_USER_DONATION_NONE_PARAMETER = "none";
 
-	public final OsmandPreference<Boolean> INAPPS_READ = new BooleanPreference("inapps_read", false).makeGlobal();
+	public final OsmandPreference<Boolean> INAPPS_READ = new BooleanPreference(this, "inapps_read", false).makeGlobal();
 
-	public final OsmandPreference<String> BILLING_USER_ID = new StringPreference("billing_user_id", "").makeGlobal();
-	public final OsmandPreference<String> BILLING_USER_TOKEN = new StringPreference("billing_user_token", "").makeGlobal();
-	public final OsmandPreference<String> BILLING_USER_NAME = new StringPreference("billing_user_name", "").makeGlobal();
-	public final OsmandPreference<String> BILLING_USER_EMAIL = new StringPreference("billing_user_email", "").makeGlobal();
-	public final OsmandPreference<String> BILLING_USER_COUNTRY = new StringPreference("billing_user_country", "").makeGlobal();
-	public final OsmandPreference<String> BILLING_USER_COUNTRY_DOWNLOAD_NAME = new StringPreference("billing_user_country_download_name", BILLING_USER_DONATION_NONE_PARAMETER).makeGlobal();
-	public final OsmandPreference<Boolean> BILLING_HIDE_USER_NAME = new BooleanPreference("billing_hide_user_name", false).makeGlobal();
-	public final OsmandPreference<Boolean> BILLING_PURCHASE_TOKEN_SENT = new BooleanPreference("billing_purchase_token_sent", false).makeGlobal();
-	public final OsmandPreference<String> BILLING_PURCHASE_TOKENS_SENT = new StringPreference("billing_purchase_tokens_sent", "").makeGlobal();
-	public final OsmandPreference<Boolean> LIVE_UPDATES_PURCHASED = new BooleanPreference("billing_live_updates_purchased", false).makeGlobal();
-	public final OsmandPreference<Long> LIVE_UPDATES_PURCHASE_CANCELLED_TIME = new LongPreference("live_updates_purchase_cancelled_time", 0).makeGlobal();
-	public final OsmandPreference<Boolean> LIVE_UPDATES_PURCHASE_CANCELLED_FIRST_DLG_SHOWN = new BooleanPreference("live_updates_purchase_cancelled_first_dlg_shown", false).makeGlobal();
-	public final OsmandPreference<Boolean> LIVE_UPDATES_PURCHASE_CANCELLED_SECOND_DLG_SHOWN = new BooleanPreference("live_updates_purchase_cancelled_second_dlg_shown", false).makeGlobal();
-	public final OsmandPreference<Boolean> FULL_VERSION_PURCHASED = new BooleanPreference("billing_full_version_purchased", false).makeGlobal();
-	public final OsmandPreference<Boolean> DEPTH_CONTOURS_PURCHASED = new BooleanPreference("billing_sea_depth_purchased", false).makeGlobal();
-	public final OsmandPreference<Boolean> CONTOUR_LINES_PURCHASED = new BooleanPreference("billing_srtm_purchased", false).makeGlobal();
-	public final OsmandPreference<Boolean> EMAIL_SUBSCRIBED = new BooleanPreference("email_subscribed", false).makeGlobal();
+	public final OsmandPreference<String> BILLING_USER_ID = new StringPreference(this, "billing_user_id", "").makeGlobal();
+	public final OsmandPreference<String> BILLING_USER_TOKEN = new StringPreference(this, "billing_user_token", "").makeGlobal();
+	public final OsmandPreference<String> BILLING_USER_NAME = new StringPreference(this, "billing_user_name", "").makeGlobal();
+	public final OsmandPreference<String> BILLING_USER_EMAIL = new StringPreference(this, "billing_user_email", "").makeGlobal();
+	public final OsmandPreference<String> BILLING_USER_COUNTRY = new StringPreference(this, "billing_user_country", "").makeGlobal();
+	public final OsmandPreference<String> BILLING_USER_COUNTRY_DOWNLOAD_NAME = new StringPreference(this, "billing_user_country_download_name", BILLING_USER_DONATION_NONE_PARAMETER).makeGlobal();
+	public final OsmandPreference<Boolean> BILLING_HIDE_USER_NAME = new BooleanPreference(this, "billing_hide_user_name", false).makeGlobal();
+	public final OsmandPreference<Boolean> BILLING_PURCHASE_TOKEN_SENT = new BooleanPreference(this, "billing_purchase_token_sent", false).makeGlobal();
+	public final OsmandPreference<String> BILLING_PURCHASE_TOKENS_SENT = new StringPreference(this, "billing_purchase_tokens_sent", "").makeGlobal();
+	public final OsmandPreference<Boolean> LIVE_UPDATES_PURCHASED = new BooleanPreference(this, "billing_live_updates_purchased", false).makeGlobal();
+	public final OsmandPreference<Long> LIVE_UPDATES_PURCHASE_CANCELLED_TIME = new LongPreference(this, "live_updates_purchase_cancelled_time", 0).makeGlobal();
+	public final OsmandPreference<Boolean> LIVE_UPDATES_PURCHASE_CANCELLED_FIRST_DLG_SHOWN = new BooleanPreference(this, "live_updates_purchase_cancelled_first_dlg_shown", false).makeGlobal();
+	public final OsmandPreference<Boolean> LIVE_UPDATES_PURCHASE_CANCELLED_SECOND_DLG_SHOWN = new BooleanPreference(this, "live_updates_purchase_cancelled_second_dlg_shown", false).makeGlobal();
+	public final OsmandPreference<Boolean> FULL_VERSION_PURCHASED = new BooleanPreference(this, "billing_full_version_purchased", false).makeGlobal();
+	public final OsmandPreference<Boolean> DEPTH_CONTOURS_PURCHASED = new BooleanPreference(this, "billing_sea_depth_purchased", false).makeGlobal();
+	public final OsmandPreference<Boolean> CONTOUR_LINES_PURCHASED = new BooleanPreference(this, "billing_srtm_purchased", false).makeGlobal();
+	public final OsmandPreference<Boolean> EMAIL_SUBSCRIBED = new BooleanPreference(this, "email_subscribed", false).makeGlobal();
 
-	public final OsmandPreference<Integer> DISCOUNT_ID = new IntPreference("discount_id", 0).makeGlobal();
-	public final OsmandPreference<Integer> DISCOUNT_SHOW_NUMBER_OF_STARTS = new IntPreference("number_of_starts_on_discount_show", 0).makeGlobal();
-	public final OsmandPreference<Integer> DISCOUNT_TOTAL_SHOW = new IntPreference("discount_total_show", 0).makeGlobal();
-	public final OsmandPreference<Long> DISCOUNT_SHOW_DATETIME_MS = new LongPreference("show_discount_datetime_ms", 0).makeGlobal();
+	public final OsmandPreference<Integer> DISCOUNT_ID = new IntPreference(this, "discount_id", 0).makeGlobal();
+	public final OsmandPreference<Integer> DISCOUNT_SHOW_NUMBER_OF_STARTS = new IntPreference(this, "number_of_starts_on_discount_show", 0).makeGlobal();
+	public final OsmandPreference<Integer> DISCOUNT_TOTAL_SHOW = new IntPreference(this, "discount_total_show", 0).makeGlobal();
+	public final OsmandPreference<Long> DISCOUNT_SHOW_DATETIME_MS = new LongPreference(this, "show_discount_datetime_ms", 0).makeGlobal();
 
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<String> USER_OSM_BUG_NAME =
-			new StringPreference("user_osm_bug_name", "NoName/OsmAnd").makeGlobal();
+			new StringPreference(this, "user_osm_bug_name", "NoName/OsmAnd").makeGlobal();
 
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<String> USER_PASSWORD =
-			new StringPreference("user_password", "").makeGlobal();
+			new StringPreference(this, "user_password", "").makeGlobal();
 
 	public final OsmandPreference<String> USER_ACCESS_TOKEN =
 			new StringPreference("user_access_token", "").makeGlobal();
@@ -2031,11 +1132,11 @@ public class OsmandSettings {
 			new StringPreference("user_access_token_secret", "").makeGlobal();
 
 	// this value boolean is synchronized with settings_pref.xml preference offline POI/Bugs edition
-	public final OsmandPreference<Boolean> OFFLINE_EDITION = new BooleanPreference("offline_osm_editing", true).makeGlobal();
+	public final OsmandPreference<Boolean> OFFLINE_EDITION = new BooleanPreference(this, "offline_osm_editing", true).makeGlobal();
 
 	// this value string is synchronized with settings_pref.xml preference name
 	public final CommonPreference<DayNightMode> DAYNIGHT_MODE =
-			new EnumStringPreference<DayNightMode>("daynight_mode", DayNightMode.DAY, DayNightMode.values());
+			new EnumStringPreference<DayNightMode>(this, "daynight_mode", DayNightMode.DAY, DayNightMode.values());
 
 	{
 		DAYNIGHT_MODE.makeProfile().cache();
@@ -2045,7 +1146,7 @@ public class OsmandSettings {
 	}
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final CommonPreference<Boolean> AUTO_ZOOM_MAP = new BooleanPreference("auto_zoom_map_on_off", false).makeProfile().cache();
+	public final CommonPreference<Boolean> AUTO_ZOOM_MAP = new BooleanPreference(this, "auto_zoom_map_on_off", false).makeProfile().cache();
 	{
 		AUTO_ZOOM_MAP.setModeDefaultValue(ApplicationMode.CAR, true);
 		AUTO_ZOOM_MAP.setModeDefaultValue(ApplicationMode.BICYCLE, false);
@@ -2053,7 +1154,7 @@ public class OsmandSettings {
 	}
 
 	public final CommonPreference<AutoZoomMap> AUTO_ZOOM_MAP_SCALE =
-			new EnumStringPreference<AutoZoomMap>("auto_zoom_map_scale", AutoZoomMap.FAR,
+			new EnumStringPreference<AutoZoomMap>(this, "auto_zoom_map_scale", AutoZoomMap.FAR,
 					AutoZoomMap.values()).makeProfile().cache();
 	{
 		AUTO_ZOOM_MAP_SCALE.setModeDefaultValue(ApplicationMode.CAR, AutoZoomMap.FAR);
@@ -2061,7 +1162,7 @@ public class OsmandSettings {
 		AUTO_ZOOM_MAP_SCALE.setModeDefaultValue(ApplicationMode.PEDESTRIAN, AutoZoomMap.CLOSE);
 	}
 
-	public final CommonPreference<Integer> DELAY_TO_START_NAVIGATION = new IntPreference("delay_to_start_navigation", -1) {
+	public final CommonPreference<Integer> DELAY_TO_START_NAVIGATION = new IntPreference(this, "delay_to_start_navigation", -1) {
 
 		protected Integer getDefaultValue() {
 			if (DEFAULT_APPLICATION_MODE.get().isDerivedRoutingFrom(ApplicationMode.CAR)) {
@@ -2071,16 +1172,16 @@ public class OsmandSettings {
 		}
 	}.makeGlobal().cache();
 
-	public final CommonPreference<Boolean> SNAP_TO_ROAD = new BooleanPreference("snap_to_road", false).makeProfile().cache();
+	public final CommonPreference<Boolean> SNAP_TO_ROAD = new BooleanPreference(this, "snap_to_road", false).makeProfile().cache();
 
 	{
 		SNAP_TO_ROAD.setModeDefaultValue(ApplicationMode.CAR, true);
 		SNAP_TO_ROAD.setModeDefaultValue(ApplicationMode.BICYCLE, true);
 	}
 
-	public final CommonPreference<Boolean> INTERRUPT_MUSIC = new BooleanPreference("interrupt_music", false).makeProfile();
+	public final CommonPreference<Boolean> INTERRUPT_MUSIC = new BooleanPreference(this, "interrupt_music", false).makeProfile();
 
-	public final CommonPreference<Boolean> ENABLE_PROXY = new BooleanPreference("enable_proxy", false) {
+	public final CommonPreference<Boolean> ENABLE_PROXY = new BooleanPreference(this, "enable_proxy", false) {
 		@Override
 		protected boolean setValue(Object prefs, Boolean val) {
 			boolean valueSaved = super.setValue(prefs, val);
@@ -2091,19 +1192,19 @@ public class OsmandSettings {
 		}
 	}.makeGlobal();
 
-	public final CommonPreference<String> PROXY_HOST = new StringPreference("proxy_host", "127.0.0.1").makeGlobal();
-	public final CommonPreference<Integer> PROXY_PORT = new IntPreference("proxy_port", 8118).makeGlobal();
-	public final CommonPreference<String> USER_ANDROID_ID = new StringPreference("user_android_id", "").makeGlobal();
+	public final CommonPreference<String> PROXY_HOST = new StringPreference(this, "proxy_host", "127.0.0.1").makeGlobal();
+	public final CommonPreference<Integer> PROXY_PORT = new IntPreference(this, "proxy_port", 8118).makeGlobal();
+	public final CommonPreference<String> USER_ANDROID_ID = new StringPreference(this, "user_android_id", "").makeGlobal();
 
 	// this value string is synchronized with settings_pref.xml preference name
 	public static final String SAVE_CURRENT_TRACK = "save_current_track"; //$NON-NLS-1$
 
-	public final CommonPreference<Boolean> SAVE_GLOBAL_TRACK_TO_GPX = new BooleanPreference("save_global_track_to_gpx", false).makeGlobal().cache();
-	public final CommonPreference<Integer> SAVE_GLOBAL_TRACK_INTERVAL = new IntPreference("save_global_track_interval", 5000).makeProfile().cache();
-	public final CommonPreference<Boolean> SAVE_GLOBAL_TRACK_REMEMBER = new BooleanPreference("save_global_track_remember", false).makeProfile().cache();
-	public final CommonPreference<Boolean> SHOW_SAVED_TRACK_REMEMBER = new BooleanPreference("show_saved_track_remember", true).makeGlobal();
+	public final CommonPreference<Boolean> SAVE_GLOBAL_TRACK_TO_GPX = new BooleanPreference(this, "save_global_track_to_gpx", false).makeGlobal().cache();
+	public final CommonPreference<Integer> SAVE_GLOBAL_TRACK_INTERVAL = new IntPreference(this, "save_global_track_interval", 5000).makeProfile().cache();
+	public final CommonPreference<Boolean> SAVE_GLOBAL_TRACK_REMEMBER = new BooleanPreference(this, "save_global_track_remember", false).makeProfile().cache();
+	public final CommonPreference<Boolean> SHOW_SAVED_TRACK_REMEMBER = new BooleanPreference(this, "show_saved_track_remember", true).makeGlobal();
 	// this value string is synchronized with settings_pref.xml preference name
-	public final CommonPreference<Boolean> SAVE_TRACK_TO_GPX = new BooleanPreference("save_track_to_gpx", false).makeProfile().cache();
+	public final CommonPreference<Boolean> SAVE_TRACK_TO_GPX = new BooleanPreference(this, "save_track_to_gpx", false).makeProfile().cache();
 
 	{
 		SAVE_TRACK_TO_GPX.setModeDefaultValue(ApplicationMode.CAR, false);
@@ -2115,67 +1216,70 @@ public class OsmandSettings {
 	public static final Integer MONTHLY_DIRECTORY = 1;
 //	public static final Integer DAILY_DIRECTORY = 2;
 
-	public final CommonPreference<Boolean> DISABLE_RECORDING_ONCE_APP_KILLED = new BooleanPreference("disable_recording_once_app_killed", false).makeProfile();
+	public final CommonPreference<Boolean> DISABLE_RECORDING_ONCE_APP_KILLED = new BooleanPreference(this, "disable_recording_once_app_killed", false).makeProfile();
 
-	public final CommonPreference<Boolean> SAVE_HEADING_TO_GPX = new BooleanPreference("save_heading_to_gpx", false).makeProfile();
+	public final CommonPreference<Boolean> SAVE_HEADING_TO_GPX = new BooleanPreference(this, "save_heading_to_gpx", false).makeProfile();
 
-	public final CommonPreference<Integer> TRACK_STORAGE_DIRECTORY = new IntPreference("track_storage_directory", 0).makeProfile();
+	public final CommonPreference<Integer> TRACK_STORAGE_DIRECTORY = new IntPreference(this, "track_storage_directory", 0).makeProfile();
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final OsmandPreference<Boolean> FAST_ROUTE_MODE = new BooleanPreference("fast_route_mode", true).makeProfile();
+	public final OsmandPreference<Boolean> FAST_ROUTE_MODE = new BooleanPreference(this, "fast_route_mode", true).makeProfile();
 	// dev version
-	public final CommonPreference<Boolean> DISABLE_COMPLEX_ROUTING = new BooleanPreference("disable_complex_routing", false).makeGlobal();
-	public final CommonPreference<Boolean> ENABLE_TIME_CONDITIONAL_ROUTING = new BooleanPreference("enable_time_conditional_routing", true).makeProfile();
+	public final CommonPreference<Boolean> DISABLE_COMPLEX_ROUTING = new BooleanPreference(this, "disable_complex_routing", false).makeProfile();
+	public final CommonPreference<Boolean> ENABLE_TIME_CONDITIONAL_ROUTING = new BooleanPreference(this, "enable_time_conditional_routing", true).makeProfile();
 
 	public boolean simulateNavigation = false;
 
-	public final CommonPreference<Boolean> SHOW_ROUTING_ALARMS = new BooleanPreference("show_routing_alarms", true).makeProfile().cache();
+	public final CommonPreference<Boolean> SHOW_ROUTING_ALARMS = new BooleanPreference(this, "show_routing_alarms", true).makeProfile().cache();
 
-	public final CommonPreference<Boolean> SHOW_TRAFFIC_WARNINGS = new BooleanPreference("show_traffic_warnings", false).makeProfile().cache();
+	public final CommonPreference<Boolean> SHOW_TRAFFIC_WARNINGS = new BooleanPreference(this, "show_traffic_warnings", false).makeProfile().cache();
 
 	{
 		SHOW_TRAFFIC_WARNINGS.setModeDefaultValue(ApplicationMode.CAR, true);
 	}
 
-	public final CommonPreference<Boolean> SHOW_PEDESTRIAN = new BooleanPreference("show_pedestrian", false).makeProfile().cache();
+	public final CommonPreference<Boolean> SHOW_PEDESTRIAN = new BooleanPreference(this, "show_pedestrian", false).makeProfile().cache();
 
 	{
 		SHOW_PEDESTRIAN.setModeDefaultValue(ApplicationMode.CAR, true);
 	}
 
-	public final CommonPreference<Boolean> SHOW_TUNNELS = new BooleanPreference("show_tunnels", false).makeProfile().cache();
+	public final CommonPreference<Boolean> SHOW_TUNNELS = new BooleanPreference(this, "show_tunnels", false).makeProfile().cache();
 
 	{
 		SHOW_TUNNELS.setModeDefaultValue(ApplicationMode.CAR, true);
 	}
 
-	public final OsmandPreference<Boolean> SHOW_CAMERAS = new BooleanPreference("show_cameras", false).makeProfile().cache();
-	public final CommonPreference<Boolean> SHOW_LANES = new BooleanPreference("show_lanes", false).makeProfile().cache();
+	public final OsmandPreference<Boolean> SHOW_CAMERAS = new BooleanPreference(this, "show_cameras", false).makeProfile().cache();
+	public final CommonPreference<Boolean> SHOW_LANES = new BooleanPreference(this, "show_lanes", false).makeProfile().cache();
 
 	{
 		SHOW_LANES.setModeDefaultValue(ApplicationMode.CAR, true);
 		SHOW_LANES.setModeDefaultValue(ApplicationMode.BICYCLE, true);
 	}
 
-	public final OsmandPreference<Boolean> SHOW_WPT = new BooleanPreference("show_gpx_wpt", true).makeGlobal().cache();
-	public final OsmandPreference<Boolean> SHOW_NEARBY_FAVORITES = new BooleanPreference("show_nearby_favorites", false).makeProfile().cache();
-	public final OsmandPreference<Boolean> SHOW_NEARBY_POI = new BooleanPreference("show_nearby_poi", false).makeProfile().cache();
+	public final OsmandPreference<Boolean> SHOW_WPT = new BooleanPreference(this, "show_gpx_wpt", true).makeGlobal().cache();
+	public final OsmandPreference<Boolean> SHOW_NEARBY_FAVORITES = new BooleanPreference(this, "show_nearby_favorites", false).makeProfile().cache();
+	public final OsmandPreference<Boolean> SHOW_NEARBY_POI = new BooleanPreference(this, "show_nearby_poi", false).makeProfile().cache();
 
-	public final OsmandPreference<Boolean> SPEAK_STREET_NAMES = new BooleanPreference("speak_street_names", true).makeProfile().cache();
-	public final CommonPreference<Boolean> SPEAK_TRAFFIC_WARNINGS = new BooleanPreference("speak_traffic_warnings", true).makeProfile().cache();
+	public final OsmandPreference<Boolean> SPEAK_STREET_NAMES = new BooleanPreference(this, "speak_street_names", true).makeProfile().cache();
+	public final CommonPreference<Boolean> SPEAK_TRAFFIC_WARNINGS = new BooleanPreference(this, "speak_traffic_warnings", true).makeProfile().cache();
 	{
 		SPEAK_TRAFFIC_WARNINGS.setModeDefaultValue(ApplicationMode.CAR, true);
 	}
-	public final CommonPreference<Boolean> SPEAK_PEDESTRIAN = new BooleanPreference("speak_pedestrian", false).makeProfile().cache();
+
+	public final CommonPreference<Boolean> SPEAK_PEDESTRIAN = new BooleanPreference(this, "speak_pedestrian", false).makeProfile().cache();
+
 	{
 		SPEAK_PEDESTRIAN.setModeDefaultValue(ApplicationMode.CAR, true);
 	}
-	public final OsmandPreference<Boolean> SPEAK_SPEED_LIMIT = new BooleanPreference("speak_speed_limit", false).makeProfile().cache();
-	public final OsmandPreference<Boolean> SPEAK_SPEED_CAMERA = new BooleanPreference("speak_cameras", false).makeProfile().cache();
-	public final OsmandPreference<Boolean> SPEAK_TUNNELS = new BooleanPreference("speak_tunnels", false).makeProfile().cache();
 
-	public final OsmandPreference<Boolean> SPEED_CAMERAS_UNINSTALLED = new BooleanPreference("speed_cameras_uninstalled", false).makeGlobal();
-	public final OsmandPreference<Boolean> SPEED_CAMERAS_ALERT_SHOWED = new BooleanPreference("speed_cameras_alert_showed", false).makeGlobal();
+	public final OsmandPreference<Boolean> SPEAK_SPEED_LIMIT = new BooleanPreference(this, "speak_speed_limit", false).makeProfile().cache();
+	public final OsmandPreference<Boolean> SPEAK_SPEED_CAMERA = new BooleanPreference(this, "speak_cameras", false).makeProfile().cache();
+	public final OsmandPreference<Boolean> SPEAK_TUNNELS = new BooleanPreference(this, "speak_tunnels", false).makeProfile().cache();
+
+	public final OsmandPreference<Boolean> SPEED_CAMERAS_UNINSTALLED = new BooleanPreference(this, "speed_cameras_uninstalled", false).makeGlobal();
+	public final OsmandPreference<Boolean> SPEED_CAMERAS_ALERT_SHOWED = new BooleanPreference(this, "speed_cameras_alert_showed", false).makeGlobal();
 
 	public Set<String> getForbiddenTypes() {
 		Set<String> typeNames = new HashSet<>();
@@ -2185,7 +1289,7 @@ public class OsmandSettings {
 		return typeNames;
 	}
 
-	public final OsmandPreference<Boolean> ANNOUNCE_WPT = new BooleanPreference("announce_wpt", true) {
+	public final OsmandPreference<Boolean> ANNOUNCE_WPT = new BooleanPreference(this, "announce_wpt", true) {
 		@Override
 		protected boolean setValue(Object prefs, Boolean val) {
 			boolean valueSaved = super.setValue(prefs, val);
@@ -2197,7 +1301,7 @@ public class OsmandSettings {
 		}
 	}.makeProfile().cache();
 
-	public final OsmandPreference<Boolean> ANNOUNCE_NEARBY_FAVORITES = new BooleanPreference("announce_nearby_favorites", false) {
+	public final OsmandPreference<Boolean> ANNOUNCE_NEARBY_FAVORITES = new BooleanPreference(this, "announce_nearby_favorites", false) {
 		@Override
 		protected boolean setValue(Object prefs, Boolean val) {
 			boolean valueSaved = super.setValue(prefs, val);
@@ -2209,7 +1313,7 @@ public class OsmandSettings {
 		}
 	}.makeProfile().cache();
 
-	public final OsmandPreference<Boolean> ANNOUNCE_NEARBY_POI = new BooleanPreference("announce_nearby_poi", false) {
+	public final OsmandPreference<Boolean> ANNOUNCE_NEARBY_POI = new BooleanPreference(this, "announce_nearby_poi", false) {
 		@Override
 		protected boolean setValue(Object prefs, Boolean val) {
 			boolean valueSaved = super.setValue(prefs, val);
@@ -2221,83 +1325,83 @@ public class OsmandSettings {
 		}
 	}.makeProfile().cache();
 
-	public final OsmandPreference<Boolean> SHOW_START_FINISH_ICONS = new BooleanPreference("show_start_finish_icons", true).makeGlobal().cache();
+	public final OsmandPreference<Boolean> GPX_ROUTE_CALC_OSMAND_PARTS = new BooleanPreference(this, "gpx_routing_calculate_osmand_route", true).makeGlobal().cache();
+	public final OsmandPreference<Boolean> GPX_CALCULATE_RTEPT = new BooleanPreference(this, "gpx_routing_calculate_rtept", true).makeGlobal().cache();
+	public final OsmandPreference<Boolean> GPX_ROUTE_CALC = new BooleanPreference(this, "calc_gpx_route", false).makeGlobal().cache();
+	public final OsmandPreference<Boolean> SHOW_START_FINISH_ICONS = new BooleanPreference(this, "show_start_finish_icons", true).makeGlobal().cache();
 
-	public final OsmandPreference<Boolean> GPX_ROUTE_CALC_OSMAND_PARTS = new BooleanPreference("gpx_routing_calculate_osmand_route", true).makeGlobal().cache();
-//	public final OsmandPreference<Boolean> GPX_CALCULATE_RTEPT = new BooleanPreference("gpx_routing_calculate_rtept", true).makeGlobal().cache();
-	public final OsmandPreference<Boolean> GPX_ROUTE_CALC = new BooleanPreference("calc_gpx_route", false).makeGlobal().cache();
+	public final OsmandPreference<Boolean> AVOID_TOLL_ROADS = new BooleanPreference(this, "avoid_toll_roads", false).makeProfile().cache();
+	public final OsmandPreference<Boolean> AVOID_MOTORWAY = new BooleanPreference(this, "avoid_motorway", false).makeProfile().cache();
+	public final OsmandPreference<Boolean> AVOID_UNPAVED_ROADS = new BooleanPreference(this, "avoid_unpaved_roads", false).makeProfile().cache();
+	public final OsmandPreference<Boolean> AVOID_FERRIES = new BooleanPreference(this, "avoid_ferries", false).makeProfile().cache();
 
-	public final OsmandPreference<Boolean> AVOID_TOLL_ROADS = new BooleanPreference("avoid_toll_roads", false).makeProfile().cache();
-	public final OsmandPreference<Boolean> AVOID_MOTORWAY = new BooleanPreference("avoid_motorway", false).makeProfile().cache();
-	public final OsmandPreference<Boolean> AVOID_UNPAVED_ROADS = new BooleanPreference("avoid_unpaved_roads", false).makeProfile().cache();
-	public final OsmandPreference<Boolean> AVOID_FERRIES = new BooleanPreference("avoid_ferries", false).makeProfile().cache();
+	public final OsmandPreference<Boolean> PREFER_MOTORWAYS = new BooleanPreference(this, "prefer_motorways", false).makeProfile().cache();
 
-	public final OsmandPreference<Boolean> PREFER_MOTORWAYS = new BooleanPreference("prefer_motorways", false).makeProfile().cache();
+	public final OsmandPreference<Long> LAST_UPDATES_CARD_REFRESH = new LongPreference(this, "last_updates_card_refresh", 0).makeGlobal();
 
-	public final OsmandPreference<Long> LAST_UPDATES_CARD_REFRESH = new LongPreference("last_updates_card_refresh", 0).makeGlobal();
-
-	public final CommonPreference<Integer> CURRENT_TRACK_COLOR = new IntPreference("current_track_color", 0).makeGlobal().cache();
-	public final CommonPreference<String> CURRENT_TRACK_WIDTH = new StringPreference("current_track_width", "").makeGlobal().cache();
-	public final CommonPreference<Boolean> CURRENT_TRACK_SHOW_ARROWS = new BooleanPreference("current_track_show_arrows", false).makeGlobal().cache();
-	public final CommonPreference<Boolean> CURRENT_TRACK_SHOW_START_FINISH = new BooleanPreference("current_track_show_start_finish", true).makeGlobal().cache();
-	public final ListStringPreference CUSTOM_TRACK_COLORS = (ListStringPreference) new ListStringPreference("custom_track_colors", null, ",").makeGlobal();
+	public final CommonPreference<Integer> CURRENT_TRACK_COLOR = new IntPreference(this, "current_track_color", 0).makeGlobal().cache();
+	public final CommonPreference<String> CURRENT_TRACK_WIDTH = new StringPreference(this, "current_track_width", "").makeGlobal().cache();
+	public final CommonPreference<Boolean> CURRENT_TRACK_SHOW_ARROWS = new BooleanPreference(this, "current_track_show_arrows", false).makeGlobal().cache();
+	public final CommonPreference<Boolean> CURRENT_TRACK_SHOW_START_FINISH = new BooleanPreference(this, "current_track_show_start_finish", true).makeGlobal().cache();
+	public final ListStringPreference CUSTOM_TRACK_COLORS = (ListStringPreference) new ListStringPreference(this, "custom_track_colors", null, ",").makeGlobal();
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final CommonPreference<Integer> SAVE_TRACK_INTERVAL = new IntPreference("save_track_interval", 5000).makeProfile();
+	public final CommonPreference<Integer> SAVE_TRACK_INTERVAL = new IntPreference(this, "save_track_interval", 5000).makeProfile();
 
 	{
 		SAVE_TRACK_INTERVAL.setModeDefaultValue(ApplicationMode.CAR, 3000);
 		SAVE_TRACK_INTERVAL.setModeDefaultValue(ApplicationMode.BICYCLE, 5000);
 		SAVE_TRACK_INTERVAL.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 10000);
 	}
-	
+
 	// Please note that SAVE_TRACK_MIN_DISTANCE, SAVE_TRACK_PRECISION, SAVE_TRACK_MIN_SPEED should all be "0" for the default profile, as we have no interface to change them
-	public final CommonPreference<Float> SAVE_TRACK_MIN_DISTANCE = new FloatPreference("save_track_min_distance", 0).makeProfile();
+	public final CommonPreference<Float> SAVE_TRACK_MIN_DISTANCE = new FloatPreference(this, "save_track_min_distance", 0).makeProfile();
 	//{
 	//	SAVE_TRACK_MIN_DISTANCE.setModeDefaultValue(ApplicationMode.CAR, 5.f);
 	//	SAVE_TRACK_MIN_DISTANCE.setModeDefaultValue(ApplicationMode.BICYCLE, 5.f);
 	//	SAVE_TRACK_MIN_DISTANCE.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 5.f);
 	//}
-	public final CommonPreference<Float> SAVE_TRACK_PRECISION = new FloatPreference("save_track_precision", 50.0f).makeProfile();
+	public final CommonPreference<Float> SAVE_TRACK_PRECISION = new FloatPreference(this, "save_track_precision", 50.0f).makeProfile();
 	//{
 //		SAVE_TRACK_PRECISION.setModeDefaultValue(ApplicationMode.CAR, 50.f);
 //		SAVE_TRACK_PRECISION.setModeDefaultValue(ApplicationMode.BICYCLE, 50.f);
 //		SAVE_TRACK_PRECISION.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 50.f);
 	//}
-	public final CommonPreference<Float> SAVE_TRACK_MIN_SPEED = new FloatPreference("save_track_min_speed", 0.f).makeProfile();
+	public final CommonPreference<Float> SAVE_TRACK_MIN_SPEED = new FloatPreference(this, "save_track_min_speed", 0.f).makeProfile();
 	//{
 	//	SAVE_TRACK_MIN_SPEED.setModeDefaultValue(ApplicationMode.CAR, 2.f);
 	//	SAVE_TRACK_MIN_SPEED.setModeDefaultValue(ApplicationMode.BICYCLE, 1.f);
 //		SAVE_TRACK_MIN_SPEED.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 0.f);
 	//}
-	public final CommonPreference<Boolean> AUTO_SPLIT_RECORDING = new BooleanPreference("auto_split_recording", true).makeProfile();
+	public final CommonPreference<Boolean> AUTO_SPLIT_RECORDING = new BooleanPreference(this, "auto_split_recording", true).makeProfile();
 
-	public final CommonPreference<Boolean> SHOW_TRIP_REC_NOTIFICATION = new BooleanPreference("show_trip_recording_notification", true).makeProfile();
+	public final CommonPreference<Boolean> SHOW_TRIP_REC_NOTIFICATION = new BooleanPreference(this, "show_trip_recording_notification", true).makeProfile();
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final CommonPreference<Boolean> LIVE_MONITORING = new BooleanPreference("live_monitoring", false).makeProfile();
+	public final CommonPreference<Boolean> LIVE_MONITORING = new BooleanPreference(this, "live_monitoring", false).makeProfile();
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final CommonPreference<Integer> LIVE_MONITORING_INTERVAL = new IntPreference("live_monitoring_interval", 5000).makeProfile();
+	public final CommonPreference<Integer> LIVE_MONITORING_INTERVAL = new IntPreference(this, "live_monitoring_interval", 5000).makeProfile();
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final CommonPreference<Integer> LIVE_MONITORING_MAX_INTERVAL_TO_SEND = new IntPreference("live_monitoring_maximum_interval_to_send", 900000).makeProfile();
+	public final CommonPreference<Integer> LIVE_MONITORING_MAX_INTERVAL_TO_SEND = new IntPreference(this, "live_monitoring_maximum_interval_to_send", 900000).makeProfile();
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final CommonPreference<String> LIVE_MONITORING_URL = new StringPreference("live_monitoring_url",
+	public final CommonPreference<String> LIVE_MONITORING_URL = new StringPreference(this, "live_monitoring_url",
 			"https://example.com?lat={0}&lon={1}&timestamp={2}&hdop={3}&altitude={4}&speed={5}").makeProfile();
 
-	public final CommonPreference<String> GPS_STATUS_APP = new StringPreference("gps_status_app", "").makeGlobal();
+	public final CommonPreference<String> GPS_STATUS_APP = new StringPreference(this, "gps_status_app", "").makeGlobal();
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final OsmandPreference<Boolean> SHOW_OSM_BUGS = new BooleanPreference("show_osm_bugs", false).makeProfile().cache();
+	public final OsmandPreference<Boolean> SHOW_OSM_BUGS = new BooleanPreference(this, "show_osm_bugs", false).makeProfile().cache();
 
-	public final OsmandPreference<Boolean> SHOW_OSM_EDITS = new BooleanPreference("show_osm_edits", true).makeProfile().cache();
+	public final OsmandPreference<Boolean> SHOW_OSM_EDITS = new BooleanPreference(this, "show_osm_edits", true).makeProfile().cache();
 
-	public final CommonPreference<Boolean> SHOW_CLOSED_OSM_BUGS = new BooleanPreference("show_closed_osm_bugs", false).makeProfile().cache();
-	public final CommonPreference<Integer> SHOW_OSM_BUGS_MIN_ZOOM = new IntPreference("show_osm_bugs_min_zoom", 8).makeProfile().cache();
+	public final CommonPreference<Boolean> SHOW_CLOSED_OSM_BUGS = new BooleanPreference(this, "show_closed_osm_bugs", false).makeProfile().cache();
+	public final CommonPreference<Integer> SHOW_OSM_BUGS_MIN_ZOOM = new IntPreference(this, "show_osm_bugs_min_zoom", 8).makeProfile().cache();
+
+	public final CommonPreference<String> MAP_INFO_CONTROLS = new StringPreference(this, "map_info_controls", "").makeProfile();
 
-	public final CommonPreference<String> MAP_INFO_CONTROLS = new StringPreference("map_info_controls", "").makeProfile();
 	{
 		for (ApplicationMode mode : ApplicationMode.allPossibleValues()) {
 			MAP_INFO_CONTROLS.setModeDefaultValue(mode, "");
@@ -2306,23 +1410,23 @@ public class OsmandSettings {
 
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final OsmandPreference<Boolean> DEBUG_RENDERING_INFO = new BooleanPreference("debug_rendering", false).makeGlobal();
+	public final OsmandPreference<Boolean> DEBUG_RENDERING_INFO = new BooleanPreference(this, "debug_rendering", false).makeGlobal();
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final OsmandPreference<Boolean> SHOW_FAVORITES = new BooleanPreference("show_favorites", true).makeProfile().cache();
+	public final OsmandPreference<Boolean> SHOW_FAVORITES = new BooleanPreference(this, "show_favorites", true).makeProfile().cache();
 
-	public final CommonPreference<Boolean> SHOW_ZOOM_BUTTONS_NAVIGATION = new BooleanPreference("show_zoom_buttons_navigation", false).makeProfile().cache();
+	public final CommonPreference<Boolean> SHOW_ZOOM_BUTTONS_NAVIGATION = new BooleanPreference(this, "show_zoom_buttons_navigation", false).makeProfile().cache();
 
 	{
 		SHOW_ZOOM_BUTTONS_NAVIGATION.setModeDefaultValue(ApplicationMode.PEDESTRIAN, true);
 	}
 
 	// Json
-	public final OsmandPreference<String> SELECTED_GPX = new StringPreference("selected_gpx", "").makeGlobal();
+	public final OsmandPreference<String> SELECTED_GPX = new StringPreference(this, "selected_gpx", "").makeGlobal();
 
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Integer> MAP_SCREEN_ORIENTATION =
-			new IntPreference("map_screen_orientation", -1/*ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED*/).makeProfile();
+			new IntPreference(this, "map_screen_orientation", -1/*ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED*/).makeProfile();
 
 	// this value string is synchronized with settings_pref.xml preference name
 //	public final CommonPreference<Boolean> SHOW_VIEW_ANGLE = new BooleanPreference("show_view_angle", false).makeProfile().cache();
@@ -2334,7 +1438,7 @@ public class OsmandSettings {
 
 	// this value string is synchronized with settings_pref.xml preference name
 	// seconds to auto_follow
-	public final CommonPreference<Integer> AUTO_FOLLOW_ROUTE = new IntPreference("auto_follow_route", 0).makeProfile();
+	public final CommonPreference<Integer> AUTO_FOLLOW_ROUTE = new IntPreference(this, "auto_follow_route", 0).makeProfile();
 
 	{
 		AUTO_FOLLOW_ROUTE.setModeDefaultValue(ApplicationMode.CAR, 15);
@@ -2344,7 +1448,7 @@ public class OsmandSettings {
 
 	// this value string is synchronized with settings_pref.xml preference name
 	// seconds to auto_follow
-	public final CommonPreference<Integer> KEEP_INFORMING = new IntPreference("keep_informing", 0).makeProfile();
+	public final CommonPreference<Integer> KEEP_INFORMING = new IntPreference(this, "keep_informing", 0).makeProfile();
 
 	{
 		KEEP_INFORMING.setModeDefaultValue(ApplicationMode.CAR, 0);
@@ -2352,9 +1456,9 @@ public class OsmandSettings {
 		KEEP_INFORMING.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 0);
 	}
 
-	public final CommonPreference<Boolean> USE_SYSTEM_SCREEN_TIMEOUT = new BooleanPreference("use_system_screen_timeout", false).makeProfile();
+	public final CommonPreference<Boolean> USE_SYSTEM_SCREEN_TIMEOUT = new BooleanPreference(this, "use_system_screen_timeout", false).makeProfile();
 
-	public final CommonPreference<Integer> TURN_SCREEN_ON_TIME_INT = new IntPreference("turn_screen_on_time_int", 0).makeProfile();
+	public final CommonPreference<Integer> TURN_SCREEN_ON_TIME_INT = new IntPreference(this, "turn_screen_on_time_int", 0).makeProfile();
 
 	{
 		TURN_SCREEN_ON_TIME_INT.setModeDefaultValue(ApplicationMode.CAR, 0);
@@ -2362,17 +1466,17 @@ public class OsmandSettings {
 		TURN_SCREEN_ON_TIME_INT.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 0);
 	}
 
-	public final CommonPreference<Boolean> TURN_SCREEN_ON_SENSOR = new BooleanPreference("turn_screen_on_sensor", false).makeProfile();
-	
+	public final CommonPreference<Boolean> TURN_SCREEN_ON_SENSOR = new BooleanPreference(this, "turn_screen_on_sensor", false).makeProfile();
+
 	{
 		TURN_SCREEN_ON_SENSOR.setModeDefaultValue(ApplicationMode.CAR, false);
 		TURN_SCREEN_ON_SENSOR.setModeDefaultValue(ApplicationMode.BICYCLE, false);
 		TURN_SCREEN_ON_SENSOR.setModeDefaultValue(ApplicationMode.PEDESTRIAN, false);
 	}
 
-	public final CommonPreference<Boolean> TURN_SCREEN_ON_NAVIGATION_INSTRUCTIONS = new BooleanPreference("turn_screen_on_navigation_instructions", false).makeProfile();
+	public final CommonPreference<Boolean> TURN_SCREEN_ON_NAVIGATION_INSTRUCTIONS = new BooleanPreference(this, "turn_screen_on_navigation_instructions", false).makeProfile();
 
-	public final CommonPreference<Boolean> TURN_SCREEN_ON_POWER_BUTTON = new BooleanPreference("turn_screen_on_power_button", false).makeProfile();
+	public final CommonPreference<Boolean> TURN_SCREEN_ON_POWER_BUTTON = new BooleanPreference(this, "turn_screen_on_power_button", false).makeProfile();
 
 	// this value string is synchronized with settings_pref.xml preference name
 	// try without AUTO_FOLLOW_ROUTE_NAV (see forum discussion 'Simplify our navigation preference menu')
@@ -2383,7 +1487,7 @@ public class OsmandSettings {
 	public static final int ROTATE_MAP_BEARING = 1;
 	public static final int ROTATE_MAP_COMPASS = 2;
 	public final CommonPreference<Integer> ROTATE_MAP =
-			new IntPreference("rotate_map", ROTATE_MAP_NONE).makeProfile().cache();
+			new IntPreference(this, "rotate_map", ROTATE_MAP_NONE).makeProfile().cache();
 
 	{
 		ROTATE_MAP.setModeDefaultValue(ApplicationMode.CAR, ROTATE_MAP_BEARING);
@@ -2397,16 +1501,16 @@ public class OsmandSettings {
 	public static final int MIDDLE_BOTTOM_CONSTANT = 2;
 	public static final int MIDDLE_TOP_CONSTANT = 3;
 	public static final int LANDSCAPE_MIDDLE_RIGHT_CONSTANT = 4;
-	public final CommonPreference<Boolean> CENTER_POSITION_ON_MAP = new BooleanPreference("center_position_on_map", false).makeProfile();
+	public final CommonPreference<Boolean> CENTER_POSITION_ON_MAP = new BooleanPreference(this, "center_position_on_map", false).makeProfile();
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final OsmandPreference<Integer> MAX_LEVEL_TO_DOWNLOAD_TILE = new IntPreference("max_level_download_tile", 20).makeProfile().cache();
+	public final OsmandPreference<Integer> MAX_LEVEL_TO_DOWNLOAD_TILE = new IntPreference(this, "max_level_download_tile", 20).makeProfile().cache();
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final OsmandPreference<Integer> LEVEL_TO_SWITCH_VECTOR_RASTER = new IntPreference("level_to_switch_vector_raster", 1).makeGlobal().cache();
+	public final OsmandPreference<Integer> LEVEL_TO_SWITCH_VECTOR_RASTER = new IntPreference(this, "level_to_switch_vector_raster", 1).makeGlobal().cache();
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final OsmandPreference<Integer> AUDIO_MANAGER_STREAM = new IntPreference("audio_stream", 3/*AudioManager.STREAM_MUSIC*/) {
+	public final OsmandPreference<Integer> AUDIO_MANAGER_STREAM = new IntPreference(this, "audio_stream", 3/*AudioManager.STREAM_MUSIC*/) {
 		@Override
 		protected boolean setValue(Object prefs, Integer stream) {
 			boolean valueSaved = super.setValue(prefs, stream);
@@ -2432,7 +1536,7 @@ public class OsmandSettings {
 	}.makeProfile();
 
 	// Corresponding USAGE value for AudioAttributes
-	public final OsmandPreference<Integer> AUDIO_USAGE = new IntPreference("audio_usage",
+	public final OsmandPreference<Integer> AUDIO_USAGE = new IntPreference(this, "audio_usage",
 			12/*AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE*/).makeProfile();
 
 	// For now this can be changed only in TestVoiceActivity
@@ -2440,67 +1544,68 @@ public class OsmandSettings {
 
 	{
 		// 1500 ms delay works for most configurations to establish a BT SCO link
-		VOICE_PROMPT_DELAY[0] = new IntPreference("voice_prompt_delay_0", 1500).makeGlobal().cache(); /*AudioManager.STREAM_VOICE_CALL*/
+		VOICE_PROMPT_DELAY[0] = new IntPreference(this, "voice_prompt_delay_0", 1500).makeGlobal().cache(); /*AudioManager.STREAM_VOICE_CALL*/
 		// On most devices sound output works pomptly so usually no voice prompt delay needed
-		VOICE_PROMPT_DELAY[3] = new IntPreference("voice_prompt_delay_3", 0).makeGlobal().cache();    /*AudioManager.STREAM_MUSIC*/
-		VOICE_PROMPT_DELAY[5] = new IntPreference("voice_prompt_delay_5", 0).makeGlobal().cache();    /*AudioManager.STREAM_NOTIFICATION*/
+		VOICE_PROMPT_DELAY[3] = new IntPreference(this, "voice_prompt_delay_3", 0).makeGlobal().cache();    /*AudioManager.STREAM_MUSIC*/
+		VOICE_PROMPT_DELAY[5] = new IntPreference(this, "voice_prompt_delay_5", 0).makeGlobal().cache();    /*AudioManager.STREAM_NOTIFICATION*/
 	}
-	public final OsmandPreference<Boolean> DISPLAY_TTS_UTTERANCE = new BooleanPreference("display_tts_utterance", false).makeGlobal();
+
+	public final OsmandPreference<Boolean> DISPLAY_TTS_UTTERANCE = new BooleanPreference(this, "display_tts_utterance", false).makeGlobal();
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final CommonPreference<Boolean> MAP_ONLINE_DATA = new BooleanPreference("map_online_data", false).makeProfile();
+	public final CommonPreference<Boolean> MAP_ONLINE_DATA = new BooleanPreference(this, "map_online_data", false).makeProfile();
 
-	public final CommonPreference<TerrainMode> TERRAIN_MODE = new EnumStringPreference<>("terrain_mode", TerrainMode.HILLSHADE, TerrainMode.values()).makeProfile();
+	public final CommonPreference<TerrainMode> TERRAIN_MODE = new EnumStringPreference<>(this, "terrain_mode", TerrainMode.HILLSHADE, TerrainMode.values()).makeProfile();
 
-	public final CommonPreference<Integer> HILLSHADE_MIN_ZOOM = new IntPreference("hillshade_min_zoom", 3).makeProfile();
+	public final CommonPreference<Integer> HILLSHADE_MIN_ZOOM = new IntPreference(this, "hillshade_min_zoom", 3).makeProfile();
 
-	public final CommonPreference<Integer> HILLSHADE_MAX_ZOOM = new IntPreference("hillshade_max_zoom", 17).makeProfile();
+	public final CommonPreference<Integer> HILLSHADE_MAX_ZOOM = new IntPreference(this, "hillshade_max_zoom", 17).makeProfile();
 
-	public final CommonPreference<Integer> HILLSHADE_TRANSPARENCY = new IntPreference("hillshade_transparency", 100).makeProfile();
+	public final CommonPreference<Integer> HILLSHADE_TRANSPARENCY = new IntPreference(this, "hillshade_transparency", 100).makeProfile();
 
-	public final CommonPreference<Integer> SLOPE_MIN_ZOOM = new IntPreference("slope_min_zoom", 3).makeProfile();
+	public final CommonPreference<Integer> SLOPE_MIN_ZOOM = new IntPreference(this, "slope_min_zoom", 3).makeProfile();
 
-	public final CommonPreference<Integer> SLOPE_MAX_ZOOM = new IntPreference("slope_max_zoom", 17).makeProfile();
+	public final CommonPreference<Integer> SLOPE_MAX_ZOOM = new IntPreference(this, "slope_max_zoom", 17).makeProfile();
 
-	public final CommonPreference<Integer> SLOPE_TRANSPARENCY = new IntPreference("slope_transparency", 80).makeProfile();
+	public final CommonPreference<Integer> SLOPE_TRANSPARENCY = new IntPreference(this, "slope_transparency", 80).makeProfile();
 
-	public final CommonPreference<Boolean> TERRAIN = new BooleanPreference("terrain_layer", true).makeProfile();
+	public final CommonPreference<Boolean> TERRAIN = new BooleanPreference(this, "terrain_layer", true).makeProfile();
 
-	public final CommonPreference<String> CONTOUR_LINES_ZOOM = new StringPreference("contour_lines_zoom", null).makeProfile().cache();
+	public final CommonPreference<String> CONTOUR_LINES_ZOOM = new StringPreference(this, "contour_lines_zoom", null).makeProfile().cache();
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final CommonPreference<String> MAP_OVERLAY = new StringPreference("map_overlay", null).makeProfile().cache();
+	public final CommonPreference<String> MAP_OVERLAY = new StringPreference(this, "map_overlay", null).makeProfile().cache();
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final CommonPreference<String> MAP_UNDERLAY = new StringPreference("map_underlay", null).makeProfile().cache();
+	public final CommonPreference<String> MAP_UNDERLAY = new StringPreference(this, "map_underlay", null).makeProfile().cache();
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final CommonPreference<Integer> MAP_OVERLAY_TRANSPARENCY = new IntPreference("overlay_transparency", 100).makeProfile().cache();
+	public final CommonPreference<Integer> MAP_OVERLAY_TRANSPARENCY = new IntPreference(this, "overlay_transparency", 100).makeProfile().cache();
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final CommonPreference<Integer> MAP_TRANSPARENCY = new IntPreference("map_transparency", 255).makeProfile().cache();
+	public final CommonPreference<Integer> MAP_TRANSPARENCY = new IntPreference(this, "map_transparency", 255).makeProfile().cache();
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final CommonPreference<String> MAP_TILE_SOURCES = new StringPreference("map_tile_sources",
+	public final CommonPreference<String> MAP_TILE_SOURCES = new StringPreference(this, "map_tile_sources",
 			TileSourceManager.getMapnikSource().getName()).makeProfile();
 
 	public final CommonPreference<LayerTransparencySeekbarMode> LAYER_TRANSPARENCY_SEEKBAR_MODE =
-			new EnumStringPreference<>("layer_transparency_seekbar_mode", LayerTransparencySeekbarMode.UNDEFINED, LayerTransparencySeekbarMode.values());
+			new EnumStringPreference<>(this, "layer_transparency_seekbar_mode", LayerTransparencySeekbarMode.UNDEFINED, LayerTransparencySeekbarMode.values());
 
-	public final CommonPreference<String> MAP_OVERLAY_PREVIOUS = new StringPreference("map_overlay_previous", null).makeGlobal().cache();
+	public final CommonPreference<String> MAP_OVERLAY_PREVIOUS = new StringPreference(this, "map_overlay_previous", null).makeGlobal().cache();
 
-	public final CommonPreference<String> MAP_UNDERLAY_PREVIOUS = new StringPreference("map_underlay_previous", null).makeGlobal().cache();
+	public final CommonPreference<String> MAP_UNDERLAY_PREVIOUS = new StringPreference(this, "map_underlay_previous", null).makeGlobal().cache();
 
-	public CommonPreference<String> PREVIOUS_INSTALLED_VERSION = new StringPreference("previous_installed_version", "").makeGlobal();
+	public CommonPreference<String> PREVIOUS_INSTALLED_VERSION = new StringPreference(this, "previous_installed_version", "").makeGlobal();
 
-	public final OsmandPreference<Boolean> SHOULD_SHOW_FREE_VERSION_BANNER = new BooleanPreference("should_show_free_version_banner", false).makeGlobal().cache();
+	public final OsmandPreference<Boolean> SHOULD_SHOW_FREE_VERSION_BANNER = new BooleanPreference(this, "should_show_free_version_banner", false).makeGlobal().cache();
 
-	public final OsmandPreference<Boolean> MARKERS_DISTANCE_INDICATION_ENABLED = new BooleanPreference("markers_distance_indication_enabled", true).makeProfile();
+	public final OsmandPreference<Boolean> MARKERS_DISTANCE_INDICATION_ENABLED = new BooleanPreference(this, "markers_distance_indication_enabled", true).makeProfile();
 
-	public final OsmandPreference<Integer> DISPLAYED_MARKERS_WIDGETS_COUNT = new IntPreference("displayed_markers_widgets_count", 1).makeProfile();
+	public final OsmandPreference<Integer> DISPLAYED_MARKERS_WIDGETS_COUNT = new IntPreference(this, "displayed_markers_widgets_count", 1).makeProfile();
 
 	public final CommonPreference<MapMarkersMode> MAP_MARKERS_MODE =
-			new EnumStringPreference<>("map_markers_mode", MapMarkersMode.TOOLBAR, MapMarkersMode.values());
+			new EnumStringPreference<>(this, "map_markers_mode", MapMarkersMode.TOOLBAR, MapMarkersMode.values());
 
 	{
 		MAP_MARKERS_MODE.makeProfile().cache();
@@ -2510,19 +1615,19 @@ public class OsmandSettings {
 		MAP_MARKERS_MODE.setModeDefaultValue(ApplicationMode.PEDESTRIAN, MapMarkersMode.TOOLBAR);
 	}
 
-	public final OsmandPreference<Boolean> SHOW_MAP_MARKERS = new BooleanPreference("show_map_markers", true).makeProfile();
+	public final OsmandPreference<Boolean> SHOW_MAP_MARKERS = new BooleanPreference(this, "show_map_markers", true).makeProfile();
 
-	public final OsmandPreference<Boolean> SHOW_COORDINATES_WIDGET = new BooleanPreference("show_coordinates_widget", false).makeProfile().cache();
+	public final OsmandPreference<Boolean> SHOW_COORDINATES_WIDGET = new BooleanPreference(this, "show_coordinates_widget", false).makeProfile().cache();
 
-	public final CommonPreference<NotesSortByMode> NOTES_SORT_BY_MODE = new EnumStringPreference<>("notes_sort_by_mode", NotesSortByMode.BY_DATE, NotesSortByMode.values());
-	public final CommonPreference<TracksSortByMode> TRACKS_SORT_BY_MODE = new EnumStringPreference<>("tracks_sort_by_mode", TracksSortByMode.BY_DATE, TracksSortByMode.values());
+	public final CommonPreference<NotesSortByMode> NOTES_SORT_BY_MODE = new EnumStringPreference<>(this, "notes_sort_by_mode", NotesSortByMode.BY_DATE, NotesSortByMode.values());
+	public final CommonPreference<TracksSortByMode> TRACKS_SORT_BY_MODE = new EnumStringPreference<>(this, "tracks_sort_by_mode", TracksSortByMode.BY_DATE, TracksSortByMode.values());
 
-	public final OsmandPreference<Boolean> ANIMATE_MY_LOCATION = new BooleanPreference("animate_my_location", true).makeProfile().cache();
+	public final OsmandPreference<Boolean> ANIMATE_MY_LOCATION = new BooleanPreference(this, "animate_my_location", true).makeProfile().cache();
 
-	public final OsmandPreference<Integer> EXTERNAL_INPUT_DEVICE = new IntPreference("external_input_device", 0).makeProfile();
+	public final OsmandPreference<Integer> EXTERNAL_INPUT_DEVICE = new IntPreference(this, "external_input_device", 0).makeProfile();
 
-	public final OsmandPreference<Boolean> ROUTE_MAP_MARKERS_START_MY_LOC = new BooleanPreference("route_map_markers_start_my_loc", false).makeGlobal().cache();
-	public final OsmandPreference<Boolean> ROUTE_MAP_MARKERS_ROUND_TRIP = new BooleanPreference("route_map_markers_round_trip", false).makeGlobal().cache();
+	public final OsmandPreference<Boolean> ROUTE_MAP_MARKERS_START_MY_LOC = new BooleanPreference(this, "route_map_markers_start_my_loc", false).makeGlobal().cache();
+	public final OsmandPreference<Boolean> ROUTE_MAP_MARKERS_ROUND_TRIP = new BooleanPreference(this, "route_map_markers_round_trip", false).makeGlobal().cache();
 
 	public ITileSource getMapTileSource(boolean warnWhenSelected) {
 		String tileName = MAP_TILE_SOURCES.get();
@@ -2650,7 +1755,7 @@ public class OsmandSettings {
 	public static final int EXTERNAL_STORAGE_TYPE_INTERNAL_FILE = 2; // ctx.getFilesDir()
 	public static final int EXTERNAL_STORAGE_TYPE_OBB = 3; // ctx.getObbDirs
 	public static final int EXTERNAL_STORAGE_TYPE_SPECIFIED = 4;
-	public final OsmandPreference<Long> OSMAND_USAGE_SPACE = new LongPreference("osmand_usage_space", 0).makeGlobal();
+	public final OsmandPreference<Long> OSMAND_USAGE_SPACE = new LongPreference(this, "osmand_usage_space", 0).makeGlobal();
 
 
 	public void freezeExternalStorageDirectory() {
@@ -2669,7 +1774,7 @@ public class OsmandSettings {
 			setExternalStorageDirectoryPre19(getInternalAppPath().getAbsolutePath());
 		} else {
 			File externalStorage = getExternal1AppPath();
-			if (externalStorage != null && OsmandSettings.isWritable(externalStorage)) {
+			if (externalStorage != null && FileUtils.isWritable(externalStorage)) {
 				setExternalStorageDirectoryV19(EXTERNAL_STORAGE_TYPE_EXTERNAL_FILE,
 						getExternal1AppPath().getAbsolutePath());
 			} else {
@@ -2721,7 +1826,7 @@ public class OsmandSettings {
 		int type = settingsAPI.getInt(globalPreferences, EXTERNAL_STORAGE_DIR_TYPE_V19, -1);
 		File location = getDefaultLocationV19();
 		if (type == -1) {
-			if (isWritable(location)) {
+			if (FileUtils.isWritable(location)) {
 				if (tp != null) {
 					tp.value = settingsAPI.contains(globalPreferences, EXTERNAL_STORAGE_DIR_V19) ?
 							EXTERNAL_STORAGE_TYPE_SPECIFIED :
@@ -2759,20 +1864,6 @@ public class OsmandSettings {
 		return new File(location);
 	}
 
-
-	public static boolean isWritable(File dirToTest) {
-		boolean isWriteable = false;
-		try {
-			dirToTest.mkdirs();
-			File writeTestFile = File.createTempFile("osmand_", ".tmp", dirToTest);
-			isWriteable = writeTestFile.exists();
-			writeTestFile.delete();
-		} catch (IOException e) {
-			isWriteable = false;
-		}
-		return isWriteable;
-	}
-
 	public boolean isExternalStorageDirectoryTypeSpecifiedV19() {
 		return settingsAPI.contains(globalPreferences, EXTERNAL_STORAGE_DIR_TYPE_V19);
 	}
@@ -2886,10 +1977,6 @@ public class OsmandSettings {
 		}
 	}
 
-	private Object objectToShow;
-	private boolean editObjectToShow;
-	private String searchRequestToShow;
-
 	public void setSearchRequestToShow(String request) {
 		this.searchRequestToShow = request;
 	}
@@ -2917,7 +2004,7 @@ public class OsmandSettings {
 	}
 
 	public void setMapLocationToShow(double latitude, double longitude, int zoom, PointDescription pointDescription,
-									 boolean addToHistory, Object toShow) {
+	                                 boolean addToHistory, Object toShow) {
 		SettingsEditor edit = settingsAPI.edit(globalPreferences);
 		edit.putFloat(MAP_LAT_TO_SHOW, (float) latitude);
 		edit.putFloat(MAP_LON_TO_SHOW, (float) longitude);
@@ -2981,7 +2068,6 @@ public class OsmandSettings {
 
 	public final static String INTERMEDIATE_POINTS = "intermediate_points"; //$NON-NLS-1$
 	public final static String INTERMEDIATE_POINTS_DESCRIPTION = "intermediate_points_description"; //$NON-NLS-1$
-	private IntermediatePointsStorage intermediatePointsStorage = new IntermediatePointsStorage();
 
 	public final static String POINT_NAVIGATE_LAT_BACKUP = "point_navigate_lat_backup"; //$NON-NLS-1$
 	public final static String POINT_NAVIGATE_LON_BACKUP = "point_navigate_lon_backup"; //$NON-NLS-1$
@@ -2995,11 +2081,10 @@ public class OsmandSettings {
 	public final static String MY_LOC_POINT_LON = "my_loc_point_lon";
 	public final static String MY_LOC_POINT_DESCRIPTION = "my_loc_point_description";
 
-	private static final String IMPASSABLE_ROAD_POINTS = "impassable_road_points";
-	private static final String IMPASSABLE_ROADS_DESCRIPTIONS = "impassable_roads_descriptions";
-	private static final String IMPASSABLE_ROADS_IDS = "impassable_roads_ids";
-	private static final String IMPASSABLE_ROADS_APP_MODE_KEYS = "impassable_roads_app_mode_keys";
-	private ImpassableRoadsStorage mImpassableRoadsStorage = new ImpassableRoadsStorage();
+	public static final String IMPASSABLE_ROAD_POINTS = "impassable_road_points";
+	public static final String IMPASSABLE_ROADS_DESCRIPTIONS = "impassable_roads_descriptions";
+	public static final String IMPASSABLE_ROADS_IDS = "impassable_roads_ids";
+	public static final String IMPASSABLE_ROADS_APP_MODE_KEYS = "impassable_roads_app_mode_keys";
 
 	public void backupPointToStart() {
 		settingsAPI.edit(globalPreferences)
@@ -3149,334 +2234,7 @@ public class OsmandSettings {
 	}
 
 	public final CommonPreference<Boolean> USE_INTERMEDIATE_POINTS_NAVIGATION =
-			new BooleanPreference("use_intermediate_points_navigation", false).makeGlobal().cache();
-
-
-	private class IntermediatePointsStorage extends MapPointsStorage {
-
-		public IntermediatePointsStorage() {
-			pointsKey = INTERMEDIATE_POINTS;
-			descriptionsKey = INTERMEDIATE_POINTS_DESCRIPTION;
-		}
-
-		@Override
-		public boolean savePoints(List<LatLon> ps, List<String> ds) {
-			boolean res = super.savePoints(ps, ds);
-			backupTargetPoints();
-			return res;
-		}
-	}
-
-	private class ImpassableRoadsStorage extends MapPointsStorage {
-
-		protected String roadsIdsKey;
-		protected String appModeKey;
-
-		public ImpassableRoadsStorage() {
-			pointsKey = IMPASSABLE_ROAD_POINTS;
-			descriptionsKey = IMPASSABLE_ROADS_DESCRIPTIONS;
-			roadsIdsKey = IMPASSABLE_ROADS_IDS;
-			appModeKey = IMPASSABLE_ROADS_APP_MODE_KEYS;
-		}
-
-		public List<Long> getRoadIds(int size) {
-			List<Long> list = new ArrayList<>();
-			String roadIds = settingsAPI.getString(globalPreferences, roadsIdsKey, "");
-			if (roadIds.trim().length() > 0) {
-				StringTokenizer tok = new StringTokenizer(roadIds, ",");
-				while (tok.hasMoreTokens() && list.size() <= size) {
-					list.add(Long.parseLong(tok.nextToken()));
-				}
-			}
-			while (list.size() < size) {
-				list.add(0L);
-			}
-			return list;
-		}
-
-		public List<String> getAppModeKeys(int size) {
-			List<String> list = new ArrayList<>();
-			String roadIds = settingsAPI.getString(globalPreferences, appModeKey, "");
-			if (roadIds.trim().length() > 0) {
-				StringTokenizer tok = new StringTokenizer(roadIds, ",");
-				while (tok.hasMoreTokens() && list.size() <= size) {
-					list.add(tok.nextToken());
-				}
-			}
-			while (list.size() < size) {
-				list.add("");
-			}
-			return list;
-		}
-
-		public List<AvoidRoadInfo> getImpassableRoadsInfo() {
-			List<LatLon> points = getPoints();
-			List<Long> roadIds = getRoadIds(points.size());
-			List<String> appModeKeys = getAppModeKeys(points.size());
-			List<String> descriptions = getPointDescriptions(points.size());
-
-			List<AvoidRoadInfo> avoidRoadsInfo = new ArrayList<>();
-
-			for (int i = 0; i < points.size(); i++) {
-				LatLon latLon = points.get(i);
-				PointDescription description = PointDescription.deserializeFromString(descriptions.get(i), null);
-
-				AvoidRoadInfo avoidRoadInfo = new AvoidRoadInfo();
-				avoidRoadInfo.id = roadIds.get(i);
-				avoidRoadInfo.latitude = latLon.getLatitude();
-				avoidRoadInfo.longitude = latLon.getLongitude();
-				avoidRoadInfo.name = description.getName();
-				avoidRoadInfo.appModeKey = appModeKeys.get(i);
-				avoidRoadsInfo.add(avoidRoadInfo);
-			}
-
-			return avoidRoadsInfo;
-		}
-
-		public boolean addImpassableRoadInfo(AvoidRoadInfo avoidRoadInfo) {
-			List<LatLon> points = getPoints();
-			List<Long> roadIds = getRoadIds(points.size());
-			List<String> appModeKeys = getAppModeKeys(points.size());
-			List<String> descriptions = getPointDescriptions(points.size());
-
-			roadIds.add(0, avoidRoadInfo.id);
-			points.add(0, new LatLon(avoidRoadInfo.latitude, avoidRoadInfo.longitude));
-			appModeKeys.add(0, avoidRoadInfo.appModeKey);
-			descriptions.add(0, PointDescription.serializeToString(new PointDescription("", avoidRoadInfo.name)));
-
-			return saveAvoidRoadData(points, descriptions, roadIds, appModeKeys);
-		}
-
-		public boolean updateImpassableRoadInfo(AvoidRoadInfo avoidRoadInfo) {
-			List<LatLon> points = getPoints();
-
-			int index = points.indexOf(new LatLon(avoidRoadInfo.latitude, avoidRoadInfo.longitude));
-			if (index != -1) {
-				List<Long> roadIds = getRoadIds(points.size());
-				List<String> appModeKeys = getAppModeKeys(points.size());
-				List<String> descriptions = getPointDescriptions(points.size());
-
-				roadIds.set(index, avoidRoadInfo.id);
-				appModeKeys.set(index, avoidRoadInfo.appModeKey);
-				descriptions.set(index, PointDescription.serializeToString(new PointDescription("", avoidRoadInfo.name)));
-				return saveAvoidRoadData(points, descriptions, roadIds, appModeKeys);
-			}
-			return false;
-		}
-
-		@Override
-		public boolean deletePoint(int index) {
-			List<LatLon> points = getPoints();
-			List<Long> roadIds = getRoadIds(points.size());
-			List<String> appModeKeys = getAppModeKeys(points.size());
-			List<String> descriptions = getPointDescriptions(points.size());
-
-			if (index < points.size()) {
-				points.remove(index);
-				roadIds.remove(index);
-				appModeKeys.remove(index);
-				descriptions.remove(index);
-				return saveAvoidRoadData(points, descriptions, roadIds, appModeKeys);
-			}
-			return false;
-		}
-
-		@Override
-		public boolean deletePoint(LatLon latLon) {
-			List<LatLon> points = getPoints();
-			List<Long> roadIds = getRoadIds(points.size());
-			List<String> appModeKeys = getAppModeKeys(points.size());
-			List<String> descriptions = getPointDescriptions(points.size());
-
-			int index = points.indexOf(latLon);
-			if (index != -1) {
-				points.remove(index);
-				roadIds.remove(index);
-				appModeKeys.remove(index);
-				descriptions.remove(index);
-				return saveAvoidRoadData(points, descriptions, roadIds, appModeKeys);
-			}
-			return false;
-		}
-
-		@Override
-		public boolean movePoint(LatLon latLonEx, LatLon latLonNew) {
-			List<LatLon> points = getPoints();
-			List<Long> roadIds = getRoadIds(points.size());
-			List<String> appModeKeys = getAppModeKeys(points.size());
-			List<String> descriptions = getPointDescriptions(points.size());
-
-			int i = points.indexOf(latLonEx);
-			if (i != -1) {
-				points.set(i, latLonNew);
-				return saveAvoidRoadData(points, descriptions, roadIds, appModeKeys);
-			} else {
-				return false;
-			}
-		}
-
-		public boolean saveAvoidRoadData(List<LatLon> points, List<String> descriptions,
-		                                 List<Long> roadIds, List<String> appModeKeys) {
-			return savePoints(points, descriptions) && saveRoadIds(roadIds) && saveAppModeKeys(appModeKeys);
-		}
-
-		public boolean saveRoadIds(List<Long> roadIds) {
-			StringBuilder stringBuilder = new StringBuilder();
-			Iterator<Long> iterator = roadIds.iterator();
-			while (iterator.hasNext()) {
-				stringBuilder.append(iterator.next());
-				if (iterator.hasNext()) {
-					stringBuilder.append(",");
-				}
-			}
-			return settingsAPI.edit(globalPreferences)
-					.putString(roadsIdsKey, stringBuilder.toString())
-					.commit();
-		}
-
-		public boolean saveAppModeKeys(List<String> appModeKeys) {
-			StringBuilder stringBuilder = new StringBuilder();
-			Iterator<String> iterator = appModeKeys.iterator();
-			while (iterator.hasNext()) {
-				stringBuilder.append(iterator.next());
-				if (iterator.hasNext()) {
-					stringBuilder.append(",");
-				}
-			}
-			return settingsAPI.edit(globalPreferences)
-					.putString(appModeKey, stringBuilder.toString())
-					.commit();
-		}
-	}
-
-	private abstract class MapPointsStorage {
-
-		protected String pointsKey;
-		protected String descriptionsKey;
-
-		public MapPointsStorage() {
-		}
-
-		public List<String> getPointDescriptions(int sz) {
-			List<String> list = new ArrayList<>();
-			String ip = settingsAPI.getString(globalPreferences, descriptionsKey, "");
-			if (ip.trim().length() > 0) {
-				list.addAll(Arrays.asList(ip.split("--")));
-			}
-			while (list.size() > sz) {
-				list.remove(list.size() - 1);
-			}
-			while (list.size() < sz) {
-				list.add("");
-			}
-			return list;
-		}
-
-		public List<LatLon> getPoints() {
-			List<LatLon> list = new ArrayList<>();
-			String ip = settingsAPI.getString(globalPreferences, pointsKey, "");
-			if (ip.trim().length() > 0) {
-				StringTokenizer tok = new StringTokenizer(ip, ",");
-				while (tok.hasMoreTokens()) {
-					String lat = tok.nextToken();
-					if (!tok.hasMoreTokens()) {
-						break;
-					}
-					String lon = tok.nextToken();
-					list.add(new LatLon(Float.parseFloat(lat), Float.parseFloat(lon)));
-				}
-			}
-			return list;
-		}
-
-		public boolean insertPoint(double latitude, double longitude, PointDescription historyDescription, int index) {
-			List<LatLon> ps = getPoints();
-			List<String> ds = getPointDescriptions(ps.size());
-			ps.add(index, new LatLon(latitude, longitude));
-			ds.add(index, PointDescription.serializeToString(historyDescription));
-			if (historyDescription != null && !historyDescription.isSearchingAddress(ctx)) {
-				SearchHistoryHelper.getInstance(ctx).addNewItemToHistory(latitude, longitude, historyDescription);
-			}
-			return savePoints(ps, ds);
-		}
-
-		public boolean updatePoint(double latitude, double longitude, PointDescription historyDescription) {
-			List<LatLon> ps = getPoints();
-			List<String> ds = getPointDescriptions(ps.size());
-			int i = ps.indexOf(new LatLon(latitude, longitude));
-			if (i != -1) {
-				ds.set(i, PointDescription.serializeToString(historyDescription));
-				if (historyDescription != null && !historyDescription.isSearchingAddress(ctx)) {
-					SearchHistoryHelper.getInstance(ctx).addNewItemToHistory(latitude, longitude, historyDescription);
-				}
-				return savePoints(ps, ds);
-			} else {
-				return false;
-			}
-		}
-
-		public boolean deletePoint(int index) {
-			List<LatLon> ps = getPoints();
-			List<String> ds = getPointDescriptions(ps.size());
-			if (index < ps.size()) {
-				ps.remove(index);
-				ds.remove(index);
-				return savePoints(ps, ds);
-			} else {
-				return false;
-			}
-		}
-
-		public boolean deletePoint(LatLon latLon) {
-			List<LatLon> ps = getPoints();
-			List<String> ds = getPointDescriptions(ps.size());
-			int index = ps.indexOf(latLon);
-			if (index != -1) {
-				ps.remove(index);
-				ds.remove(index);
-				return savePoints(ps, ds);
-			} else {
-				return false;
-			}
-		}
-
-		public boolean savePoints(List<LatLon> ps, List<String> ds) {
-			StringBuilder sb = new StringBuilder();
-			for (int i = 0; i < ps.size(); i++) {
-				if (i > 0) {
-					sb.append(",");
-				}
-				sb.append(((float) ps.get(i).getLatitude() + "")).append(",").append(((float) ps.get(i).getLongitude() + ""));
-			}
-			StringBuilder tb = new StringBuilder();
-			for (int i = 0; i < ds.size(); i++) {
-				if (i > 0) {
-					tb.append("--");
-				}
-				if (ds.get(i) == null) {
-					tb.append("");
-				} else {
-					tb.append(ds.get(i));
-				}
-			}
-			return settingsAPI.edit(globalPreferences)
-					.putString(pointsKey, sb.toString())
-					.putString(descriptionsKey, tb.toString())
-					.commit();
-		}
-
-		public boolean movePoint(LatLon latLonEx, LatLon latLonNew) {
-			List<LatLon> ps = getPoints();
-			List<String> ds = getPointDescriptions(ps.size());
-			int i = ps.indexOf(latLonEx);
-			if (i != -1) {
-				ps.set(i, latLonNew);
-				return savePoints(ps, ds);
-			} else {
-				return false;
-			}
-		}
-	}
+			new BooleanPreference(this, "use_intermediate_points_navigation", false).makeGlobal().cache();
 
 
 	public List<String> getIntermediatePointDescriptions(int sz) {
@@ -3537,27 +2295,27 @@ public class OsmandSettings {
 	}
 
 	public List<AvoidRoadInfo> getImpassableRoadPoints() {
-		return mImpassableRoadsStorage.getImpassableRoadsInfo();
+		return impassableRoadsStorage.getImpassableRoadsInfo();
 	}
 
 	public boolean addImpassableRoad(AvoidRoadInfo avoidRoadInfo) {
-		return mImpassableRoadsStorage.addImpassableRoadInfo(avoidRoadInfo);
+		return impassableRoadsStorage.addImpassableRoadInfo(avoidRoadInfo);
 	}
 
 	public boolean updateImpassableRoadInfo(AvoidRoadInfo avoidRoadInfo) {
-		return mImpassableRoadsStorage.updateImpassableRoadInfo(avoidRoadInfo);
+		return impassableRoadsStorage.updateImpassableRoadInfo(avoidRoadInfo);
 	}
 
 	public boolean removeImpassableRoad(int index) {
-		return mImpassableRoadsStorage.deletePoint(index);
+		return impassableRoadsStorage.deletePoint(index);
 	}
 
 	public boolean removeImpassableRoad(LatLon latLon) {
-		return mImpassableRoadsStorage.deletePoint(latLon);
+		return impassableRoadsStorage.deletePoint(latLon);
 	}
 
 	public boolean moveImpassableRoad(LatLon latLonEx, LatLon latLonNew) {
-		return mImpassableRoadsStorage.movePoint(latLonEx, latLonNew);
+		return impassableRoadsStorage.movePoint(latLonEx, latLonNew);
 	}
 
 	/**
@@ -3569,16 +2327,16 @@ public class OsmandSettings {
 	public static final String QUICK_FAB_MARGIN_X_LANDSCAPE_MARGIN = "quick_fab_margin_x_landscape_margin";
 	public static final String QUICK_FAB_MARGIN_Y_LANDSCAPE_MARGIN = "quick_fab_margin_y_landscape_margin";
 
-	public final CommonPreference<Boolean> QUICK_ACTION = new BooleanPreference("quick_action_state", false).makeProfile();
+	public final CommonPreference<Boolean> QUICK_ACTION = new BooleanPreference(this, "quick_action_state", false).makeProfile();
 
-	public final CommonPreference<String> QUICK_ACTION_LIST = new StringPreference("quick_action_list", "").makeGlobal();
+	public final CommonPreference<String> QUICK_ACTION_LIST = new StringPreference(this, "quick_action_list", "").makeGlobal();
 
-	public final CommonPreference<Boolean> IS_QUICK_ACTION_TUTORIAL_SHOWN = new BooleanPreference("quick_action_tutorial", false).makeGlobal();
+	public final CommonPreference<Boolean> IS_QUICK_ACTION_TUTORIAL_SHOWN = new BooleanPreference(this, "quick_action_tutorial", false).makeGlobal();
 
-	private final CommonPreference<Integer> QUICK_ACTION_FAB_MARGIN_X_PORTRAIT = new IntPreference(QUICK_FAB_MARGIN_X_PORTRAIT_MARGIN, 0).makeProfile();
-	private final CommonPreference<Integer> QUICK_ACTION_FAB_MARGIN_Y_PORTRAIT = new IntPreference(QUICK_FAB_MARGIN_Y_PORTRAIT_MARGIN, 0).makeProfile();
-	private final CommonPreference<Integer> QUICK_ACTION_FAB_MARGIN_X_LANDSCAPE_MARGIN = new IntPreference(QUICK_FAB_MARGIN_X_LANDSCAPE_MARGIN, 0).makeProfile();
-	private final CommonPreference<Integer> QUICK_ACTION_FAB_MARGIN_Y_LANDSCAPE_MARGIN = new IntPreference(QUICK_FAB_MARGIN_Y_LANDSCAPE_MARGIN, 0).makeProfile();
+	private final CommonPreference<Integer> QUICK_ACTION_FAB_MARGIN_X_PORTRAIT = new IntPreference(this, QUICK_FAB_MARGIN_X_PORTRAIT_MARGIN, 0).makeProfile();
+	private final CommonPreference<Integer> QUICK_ACTION_FAB_MARGIN_Y_PORTRAIT = new IntPreference(this, QUICK_FAB_MARGIN_Y_PORTRAIT_MARGIN, 0).makeProfile();
+	private final CommonPreference<Integer> QUICK_ACTION_FAB_MARGIN_X_LANDSCAPE_MARGIN = new IntPreference(this, QUICK_FAB_MARGIN_X_LANDSCAPE_MARGIN, 0).makeProfile();
+	private final CommonPreference<Integer> QUICK_ACTION_FAB_MARGIN_Y_LANDSCAPE_MARGIN = new IntPreference(this, QUICK_FAB_MARGIN_Y_LANDSCAPE_MARGIN, 0).makeProfile();
 
 	public boolean setPortraitFabMargin(int x, int y) {
 		return QUICK_ACTION_FAB_MARGIN_X_PORTRAIT.set(x) && QUICK_ACTION_FAB_MARGIN_Y_PORTRAIT.set(y);
@@ -3724,10 +2482,10 @@ public class OsmandSettings {
 		return settingsAPI.edit(globalPreferences).putString(LAST_SEARCHED_INTERSECTED_STREET, street).commit();
 	}
 
-	public final OsmandPreference<String> LAST_SELECTED_GPX_TRACK_FOR_NEW_POINT = new StringPreference("last_selected_gpx_track_for_new_point", null).makeGlobal().cache();
+	public final OsmandPreference<String> LAST_SELECTED_GPX_TRACK_FOR_NEW_POINT = new StringPreference(this, "last_selected_gpx_track_for_new_point", null).makeGlobal().cache();
 
 	// Avoid using this property, probably you need to use PoiFiltersHelper.getSelectedPoiFilters()
-	public final OsmandPreference<String> SELECTED_POI_FILTER_FOR_MAP = new StringPreference("selected_poi_filter_for_map", null).makeProfile().cache();
+	public final OsmandPreference<String> SELECTED_POI_FILTER_FOR_MAP = new StringPreference(this, "selected_poi_filter_for_map", null).makeProfile().cache();
 
 	public Set<String> getSelectedPoiFilters() {
 		Set<String> result = new LinkedHashSet<>();
@@ -3743,21 +2501,21 @@ public class OsmandSettings {
 	}
 
 	public final ListStringPreference POI_FILTERS_ORDER = (ListStringPreference)
-			new ListStringPreference("poi_filters_order", null, ",,").makeProfile().cache();
-	
+			new ListStringPreference(this, "poi_filters_order", null, ",,").makeProfile().cache();
+
 	public final ListStringPreference INACTIVE_POI_FILTERS = (ListStringPreference)
-			new ListStringPreference("inactive_poi_filters", null, ",,").makeProfile().cache();
+			new ListStringPreference(this, "inactive_poi_filters", null, ",,").makeProfile().cache();
 
 	public final ContextMenuItemsPreference DRAWER_ITEMS =
-			(ContextMenuItemsPreference) new ContextMenuItemsPreference("drawer_items", DRAWER_ITEM_ID_SCHEME, new ContextMenuItemsSettings())
+			(ContextMenuItemsPreference) new ContextMenuItemsPreference(this, "drawer_items", DRAWER_ITEM_ID_SCHEME, new ContextMenuItemsSettings())
 					.makeProfile().cache();
 
 	public final ContextMenuItemsPreference CONFIGURE_MAP_ITEMS =
-			(ContextMenuItemsPreference) new ContextMenuItemsPreference("configure_map_items", CONFIGURE_MAP_ITEM_ID_SCHEME, new ContextMenuItemsSettings())
+			(ContextMenuItemsPreference) new ContextMenuItemsPreference(this, "configure_map_items", CONFIGURE_MAP_ITEM_ID_SCHEME, new ContextMenuItemsSettings())
 					.makeProfile().cache();
 
 	public final ContextMenuItemsPreference CONTEXT_MENU_ACTIONS_ITEMS =
-			(ContextMenuItemsPreference) new ContextMenuItemsPreference("context_menu_items", MAP_CONTEXT_MENU_ACTIONS, new MainContextMenuItemsSettings())
+			(ContextMenuItemsPreference) new ContextMenuItemsPreference(this, "context_menu_items", MAP_CONTEXT_MENU_ACTIONS, new MainContextMenuItemsSettings())
 					.makeProfile().cache();
 
 	public final List<ContextMenuItemsPreference> CONTEXT_MENU_ITEMS_PREFERENCES = Arrays.asList(DRAWER_ITEMS, CONFIGURE_MAP_ITEMS, CONTEXT_MENU_ACTIONS_ITEMS);
@@ -3765,7 +2523,7 @@ public class OsmandSettings {
 	@Nullable
 	public ContextMenuItemsPreference getContextMenuItemsPreference(@NonNull String id) {
 		for (ContextMenuItemsPreference preference : CONTEXT_MENU_ITEMS_PREFERENCES) {
-			if (id.startsWith(preference.idScheme)) {
+			if (id.startsWith(preference.getIdScheme())) {
 				return preference;
 			}
 		}
@@ -3779,7 +2537,7 @@ public class OsmandSettings {
 	};
 	// this value string is synchronized with settings_pref.xml preference name
 	// this value could localized
-	public final OsmandPreference<String> VOICE_PROVIDER = new StringPreference("voice_provider", null) {
+	public final OsmandPreference<String> VOICE_PROVIDER = new StringPreference(this, "voice_provider", null) {
 		protected String getDefaultValue() {
 
 			Configuration config = ctx.getResources().getConfiguration();
@@ -3794,7 +2552,7 @@ public class OsmandSettings {
 
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final CommonPreference<String> RENDERER = new StringPreference("renderer", RendererRegistry.DEFAULT_RENDER) {
+	public final CommonPreference<String> RENDERER = new StringPreference(this, "renderer", RendererRegistry.DEFAULT_RENDER) {
 
 		@Override
 		protected boolean setValue(Object prefs, String val) {
@@ -3815,11 +2573,9 @@ public class OsmandSettings {
 		RENDERER.setModeDefaultValue(ApplicationMode.SKI, RendererRegistry.WINTER_SKI_RENDER);
 	}
 
-	Map<String, CommonPreference<String>> customRendersProps = new LinkedHashMap<String, OsmandSettings.CommonPreference<String>>();
-
 	public CommonPreference<String> getCustomRenderProperty(String attrName) {
 		if (!customRendersProps.containsKey(attrName)) {
-			customRendersProps.put(attrName, new StringPreference(RENDERER_PREFERENCE_PREFIX + attrName, "").makeProfile());
+			customRendersProps.put(attrName, new StringPreference(this, RENDERER_PREFERENCE_PREFIX + attrName, "").makeProfile());
 		}
 		return customRendersProps.get(attrName);
 	}
@@ -3829,91 +2585,86 @@ public class OsmandSettings {
 		getCustomRenderProperty("defAppMode");
 	}
 
-	Map<String, CommonPreference<Boolean>> customBooleanRendersProps = new LinkedHashMap<String, OsmandSettings.CommonPreference<Boolean>>();
-
 	public CommonPreference<Boolean> getCustomRenderBooleanProperty(String attrName) {
 		if (!customBooleanRendersProps.containsKey(attrName)) {
-			customBooleanRendersProps.put(attrName, new BooleanPreference(RENDERER_PREFERENCE_PREFIX + attrName, false).makeProfile());
+			customBooleanRendersProps.put(attrName, new BooleanPreference(this, RENDERER_PREFERENCE_PREFIX + attrName, false).makeProfile());
 		}
 		return customBooleanRendersProps.get(attrName);
 	}
 
-	Map<String, CommonPreference<String>> customRoutingProps = new LinkedHashMap<>();
-
 	public CommonPreference<String> getCustomRoutingProperty(String attrName, String defValue) {
 		if (!customRoutingProps.containsKey(attrName)) {
-			customRoutingProps.put(attrName, new StringPreference(ROUTING_PREFERENCE_PREFIX + attrName, defValue).makeProfile());
+			customRoutingProps.put(attrName, new StringPreference(this, ROUTING_PREFERENCE_PREFIX + attrName, defValue).makeProfile());
 		}
 		return customRoutingProps.get(attrName);
 	}
 
-	Map<String, CommonPreference<Boolean>> customBooleanRoutingProps = new LinkedHashMap<>();
 
 	public CommonPreference<Boolean> getCustomRoutingBooleanProperty(String attrName, boolean defaulfValue) {
 		if (!customBooleanRoutingProps.containsKey(attrName)) {
-			customBooleanRoutingProps.put(attrName, new BooleanStringPreference(ROUTING_PREFERENCE_PREFIX + attrName, defaulfValue).makeProfile());
+			customBooleanRoutingProps.put(attrName, new BooleanStringPreference(this, ROUTING_PREFERENCE_PREFIX + attrName, defaulfValue).makeProfile());
 		}
 		return customBooleanRoutingProps.get(attrName);
 	}
 
-	public final CommonPreference<Float> ROUTE_RECALCULATION_DISTANCE = new FloatPreference("routing_recalc_distance", 0.f).makeProfile();
-	public final CommonPreference<Float> ROUTE_STRAIGHT_ANGLE = new FloatPreference("routing_straight_angle", 30.f).makeProfile();
+	public final CommonPreference<Float> ROUTE_RECALCULATION_DISTANCE = new FloatPreference(this, "routing_recalc_distance", 0.f).makeProfile();
+	public final CommonPreference<Float> ROUTE_STRAIGHT_ANGLE = new FloatPreference(this, "routing_straight_angle", 30.f).makeProfile();
 
-	public final OsmandPreference<Boolean> USE_OSM_LIVE_FOR_ROUTING = new BooleanPreference("enable_osmc_routing", true).makeGlobal();
+	public final OsmandPreference<Boolean> USE_OSM_LIVE_FOR_ROUTING = new BooleanPreference(this, "enable_osmc_routing", true).makeProfile();
 
-	public final OsmandPreference<Boolean> USE_OSM_LIVE_FOR_PUBLIC_TRANSPORT = new BooleanPreference("enable_osmc_public_transport", false).makeGlobal();
+	public final OsmandPreference<Boolean> USE_OSM_LIVE_FOR_PUBLIC_TRANSPORT = new BooleanPreference(this, "enable_osmc_public_transport", false).makeProfile();
 
-	public final OsmandPreference<Boolean> VOICE_MUTE = new BooleanPreference("voice_mute", false).makeProfile().cache();
+	public final OsmandPreference<Boolean> VOICE_MUTE = new BooleanPreference(this, "voice_mute", false).makeProfile().cache();
 
 	// for background service
-	public final OsmandPreference<Boolean> MAP_ACTIVITY_ENABLED = new BooleanPreference("map_activity_enabled", false).makeGlobal();
+	public final OsmandPreference<Boolean> MAP_ACTIVITY_ENABLED = new BooleanPreference(this, "map_activity_enabled", false).makeGlobal();
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final OsmandPreference<Boolean> SAFE_MODE = new BooleanPreference("safe_mode", false).makeGlobal();
-	public final OsmandPreference<Boolean> PT_SAFE_MODE = new BooleanPreference("pt_safe_mode", false).makeGlobal();
-	public final OsmandPreference<Boolean> NATIVE_RENDERING_FAILED = new BooleanPreference("native_rendering_failed_init", false).makeGlobal();
+	public final OsmandPreference<Boolean> SAFE_MODE = new BooleanPreference(this, "safe_mode", false).makeGlobal();
+	public final OsmandPreference<Boolean> PT_SAFE_MODE = new BooleanPreference(this, "pt_safe_mode", false).makeProfile();
+	public final OsmandPreference<Boolean> NATIVE_RENDERING_FAILED = new BooleanPreference(this, "native_rendering_failed_init", false).makeGlobal();
 
-	public final OsmandPreference<Boolean> USE_OPENGL_RENDER = new BooleanPreference("use_opengl_render",
+	public final OsmandPreference<Boolean> USE_OPENGL_RENDER = new BooleanPreference(this, "use_opengl_render",
 			false /*Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH*/
 	).makeGlobal().cache();
 
-	public final OsmandPreference<Boolean> OPENGL_RENDER_FAILED = new BooleanPreference("opengl_render_failed", false).makeGlobal().cache();
+	public final OsmandPreference<Boolean> OPENGL_RENDER_FAILED = new BooleanPreference(this, "opengl_render_failed", false).makeGlobal().cache();
 
 
 	// this value string is synchronized with settings_pref.xml preference name
-	public final OsmandPreference<String> CONTRIBUTION_INSTALL_APP_DATE = new StringPreference("CONTRIBUTION_INSTALL_APP_DATE", null).makeGlobal();
+	public final OsmandPreference<String> CONTRIBUTION_INSTALL_APP_DATE = new StringPreference(this, "CONTRIBUTION_INSTALL_APP_DATE", null).makeGlobal();
 
-	public final OsmandPreference<Integer> COORDINATES_FORMAT = new IntPreference("coordinates_format", PointDescription.FORMAT_DEGREES).makeProfile();
+	public final OsmandPreference<Integer> COORDINATES_FORMAT = new IntPreference(this, "coordinates_format", PointDescription.FORMAT_DEGREES).makeProfile();
 
-	public final OsmandPreference<Boolean> FOLLOW_THE_ROUTE = new BooleanPreference("follow_to_route", false).makeGlobal();
-	public final OsmandPreference<String> FOLLOW_THE_GPX_ROUTE = new StringPreference("follow_gpx", null).makeGlobal();
-	
-	public final OsmandPreference<String> SELECTED_TRAVEL_BOOK = new StringPreference("selected_travel_book", "").makeGlobal();
+	public final OsmandPreference<Boolean> FOLLOW_THE_ROUTE = new BooleanPreference(this, "follow_to_route", false).makeGlobal();
+	public final OsmandPreference<String> FOLLOW_THE_GPX_ROUTE = new StringPreference(this, "follow_gpx", null).makeGlobal();
+
+	public final OsmandPreference<String> SELECTED_TRAVEL_BOOK = new StringPreference(this, "selected_travel_book", "").makeGlobal();
 
 	public final ListStringPreference DISPLAYED_TRANSPORT_SETTINGS = (ListStringPreference)
-			new ListStringPreference("displayed_transport_settings", null, ",").makeProfile();
-	
+			new ListStringPreference(this, "displayed_transport_settings", null, ",").makeProfile();
+
 	public final OsmandPreference<Boolean> SHOW_ARRIVAL_TIME_OTHERWISE_EXPECTED_TIME =
-			new BooleanPreference("show_arrival_time", true).makeProfile();
+			new BooleanPreference(this, "show_arrival_time", true).makeProfile();
 
 	public final OsmandPreference<Boolean> SHOW_INTERMEDIATE_ARRIVAL_TIME_OTHERWISE_EXPECTED_TIME =
-			new BooleanPreference("show_intermediate_arrival_time", true).makeProfile();
+			new BooleanPreference(this, "show_intermediate_arrival_time", true).makeProfile();
 
 	public final OsmandPreference<Boolean> SHOW_RELATIVE_BEARING_OTHERWISE_REGULAR_BEARING =
-			new BooleanPreference("show_relative_bearing", true).makeProfile();
+			new BooleanPreference(this, "show_relative_bearing", true).makeProfile();
 
 	public final OsmandPreference<Long> AGPS_DATA_LAST_TIME_DOWNLOADED =
-			new LongPreference("agps_data_downloaded", 0).makeGlobal();
+			new LongPreference(this, "agps_data_downloaded", 0).makeGlobal();
 
 	// Live Updates
 	public final OsmandPreference<Boolean> IS_LIVE_UPDATES_ON =
-			new BooleanPreference("is_live_updates_on", false).makeGlobal();
+			new BooleanPreference(this, "is_live_updates_on", false).makeGlobal();
 	public final OsmandPreference<Integer> LIVE_UPDATES_RETRIES =
-			new IntPreference("live_updates_retryes", 2).makeGlobal();
+			new IntPreference(this, "live_updates_retryes", 2).makeGlobal();
 
 	// UI boxes
 	public final CommonPreference<Boolean> TRANSPARENT_MAP_THEME =
-			new BooleanPreference("transparent_map_theme", true).makeProfile();
+			new BooleanPreference(this, "transparent_map_theme", true).makeProfile();
 
 	{
 		TRANSPARENT_MAP_THEME.setModeDefaultValue(ApplicationMode.CAR, false);
@@ -3922,7 +2673,7 @@ public class OsmandSettings {
 	}
 
 	public final CommonPreference<Boolean> SHOW_STREET_NAME =
-			new BooleanPreference("show_street_name", false).makeProfile();
+			new BooleanPreference(this, "show_street_name", false).makeProfile();
 
 	{
 		SHOW_STREET_NAME.setModeDefaultValue(ApplicationMode.DEFAULT, false);
@@ -3941,13 +2692,13 @@ public class OsmandSettings {
 	public static final int PARROT_EXTERNAL_DEVICE = 3;
 
 	public final CommonPreference<Integer> SEARCH_TAB =
-			new IntPreference("SEARCH_TAB", 0).makeGlobal().cache();
+			new IntPreference(this, "SEARCH_TAB", 0).makeGlobal().cache();
 
 	public final CommonPreference<Integer> FAVORITES_TAB =
-			new IntPreference("FAVORITES_TAB", 0).makeGlobal().cache();
+			new IntPreference(this, "FAVORITES_TAB", 0).makeGlobal().cache();
 
 	public final CommonPreference<Integer> OSMAND_THEME =
-			new IntPreference("osmand_theme", OSMAND_LIGHT_THEME) {
+			new IntPreference(this, "osmand_theme", OSMAND_LIGHT_THEME) {
 				@Override
 				public void readFromJson(JSONObject json, ApplicationMode appMode) throws JSONException {
 					Integer theme = parseString(json.getString(getId()));
@@ -3959,7 +2710,7 @@ public class OsmandSettings {
 			}.makeProfile().cache();
 
 	public final OsmandPreference<Boolean> OPEN_ONLY_HEADER_STATE_ROUTE_CALCULATED =
-			new BooleanPreference("open_only_header_route_calculated", false).makeProfile();
+			new BooleanPreference(this, "open_only_header_route_calculated", false).makeProfile();
 
 	public boolean isLightActionBar() {
 		return isLightContent();
@@ -3995,29 +2746,28 @@ public class OsmandSettings {
 	}
 
 	public final CommonPreference<Boolean> FLUORESCENT_OVERLAYS =
-			new BooleanPreference("fluorescent_overlays", false).makeGlobal().cache();
-
+			new BooleanPreference(this, "fluorescent_overlays", false).makeGlobal().cache();
 
 
 //	public final OsmandPreference<Integer> NUMBER_OF_FREE_DOWNLOADS_V2 = new IntPreference("free_downloads_v2", 0).makeGlobal();
 
-	public final OsmandPreference<Integer> NUMBER_OF_FREE_DOWNLOADS = new IntPreference(NUMBER_OF_FREE_DOWNLOADS_ID, 0).makeGlobal();
+	public final OsmandPreference<Integer> NUMBER_OF_FREE_DOWNLOADS = new IntPreference(this, NUMBER_OF_FREE_DOWNLOADS_ID, 0).makeGlobal();
 
 	// For RateUsDialog
 	public final OsmandPreference<Long> LAST_DISPLAY_TIME =
-			new LongPreference("last_display_time", 0).makeGlobal().cache();
+			new LongPreference(this, "last_display_time", 0).makeGlobal().cache();
 
 	public final OsmandPreference<Long> LAST_CHECKED_UPDATES =
-			new LongPreference("last_checked_updates", 0).makeGlobal();
+			new LongPreference(this, "last_checked_updates", 0).makeGlobal();
 
 	public final OsmandPreference<Integer> NUMBER_OF_APP_STARTS_ON_DISLIKE_MOMENT =
-			new IntPreference("number_of_app_starts_on_dislike_moment", 0).makeGlobal().cache();
+			new IntPreference(this, "number_of_app_starts_on_dislike_moment", 0).makeGlobal().cache();
 
 	public final OsmandPreference<RateUsState> RATE_US_STATE =
-			new EnumStringPreference<>("rate_us_state", RateUsState.INITIAL_STATE, RateUsState.values()).makeGlobal();
+			new EnumStringPreference<>(this, "rate_us_state", RateUsState.INITIAL_STATE, RateUsState.values()).makeGlobal();
 
 	public final CommonPreference<String> CUSTOM_APP_MODES_KEYS =
-		new StringPreference("custom_app_modes_keys", "").makeGlobal().cache();
+			new StringPreference(this, "custom_app_modes_keys", "").makeGlobal().cache();
 
 	public Set<String> getCustomAppModesKeys() {
 		String appModesKeys = CUSTOM_APP_MODES_KEYS.get();
@@ -4029,458 +2779,13 @@ public class OsmandSettings {
 		return res;
 	}
 
-	public enum DayNightMode {
-		AUTO(R.string.daynight_mode_auto, R.drawable.ic_action_map_sunset),
-		DAY(R.string.daynight_mode_day, R.drawable.ic_action_map_day),
-		NIGHT(R.string.daynight_mode_night, R.drawable.ic_action_map_night),
-		SENSOR(R.string.daynight_mode_sensor, R.drawable.ic_action_map_light_sensor);
-
-		private final int key;
-		@DrawableRes
-		private final int drawableRes;
-
-		DayNightMode(@StringRes int key, @DrawableRes int drawableRes) {
-			this.key = key;
-			this.drawableRes = drawableRes;
-		}
-
-		public String toHumanString(Context ctx) {
-			return ctx.getString(key);
-		}
-
-		@DrawableRes
-		public int getIconRes() {
-			return drawableRes;
-		}
-
-		public boolean isSensor() {
-			return this == SENSOR;
-		}
-
-		public boolean isAuto() {
-			return this == AUTO;
-		}
-
-		public boolean isDay() {
-			return this == DAY;
-		}
-
-		public boolean isNight() {
-			return this == NIGHT;
-		}
-
-		public static DayNightMode[] possibleValues(Context context) {
-			SensorManager mSensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
-			Sensor mLight = mSensorManager.getDefaultSensor(Sensor.TYPE_LIGHT);
-			boolean isLightSensorEnabled = mLight != null;
-			if (isLightSensorEnabled) {
-				return DayNightMode.values();
-			} else {
-				return new DayNightMode[]{AUTO, DAY, NIGHT};
+	public void setQuickActions(HashMap<String, Boolean> quickActions, ApplicationMode mode) {
+		if (!QUICK_ACTION.isSetForMode(mode)) {
+			Boolean actionState = quickActions.get(mode.getStringKey());
+			if (actionState == null) {
+				actionState = QUICK_ACTION.getDefaultValue();
 			}
+			setPreference(QUICK_ACTION.getId(), actionState, mode);
 		}
 	}
-
-
-	public enum LayerTransparencySeekbarMode {
-		OVERLAY(R.string.overlay_transparency),
-		UNDERLAY(R.string.map_transparency),
-		OFF(R.string.shared_string_off),
-		UNDEFINED(R.string.shared_string_none);
-
-		private final int key;
-
-		LayerTransparencySeekbarMode(int key) {
-			this.key = key;
-		}
-
-		public String toHumanString(Context ctx) {
-			return ctx.getString(key);
-		}
-	}
-
-	public enum NotesSortByMode {
-		BY_TYPE,
-		BY_DATE;
-
-		public boolean isByType() {
-			return this == BY_TYPE;
-		}
-
-		public boolean isByDate() {
-			return this == BY_DATE;
-		}
-	}
-
-	public enum TracksSortByMode {
-		BY_DATE(R.string.sort_last_modified, R.drawable.ic_action_time_start),
-		BY_NAME_ASCENDING(R.string.sort_name_ascending, R.drawable.ic_action_sort_by_name_ascending),
-		BY_NAME_DESCENDING(R.string.sort_name_descending, R.drawable.ic_action_sort_by_name_descending);
-
-		private final int iconId;
-		private final int nameId;
-
-		TracksSortByMode(int nameId, int iconId) {
-			this.nameId = nameId;
-			this.iconId = iconId;
-		}
-
-		public boolean isByName() {
-			return this == BY_NAME_ASCENDING || this == BY_NAME_DESCENDING;
-		}
-
-		public boolean isByDate() {
-			return this == BY_DATE;
-		}
-
-		@StringRes
-		public int getNameId() {
-			return nameId;
-		}
-
-		@DrawableRes
-		public int getIconId() {
-			return iconId;
-		}
-	}
-
-	public enum MapMarkersMode {
-		TOOLBAR(R.string.shared_string_topbar),
-		WIDGETS(R.string.shared_string_widgets),
-		NONE(R.string.shared_string_none);
-
-		private final int key;
-
-		MapMarkersMode(int key) {
-			this.key = key;
-		}
-
-		public String toHumanString(Context ctx) {
-			return ctx.getString(key);
-		}
-
-		public boolean isToolbar() {
-			return this == TOOLBAR;
-		}
-
-		public boolean isWidgets() {
-			return this == WIDGETS;
-		}
-
-		public boolean isNone() {
-			return this == NONE;
-		}
-
-		public static MapMarkersMode[] possibleValues(Context context) {
-			return new MapMarkersMode[]{TOOLBAR, WIDGETS, NONE};
-		}
-	}
-
-	public enum SpeedConstants {
-		KILOMETERS_PER_HOUR(R.string.km_h, R.string.si_kmh, false),
-		MILES_PER_HOUR(R.string.mile_per_hour, R.string.si_mph, true),
-		METERS_PER_SECOND(R.string.m_s, R.string.si_m_s, false),
-		MINUTES_PER_MILE(R.string.min_mile, R.string.si_min_m, true),
-		MINUTES_PER_KILOMETER(R.string.min_km, R.string.si_min_km, false),
-		NAUTICALMILES_PER_HOUR(R.string.nm_h, R.string.si_nm_h, true);
-
-		public final int key;
-		public final int descr;
-		public final boolean imperial;
-
-		SpeedConstants(int key, int descr, boolean imperial) {
-			this.key = key;
-			this.descr = descr;
-			this.imperial = imperial;
-		}
-
-
-
-		public String toHumanString(Context ctx) {
-			return ctx.getString(descr);
-		}
-
-		public String toShortString(Context ctx) {
-			return ctx.getString(key);
-		}
-
-
-	}
-
-	public enum MetricsConstants {
-		KILOMETERS_AND_METERS(R.string.si_km_m, "km-m"),
-		MILES_AND_FEET(R.string.si_mi_feet, "mi-f"),
-		MILES_AND_METERS(R.string.si_mi_meters, "mi-m"),
-		MILES_AND_YARDS(R.string.si_mi_yard, "mi-y"),
-		NAUTICAL_MILES(R.string.si_nm, "nm");
-
-		private final int key;
-		private final String ttsString;
-
-		MetricsConstants(int key, String ttsString) {
-			this.key = key;
-			this.ttsString = ttsString;
-		}
-
-		public String toHumanString(Context ctx) {
-			return ctx.getString(key);
-		}
-
-		public String toTTSString() {
-			return ttsString;
-		}
-
-	}
-
-	public enum AngularConstants {
-		DEGREES(R.string.shared_string_degrees, "°"),
-		DEGREES360(R.string.shared_string_degrees, "°"),
-		MILLIRADS(R.string.shared_string_milliradians, "mil");
-
-		private final int key;
-		private final String unit;
-		
-		AngularConstants(int key, String unit) {
-			this.key = key;
-			this.unit = unit;
-		}
-
-		public String toHumanString(Context ctx) {
-			return ctx.getString(key);
-		}
-		public String getUnitSymbol() {
-			return unit;
-		}
-
-	}
-
-	public enum AutoZoomMap {
-		FARTHEST(R.string.auto_zoom_farthest, 1f, 15.5f),
-		FAR(R.string.auto_zoom_far, 1.4f, 17f),
-		CLOSE(R.string.auto_zoom_close, 2f, 19f);
-		public final float coefficient;
-		public final int name;
-		public final float maxZoom;
-
-		AutoZoomMap(int name, float coefficient, float maxZoom) {
-			this.name = name;
-			this.coefficient = coefficient;
-			this.maxZoom = maxZoom;
-
-		}
-	}
-
-	/**
-	 * Class represents specific for driving region
-	 * Signs, leftHandDriving
-	 */
-	public enum DrivingRegion {
-
-		EUROPE_ASIA(R.string.driving_region_europe_asia, MetricsConstants.KILOMETERS_AND_METERS, false),
-		US(R.string.driving_region_us, MetricsConstants.MILES_AND_FEET, false),
-		CANADA(R.string.driving_region_canada, MetricsConstants.KILOMETERS_AND_METERS, false),
-		UK_AND_OTHERS(R.string.driving_region_uk, MetricsConstants.MILES_AND_METERS, true),
-		JAPAN(R.string.driving_region_japan, MetricsConstants.KILOMETERS_AND_METERS, true),
-		AUSTRALIA(R.string.driving_region_australia, MetricsConstants.KILOMETERS_AND_METERS, true);
-
-		public final boolean leftHandDriving;
-		public final MetricsConstants defMetrics;
-		public final int name;
-
-		DrivingRegion(int name, MetricsConstants def, boolean leftHandDriving) {
-			this.name = name;
-			defMetrics = def;
-			this.leftHandDriving = leftHandDriving;
-		}
-
-		public boolean isAmericanTypeSigns() {
-			return this == OsmandSettings.DrivingRegion.AUSTRALIA ||
-					this == OsmandSettings.DrivingRegion.US ||
-					this == OsmandSettings.DrivingRegion.CANADA;
-		}
-
-		public String getDescription(Context ctx) {
-			return ctx.getString(leftHandDriving ? R.string.left_side_navigation : R.string.right_side_navigation) +
-					", " +
-					defMetrics.toHumanString(ctx).toLowerCase();
-		}
-	}
-
-	public enum RulerMode {
-		FIRST,
-		SECOND,
-		EMPTY
-	}
-
-	public enum WikiArticleShowImages {
-		ON(R.string.shared_string_on),
-		OFF(R.string.shared_string_off),
-		WIFI(R.string.shared_string_wifi_only);
-
-		public final int name;
-
-		WikiArticleShowImages(int name) {
-			this.name = name;
-		}
-	}
-
-	public enum TerrainMode {
-		HILLSHADE,
-		SLOPE
-	}
-
-	private OsmandPreference[] generalPrefs = new OsmandPreference[]{
-			EXTERNAL_INPUT_DEVICE,
-			CENTER_POSITION_ON_MAP,
-			ROTATE_MAP,
-			MAP_SCREEN_ORIENTATION,
-			LIVE_MONITORING_URL,
-			LIVE_MONITORING_MAX_INTERVAL_TO_SEND,
-			LIVE_MONITORING_INTERVAL,
-			LIVE_MONITORING,
-			SHOW_TRIP_REC_NOTIFICATION,
-			AUTO_SPLIT_RECORDING,
-			SAVE_TRACK_MIN_SPEED,
-			SAVE_TRACK_PRECISION,
-			SAVE_TRACK_MIN_DISTANCE,
-			SAVE_TRACK_INTERVAL,
-			TRACK_STORAGE_DIRECTORY,
-			SAVE_HEADING_TO_GPX,
-			DISABLE_RECORDING_ONCE_APP_KILLED,
-			SAVE_TRACK_TO_GPX,
-			SAVE_GLOBAL_TRACK_REMEMBER,
-			SAVE_GLOBAL_TRACK_INTERVAL,
-			MAP_EMPTY_STATE_ALLOWED,
-			DO_NOT_USE_ANIMATIONS,
-			USE_KALMAN_FILTER_FOR_COMPASS,
-			USE_MAGNETIC_FIELD_SENSOR_COMPASS,
-			USE_TRACKBALL_FOR_MOVEMENTS,
-			SPEED_SYSTEM,
-			ANGULAR_UNITS,
-			METRIC_SYSTEM,
-			DRIVING_REGION,
-			DRIVING_REGION_AUTOMATIC
-	};
-
-	String[]
-			appModeBeanPrefsIds = new String[] {
-			ICON_COLOR.getId(),
-			ICON_RES_NAME.getId(),
-			PARENT_APP_MODE.getId(),
-			ROUTING_PROFILE.getId(),
-			ROUTE_SERVICE.getId(),
-			USER_PROFILE_NAME.getId(),
-			LOCATION_ICON.getId(),
-			NAVIGATION_ICON.getId(),
-			APP_MODE_ORDER.getId()
-	};
-
-	public class PreferencesDataStore extends PreferenceDataStore {
-
-		private ApplicationMode appMode;
-
-		public PreferencesDataStore(@NonNull ApplicationMode appMode) {
-			this.appMode = appMode;
-		}
-
-		@Override
-		public void putString(String key, @Nullable String value) {
-			setPreference(key, value, appMode);
-		}
-
-		@Override
-		public void putStringSet(String key, @Nullable Set<String> values) {
-			setPreference(key, values, appMode);
-		}
-
-		@Override
-		public void putInt(String key, int value) {
-			setPreference(key, value, appMode);
-		}
-
-		@Override
-		public void putLong(String key, long value) {
-			setPreference(key, value, appMode);
-		}
-
-		@Override
-		public void putFloat(String key, float value) {
-			setPreference(key, value, appMode);
-		}
-
-		@Override
-		public void putBoolean(String key, boolean value) {
-			setPreference(key, value, appMode);
-		}
-
-		public void putValue(String key, Object value) {
-			setPreference(key, value, appMode);
-		}
-
-		@Nullable
-		@Override
-		public String getString(String key, @Nullable String defValue) {
-			OsmandPreference preference = getPreference(key);
-			if (preference instanceof StringPreference) {
-				return ((StringPreference) preference).getModeValue(appMode);
-			} else {
-				Object value = preference.getModeValue(appMode);
-				if (value != null) {
-					return value.toString();
-				}
-			}
-			return defValue;
-		}
-
-		@Nullable
-		@Override
-		public Set<String> getStringSet(String key, @Nullable Set<String> defValues) {
-			return super.getStringSet(key, defValues);
-		}
-
-		@Override
-		public int getInt(String key, int defValue) {
-			OsmandPreference preference = getPreference(key);
-			if (preference instanceof IntPreference) {
-				return ((IntPreference) preference).getModeValue(appMode);
-			}
-			return defValue;
-		}
-
-		@Override
-		public long getLong(String key, long defValue) {
-			OsmandPreference preference = getPreference(key);
-			if (preference instanceof LongPreference) {
-				return ((LongPreference) preference).getModeValue(appMode);
-			}
-			return defValue;
-		}
-
-		@Override
-		public float getFloat(String key, float defValue) {
-			OsmandPreference preference = getPreference(key);
-			if (preference instanceof FloatPreference) {
-				return ((FloatPreference) preference).getModeValue(appMode);
-			}
-			return defValue;
-		}
-
-		@Override
-		public boolean getBoolean(String key, boolean defValue) {
-			OsmandPreference preference = getPreference(key);
-			if (preference instanceof BooleanPreference) {
-				return ((BooleanPreference) preference).getModeValue(appMode);
-			}
-			return defValue;
-		}
-
-		@Nullable
-		public Object getValue(String key, Object defValue) {
-			OsmandPreference preference = getPreference(key);
-			if (preference != null) {
-				return preference.getModeValue(appMode);
-			}
-			return defValue;
-		}
-	}
-}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/PreferenceWithListener.java b/OsmAnd/src/net/osmand/plus/settings/backend/PreferenceWithListener.java
new file mode 100644
index 0000000000..5ffb4466ba
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/PreferenceWithListener.java
@@ -0,0 +1,49 @@
+package net.osmand.plus.settings.backend;
+
+import net.osmand.StateChangedListener;
+
+import java.lang.ref.WeakReference;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+abstract class PreferenceWithListener<T> implements OsmandPreference<T> {
+	private List<WeakReference<StateChangedListener<T>>> l = null;
+
+	@Override
+	public synchronized void addListener(StateChangedListener<T> listener) {
+		if (l == null) {
+			l = new LinkedList<WeakReference<StateChangedListener<T>>>();
+		}
+		if (!l.contains(new WeakReference<StateChangedListener<T>>(listener))) {
+			l.add(new WeakReference<StateChangedListener<T>>(listener));
+		}
+	}
+
+	public synchronized void fireEvent(T value) {
+		if (l != null) {
+			Iterator<WeakReference<StateChangedListener<T>>> it = l.iterator();
+			while (it.hasNext()) {
+				StateChangedListener<T> t = it.next().get();
+				if (t == null) {
+					it.remove();
+				} else {
+					t.stateChanged(value);
+				}
+			}
+		}
+	}
+
+	@Override
+	public synchronized void removeListener(StateChangedListener<T> listener) {
+		if (l != null) {
+			Iterator<WeakReference<StateChangedListener<T>>> it = l.iterator();
+			while (it.hasNext()) {
+				StateChangedListener<T> t = it.next().get();
+				if (t == listener) {
+					it.remove();
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/SettingsHelper.java b/OsmAnd/src/net/osmand/plus/settings/backend/SettingsHelper.java
index 0172531139..60a411121a 100644
--- a/OsmAnd/src/net/osmand/plus/settings/backend/SettingsHelper.java
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/SettingsHelper.java
@@ -20,8 +20,6 @@ import net.osmand.map.TileSourceManager.TileSourceTemplate;
 import net.osmand.map.WorldRegion;
 import net.osmand.osm.MapPoiTypes;
 import net.osmand.osm.PoiCategory;
-import net.osmand.plus.settings.backend.ApplicationMode.ApplicationModeBean;
-import net.osmand.plus.settings.backend.ApplicationMode.ApplicationModeBuilder;
 import net.osmand.plus.CustomOsmandPlugin;
 import net.osmand.plus.CustomOsmandPlugin.SuggestedDownloadItem;
 import net.osmand.plus.CustomRegion;
@@ -29,12 +27,13 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
 import net.osmand.plus.SQLiteTileSource;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
 import net.osmand.plus.helpers.AvoidSpecificRoads;
 import net.osmand.plus.helpers.AvoidSpecificRoads.AvoidRoadInfo;
 import net.osmand.plus.poi.PoiUIFilter;
 import net.osmand.plus.quickaction.QuickAction;
 import net.osmand.plus.quickaction.QuickActionRegistry;
+import net.osmand.plus.settings.backend.ApplicationMode.ApplicationModeBean;
+import net.osmand.plus.settings.backend.ApplicationMode.ApplicationModeBuilder;
 import net.osmand.router.GeneralRouter;
 import net.osmand.util.Algorithms;
 
@@ -947,7 +946,7 @@ public class SettingsHelper {
 		@Override
 		protected void init() {
 			super.init();
-			appModeBeanPrefsIds = new HashSet<>(Arrays.asList(app.getSettings().appModeBeanPrefsIds));
+			appModeBeanPrefsIds = new HashSet<>(Arrays.asList(getAppModeBeanPrefsIds()));
 		}
 
 		@NonNull
@@ -1188,6 +1187,21 @@ public class SettingsHelper {
 				}
 			};
 		}
+
+		private String[] getAppModeBeanPrefsIds() {
+			OsmandSettings settings = app.getSettings();
+			return new String[] {
+					settings.ICON_COLOR.getId(),
+					settings.ICON_RES_NAME.getId(),
+					settings.PARENT_APP_MODE.getId(),
+					settings.ROUTING_PROFILE.getId(),
+					settings.ROUTE_SERVICE.getId(),
+					settings.USER_PROFILE_NAME.getId(),
+					settings.LOCATION_ICON.getId(),
+					settings.NAVIGATION_ICON.getId(),
+					settings.APP_MODE_ORDER.getId()
+			};
+		}
 	}
 
 	public abstract static class StreamSettingsItemReader extends SettingsItemReader<StreamSettingsItem> {
@@ -2937,6 +2951,11 @@ public class SettingsHelper {
 		for (ExportSettingsType settingsType : settingsTypes) {
 			List<?> settingsDataObjects = additionalData.get(settingsType);
 			if (settingsDataObjects != null) {
+				for (Object object : settingsDataObjects) {
+					if (object instanceof ApplicationModeBean) {
+						settingsItems.add(new ProfileSettingsItem(app, null, (ApplicationModeBean) object));
+					}
+				}
 				settingsItems.addAll(prepareAdditionalSettingsItems(new ArrayList<>(settingsDataObjects)));
 			}
 		}
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/SettingsMapPointsStorage.java b/OsmAnd/src/net/osmand/plus/settings/backend/SettingsMapPointsStorage.java
new file mode 100644
index 0000000000..07307f05f2
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/SettingsMapPointsStorage.java
@@ -0,0 +1,150 @@
+package net.osmand.plus.settings.backend;
+
+import net.osmand.data.LatLon;
+import net.osmand.data.PointDescription;
+import net.osmand.plus.api.SettingsAPI;
+import net.osmand.plus.helpers.SearchHistoryHelper;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.StringTokenizer;
+
+abstract class SettingsMapPointsStorage {
+
+	private OsmandSettings osmandSettings;
+	protected String pointsKey;
+	protected String descriptionsKey;
+
+	public SettingsMapPointsStorage(OsmandSettings osmandSettings) {
+		this.osmandSettings = osmandSettings;
+	}
+
+	protected SettingsAPI getSettingsAPI() {
+		return osmandSettings.getSettingsAPI();
+	}
+
+	protected OsmandSettings getOsmandSettings() {
+		return osmandSettings;
+	}
+
+	public List<String> getPointDescriptions(int sz) {
+		List<String> list = new ArrayList<>();
+		String ip = getSettingsAPI().getString(osmandSettings.getGlobalPreferences(), descriptionsKey, "");
+		if (ip.trim().length() > 0) {
+			list.addAll(Arrays.asList(ip.split("--")));
+		}
+		while (list.size() > sz) {
+			list.remove(list.size() - 1);
+		}
+		while (list.size() < sz) {
+			list.add("");
+		}
+		return list;
+	}
+
+	public List<LatLon> getPoints() {
+		List<LatLon> list = new ArrayList<>();
+		String ip = getSettingsAPI().getString(osmandSettings.getGlobalPreferences(), pointsKey, "");
+		if (ip.trim().length() > 0) {
+			StringTokenizer tok = new StringTokenizer(ip, ",");
+			while (tok.hasMoreTokens()) {
+				String lat = tok.nextToken();
+				if (!tok.hasMoreTokens()) {
+					break;
+				}
+				String lon = tok.nextToken();
+				list.add(new LatLon(Float.parseFloat(lat), Float.parseFloat(lon)));
+			}
+		}
+		return list;
+	}
+
+	public boolean insertPoint(double latitude, double longitude, PointDescription historyDescription, int index) {
+		List<LatLon> ps = getPoints();
+		List<String> ds = getPointDescriptions(ps.size());
+		ps.add(index, new LatLon(latitude, longitude));
+		ds.add(index, PointDescription.serializeToString(historyDescription));
+		if (historyDescription != null && !historyDescription.isSearchingAddress(osmandSettings.getContext())) {
+			SearchHistoryHelper.getInstance(osmandSettings.getContext()).addNewItemToHistory(latitude, longitude, historyDescription);
+		}
+		return savePoints(ps, ds);
+	}
+
+	public boolean updatePoint(double latitude, double longitude, PointDescription historyDescription) {
+		List<LatLon> ps = getPoints();
+		List<String> ds = getPointDescriptions(ps.size());
+		int i = ps.indexOf(new LatLon(latitude, longitude));
+		if (i != -1) {
+			ds.set(i, PointDescription.serializeToString(historyDescription));
+			if (historyDescription != null && !historyDescription.isSearchingAddress(osmandSettings.getContext())) {
+				SearchHistoryHelper.getInstance(osmandSettings.getContext()).addNewItemToHistory(latitude, longitude, historyDescription);
+			}
+			return savePoints(ps, ds);
+		} else {
+			return false;
+		}
+	}
+
+	public boolean deletePoint(int index) {
+		List<LatLon> ps = getPoints();
+		List<String> ds = getPointDescriptions(ps.size());
+		if (index < ps.size()) {
+			ps.remove(index);
+			ds.remove(index);
+			return savePoints(ps, ds);
+		} else {
+			return false;
+		}
+	}
+
+	public boolean deletePoint(LatLon latLon) {
+		List<LatLon> ps = getPoints();
+		List<String> ds = getPointDescriptions(ps.size());
+		int index = ps.indexOf(latLon);
+		if (index != -1) {
+			ps.remove(index);
+			ds.remove(index);
+			return savePoints(ps, ds);
+		} else {
+			return false;
+		}
+	}
+
+	public boolean savePoints(List<LatLon> ps, List<String> ds) {
+		StringBuilder sb = new StringBuilder();
+		for (int i = 0; i < ps.size(); i++) {
+			if (i > 0) {
+				sb.append(",");
+			}
+			sb.append(((float) ps.get(i).getLatitude() + "")).append(",").append(((float) ps.get(i).getLongitude() + ""));
+		}
+		StringBuilder tb = new StringBuilder();
+		for (int i = 0; i < ds.size(); i++) {
+			if (i > 0) {
+				tb.append("--");
+			}
+			if (ds.get(i) == null) {
+				tb.append("");
+			} else {
+				tb.append(ds.get(i));
+			}
+		}
+		return getSettingsAPI().edit(osmandSettings.getGlobalPreferences())
+				.putString(pointsKey, sb.toString())
+				.putString(descriptionsKey, tb.toString())
+				.commit();
+	}
+
+	public boolean movePoint(LatLon latLonEx, LatLon latLonNew) {
+		List<LatLon> ps = getPoints();
+		List<String> ds = getPointDescriptions(ps.size());
+		int i = ps.indexOf(latLonEx);
+		if (i != -1) {
+			ps.set(i, latLonNew);
+			return savePoints(ps, ds);
+		} else {
+			return false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/StringPreference.java b/OsmAnd/src/net/osmand/plus/settings/backend/StringPreference.java
new file mode 100644
index 0000000000..1bbb6d4e94
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/StringPreference.java
@@ -0,0 +1,23 @@
+package net.osmand.plus.settings.backend;
+
+public class StringPreference extends CommonPreference<String> {
+
+	StringPreference(OsmandSettings settings, String id, String defaultValue) {
+		super(settings, id, defaultValue);
+	}
+
+	@Override
+	protected String getValue(Object prefs, String defaultValue) {
+		return getSettingsAPI().getString(prefs, getId(), defaultValue);
+	}
+
+	@Override
+	protected boolean setValue(Object prefs, String val) {
+		return getSettingsAPI().edit(prefs).putString(getId(), (val != null) ? val.trim() : val).commit();
+	}
+
+	@Override
+	public String parseString(String s) {
+		return s;
+	}
+}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java
index c988dbdf68..f34d6938fb 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java
@@ -16,9 +16,8 @@ import net.osmand.AndroidUtils;
 import net.osmand.PlatformUtil;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.BooleanPreference;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
+import net.osmand.plus.settings.backend.BooleanPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
@@ -57,7 +56,7 @@ public class BooleanPreferenceBottomSheet extends BasePreferenceBottomSheet {
 		String title = switchPreference.getTitle().toString();
 		items.add(new TitleItem(title));
 
-		final OsmandSettings.BooleanPreference pref = (BooleanPreference) preference;
+		final BooleanPreference pref = (BooleanPreference) preference;
 		CharSequence summaryOn = switchPreference.getSummaryOn();
 		CharSequence summaryOff = switchPreference.getSummaryOff();
 		final String on = summaryOn == null || summaryOn.toString().equals("")
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeDataStorageBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeDataStorageBottomSheet.java
index 334cc42aa8..e61faafe16 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeDataStorageBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeDataStorageBottomSheet.java
@@ -11,8 +11,8 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
+import net.osmand.FileUtils;
 import net.osmand.PlatformUtil;
-import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
@@ -63,7 +63,7 @@ public class ChangeDataStorageBottomSheet extends BasePreferenceBottomSheet {
 		CharSequence desc = null;
 		
 		File currentStorageFile = new File(currentDirectory.getDirectory());
-		if ((!OsmandSettings.isWritable(currentStorageFile))) {
+		if ((!FileUtils.isWritable(currentStorageFile))) {
 			desc = String.format(getString(R.string.android_19_location_disabled), currentStorageFile.getAbsoluteFile());
 		} else {
 			String from = currentDirectory.getKey().equals(MANUALLY_SPECIFIED) ? currentDirectory.getDirectory() : currentDirectory.getTitle();
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/RecalculateRouteInDeviationBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/RecalculateRouteInDeviationBottomSheet.java
index 4c658406ce..d2679564a8 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/RecalculateRouteInDeviationBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/RecalculateRouteInDeviationBottomSheet.java
@@ -14,9 +14,11 @@ import androidx.fragment.app.FragmentManager;
 import com.google.android.material.slider.Slider;
 
 import net.osmand.AndroidUtils;
+import net.osmand.plus.helpers.enums.MetricsConstants;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
@@ -43,7 +45,7 @@ public class RecalculateRouteInDeviationBottomSheet extends BooleanPreferenceBot
 	private OsmandApplication app;
 	private OsmandSettings settings;
 	private ApplicationMode appMode;
-	private OsmandSettings.CommonPreference<Float> preference;
+	private CommonPreference<Float> preference;
 
 	private Slider slider;
 	private TextView tvSliderTitle;
@@ -75,8 +77,8 @@ public class RecalculateRouteInDeviationBottomSheet extends BooleanPreferenceBot
 		int contentPaddingSmall = app.getResources().getDimensionPixelSize(R.dimen.content_padding_small);
 		int contentPadding = app.getResources().getDimensionPixelSize(R.dimen.content_padding);
 
-		OsmandSettings.MetricsConstants mc = settings.METRIC_SYSTEM.get();
-		if (mc == OsmandSettings.MetricsConstants.KILOMETERS_AND_METERS) {
+		MetricsConstants mc = settings.METRIC_SYSTEM.get();
+		if (mc == MetricsConstants.KILOMETERS_AND_METERS) {
 			entryValues = new Float[]{10.f, 20.0f, 30.0f, 50.0f, 100.0f, 200.0f, 500.0f, 1000.0f, 1500.0f};
 		} else {
 			entryValues = new Float[]{9.1f, 18.3f, 30.5f, 45.7f, 91.5f, 183.0f, 482.0f, 965.0f, 1609.0f};
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java
index e416d2c32e..86940e7d7a 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java
@@ -55,8 +55,9 @@ import net.osmand.PlatformUtil;
 import net.osmand.access.AccessibilitySettingsFragment;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
@@ -834,11 +835,11 @@ public abstract class BaseSettingsFragment extends PreferenceFragmentCompat impl
 		return icon;
 	}
 
-	public SwitchPreferenceCompat createSwitchPreference(OsmandSettings.OsmandPreference<Boolean> b, int title, int summary, int layoutId) {
+	public SwitchPreferenceCompat createSwitchPreference(OsmandPreference<Boolean> b, int title, int summary, int layoutId) {
 		return createSwitchPreference(b, getString(title), getString(summary), layoutId);
 	}
 
-	public SwitchPreferenceCompat createSwitchPreference(OsmandSettings.OsmandPreference<Boolean> b, String title, String summary, int layoutId) {
+	public SwitchPreferenceCompat createSwitchPreference(OsmandPreference<Boolean> b, String title, String summary, int layoutId) {
 		SwitchPreferenceCompat p = new SwitchPreferenceCompat(getContext());
 		p.setTitle(title);
 		p.setKey(b.getId());
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java
index 4d2309af82..ee8e11b970 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java
@@ -27,6 +27,9 @@ import net.osmand.PlatformUtil;
 import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuItem;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.settings.backend.ContextMenuItemsPreference;
+import net.osmand.plus.settings.backend.ContextMenuItemsSettings;
+import net.osmand.plus.settings.backend.MainContextMenuItemsSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
@@ -171,9 +174,9 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment
 
 	private void initMainActionsIds(ApplicationMode appMode) {
 		List<ContextMenuItem> defItems = getCustomizableDefaultItems(contextMenuAdapter.getDefaultItems());
-		OsmandSettings.ContextMenuItemsSettings pref = getSettingForScreen(app, screenType).getModeValue(appMode);
-		if (pref instanceof OsmandSettings.MainContextMenuItemsSettings) {
-			mainActionItems = new ArrayList<>(((OsmandSettings.MainContextMenuItemsSettings) pref).getMainIds());
+		ContextMenuItemsSettings pref = getSettingForScreen(app, screenType).getModeValue(appMode);
+		if (pref instanceof MainContextMenuItemsSettings) {
+			mainActionItems = new ArrayList<>(((MainContextMenuItemsSettings) pref).getMainIds());
 			if (mainActionItems.isEmpty()) {
 				for (int i = 0; i < MAIN_BUTTONS_QUANTITY && i < defItems.size(); i++) {
 					mainActionItems.add(defItems.get(i).getId());
@@ -265,11 +268,11 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment
 					}
 				}
 				FragmentManager fm = getFragmentManager();
-				final OsmandSettings.ContextMenuItemsSettings prefToSave;
+				final ContextMenuItemsSettings prefToSave;
 				if (screenType == ScreenType.CONTEXT_MENU_ACTIONS) {
-					prefToSave = new OsmandSettings.MainContextMenuItemsSettings(mainActionItems, hiddenMenuItems, ids);
+					prefToSave = new MainContextMenuItemsSettings(mainActionItems, hiddenMenuItems, ids);
 				} else {
-					prefToSave = new OsmandSettings.ContextMenuItemsSettings(hiddenMenuItems, ids);
+					prefToSave = new ContextMenuItemsSettings(hiddenMenuItems, ids);
 				}
 				if (fm != null) {
 					ChangeGeneralProfilesPrefBottomSheet.showInstance(fm,
@@ -533,7 +536,7 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment
 		}
 	}
 
-	public static OsmandSettings.ContextMenuItemsPreference getSettingForScreen(OsmandApplication app, ScreenType screenType) throws IllegalArgumentException {
+	public static ContextMenuItemsPreference getSettingForScreen(OsmandApplication app, ScreenType screenType) throws IllegalArgumentException {
 		switch (screenType) {
 			case DRAWER:
 				return app.getSettings().DRAWER_ITEMS;
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageFragment.java
index 93719a83ab..842b53e2fa 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageFragment.java
@@ -23,6 +23,7 @@ import androidx.preference.PreferenceScreen;
 import androidx.preference.PreferenceViewHolder;
 
 import net.osmand.AndroidUtils;
+import net.osmand.FileUtils;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.ProgressImplementation;
@@ -408,7 +409,7 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto
 		String newDirectory = newStorageDirectory.getDirectory();
 		int type = newStorageDirectory.getType();
 		File newDirectoryFile = new File(newDirectory);
-		boolean wr = OsmandSettings.isWritable(newDirectoryFile);
+		boolean wr = FileUtils.isWritable(newDirectoryFile);
 		if (wr) {
 			app.setExternalStorageDirectory(type, newDirectory);
 			reloadData();
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java
index 0cd1e628bb..3a81548285 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java
@@ -22,9 +22,12 @@ import androidx.preference.PreferenceViewHolder;
 import androidx.preference.SwitchPreferenceCompat;
 
 import net.osmand.data.PointDescription;
+import net.osmand.plus.helpers.enums.AngularConstants;
+import net.osmand.plus.helpers.enums.MetricsConstants;
+import net.osmand.plus.helpers.enums.SpeedConstants;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.DrivingRegion;
+import net.osmand.plus.helpers.enums.DrivingRegion;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.Version;
@@ -186,7 +189,7 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment impleme
 	}
 
 	private void setupUnitsOfLengthPref() {
-		OsmandSettings.MetricsConstants[] metricsConstants = OsmandSettings.MetricsConstants.values();
+		MetricsConstants[] metricsConstants = MetricsConstants.values();
 		String[] entries = new String[metricsConstants.length];
 		Integer[] entryValues = new Integer[metricsConstants.length];
 
@@ -208,20 +211,20 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment impleme
 	}
 
 	private void setupAngularUnitsPref() {
-		OsmandSettings.AngularConstants[] ac = OsmandSettings.AngularConstants.values();
+		AngularConstants[] ac = AngularConstants.values();
 		String[] entries = new String[ac.length];
 		Integer[] entryValues = new Integer[ac.length];
 
 		for (int i = 0; i < entries.length; i++) {
-			if (ac[i] == OsmandSettings.AngularConstants.DEGREES) {
-				entries[i] = OsmandSettings.AngularConstants.DEGREES.toHumanString(app) + " 180";
-				entryValues[i] = OsmandSettings.AngularConstants.DEGREES.ordinal();
-			} else if (ac[i] == OsmandSettings.AngularConstants.DEGREES360) {
-				entries[i] = OsmandSettings.AngularConstants.DEGREES.toHumanString(app) + " 360";
-				entryValues[i] = OsmandSettings.AngularConstants.DEGREES360.ordinal();
+			if (ac[i] == AngularConstants.DEGREES) {
+				entries[i] = AngularConstants.DEGREES.toHumanString(app) + " 180";
+				entryValues[i] = AngularConstants.DEGREES.ordinal();
+			} else if (ac[i] == AngularConstants.DEGREES360) {
+				entries[i] = AngularConstants.DEGREES.toHumanString(app) + " 360";
+				entryValues[i] = AngularConstants.DEGREES360.ordinal();
 			} else {
 				entries[i] = ac[i].toHumanString(app);
-				entryValues[i] = OsmandSettings.AngularConstants.MILLIRADS.ordinal();
+				entryValues[i] = AngularConstants.MILLIRADS.ordinal();
 			}
 		}
 
@@ -232,7 +235,7 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment impleme
 	}
 
 	private void setupSpeedSystemPref() {
-		OsmandSettings.SpeedConstants[] speedConstants = OsmandSettings.SpeedConstants.values();
+		SpeedConstants[] speedConstants = SpeedConstants.values();
 		String[] entries = new String[speedConstants.length];
 		Integer[] entryValues = new Integer[speedConstants.length];
 
@@ -377,14 +380,14 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment impleme
 				if (mapViewTrackingUtilities != null) {
 					mapViewTrackingUtilities.resetDrivingRegionUpdate();
 				}
-			} else if (newValue instanceof OsmandSettings.DrivingRegion) {
+			} else if (newValue instanceof DrivingRegion) {
 				applyPreference(settings.DRIVING_REGION_AUTOMATIC.getId(), applyToAllProfiles, false);
 				if (applyToAllProfiles) {
 					for (ApplicationMode appMode : ApplicationMode.allPossibleValues()) {
-						settings.DRIVING_REGION.setModeValue(appMode, (OsmandSettings.DrivingRegion) newValue);
+						settings.DRIVING_REGION.setModeValue(appMode, (DrivingRegion) newValue);
 					}
 				} else {
-					settings.DRIVING_REGION.setModeValue(selectedMode, (OsmandSettings.DrivingRegion) newValue);
+					settings.DRIVING_REGION.setModeValue(selectedMode, (DrivingRegion) newValue);
 				}
 			}
 			updateAllSettings();
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/MapDuringNavigationFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/MapDuringNavigationFragment.java
index 06aa0c4c08..0fe5a6d6a3 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/MapDuringNavigationFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/MapDuringNavigationFragment.java
@@ -2,8 +2,8 @@ package net.osmand.plus.settings.fragments;
 
 import androidx.preference.Preference;
 
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.AutoZoomMap;
+import net.osmand.plus.helpers.enums.MetricsConstants;
+import net.osmand.plus.helpers.enums.AutoZoomMap;
 import net.osmand.plus.R;
 import net.osmand.plus.settings.preferences.ListPreferenceEx;
 import net.osmand.plus.settings.preferences.SwitchPreferenceEx;
@@ -78,7 +78,7 @@ public class MapDuringNavigationFragment extends BaseSettingsFragment {
 		Float[] valuesKmh = new Float[]{0f, 5f, 7f, 10f, 15f, 20f};
 		Float[] valuesMph = new Float[]{0f, 3f, 5f, 7f, 10f, 15f};
 		String[] names;
-		if (settings.METRIC_SYSTEM.getModeValue(getSelectedAppMode()) == OsmandSettings.MetricsConstants.KILOMETERS_AND_METERS) {
+		if (settings.METRIC_SYSTEM.getModeValue(getSelectedAppMode()) == MetricsConstants.KILOMETERS_AND_METERS) {
 			names = new String[valuesKmh.length];
 			for (int i = 0; i < names.length; i++) {
 				names[i] = valuesKmh[i].intValue() + " " + getString(R.string.km_h);
@@ -113,7 +113,7 @@ public class MapDuringNavigationFragment extends BaseSettingsFragment {
 				} else {
 					applyPreference(settings.AUTO_ZOOM_MAP.getId(), applyToAllProfiles, true);
 					applyPreference(settings.AUTO_ZOOM_MAP_SCALE.getId(),
-							applyToAllProfiles, OsmandSettings.AutoZoomMap.values()[position - 1]);
+							applyToAllProfiles, AutoZoomMap.values()[position - 1]);
 				}
 			}
 		} else {
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
index cfd6874d89..a17c265645 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
@@ -25,18 +25,19 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.slider.Slider;
 
 import net.osmand.StateChangedListener;
-import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.BooleanPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
+import net.osmand.plus.Version;
 import net.osmand.plus.activities.SettingsBaseActivity;
 import net.osmand.plus.activities.SettingsNavigationActivity;
 import net.osmand.plus.routing.RouteProvider;
 import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
+import net.osmand.plus.settings.backend.ApplicationMode;
+import net.osmand.plus.settings.backend.BooleanPreference;
+import net.osmand.plus.settings.backend.CommonPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.settings.bottomsheets.RecalculateRouteInDeviationBottomSheet;
 import net.osmand.plus.settings.preferences.ListPreferenceEx;
 import net.osmand.plus.settings.preferences.MultiSelectBooleanPreference;
@@ -155,6 +156,58 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
 		getPreferenceScreen().addPreference(timeConditionalRouting);
 	}
 
+	private void setupOsmLiveForPublicTransportPref() {
+		SwitchPreferenceEx useOsmLiveForPublicTransport = createSwitchPreferenceEx(settings.USE_OSM_LIVE_FOR_PUBLIC_TRANSPORT.getId(),
+		R.string.use_live_public_transport, R.layout.preference_with_descr_dialog_and_switch);
+		useOsmLiveForPublicTransport.setDescription(getString(R.string.use_osm_live_public_transport_description));
+		useOsmLiveForPublicTransport.setSummaryOn(R.string.shared_string_enabled);
+		useOsmLiveForPublicTransport.setSummaryOff(R.string.shared_string_disabled);
+		useOsmLiveForPublicTransport.setIconSpaceReserved(true);
+		getPreferenceScreen().addPreference(useOsmLiveForPublicTransport);
+	}
+
+	private void setupNativePublicTransport() {
+		if (!Version.isBlackberry(app)) {
+			SwitchPreferenceEx setupNativePublicTransport = createSwitchPreferenceEx(settings.PT_SAFE_MODE.getId(),
+					R.string.use_native_pt, R.layout.preference_with_descr_dialog_and_switch);
+			setupNativePublicTransport.setDescription(getString(R.string.use_native_pt_desc));
+			setupNativePublicTransport.setSummaryOn(R.string.shared_string_enabled);
+			setupNativePublicTransport.setSummaryOff(R.string.shared_string_disabled);
+			setupNativePublicTransport.setIconSpaceReserved(true);
+			getPreferenceScreen().addPreference(setupNativePublicTransport);
+		}
+	}
+
+	private void setupOsmLiveForRoutingPref() {
+		SwitchPreferenceEx useOsmLiveForRouting = createSwitchPreferenceEx(settings.USE_OSM_LIVE_FOR_ROUTING.getId(),
+				R.string.use_live_routing, R.layout.preference_with_descr_dialog_and_switch);
+		useOsmLiveForRouting.setDescription(getString(R.string.use_osm_live_routing_description));
+		useOsmLiveForRouting.setSummaryOn(R.string.shared_string_enabled);
+		useOsmLiveForRouting.setSummaryOff(R.string.shared_string_disabled);
+		useOsmLiveForRouting.setIconSpaceReserved(true);
+		getPreferenceScreen().addPreference(useOsmLiveForRouting);
+	}
+
+	private void setupDisableComplexRoutingPref() {
+		SwitchPreferenceEx disableComplexRouting = createSwitchPreferenceEx(settings.DISABLE_COMPLEX_ROUTING.getId(),
+				R.string.use_complex_routing, R.layout.preference_with_descr_dialog_and_switch);
+		disableComplexRouting.setDescription(getString(R.string.complex_routing_descr));
+		disableComplexRouting.setSummaryOn(R.string.shared_string_enabled);
+		disableComplexRouting.setSummaryOff(R.string.shared_string_disabled);
+		disableComplexRouting.setIconSpaceReserved(true);
+		getPreferenceScreen().addPreference(disableComplexRouting);
+	}
+
+	private void setupFastRecalculationPref() {
+		SwitchPreferenceEx useFastRecalculation = createSwitchPreferenceEx(settings.USE_FAST_RECALCULATION.getId(),
+				R.string.use_fast_recalculation, R.layout.preference_with_descr_dialog_and_switch);
+		useFastRecalculation.setDescription(getString(R.string.use_fast_recalculation_desc));
+		useFastRecalculation.setSummaryOn(R.string.shared_string_enabled);
+		useFastRecalculation.setSummaryOff(R.string.shared_string_disabled);
+		useFastRecalculation.setIconSpaceReserved(true);
+		getPreferenceScreen().addPreference(useFastRecalculation);
+	}
+
 	private void setupRoutingPrefs() {
 		OsmandApplication app = getMyApplication();
 		if (app == null) {
@@ -170,7 +223,7 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
 		fastRoute.setSummaryOn(R.string.shared_string_on);
 		fastRoute.setSummaryOff(R.string.shared_string_off);
 
-		if (am.getRouteService() == RouteProvider.RouteService.OSMAND){
+		if (am.getRouteService() == RouteProvider.RouteService.OSMAND) {
 			GeneralRouter router = app.getRouter(am);
 			clearParameters();
 			if (router != null) {
@@ -230,7 +283,8 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
 					String description = SettingsBaseActivity.getRoutingStringPropertyDescription(app, p.getId(), p.getDescription());
 
 					if (p.getType() == RoutingParameterType.BOOLEAN) {
-						OsmandPreference<Boolean> pref = settings.getCustomRoutingBooleanProperty(p.getId(), p.getDefaultBoolean());
+						OsmandPreference pref = settings.getCustomRoutingBooleanProperty(p.getId(), p.getDefaultBoolean());
+
 						SwitchPreferenceEx switchPreferenceEx = (SwitchPreferenceEx) createSwitchPreferenceEx(pref.getId(), title, description, R.layout.preference_with_descr_dialog_and_switch);
 						switchPreferenceEx.setDescription(description);
 						switchPreferenceEx.setIcon(getRoutingPrefIcon(p.getId()));
@@ -244,7 +298,8 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
 						for (Object o : vls) {
 							svlss[i++] = o.toString();
 						}
-						OsmandPreference<String> pref = settings.getCustomRoutingProperty(p.getId(), p.getType() == RoutingParameterType.NUMERIC ? "0.0" : "-");
+						OsmandPreference pref = settings.getCustomRoutingProperty(p.getId(), p.getType() == RoutingParameterType.NUMERIC ? "0.0" : "-");
+
 						ListPreferenceEx listPreferenceEx = (ListPreferenceEx) createListPreferenceEx(pref.getId(), p.getPossibleValueDescriptions(), svlss, title, R.layout.preference_with_descr);
 						listPreferenceEx.setDescription(description);
 						listPreferenceEx.setIcon(getRoutingPrefIcon(p.getId()));
@@ -272,6 +327,17 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
 		setupRouteRecalcHeader(screen);
 		setupSelectRouteRecalcDistance(screen);
 		setupReverseDirectionRecalculation(screen);
+		addDivider(screen);
+		setupDevelopmentCategoryHeader(screen);
+		if (am.isDerivedRoutingFrom(ApplicationMode.PUBLIC_TRANSPORT)) {
+			setupOsmLiveForPublicTransportPref();
+			setupNativePublicTransport();
+		}
+		if (am.isDerivedRoutingFrom(ApplicationMode.CAR)) {
+			setupOsmLiveForRoutingPref();
+			setupDisableComplexRoutingPref();
+		}
+		setupFastRecalculationPref();
 	}
 
 	private void addDivider(PreferenceScreen screen) {
@@ -299,6 +365,13 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
 		screen.addPreference(routingCategory);
 	}
 
+	private void setupDevelopmentCategoryHeader(PreferenceScreen screen) {
+		PreferenceCategory developmentCategory = new PreferenceCategory(requireContext());
+		developmentCategory.setLayoutResource(R.layout.preference_category_with_descr);
+		developmentCategory.setTitle(R.string.development);
+		screen.addPreference(developmentCategory);
+	}
+
 	@Override
 	public boolean onPreferenceClick(Preference preference) {
 		if (preference.getKey().equals(settings.ROUTE_STRAIGHT_ANGLE.getId())) {
@@ -420,10 +493,10 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
 
 		for (RoutingParameter parameter : otherRoutingParameters) {
 			if (parameter.getType() == RoutingParameterType.BOOLEAN) {
-				OsmandSettings.CommonPreference<Boolean> pref = settings.getCustomRoutingBooleanProperty(parameter.getId(), parameter.getDefaultBoolean());
+				CommonPreference<Boolean> pref = settings.getCustomRoutingBooleanProperty(parameter.getId(), parameter.getDefaultBoolean());
 				pref.addListener(booleanRoutingPrefListener);
 			} else {
-				OsmandSettings.CommonPreference<String> pref = settings.getCustomRoutingProperty(parameter.getId(), parameter.getType() == RoutingParameterType.NUMERIC ? "0.0" : "-");
+				CommonPreference<String> pref = settings.getCustomRoutingProperty(parameter.getId(), parameter.getType() == RoutingParameterType.NUMERIC ? "0.0" : "-");
 				pref.addListener(customRoutingPrefListener);
 			}
 		}
@@ -435,15 +508,23 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
 
 		for (RoutingParameter parameter : otherRoutingParameters) {
 			if (parameter.getType() == RoutingParameterType.BOOLEAN) {
-				OsmandSettings.CommonPreference<Boolean> pref = settings.getCustomRoutingBooleanProperty(parameter.getId(), parameter.getDefaultBoolean());
+				CommonPreference<Boolean> pref = settings.getCustomRoutingBooleanProperty(parameter.getId(), parameter.getDefaultBoolean());
 				pref.removeListener(booleanRoutingPrefListener);
 			} else {
-				OsmandSettings.CommonPreference<String> pref = settings.getCustomRoutingProperty(parameter.getId(), parameter.getType() == RoutingParameterType.NUMERIC ? "0.0" : "-");
+				CommonPreference<String> pref = settings.getCustomRoutingProperty(parameter.getId(), parameter.getType() == RoutingParameterType.NUMERIC ? "0.0" : "-");
 				pref.removeListener(customRoutingPrefListener);
 			}
 		}
 	}
 
+	@Override
+	public boolean onPreferenceChange(Preference preference, Object newValue) {
+		if (settings.DISABLE_COMPLEX_ROUTING.getId().equals(preference.getKey()) && newValue instanceof Boolean) {
+			return onConfirmPreferenceChange(preference.getKey(), !(Boolean) newValue, getApplyQueryType()); // pref ui was inverted
+		}
+		return onConfirmPreferenceChange(preference.getKey(), newValue, getApplyQueryType());
+	}
+
 	@Override
 	public void onApplyPreferenceChange(String prefId, boolean applyToAllProfiles, Object newValue) {
 		if ((RELIEF_SMOOTHNESS_FACTOR.equals(prefId) || DRIVING_STYLE.equals(prefId)) && newValue instanceof String) {
@@ -471,7 +552,7 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
 			applyPreference(ROUTING_RECALC_DISTANCE, applyToAllProfiles, valueToSave);
 			applyPreference(settings.DISABLE_OFFROUTE_RECALC.getId(), applyToAllProfiles, !enabled);
 			updateRouteRecalcDistancePref();
-		} else if (settings.DISABLE_WRONG_DIRECTION_RECALC.getId().equals(prefId)){
+		} else if (settings.DISABLE_WRONG_DIRECTION_RECALC.getId().equals(prefId)) {
 			applyPreference(settings.DISABLE_WRONG_DIRECTION_RECALC.getId(), applyToAllProfiles, newValue);
 		} else {
 			super.onApplyPreferenceChange(prefId, applyToAllProfiles, newValue);
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java
index df1af1a693..dfed2c5930 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java
@@ -14,7 +14,7 @@ import net.osmand.plus.activities.SettingsBaseActivity;
 import net.osmand.plus.routing.RouteProvider.RouteService;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.settings.backend.ApplicationMode;
-import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.backend.StringPreference;
 import net.osmand.plus.settings.bottomsheets.VehicleParametersBottomSheet;
 import net.osmand.plus.settings.bottomsheets.VehicleSizeAssets;
 import net.osmand.plus.settings.preferences.ListPreferenceEx;
@@ -72,7 +72,7 @@ public class VehicleParametersFragment extends BaseSettingsFragment implements O
 				parameter.getDescription());
 		String defValue = parameter.getType() == RoutingParameterType.NUMERIC
 				? ROUTING_PARAMETER_NUMERIC_DEFAULT : ROUTING_PARAMETER_SYMBOLIC_DEFAULT;
-		OsmandSettings.StringPreference pref = (OsmandSettings.StringPreference) app.getSettings()
+		StringPreference pref = (StringPreference) app.getSettings()
 				.getCustomRoutingProperty(parameterId, defValue);
 		VehicleSizeAssets assets = VehicleSizeAssets.getAssets(parameterId, routerProfile);
 		Object[] values = parameter.getPossibleValues();
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/VoiceAnnouncesFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/VoiceAnnouncesFragment.java
index 4ff8f3262d..8013baeb63 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/VoiceAnnouncesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/VoiceAnnouncesFragment.java
@@ -18,6 +18,7 @@ import androidx.preference.SwitchPreferenceCompat;
 
 import net.osmand.AndroidUtils;
 import net.osmand.plus.dialogs.SpeedCamerasBottomSheet;
+import net.osmand.plus.helpers.enums.MetricsConstants;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
@@ -107,7 +108,7 @@ public class VoiceAnnouncesFragment extends BaseSettingsFragment implements OnPr
 		Float[] valuesKmh = new Float[]{-10f, -7f, -5f, 0f, 5f, 7f, 10f, 15f, 20f};
 		Float[] valuesMph = new Float[]{-7f, -5f, -3f, 0f, 3f, 5f, 7f, 10f, 15f};
 		String[] names;
-		if (settings.METRIC_SYSTEM.getModeValue(getSelectedAppMode()) == OsmandSettings.MetricsConstants.KILOMETERS_AND_METERS) {
+		if (settings.METRIC_SYSTEM.getModeValue(getSelectedAppMode()) == MetricsConstants.KILOMETERS_AND_METERS) {
 			names = new String[valuesKmh.length];
 			for (int i = 0; i < names.length; i++) {
 				names[i] = valuesKmh[i].intValue() + " " + getString(R.string.km_h);
diff --git a/OsmAnd/src/net/osmand/plus/settings/preferences/ListPreferenceEx.java b/OsmAnd/src/net/osmand/plus/settings/preferences/ListPreferenceEx.java
index 0743cd9c8b..07e5d088b9 100644
--- a/OsmAnd/src/net/osmand/plus/settings/preferences/ListPreferenceEx.java
+++ b/OsmAnd/src/net/osmand/plus/settings/preferences/ListPreferenceEx.java
@@ -8,7 +8,7 @@ import androidx.preference.DialogPreference;
 import androidx.preference.PreferenceDataStore;
 
 import net.osmand.plus.settings.backend.ApplicationMode;
-import net.osmand.plus.settings.backend.OsmandSettings.PreferencesDataStore;
+import net.osmand.plus.settings.backend.OsmAndPreferencesDataStore;
 
 public class ListPreferenceEx extends DialogPreference {
 
@@ -126,8 +126,8 @@ public class ListPreferenceEx extends DialogPreference {
 
 	private Object getPersistedValue(Object defaultValue) {
 		PreferenceDataStore dataStore = getPreferenceDataStore();
-		if (dataStore instanceof PreferencesDataStore) {
-			Object value = ((PreferencesDataStore) dataStore).getValue(getKey(), defaultValue);
+		if (dataStore instanceof OsmAndPreferencesDataStore) {
+			Object value = ((OsmAndPreferencesDataStore) dataStore).getValue(getKey(), defaultValue);
 			if (value instanceof Enum) {
 				return ((Enum) value).ordinal();
 			} else if (value instanceof ApplicationMode) {
@@ -144,8 +144,8 @@ public class ListPreferenceEx extends DialogPreference {
 			return;
 		}
 		PreferenceDataStore dataStore = getPreferenceDataStore();
-		if (dataStore instanceof PreferencesDataStore) {
-			((PreferencesDataStore) dataStore).putValue(getKey(), value);
+		if (dataStore instanceof OsmAndPreferencesDataStore) {
+			((OsmAndPreferencesDataStore) dataStore).putValue(getKey(), value);
 		}
 	}
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/settings/preferences/MultiSelectBooleanPreference.java b/OsmAnd/src/net/osmand/plus/settings/preferences/MultiSelectBooleanPreference.java
index 896e1864d1..1f69cd0989 100644
--- a/OsmAnd/src/net/osmand/plus/settings/preferences/MultiSelectBooleanPreference.java
+++ b/OsmAnd/src/net/osmand/plus/settings/preferences/MultiSelectBooleanPreference.java
@@ -6,7 +6,7 @@ import android.util.AttributeSet;
 import androidx.preference.MultiSelectListPreference;
 import androidx.preference.PreferenceDataStore;
 
-import net.osmand.plus.settings.backend.OsmandSettings.PreferencesDataStore;
+import net.osmand.plus.settings.backend.OsmAndPreferencesDataStore;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -79,8 +79,8 @@ public class MultiSelectBooleanPreference extends MultiSelectListPreference {
 			return;
 		}
 		PreferenceDataStore dataStore = getPreferenceDataStore();
-		if (dataStore instanceof PreferencesDataStore) {
-			PreferencesDataStore preferencesDataStore = (PreferencesDataStore) dataStore;
+		if (dataStore instanceof OsmAndPreferencesDataStore) {
+			OsmAndPreferencesDataStore preferencesDataStore = (OsmAndPreferencesDataStore) dataStore;
 
 			for (String prefId : getPrefsIds()) {
 				preferencesDataStore.putBoolean(prefId, getValues().contains(prefId));
@@ -96,8 +96,8 @@ public class MultiSelectBooleanPreference extends MultiSelectListPreference {
 		Set<String> enabledPrefs = new HashSet<>();
 		PreferenceDataStore dataStore = getPreferenceDataStore();
 
-		if (dataStore instanceof PreferencesDataStore && getEntryValues() != null) {
-			PreferencesDataStore preferencesDataStore = (PreferencesDataStore) dataStore;
+		if (dataStore instanceof OsmAndPreferencesDataStore && getEntryValues() != null) {
+			OsmAndPreferencesDataStore preferencesDataStore = (OsmAndPreferencesDataStore) dataStore;
 
 			for (String prefId : getPrefsIds()) {
 				boolean enabled = preferencesDataStore.getBoolean(prefId, false);
diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesAction.java b/OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesAction.java
index 9c4ae901f7..bcbd80ff92 100644
--- a/OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesAction.java
+++ b/OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesAction.java
@@ -8,7 +8,7 @@ import android.widget.TextView;
 
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
-import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.quickaction.QuickAction;
@@ -46,7 +46,7 @@ public class ContourLinesAction extends QuickAction {
 					OsmandApplication app = activity.getMyApplication();
 					RenderingRuleProperty contourLinesProp = app.getRendererRegistry().getCustomRenderingRuleProperty(CONTOUR_LINES_ATTR);
 					if (contourLinesProp != null) {
-						final OsmandSettings.CommonPreference<String> pref = app.getSettings().getCustomRenderProperty(contourLinesProp.getAttrName());
+						final CommonPreference<String> pref = app.getSettings().getCustomRenderProperty(contourLinesProp.getAttrName());
 						boolean selected = !pref.get().equals(CONTOUR_LINES_DISABLED_VALUE);
 
 						if (selected && !plugin.isActive() && !plugin.needsInstallation()) {
diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesMenu.java b/OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesMenu.java
index 94a33cf6a8..be2631dc04 100644
--- a/OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesMenu.java
+++ b/OsmAnd/src/net/osmand/plus/srtmplugin/ContourLinesMenu.java
@@ -7,6 +7,7 @@ import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuItem;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
@@ -61,8 +62,8 @@ public class ContourLinesMenu {
 
 		final String contourWidthName;
 		final String contourDensityName;
-		final OsmandSettings.CommonPreference<String> widthPref;
-		final OsmandSettings.CommonPreference<String> densityPref;
+		final CommonPreference<String> widthPref;
+		final CommonPreference<String> densityPref;
 		final RenderingRuleProperty contourWidthProp = app.getRendererRegistry().getCustomRenderingRuleProperty(CONTOUR_WIDTH_ATTR);
 		if (contourWidthProp != null) {
 			contourWidthName = SettingsActivity.getStringPropertyName(app, contourWidthProp.getAttrName(),
@@ -82,8 +83,8 @@ public class ContourLinesMenu {
 			densityPref = null;
 		}
 
-		final OsmandSettings.CommonPreference<String> pref = settings.getCustomRenderProperty(contourLinesProp.getAttrName());
-		final OsmandSettings.CommonPreference<String> colorPref = settings.getCustomRenderProperty(colorSchemeProp.getAttrName());
+		final CommonPreference<String> pref = settings.getCustomRenderProperty(contourLinesProp.getAttrName());
+		final CommonPreference<String> colorPref = settings.getCustomRenderProperty(colorSchemeProp.getAttrName());
 
 		final boolean selected = !pref.get().equals(CONTOUR_LINES_DISABLED_VALUE);
 		final int toggleActionStringId = selected ? R.string.shared_string_on : R.string.shared_string_off;
diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java b/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java
index 3690afbc3d..5a186e75d0 100644
--- a/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java
@@ -21,8 +21,7 @@ import net.osmand.plus.DialogListItemAdapter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.TerrainMode;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.SettingsActivity;
@@ -236,7 +235,7 @@ public class SRTMPlugin extends OsmandPlugin {
 
 		RenderingRuleProperty contourLinesProp = app.getRendererRegistry().getCustomRenderingRuleProperty(CONTOUR_LINES_ATTR);
 		if (contourLinesProp != null) {
-			final OsmandSettings.CommonPreference<String> pref = app.getSettings().getCustomRenderProperty(contourLinesProp.getAttrName());
+			final CommonPreference<String> pref = app.getSettings().getCustomRenderProperty(contourLinesProp.getAttrName());
 			if (!Algorithms.isEmpty(pref.get())) {
 				contourLinesEnabled = !CONTOUR_LINES_DISABLED_VALUE.equals(pref.get());
 			} else {
@@ -293,7 +292,7 @@ public class SRTMPlugin extends OsmandPlugin {
 						public void run() {
 							RenderingRuleProperty contourLinesProp = app.getRendererRegistry().getCustomRenderingRuleProperty(CONTOUR_LINES_ATTR);
 							if (contourLinesProp != null) {
-								final OsmandSettings.CommonPreference<String> pref = settings.getCustomRenderProperty(contourLinesProp.getAttrName());
+								final CommonPreference<String> pref = settings.getCustomRenderProperty(contourLinesProp.getAttrName());
 								boolean selected = !pref.get().equals(CONTOUR_LINES_DISABLED_VALUE);
 
 								SRTMPlugin plugin = OsmandPlugin.getPlugin(SRTMPlugin.class);
@@ -340,7 +339,7 @@ public class SRTMPlugin extends OsmandPlugin {
 
 		RenderingRuleProperty contourLinesProp = app.getRendererRegistry().getCustomRenderingRuleProperty(CONTOUR_LINES_ATTR);
 		if (contourLinesProp != null) {
-			final OsmandSettings.CommonPreference<String> pref = settings.getCustomRenderProperty(contourLinesProp.getAttrName());
+			final CommonPreference<String> pref = settings.getCustomRenderProperty(contourLinesProp.getAttrName());
 			boolean contourLinesSelected = isContourLinesLayerEnabled(app);
 			String descr = getPrefDescription(app, contourLinesProp, pref);
 			adapter.addItem(new ContextMenuItem.ItemBuilder()
@@ -409,7 +408,7 @@ public class SRTMPlugin extends OsmandPlugin {
 								   final Runnable callback) {
 		RenderingRuleProperty contourLinesProp = app.getRendererRegistry().getCustomRenderingRuleProperty(CONTOUR_LINES_ATTR);
 		if (contourLinesProp != null) {
-			final OsmandSettings.CommonPreference<String> pref = settings.getCustomRenderProperty(contourLinesProp.getAttrName());
+			final CommonPreference<String> pref = settings.getCustomRenderProperty(contourLinesProp.getAttrName());
 			CommonPreference<String> zoomSetting = settings.CONTOUR_LINES_ZOOM;
 			if (!isChecked) {
 				zoomSetting.set(pref.get());
@@ -437,7 +436,7 @@ public class SRTMPlugin extends OsmandPlugin {
 		}
 	}
 
-	public String getPrefDescription(final Context ctx, final RenderingRuleProperty p, final OsmandSettings.CommonPreference<String> pref) {
+	public String getPrefDescription(final Context ctx, final RenderingRuleProperty p, final CommonPreference<String> pref) {
 		if (!Algorithms.isEmpty(pref.get())) {
 			return SettingsActivity.getStringPropertyValue(ctx, pref.get());
 		} else {
@@ -447,7 +446,7 @@ public class SRTMPlugin extends OsmandPlugin {
 
 	public void selectPropertyValue(final MapActivity activity,
 									final RenderingRuleProperty p,
-									final OsmandSettings.CommonPreference<String> pref,
+									final CommonPreference<String> pref,
 									final Runnable callback) {
 		final String propertyDescr = SettingsActivity.getStringPropertyDescription(activity,
 				p.getAttrName(), p.getName());
diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainFragment.java b/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainFragment.java
index b613d2ba13..3635aafe89 100644
--- a/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainFragment.java
+++ b/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainFragment.java
@@ -43,7 +43,6 @@ import net.osmand.plus.download.DownloadValidationManager;
 import net.osmand.plus.download.IndexItem;
 import net.osmand.plus.helpers.FontCache;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.TerrainMode;
 import net.osmand.plus.widgets.style.CustomTypefaceSpan;
 
 import org.apache.commons.logging.Log;
@@ -55,8 +54,8 @@ import java.util.List;
 import static net.osmand.plus.UiUtilities.CustomRadioButtonType.*;
 import static net.osmand.plus.download.DownloadActivityType.HILLSHADE_FILE;
 import static net.osmand.plus.download.DownloadActivityType.SLOPE_FILE;
-import static net.osmand.plus.settings.backend.OsmandSettings.TerrainMode.HILLSHADE;
-import static net.osmand.plus.settings.backend.OsmandSettings.TerrainMode.SLOPE;
+import static net.osmand.plus.srtmplugin.TerrainMode.HILLSHADE;
+import static net.osmand.plus.srtmplugin.TerrainMode.SLOPE;
 import static net.osmand.plus.srtmplugin.SRTMPlugin.TERRAIN_MAX_ZOOM;
 import static net.osmand.plus.srtmplugin.SRTMPlugin.TERRAIN_MIN_ZOOM;
 
diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainLayer.java b/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainLayer.java
index 8f75c68259..79e47de648 100644
--- a/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainLayer.java
+++ b/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainLayer.java
@@ -18,7 +18,6 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.SQLiteTileSource;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.api.SQLiteAPI.SQLiteConnection;
-import net.osmand.plus.settings.backend.OsmandSettings.TerrainMode;
 import net.osmand.plus.views.MapTileLayer;
 import net.osmand.util.Algorithms;
 
@@ -31,7 +30,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import static net.osmand.plus.settings.backend.OsmandSettings.TerrainMode.HILLSHADE;
+import static net.osmand.plus.srtmplugin.TerrainMode.HILLSHADE;
 
 public class TerrainLayer extends MapTileLayer {
 
diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainMode.java b/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainMode.java
new file mode 100644
index 0000000000..e9f3d20d9f
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainMode.java
@@ -0,0 +1,6 @@
+package net.osmand.plus.srtmplugin;
+
+public enum TerrainMode {
+	HILLSHADE,
+	SLOPE
+}
diff --git a/OsmAnd/src/net/osmand/plus/track/ShowStartFinishCard.java b/OsmAnd/src/net/osmand/plus/track/ShowStartFinishCard.java
index 3941bdbb15..eaf145379c 100644
--- a/OsmAnd/src/net/osmand/plus/track/ShowStartFinishCard.java
+++ b/OsmAnd/src/net/osmand/plus/track/ShowStartFinishCard.java
@@ -10,8 +10,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.routepreparationmenu.cards.BaseCard;
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 
 class ShowStartFinishCard extends BaseCard {
 
diff --git a/OsmAnd/src/net/osmand/plus/track/TrackAppearanceFragment.java b/OsmAnd/src/net/osmand/plus/track/TrackAppearanceFragment.java
index 81a43da20f..2276d57cd2 100644
--- a/OsmAnd/src/net/osmand/plus/track/TrackAppearanceFragment.java
+++ b/OsmAnd/src/net/osmand/plus/track/TrackAppearanceFragment.java
@@ -41,7 +41,7 @@ import net.osmand.plus.dialogs.GpxAppearanceAdapter;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.routepreparationmenu.cards.BaseCard;
 import net.osmand.plus.routepreparationmenu.cards.BaseCard.CardListener;
-import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.track.CustomColorBottomSheet.ColorPickerListener;
 import net.osmand.plus.track.SplitTrackAsyncTask.SplitTrackListener;
 import net.osmand.render.RenderingRulesStorage;
@@ -185,7 +185,7 @@ public class TrackAppearanceFragment extends ContextMenuScrollFragment implement
 		}
 		if (color == 0) {
 			RenderingRulesStorage renderer = app.getRendererRegistry().getCurrentSelectedRenderer();
-			OsmandSettings.CommonPreference<String> prefColor = app.getSettings().getCustomRenderProperty(CURRENT_TRACK_COLOR_ATTR);
+			CommonPreference<String> prefColor = app.getSettings().getCustomRenderProperty(CURRENT_TRACK_COLOR_ATTR);
 			color = GpxAppearanceAdapter.parseTrackColor(renderer, prefColor.get());
 		}
 		trackDrawInfo.setColor(color);
diff --git a/OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java b/OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java
index aff1e354e4..e47ce6c8d2 100644
--- a/OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java
+++ b/OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java
@@ -20,7 +20,7 @@ import net.osmand.CallbackWithObject;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/AidlMapLayer.java b/OsmAnd/src/net/osmand/plus/views/layers/AidlMapLayer.java
index d1c32ee4a9..580f0c3490 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/AidlMapLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/AidlMapLayer.java
@@ -24,7 +24,7 @@ import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.data.RotatedTileBox;
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java b/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java
index 641944ce21..46d51bca33 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java
@@ -50,7 +50,7 @@ import net.osmand.plus.mapcontextmenu.other.TrackChartPoints;
 import net.osmand.plus.render.OsmandRenderer;
 import net.osmand.plus.render.OsmandRenderer.RenderingContext;
 import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.track.SaveGpxAsyncTask;
 import net.osmand.plus.track.TrackDrawInfo;
 import net.osmand.plus.views.OsmandMapLayer;
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/layers/MapControlsLayer.java
index f1c3c1f13a..6a4cf344c7 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/MapControlsLayer.java
@@ -44,6 +44,10 @@ import net.osmand.plus.OsmAndLocationProvider;
 import net.osmand.plus.OsmAndLocationSimulation;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.settings.backend.OsmandPreference;
+import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.backend.CommonPreference;
+import net.osmand.plus.rastermaps.LayerTransparencySeekbarMode;
 import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.TargetPointsHelper.TargetPoint;
@@ -63,9 +67,6 @@ import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.search.QuickSearchDialogFragment.QuickSearchType;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.settings.backend.OsmAndAppCustomization;
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;
-import net.osmand.plus.settings.backend.OsmandSettings.LayerTransparencySeekbarMode;
 import net.osmand.plus.views.OsmandMapLayer;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.corenative.NativeCoreContext;
@@ -1360,7 +1361,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 			@Override
 			public boolean onLongClick(View notUseCouldBeNull) {
-				final OsmandSettings.OsmandPreference<Float> mapDensity = view.getSettings().MAP_DENSITY;
+				final OsmandPreference<Float> mapDensity = view.getSettings().MAP_DENSITY;
 				final AlertDialog.Builder bld = new AlertDialog.Builder(view.getContext());
 				int p = (int) (mapDensity.get() * 100);
 				final TIntArrayList tlist = new TIntArrayList(new int[]{25, 33, 50, 75, 100, 125, 150, 200, 300, 400});
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/RulerControlLayer.java b/OsmAnd/src/net/osmand/plus/views/layers/RulerControlLayer.java
index 5bd719b11b..8ba37ca98a 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/RulerControlLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/RulerControlLayer.java
@@ -29,9 +29,9 @@ import net.osmand.data.QuadPoint;
 import net.osmand.data.RotatedTileBox;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.AngularConstants;
-import net.osmand.plus.settings.backend.OsmandSettings.RulerMode;
+import net.osmand.plus.helpers.enums.MetricsConstants;
+import net.osmand.plus.settings.backend.OsmandPreference;
+import net.osmand.plus.helpers.enums.AngularConstants;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.views.OsmandMapLayer;
@@ -70,8 +70,8 @@ public class RulerControlLayer extends OsmandMapLayer {
 
 	private QuadPoint cacheCenter;
 	private float cacheMapDensity;
-	private OsmandSettings.OsmandPreference<Float> mapDensity;
-	private OsmandSettings.MetricsConstants cacheMetricSystem;
+	private OsmandPreference<Float> mapDensity;
+	private MetricsConstants cacheMetricSystem;
 	private int cacheIntZoom;
 	private LatLon cacheCenterLatLon;
 	private long cacheMultiTouchEndTime;
@@ -451,7 +451,7 @@ public class RulerControlLayer extends OsmandMapLayer {
 				updateCenter(tb, center);
 			}
 
-			OsmandSettings.MetricsConstants currentMetricSystem = app.getSettings().METRIC_SYSTEM.get();
+			MetricsConstants currentMetricSystem = app.getSettings().METRIC_SYSTEM.get();
 			boolean updateCache = tb.getZoom() != cacheIntZoom
 					|| !tb.getCenterLatLon().equals(cacheCenterLatLon) || mapDensity.get() != cacheMapDensity
 					|| cacheMetricSystem != currentMetricSystem;
@@ -822,4 +822,10 @@ public class RulerControlLayer extends OsmandMapLayer {
 	public boolean drawInScreenPixels() {
 		return false;
 	}
+
+	public enum RulerMode {
+		FIRST,
+		SECOND,
+		EMPTY
+	}
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/TransportStopsLayer.java b/OsmAnd/src/net/osmand/plus/views/layers/TransportStopsLayer.java
index ce20aa066e..2eb4f27956 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/TransportStopsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/TransportStopsLayer.java
@@ -21,6 +21,7 @@ import net.osmand.data.TransportStop;
 import net.osmand.osm.edit.Node;
 import net.osmand.osm.edit.Way;
 import net.osmand.plus.base.PointImageDrawable;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
@@ -53,7 +54,7 @@ public class TransportStopsLayer extends OsmandMapLayer implements ContextMenuLa
 	private MapLayerData<List<TransportStop>> data;
 	private TransportStopRoute stopRoute = null;
 
-	private OsmandSettings.CommonPreference<Boolean> showTransportStops;
+	private CommonPreference<Boolean> showTransportStops;
 
 	private Path path;
 
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index 9979b3820b..565fb872c0 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -48,6 +48,7 @@ import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmAndLocationProvider;
 import net.osmand.plus.OsmAndLocationProvider.GPSInfo;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
@@ -63,11 +64,10 @@ import net.osmand.plus.routepreparationmenu.ShowAlongTheRouteBottomSheet;
 import net.osmand.plus.routing.RouteCalculationResult;
 import net.osmand.plus.routing.RouteDirectionInfo;
 import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.RulerMode;
 import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.layers.RulerControlLayer;
+import net.osmand.plus.views.layers.RulerControlLayer.RulerMode;
 import net.osmand.plus.views.mapwidgets.widgets.TextInfoWidget;
 import net.osmand.render.RenderingRuleSearchRequest;
 import net.osmand.render.RenderingRulesStorage;
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
index 1e968e4ae6..2cf6d23d93 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java
@@ -17,7 +17,7 @@ import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuItem;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
index e3a16e5975..f77bc27f36 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
@@ -16,6 +16,8 @@ import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmAndLocationProvider;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
 import net.osmand.plus.TargetPointsHelper.TargetPoint;
@@ -23,8 +25,6 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.MapViewTrackingUtilities;
 import net.osmand.plus.routing.RouteCalculationResult.NextDirectionInfo;
 import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
 import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.mapwidgets.widgets.AlarmWidget;
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgets/AlarmWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgets/AlarmWidget.java
index a75422967d..2dc092139e 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgets/AlarmWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgets/AlarmWidget.java
@@ -16,6 +16,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.MapViewTrackingUtilities;
 import net.osmand.plus.helpers.AndroidUiHelper;
+import net.osmand.plus.helpers.enums.DrivingRegion;
 import net.osmand.plus.helpers.WaypointHelper;
 import net.osmand.plus.routing.AlarmInfo;
 import net.osmand.plus.routing.RoutingHelper;
@@ -40,7 +41,7 @@ public class AlarmWidget {
 	private int imgId;
 	private String cachedText;
 	private String cachedBottomText;
-	private OsmandSettings.DrivingRegion cachedRegion;
+	private DrivingRegion cachedRegion;
 
 	public AlarmWidget(final OsmandApplication app, MapActivity ma) {
 		layout = ma.findViewById(R.id.map_alarm_warning);
@@ -81,9 +82,9 @@ public class AlarmWidget {
 				int locimgId = R.drawable.warnings_limit;
 				String text = "";
 				String bottomText = "";
-				OsmandSettings.DrivingRegion region = settings.DRIVING_REGION.get();
+				DrivingRegion region = settings.DRIVING_REGION.get();
 				boolean americanType = region.isAmericanTypeSigns();
-				boolean isCanadianRegion = region == OsmandSettings.DrivingRegion.CANADA;
+				boolean isCanadianRegion = region == DrivingRegion.CANADA;
 				if (alarm.getType() == AlarmInfo.AlarmInfoType.SPEED_LIMIT) {
 					if (isCanadianRegion) {
 						locimgId = R.drawable.warnings_speed_limit_ca;
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgets/RulerWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgets/RulerWidget.java
index 8d576c72cf..636ef0af5a 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgets/RulerWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgets/RulerWidget.java
@@ -10,7 +10,7 @@ import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.helpers.AndroidUiHelper;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
 import net.osmand.plus.views.OsmandMapTileView;
 
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgetstates/BearingWidgetState.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgetstates/BearingWidgetState.java
index ce4761eab1..d3fc793ee1 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgetstates/BearingWidgetState.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgetstates/BearingWidgetState.java
@@ -2,14 +2,14 @@ package net.osmand.plus.views.mapwidgets.widgetstates;
 
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
-import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.backend.OsmandPreference;
 
 public class BearingWidgetState extends WidgetState {
 
 	public static final int BEARING_WIDGET_STATE_RELATIVE_BEARING = R.id.bearing_widget_state_relative_bearing;
 	public static final int BEARING_WIDGET_STATE_MAGNETIC_BEARING = R.id.bearing_widget_state_magnetic_bearing;
 
-	private final OsmandSettings.OsmandPreference<Boolean> showRelativeBearing;
+	private final OsmandPreference<Boolean> showRelativeBearing;
 
 	public BearingWidgetState(OsmandApplication ctx) {
 		super(ctx);
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgetstates/CompassRulerWidgetState.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgetstates/CompassRulerWidgetState.java
index eb77043746..39de1d653c 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgetstates/CompassRulerWidgetState.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgetstates/CompassRulerWidgetState.java
@@ -2,7 +2,7 @@ package net.osmand.plus.views.mapwidgets.widgetstates;
 
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 
 public class CompassRulerWidgetState extends WidgetState {
 
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgetstates/TimeWidgetState.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgetstates/TimeWidgetState.java
index 3274245a0c..b42d5a970d 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgetstates/TimeWidgetState.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/widgetstates/TimeWidgetState.java
@@ -2,7 +2,7 @@ package net.osmand.plus.views.mapwidgets.widgetstates;
 
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
-import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
+import net.osmand.plus.settings.backend.OsmandPreference;
 
 public class TimeWidgetState extends WidgetState {
 
diff --git a/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java b/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java
index 74c0de1508..44f301945f 100644
--- a/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java
+++ b/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java
@@ -12,7 +12,7 @@ import net.osmand.StateChangedListener;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.MetricsConstants;
+import net.osmand.plus.helpers.enums.MetricsConstants;
 import net.osmand.plus.R;
 import net.osmand.plus.api.AudioFocusHelper;
 
diff --git a/OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java
index 7b9d7a4972..d9bc2b0f9d 100644
--- a/OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java
+++ b/OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java
@@ -8,7 +8,7 @@ import android.os.Build;
 import net.osmand.PlatformUtil;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.routing.VoiceRouter;
 
 import org.apache.commons.logging.Log;
@@ -91,7 +91,7 @@ public class MediaCommandPlayerImpl extends AbstractPrologCommandPlayer implemen
 			// Delay first prompt of each batch to allow BT SCO link being established, or when VOICE_PROMPT_DELAY is set >0 for the other stream types
 			if (ctx != null) {
 				Integer stream = ctx.getSettings().AUDIO_MANAGER_STREAM.getModeValue(getApplicationMode());
-				OsmandSettings.OsmandPreference<Integer> pref = ctx.getSettings().VOICE_PROMPT_DELAY[stream];
+				OsmandPreference<Integer> pref = ctx.getSettings().VOICE_PROMPT_DELAY[stream];
 				if (pref.getModeValue(getApplicationMode()) > 0) {
 					try {
 						Thread.sleep(pref.getModeValue(getApplicationMode()));
diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
index 8ac282c331..993d7bc038 100644
--- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
+++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
@@ -17,7 +17,7 @@ import androidx.appcompat.app.AlertDialog;
 import net.osmand.PlatformUtil;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.backend.OsmandPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.SettingsActivity;
 import net.osmand.plus.routing.VoiceRouter;
@@ -127,7 +127,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
 				// Delay first prompt of each batch to allow BT SCO link being established, or when VOICE_PROMPT_DELAY is set >0 for the other stream types
 				if (ctx != null) {
 					Integer streamModeValue = ctx.getSettings().AUDIO_MANAGER_STREAM.getModeValue(getApplicationMode());
-					OsmandSettings.OsmandPreference<Integer> pref = ctx.getSettings().VOICE_PROMPT_DELAY[streamModeValue];
+					OsmandPreference<Integer> pref = ctx.getSettings().VOICE_PROMPT_DELAY[streamModeValue];
 					int vpd = pref == null ? 0 : pref.getModeValue(getApplicationMode());
 					if (vpd > 0) {
 						ttsRequests++;
diff --git a/OsmAnd/src/net/osmand/plus/wikipedia/WikiArticleBaseDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikipedia/WikiArticleBaseDialogFragment.java
index 302140ba03..0e15c2b4a9 100644
--- a/OsmAnd/src/net/osmand/plus/wikipedia/WikiArticleBaseDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikipedia/WikiArticleBaseDialogFragment.java
@@ -13,7 +13,6 @@ import androidx.annotation.NonNull;
 
 import net.osmand.AndroidUtils;
 import net.osmand.IndexConstants;
-import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.wikivoyage.WikiBaseDialogFragment;
 
@@ -94,7 +93,7 @@ public abstract class WikiArticleBaseDialogFragment extends WikiBaseDialogFragme
 
 
 	protected void updateWebSettings() {
-		OsmandSettings.WikiArticleShowImages showImages = getSettings().WIKI_ARTICLE_SHOW_IMAGES.get();
+		WikiArticleShowImages showImages = getSettings().WIKI_ARTICLE_SHOW_IMAGES.get();
 		WebSettings webSettings = contentWebView.getSettings();
 		switch (showImages) {
 			case ON:
diff --git a/OsmAnd/src/net/osmand/plus/wikipedia/WikiArticleShowImages.java b/OsmAnd/src/net/osmand/plus/wikipedia/WikiArticleShowImages.java
new file mode 100644
index 0000000000..ea3d8a925b
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/wikipedia/WikiArticleShowImages.java
@@ -0,0 +1,15 @@
+package net.osmand.plus.wikipedia;
+
+import net.osmand.plus.R;
+
+public enum WikiArticleShowImages {
+	ON(R.string.shared_string_on),
+	OFF(R.string.shared_string_off),
+	WIFI(R.string.shared_string_wifi_only);
+
+	public final int name;
+
+	WikiArticleShowImages(int name) {
+		this.name = name;
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaOptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaOptionsBottomSheetDialogFragment.java
index 41edcb0a02..7c2b23867e 100644
--- a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaOptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaOptionsBottomSheetDialogFragment.java
@@ -9,8 +9,7 @@ import androidx.appcompat.widget.PopupMenu;
 import androidx.fragment.app.Fragment;
 
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.WikiArticleShowImages;
+import net.osmand.plus.settings.backend.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.base.MenuBottomSheetDialogFragment;
 import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
@@ -28,7 +27,7 @@ public class WikipediaOptionsBottomSheetDialogFragment extends MenuBottomSheetDi
 	@Override
 	public void createMenuItems(Bundle savedInstanceState) {
 		final OsmandApplication app = getMyApplication();
-		final OsmandSettings.CommonPreference<WikiArticleShowImages> showImagesPref = app.getSettings().WIKI_ARTICLE_SHOW_IMAGES;
+		final CommonPreference<WikiArticleShowImages> showImagesPref = app.getSettings().WIKI_ARTICLE_SHOW_IMAGES;
 
 		items.add(new TitleItem(getString(R.string.shared_string_options)));
 
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageShowPicturesDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageShowPicturesDialogFragment.java
index 07c748cd28..824a2e9e49 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageShowPicturesDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageShowPicturesDialogFragment.java
@@ -18,7 +18,7 @@ import androidx.fragment.app.Fragment;
 
 import net.osmand.AndroidUtils;
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.settings.backend.OsmandSettings.WikiArticleShowImages;
+import net.osmand.plus.wikipedia.WikiArticleShowImages;
 import net.osmand.plus.R;
 import net.osmand.plus.base.BottomSheetDialogFragment;
 import net.osmand.plus.helpers.AndroidUiHelper;
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java
index be9d3f2e58..fa704688a0 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java
@@ -50,7 +50,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import static net.osmand.plus.settings.backend.OsmandSettings.WikiArticleShowImages.OFF;
+import static net.osmand.plus.wikipedia.WikiArticleShowImages.OFF;
 
 
 public class WikivoyageArticleDialogFragment extends WikiArticleBaseDialogFragment {
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/WikivoyageOptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/WikivoyageOptionsBottomSheetDialogFragment.java
index 3b67249cf7..988598c359 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/WikivoyageOptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/WikivoyageOptionsBottomSheetDialogFragment.java
@@ -15,8 +15,8 @@ import androidx.appcompat.widget.PopupMenu;
 import net.osmand.PicassoUtils;
 import net.osmand.plus.OnDialogFragmentResultListener;
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.settings.backend.OsmandSettings;
-import net.osmand.plus.settings.backend.OsmandSettings.WikiArticleShowImages;
+import net.osmand.plus.settings.backend.CommonPreference;
+import net.osmand.plus.wikipedia.WikiArticleShowImages;
 import net.osmand.plus.R;
 import net.osmand.plus.base.MenuBottomSheetDialogFragment;
 import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
@@ -44,7 +44,7 @@ public class WikivoyageOptionsBottomSheetDialogFragment extends MenuBottomSheetD
 		if (app == null) {
 			return;
 		}
-		final OsmandSettings.CommonPreference<WikiArticleShowImages> showImagesPref = app.getSettings().WIKI_ARTICLE_SHOW_IMAGES;
+		final CommonPreference<WikiArticleShowImages> showImagesPref = app.getSettings().WIKI_ARTICLE_SHOW_IMAGES;
 		final TravelDbHelper dbHelper = app.getTravelDbHelper();
 
 		items.add(new TitleItem(getString(R.string.shared_string_options)));